archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Remove unused uniform and UBO.

Browse Source
This commit is contained in:
Clément Foucault
2018-08-16 23:39:23 +02:00
parent d96715fe5c
commit a01dec2d9c
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/intern/draw_common.c
View File

@@ -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;

8
source/blender/draw/modes/object_mode.c
View File

@@ -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 */

1
source/blender/draw/modes/shaders/armature_shape_solid_vert.glsl
View File

@@ -5,7 +5,6 @@ uniform mat4 ViewProjectionMatrix;
uniform mat4 ViewMatrix;
uniform mat4 ProjectionMatrix;
uniform vec2 viewportSize;
/* ---- Instanciated Attribs ---- */
in vec3 pos;