diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2022-05-02 01:57:32 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2022-05-02 01:57:32 +0300 |
| commit | f0118e9aca8266512c87c8a9310b52056138596c (patch) | |
| tree | 7ec4c32ac166264bf7e9b559be3fbcbe72161b71 /source/blender/gpu | |
| parent | 5e5e198bbef843e28bcb91662dc1facafe6e5238 (diff) | |
GPUShader: Remove GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE
This had only one use and it was for debugging. Remove the shader for now.
This also simplifies the debug drawing even if slower.
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_builtin.c | 9 | ||||
| -rw-r--r-- | source/blender/gpu/tests/gpu_shader_builtin_test.cc | 1 |
3 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index 0e7ce0889c2..b620fe9cc9d 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -338,8 +338,6 @@ typedef enum eGPUBuiltinShader { /* lines */ GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR, GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR, - /* instance */ - GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE, /* Uniformly scaled */ /* grease pencil drawing */ GPU_SHADER_GPENCIL_STROKE, /* specialized for widget drawing */ diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c index 6ab077da413..f6e416e7c48 100644 --- a/source/blender/gpu/intern/gpu_shader_builtin.c +++ b/source/blender/gpu/intern/gpu_shader_builtin.c @@ -266,14 +266,6 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = { .create_info = "gpu_shader_3D_point_uniform_size_uniform_color_aa", .clipped_create_info = "gpu_shader_3D_point_uniform_size_uniform_color_aa_clipped"}, - [GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE] = - { - .name = "GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE", - .vert = datatoc_gpu_shader_instance_variying_size_variying_color_vert_glsl, - .frag = datatoc_gpu_shader_flat_color_frag_glsl, - .defs = "#define UNIFORM_SCALE\n", - }, - [GPU_SHADER_2D_AREA_BORDERS] = {.name = "GPU_SHADER_2D_AREA_BORDERS", .create_info = "gpu_shader_2D_area_borders"}, [GPU_SHADER_2D_WIDGET_BASE] = {.name = "GPU_SHADER_2D_WIDGET_BASE", @@ -326,7 +318,6 @@ GPUShader *GPU_shader_get_builtin_shader_with_config(eGPUBuiltinShader shader, GPU_SHADER_3D_UNIFORM_COLOR, GPU_SHADER_3D_SMOOTH_COLOR, GPU_SHADER_3D_DEPTH_ONLY, - GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE, GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA, GPU_SHADER_3D_FLAT_COLOR, GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR)); diff --git a/source/blender/gpu/tests/gpu_shader_builtin_test.cc b/source/blender/gpu/tests/gpu_shader_builtin_test.cc index 7ff047418fc..6ef8a032a73 100644 --- a/source/blender/gpu/tests/gpu_shader_builtin_test.cc +++ b/source/blender/gpu/tests/gpu_shader_builtin_test.cc @@ -26,7 +26,6 @@ static void test_shader_builtin() test_compile_builtin_shader(GPU_SHADER_3D_SMOOTH_COLOR); test_compile_builtin_shader(GPU_SHADER_3D_DEPTH_ONLY); test_compile_builtin_shader(GPU_SHADER_3D_FLAT_COLOR); - test_compile_builtin_shader(GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE); test_compile_builtin_shader(GPU_SHADER_3D_LINE_DASHED_UNIFORM_COLOR); test_compile_builtin_shader(GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA); |