diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-12-23 16:13:24 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-01-11 18:00:23 +0300 |
| commit | 1459a7048958de229f35a23a1a760c28a06a5f44 (patch) | |
| tree | 6aa354a8304432704bbc992e7c133fb2623a01f3 /source/blender/gpu | |
| parent | a46dc9b234399401eac185284559adf713d75ecf (diff) | |
GPUShader: Cleanup Unused shaders
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/GPU_shader.h | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader.c | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index eea8f78fe48..ea7983f8a2e 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -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. * diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c index 6ad6faf86e1..88d4f1e5c52 100644 --- a/source/blender/gpu/intern/gpu_shader.c +++ b/source/blender/gpu/intern/gpu_shader.c @@ -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"; |