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

GPUShader: Cleanup Unused shaders

Browse Source
This commit is contained in:
Clément Foucault
2018-12-23 14:13:24 +01:00
parent a46dc9b234
commit 1459a70489
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/gpu/GPU_shader.h
View File

@@ -161,7 +161,6 @@ typedef enum GPUBuiltinShader {
* \param pos: in vec3
*/
GPU_SHADER_3D_UNIFORM_COLOR,
GPU_SHADER_3D_UNIFORM_COLOR_U32,
GPU_SHADER_3D_UNIFORM_COLOR_INSTANCE,
/**
* Take a 3D position and color for each vertex without color interpolation.
@@ -170,7 +169,6 @@ typedef enum GPUBuiltinShader {
* \param pos: in vec3
*/
GPU_SHADER_3D_FLAT_COLOR,
GPU_SHADER_3D_FLAT_COLOR_U32, /* use for select-id's */
/**
* Take a 3D position and color for each vertex with perspective correct interpolation.
*

10
source/blender/gpu/intern/gpu_shader.c
View File

@@ -795,15 +795,9 @@ static const GPUShaderStages builtin_shader_stages[GPU_NUM_BUILTIN_SHADERS] = {
[GPU_SHADER_3D_UNIFORM_COLOR] =
{ datatoc_gpu_shader_3D_vert_glsl,
datatoc_gpu_shader_uniform_color_frag_glsl },
[GPU_SHADER_3D_UNIFORM_COLOR_U32] =
{ datatoc_gpu_shader_3D_vert_glsl,
datatoc_gpu_shader_uniform_color_frag_glsl },
[GPU_SHADER_3D_FLAT_COLOR] =
{ datatoc_gpu_shader_3D_flat_color_vert_glsl,
datatoc_gpu_shader_flat_color_frag_glsl },
[GPU_SHADER_3D_FLAT_COLOR_U32] =
{ datatoc_gpu_shader_3D_flat_color_vert_glsl,
datatoc_gpu_shader_flat_color_frag_glsl },
[GPU_SHADER_3D_SMOOTH_COLOR] =
{ datatoc_gpu_shader_3D_smooth_color_vert_glsl,
datatoc_gpu_shader_3D_smooth_color_frag_glsl },
@@ -1007,10 +1001,6 @@ static const char *gpu_shader_get_builtin_shader_defines(
case GPU_SHADER_3D_OBJECTSPACE_SIMPLE_LIGHTING_VARIYING_COLOR:
return "#define USE_INSTANCE_COLOR\n";
case GPU_SHADER_3D_FLAT_COLOR_U32:
case GPU_SHADER_3D_UNIFORM_COLOR_U32:
return "#define USE_COLOR_U32\n";
case GPU_SHADER_SIMPLE_LIGHTING_FLAT_COLOR:
return "#define USE_FLAT_NORMAL\n";