From 6669431846af3e9b595f6916b904831155494a73 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 10 Jan 2022 12:42:44 +0100 Subject: Remove GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR. Shader isn't used and not accessible via py-api. --- source/blender/gpu/GPU_shader.h | 8 -------- source/blender/gpu/intern/gpu_shader_builtin.c | 6 ------ source/blender/gpu/tests/gpu_shader_builtin_test.cc | 2 -- 3 files changed, 16 deletions(-) diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index 031ed04d5f2..21788c7d271 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -341,14 +341,6 @@ typedef enum eGPUBuiltinShader { * \param pos: in vec2 */ GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR, - /** - * Draw round points with a hardcoded size. - * Take a single color for all the vertices and a 3D position for each vertex. - * - * \param color: uniform vec4 - * \param pos: in vec3 - */ - GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR, /** * Draw round points with a hardcoded size. * Take a single color for all the vertices and a 3D position for each vertex. diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c index c61afb70f36..d24d4f33144 100644 --- a/source/blender/gpu/intern/gpu_shader_builtin.c +++ b/source/blender/gpu/intern/gpu_shader_builtin.c @@ -364,12 +364,6 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = { .vert = datatoc_gpu_shader_2D_point_uniform_size_varying_color_outline_aa_vert_glsl, .frag = datatoc_gpu_shader_point_varying_color_outline_aa_frag_glsl, }, - [GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR] = - { - .name = "GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR", - .vert = datatoc_gpu_shader_3D_vert_glsl, - .frag = datatoc_gpu_shader_point_uniform_color_frag_glsl, - }, [GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR] = { .name = "GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR", diff --git a/source/blender/gpu/tests/gpu_shader_builtin_test.cc b/source/blender/gpu/tests/gpu_shader_builtin_test.cc index 0bb4b73b2ac..1fb398203cd 100644 --- a/source/blender/gpu/tests/gpu_shader_builtin_test.cc +++ b/source/blender/gpu/tests/gpu_shader_builtin_test.cc @@ -58,8 +58,6 @@ static void test_shader_builtin() GPU_SHADER_CFG_DEFAULT); test_compile_builtin_shader(GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR, GPU_SHADER_CFG_DEFAULT); - test_compile_builtin_shader(GPU_SHADER_3D_POINT_FIXED_SIZE_UNIFORM_COLOR, - GPU_SHADER_CFG_DEFAULT); test_compile_builtin_shader(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA, GPU_SHADER_CFG_DEFAULT); test_compile_builtin_shader(GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA, -- cgit v1.2.3