[Bf-blender-cvs] [e13a2cde28d] master: GPU: Comment incorrect asserts

Clément Foucault noreply at git.blender.org
Tue Sep 17 19:56:51 CEST 2019


Commit: e13a2cde28d715f6ff501d46b0f8b4ab37b95603
Author: Clément Foucault
Date:   Tue Sep 17 19:56:36 2019 +0200
Branches: master
https://developer.blender.org/rBe13a2cde28d715f6ff501d46b0f8b4ab37b95603

GPU: Comment incorrect asserts

These asserts are too simple and triggers false positive.

===================================================================

M	source/blender/gpu/intern/gpu_batch.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index bc750fb74c9..9c0c001b979 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -676,9 +676,12 @@ void GPU_batch_draw_advanced(GPUBatch *batch, int v_first, int v_count, int i_fi
   }
 
   /* Verify there is enough data do draw. */
-  BLI_assert(i_first + i_count <= (batch->inst ? batch->inst->vertex_len : INT_MAX));
-  BLI_assert(v_first + v_count <=
-             (batch->elem ? batch->elem->index_len : batch->verts[0]->vertex_len));
+  /* TODO(fclem) Nice to have but this is invalid when using procedural drawcalls.
+   * The right assert would be to check if there is an enabled attrib from each VBO
+   * and check their length. */
+  // BLI_assert(i_first + i_count <= (batch->inst ? batch->inst->vertex_len : INT_MAX));
+  // BLI_assert(v_first + v_count <=
+  //            (batch->elem ? batch->elem->index_len : batch->verts[0]->vertex_len));
 
   if (!GPU_arb_base_instance_is_supported()) {
     if (i_first > 0) {



More information about the Bf-blender-cvs mailing list