[Bf-blender-cvs] [4649deaab7c] tmp-drw-callbatching: DRW: Remove common_view_lib uniform default values

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


Commit: 4649deaab7c5f66005cce844c73bc275c60aea0a
Author: Clément Foucault
Date:   Fri Jun 7 13:27:17 2019 +0200
Branches: tmp-drw-callbatching
https://developer.blender.org/rB4649deaab7c5f66005cce844c73bc275c60aea0a

DRW: Remove common_view_lib uniform default values

Thoses default values makes the uniform never disabled so they
are updated even if not used.

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

M	source/blender/draw/modes/shaders/common_view_lib.glsl

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

diff --git a/source/blender/draw/modes/shaders/common_view_lib.glsl b/source/blender/draw/modes/shaders/common_view_lib.glsl
index e7bffaa7455..4cbb2c34aeb 100644
--- a/source/blender/draw/modes/shaders/common_view_lib.glsl
+++ b/source/blender/draw/modes/shaders/common_view_lib.glsl
@@ -24,14 +24,14 @@ layout(std140) uniform viewBlock
     _world_clip_planes_calc_clip_distance(p, clipPlanes)
 #endif
 
-uniform int resourceChunk = 0;
+uniform int resourceChunk;
 
 #ifdef GPU_VERTEX_SHADER
 #  ifdef GL_ARB_shader_draw_parameters
 #    define resource_id (gl_BaseInstanceARB + gl_InstanceID)
 
 #  else /* no ARB_shader_draw_parameters */
-uniform int baseInstance = 0;
+uniform int baseInstance;
 #    define resource_id (baseInstance + gl_InstanceID)
 
 #  endif



More information about the Bf-blender-cvs mailing list