Fix #105455: GPU subdivision with textures corrupts display after undo #105844

Brecht Van Lommel · 2023-03-16T20:59:19+01:00

Brecht Van Lommel commented

2023-03-16 20:59:19 +01:00

This is an issue revealed by the recent optimization in 4d3bfb3f41 to have
CPU and GPU subdivision topology both cached.

BKE_subsurf_modifier_subdiv_descriptor_ensure is what (re)creates the
topology refiner when needed. Invalidating the topology refiner on changes
must be done before it, otherwise we end up with an incomplete Subdiv that
either does not draw or draw incorrectly.

This is an issue revealed by the recent optimization in 4d3bfb3f41 to have CPU and GPU subdivision topology both cached. BKE_subsurf_modifier_subdiv_descriptor_ensure is what (re)creates the topology refiner when needed. Invalidating the topology refiner on changes must be done before it, otherwise we end up with an incomplete Subdiv that either does not draw or draw incorrectly.

Brecht Van Lommel requested review from Kévin Dietrich 2023-03-16 20:59:47 +01:00

Brecht Van Lommel requested review from Alexander Gavrilov 2023-03-16 20:59:47 +01:00

Brecht Van Lommel changed title from ~~Fix #105455: GPU subdivision with textures corrupt display after undo~~ to Fix #105455: GPU subdivision with textures corrupts display after undo

2023-03-16 21:05:07 +01:00

Kévin Dietrich requested changes 2023-03-16 22:32:01 +01:00

Kévin Dietrich left a comment

This causes a crash in one of my test file as draw_subdiv_invalidate_evaluator_for_orco is not checking the validity of the Subdiv pointer.

diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
index 2f0dd84af8c..eb8c2c5e6b4 100644
--- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc
+++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc
@@ -838,6 +838,10 @@ static DRWSubdivCache *mesh_batch_cache_ensure_subdiv_cache(MeshBatchCache *mbc)
 
 static void draw_subdiv_invalidate_evaluator_for_orco(Subdiv *subdiv, Mesh *mesh)
 {
+  if (!subdiv) {
+    return;
+  }
+
   const bool has_orco = CustomData_has_layer(&mesh->vdata, CD_ORCO);
   if (has_orco && subdiv->evaluator && !subdiv->evaluator->hasVertexData(subdiv->evaluator)) {
     /* If we suddenly have/need original coordinates, recreate the evaluator if the extra

This causes a crash in one of my test file as draw_subdiv_invalidate_evaluator_for_orco is not checking the validity of the Subdiv pointer. ``` diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index 2f0dd84af8c..eb8c2c5e6b4 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -838,6 +838,10 @@ static DRWSubdivCache *mesh_batch_cache_ensure_subdiv_cache(MeshBatchCache *mbc) static void draw_subdiv_invalidate_evaluator_for_orco(Subdiv *subdiv, Mesh *mesh) { + if (!subdiv) { + return; + } + const bool has_orco = CustomData_has_layer(&mesh->vdata, CD_ORCO); if (has_orco && subdiv->evaluator && !subdiv->evaluator->hasVertexData(subdiv->evaluator)) { /* If we suddenly have/need original coordinates, recreate the evaluator if the extra ```

Brecht Van Lommel commented

2023-03-16 22:45:40 +01:00

Thanks!

I had actually fixed that in brecht/blender@3a5c44e057 but for some reason the PR did not update.

Thanks! I had actually fixed that in brecht/blender@3a5c44e05760756d32f33d7346b8ba0d197e3789 but for some reason the PR did not update.

Brecht Van Lommel force-pushed fix-undo-orco-subdiv from e2bfeedb70 to ebf8153911

2023-03-16 22:46:16 +01:00

Compare

Brecht Van Lommel force-pushed fix-undo-orco-subdiv from ebf8153911 to aa83501d80

2023-03-16 22:50:16 +01:00

Compare

Brecht Van Lommel commented

2023-03-16 22:51:58 +01:00

Ok, code should be updated now with a similar null check.

Kévin Dietrich approved these changes 2023-03-16 22:59:37 +01:00

Brecht Van Lommel merged commit 20a8bc1204 into blender-v3.5-release

2023-03-16 23:19:05 +01:00

Brecht Van Lommel referenced this issue from a commit

2023-03-16 23:19:06 +01:00

Fix #105455: GPU subdivision with textures corrupts display after undo

Brecht Van Lommel deleted branch fix-undo-orco-subdiv

2023-03-16 23:19:07 +01:00

Sign in to join this conversation.

No reviewers

No Label

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Fix #105455: GPU subdivision with textures corrupts display after undo #105844