Commit: e12a7076924a2f3904ee10c0d3a4357dc88df467
Author: Jeroen Bakker
Date: Mon Jan 10 12:41:02 2022 +0100
Branches: master
https://developer.blender.org/rBe12a7076924a2f3904ee10c0d3a4357dc88df467
Remove GPU_SHADER_3D_POINT_VARYING_SIZE_UNIFORM_COLOR.
Shader isn't used and not accessible via the py-api.
===================================================================
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/GPU_shader.h
M source/blender/gpu/intern/gpu_shader_builtin.c
D source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_vert.glsl
M source/blender/gpu/tests/gpu_shader_builtin_test.cc
===================================================================
diff --git a/source/blender/gpu/CMakeLists.txt
b/source/blender/gpu/CMakeLists.txt
index 998244c085e..3e56ab631aa 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -252,7 +252,6 @@
data_to_c_simple(shaders/gpu_shader_point_varying_color_outline_aa_frag.glsl SRC
data_to_c_simple(shaders/gpu_shader_point_varying_color_varying_outline_aa_frag.glsl
SRC)
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_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)
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 38f39639866..031ed04d5f2 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -366,15 +366,6 @@ typedef enum eGPUBuiltinShader {
* \param pos: in vec3
*/
GPU_SHADER_3D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_AA,
- /**
- * Draw round points with a constant size and an outline.
- * Take a single color for all the vertices and a 3D position for each
vertex.
- *
- * \param color: uniform vec4
- * \param size: in float
- * \param pos: in vec3
- */
- GPU_SHADER_3D_POINT_VARYING_SIZE_UNIFORM_COLOR,
/**
* Draw round points with a constant size and an outline.
* Take a 3D position and a color for each vertex.
diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c
b/source/blender/gpu/intern/gpu_shader_builtin.c
index 076c89c8795..c61afb70f36 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -100,7 +100,6 @@ extern char
datatoc_gpu_shader_point_varying_color_outline_aa_frag_glsl[];
extern char
datatoc_gpu_shader_point_varying_color_varying_outline_aa_frag_glsl[];
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_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[];
@@ -377,12 +376,6 @@ static const GPUShaderStages
builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
.vert =
datatoc_gpu_shader_3D_point_fixed_size_varying_color_vert_glsl,
.frag = datatoc_gpu_shader_point_varying_color_frag_glsl,
},
- [GPU_SHADER_3D_POINT_VARYING_SIZE_UNIFORM_COLOR] =
- {
- .name = "GPU_SHADER_3D_POINT_VARYING_SIZE_UNIFORM_COLOR",
- .vert = datatoc_gpu_shader_3D_point_varying_size_vert_glsl,
- .frag = datatoc_gpu_shader_point_uniform_color_frag_glsl,
- },
[GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR] =
{
.name = "GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR",
diff --git
a/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_vert.glsl
b/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_vert.glsl
deleted file mode 100644
index fc61be936fe..00000000000
--- a/source/blender/gpu/shaders/gpu_shader_3D_point_varying_size_vert.glsl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-uniform mat4 ModelViewProjectionMatrix;
-
-in vec3 pos;
-in float size;
-
-void main()
-{
- gl_Position = ModelViewProjectionMatrix * vec4(pos, 1.0);
- gl_PointSize = size;
-}
diff --git a/source/blender/gpu/tests/gpu_shader_builtin_test.cc
b/source/blender/gpu/tests/gpu_shader_builtin_test.cc
index 40b4498dbbf..0bb4b73b2ac 100644
--- a/source/blender/gpu/tests/gpu_shader_builtin_test.cc
+++ b/source/blender/gpu/tests/gpu_shader_builtin_test.cc
@@ -66,8 +66,6 @@ static void test_shader_builtin()
GPU_SHADER_CFG_DEFAULT);
test_compile_builtin_shader(GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR,
GPU_SHADER_CFG_DEFAULT);
- test_compile_builtin_shader(GPU_SHADER_3D_POINT_VARYING_SIZE_UNIFORM_COLOR,
- GPU_SHADER_CFG_DEFAULT);
test_compile_builtin_shader(GPU_SHADER_3D_POINT_VARYING_SIZE_VARYING_COLOR,
GPU_SHADER_CFG_DEFAULT);
test_compile_builtin_shader(GPU_SHADER_2D_LINE_DASHED_UNIFORM_COLOR,
GPU_SHADER_CFG_DEFAULT);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
