diff options
author | Jeroen Bakker <jeroen@blender.org> | 2022-01-10 14:49:08 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2022-01-10 14:51:21 +0300 |
commit | 8a772645e2987327bb74c8858252800e62e0296b (patch) | |
tree | bf12d89970a7e4e3b179c324b7ca32c683a4be25 /source/blender/gpu | |
parent | 1b57dcf3209a1d31b59415302897c41d1ccba846 (diff) |
Remove GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR.
Shader isn't used and not accessible via py-api.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/gpu/GPU_shader.h | 9 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_shader_builtin.c | 7 | ||||
-rw-r--r-- | source/blender/gpu/tests/gpu_shader_builtin_test.cc | 2 |
4 files changed, 0 insertions, 19 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 27f6589c0d9..4b98359eff6 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -253,7 +253,6 @@ data_to_c_simple(shaders/gpu_shader_point_varying_color_frag.glsl SRC) data_to_c_simple(shaders/gpu_shader_3D_point_fixed_size_varying_color_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_3D_point_varying_size_varying_color_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_3D_point_uniform_size_aa_vert.glsl SRC) -data_to_c_simple(shaders/gpu_shader_2D_point_varying_size_varying_color_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_2D_point_uniform_size_aa_vert.glsl SRC) data_to_c_simple(shaders/gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl SRC) diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index 378062a04ea..2ac1e5dd553 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -322,15 +322,6 @@ typedef enum eGPUBuiltinShader { */ GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA, /** - * Draw round points with a constant size and an outline. - * Take a 2D position and a color for each vertex. - * - * \param size: in float - * \param color: in vec4 - * \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. * diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c index 6f339e2bc9d..695ea440316 100644 --- a/source/blender/gpu/intern/gpu_shader_builtin.c +++ b/source/blender/gpu/intern/gpu_shader_builtin.c @@ -101,7 +101,6 @@ extern char datatoc_gpu_shader_point_varying_color_frag_glsl[]; extern char datatoc_gpu_shader_3D_point_fixed_size_varying_color_vert_glsl[]; extern char datatoc_gpu_shader_3D_point_varying_size_varying_color_vert_glsl[]; extern char datatoc_gpu_shader_3D_point_uniform_size_aa_vert_glsl[]; -extern char datatoc_gpu_shader_2D_point_varying_size_varying_color_vert_glsl[]; extern char datatoc_gpu_shader_2D_point_uniform_size_aa_vert_glsl[]; extern char datatoc_gpu_shader_2D_point_uniform_size_outline_aa_vert_glsl[]; @@ -338,12 +337,6 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = { .vert = datatoc_gpu_shader_2D_vert_glsl, .frag = datatoc_gpu_shader_point_uniform_color_frag_glsl, }, - [GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR] = - { - .name = "GPU_SHADER_2D_POINT_VARYING_SIZE_VARYING_COLOR", - .vert = datatoc_gpu_shader_2D_point_varying_size_varying_color_vert_glsl, - .frag = datatoc_gpu_shader_point_varying_color_frag_glsl, - }, [GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA] = { .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA", diff --git a/source/blender/gpu/tests/gpu_shader_builtin_test.cc b/source/blender/gpu/tests/gpu_shader_builtin_test.cc index fabe02dce46..db1967de5c5 100644 --- a/source/blender/gpu/tests/gpu_shader_builtin_test.cc +++ b/source/blender/gpu/tests/gpu_shader_builtin_test.cc @@ -54,8 +54,6 @@ static void test_shader_builtin() test_compile_builtin_shader(GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR, GPU_SHADER_CFG_DEFAULT); test_compile_builtin_shader(GPU_SHADER_2D_POINT_FIXED_SIZE_UNIFORM_COLOR, 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_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, |