[Bf-blender-cvs] [56f2293a51d] blender2.8: GLSL: No need to extract the UBO dynamic inputs

[Dalai Felinto]

Commit: 56f2293a51d8ec572325f2581c7decb3cf2f8419
Author: Dalai Felinto
Date:   Thu Jun 7 19:40:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB56f2293a51d8ec572325f2581c7decb3cf2f8419

GLSL: No need to extract the UBO dynamic inputs

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

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

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

diff --git a/source/blender/gpu/intern/gpu_codegen.c 
b/source/blender/gpu/intern/gpu_codegen.c
index 91d0d9dbecc..76ecf411143 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -1162,8 +1162,12 @@ void GPU_nodes_extract_dynamic_inputs(GPUShader *shader, 
ListBase *inputs, ListB
                                if (input->bindtex)
                                        extract = 1;
                        }
-                       else if (input->dynamicvec)
+                       else if (input->dynamictype == GPU_DYNAMIC_UBO) {
+                               /* Don't extract UBOs */
+                       }
+                       else if (input->dynamicvec) {
                                extract = 1;
+                       }
 
                        if (extract)
                                input->shaderloc = 
GPU_shader_get_uniform(shader, input->shadername);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs