GPUShader: Cleanup Unused shaders
authorClément Foucault <foucault.clem@gmail.com>
Sun, 23 Dec 2018 13:13:24 +0000 (14:13 +0100)
committerClément Foucault <foucault.clem@gmail.com>
Fri, 11 Jan 2019 15:00:23 +0000 (16:00 +0100)
source/blender/gpu/GPU_shader.h
source/blender/gpu/intern/gpu_shader.c

index eea8f78fe48d3dda23cf907e8321206c8426f4a1..ea7983f8a2eb9569ef7881270e1717ae2ea00f03 100644 (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.
         *
index 6ad6faf86e103386f4aa4364eeb7cd24444408c6..88d4f1e5c52e1aa9ef457923e7882bf1a371aee3 100644 (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";