Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2018-10-04 19:53:40 +0300
committerJacques Lucke <mail@jlucke.com>2018-10-04 19:54:08 +0300
commita2d633316bb87df4f147d9b837d875d900225988 (patch)
tree66ceb617f9e929fc961837d4a6eb6b5f132cadd1 /source/blender/gpu/intern/gpu_shader.c
parent33d89e482b9a4f0fca3366f1482b83be178a2652 (diff)
Cleanup: Remove some unneeded code
Reviewers: fclem Differential Revision: https://developer.blender.org/D3767
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader.c')
-rw-r--r--source/blender/gpu/intern/gpu_shader.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 4fa0fae4c87..274ad1c8c0c 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -64,7 +64,6 @@ extern char datatoc_gpu_shader_simple_lighting_frag_glsl[];
extern char datatoc_gpu_shader_simple_lighting_flat_color_frag_glsl[];
extern char datatoc_gpu_shader_simple_lighting_smooth_color_frag_glsl[];
extern char datatoc_gpu_shader_simple_lighting_smooth_color_alpha_frag_glsl[];
-extern char datatoc_gpu_shader_multiply_and_blend_preprocessing_glsl[];
extern char datatoc_gpu_shader_flat_color_frag_glsl[];
extern char datatoc_gpu_shader_flat_color_alpha_test_0_frag_glsl[];
extern char datatoc_gpu_shader_flat_id_frag_glsl[];
@@ -714,9 +713,6 @@ static const GPUShaderStages builtin_shader_stages[GPU_NUM_BUILTIN_SHADERS] = {
[GPU_SHADER_SIMPLE_LIGHTING_SMOOTH_COLOR_ALPHA] =
{ datatoc_gpu_shader_3D_normal_smooth_color_vert_glsl,
datatoc_gpu_shader_simple_lighting_smooth_color_alpha_frag_glsl },
- [GPU_SHADER_MULTIPLY_AND_BLEND_PREPROCESSING] =
- { datatoc_gpu_shader_3D_normal_smooth_color_vert_glsl,
- datatoc_gpu_shader_multiply_and_blend_preprocessing_glsl },
[GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR] =
{ datatoc_gpu_shader_3D_image_vert_glsl,