[Bf-blender-cvs] [19999c6ffbf] tmp-drw-callbatching: GPU: Fix USE_MULTI_DRAW_INDIRECT macro

Clément Foucault noreply at git.blender.org
Sat Aug 17 14:51:11 CEST 2019


Commit: 19999c6ffbfc9125d253dd5883eb1d4882f08136
Author: Clément Foucault
Date:   Sun Aug 11 22:05:16 2019 +0200
Branches: tmp-drw-callbatching
https://developer.blender.org/rB19999c6ffbfc9125d253dd5883eb1d4882f08136

GPU: Fix USE_MULTI_DRAW_INDIRECT macro

Now uses GPU_arb_base_instance_is_supported properly.

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

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 5fc7a885a92..77eb67acb83 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -743,7 +743,8 @@ void GPU_draw_primitive(GPUPrimType prim_type, int v_count)
 #if 0
 #  define USE_MULTI_DRAW_INDIRECT 0
 #else
-#  define USE_MULTI_DRAW_INDIRECT (GL_ARB_multi_draw_indirect && GLEW_ARB_base_instance)
+#  define USE_MULTI_DRAW_INDIRECT \
+    (GL_ARB_multi_draw_indirect && GPU_arb_base_instance_is_supported())
 #endif
 
 typedef struct GPUDrawCommand {



More information about the Bf-blender-cvs mailing list