[Bf-blender-cvs] [f8f28dc7841] master: Workaround for NVidia broken driver

[Clément Foucault]

Commit: f8f28dc7841a7509727d93f05a941db82746dbd1
Author: Clément Foucault
Date:   Wed Oct 2 14:13:41 2019 +0200
Branches: master
https://developer.blender.org/rBf8f28dc7841a7509727d93f05a941db82746dbd1

Workaround for NVidia broken driver

This disable the indirect drawcall on all Nvidia hardware.

This has to be until nvidia fixes their drivers or instruct us
how to correctly fix the issue.

Related to T70011 Various display issues on NVIDIA
after draw call batching.

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

M	source/blender/editors/space_node/drawnode.c
M	source/blender/gpu/intern/gpu_batch.c

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

diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 3beb12fbb2a..f7c772ef145 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -3890,9 +3890,7 @@ static void nodelink_batch_draw(SpaceNode *snode)
 
 void nodelink_batch_start(SpaceNode *UNUSED(snode))
 {
-  /* TODO: partial workaround for NVIDIA driver bug on recent GTX/RTX cards,
-   * that breaks instancing when using indirect draw-call (see T70011). */
-  g_batch_link.enabled = !GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_ANY);
+  g_batch_link.enabled = true;
 }
 
 void nodelink_batch_end(SpaceNode *snode)
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 2620ba49799..c08680d7d14 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -718,8 +718,11 @@ void GPU_draw_primitive(GPUPrimType prim_type, int v_count)
 #if 0
 #  define USE_MULTI_DRAW_INDIRECT 0
 #else
+/* TODO: partial workaround for NVIDIA driver bug on recent GTX/RTX cards,
+ * that breaks instancing when using indirect draw-call (see T70011). */
 #  define USE_MULTI_DRAW_INDIRECT \
-    (GL_ARB_multi_draw_indirect && GPU_arb_base_instance_is_supported())
+    (GL_ARB_multi_draw_indirect && GPU_arb_base_instance_is_supported() && \
+     !GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_OFFICIAL))
 #endif
 
 typedef struct GPUDrawCommand {