[Bf-blender-cvs] [a01dec2d9cc] blender2.8: Cleanup: Remove unused uniform and UBO.

[Clément Foucault]

Commit: a01dec2d9cc10d8588ee08332322d5e906d2e66b
Author: Clément Foucault
Date:   Thu Aug 16 23:39:23 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa01dec2d9cc10d8588ee08332322d5e906d2e66b

Cleanup: Remove unused uniform and UBO.

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

M	source/blender/draw/intern/draw_common.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl

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

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 77d6e888771..ca4668af74f 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -641,7 +641,6 @@ DRWShadingGroup *shgroup_instance_bone_shape_solid(DRWPass *pass, struct GPUBatc
 	DRWShadingGroup *grp = DRW_shgroup_instance_create(
 	        g_shaders.shape_solid,
 	        pass, geom, g_formats.instance_bone);
-	DRW_shgroup_uniform_vec2(grp, "viewportSize", DRW_viewport_size_get(), 1);
 	DRW_shgroup_uniform_float_copy(grp, "alpha", transp ? 0.6f : 1.0f);
 
 	return grp;
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 7e74e5f9629..cf8fb3412f5 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -397,15 +397,13 @@ static void OBJECT_engine_init(void *vedata)
 		e_data.outline_fade_sh = DRW_shader_create_fullscreen(datatoc_object_outline_expand_frag_glsl, NULL);
 
 		/* Empty images */
-		e_data.object_empty_image_sh = DRW_shader_create_with_lib(
+		e_data.object_empty_image_sh = DRW_shader_create(
 		           datatoc_object_empty_image_vert_glsl, NULL,
-		           datatoc_object_empty_image_frag_glsl,
-		           datatoc_common_globals_lib_glsl, NULL);
+		           datatoc_object_empty_image_frag_glsl, NULL);
 
-		e_data.object_empty_image_wire_sh = DRW_shader_create_with_lib(
+		e_data.object_empty_image_wire_sh = DRW_shader_create(
 		           datatoc_object_empty_image_vert_glsl, NULL,
 		           datatoc_object_empty_image_frag_glsl,
-		           datatoc_common_globals_lib_glsl,
 		           "#define USE_WIRE\n");
 
 		/* Grid */
diff --git a/source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl b/source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl
index 505868c9dcf..2ccfd88892c 100644
--- a/source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl
+++ b/source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl
@@ -5,7 +5,6 @@ uniform mat4 ViewProjectionMatrix;
 
 uniform mat4 ViewMatrix;
 uniform mat4 ProjectionMatrix;
-uniform vec2 viewportSize;
 
 /* ---- Instanciated Attribs ---- */
 in vec3 pos;