[Bf-blender-cvs] [0e8fd2b064f] tmp-gpu-shader-descriptor-2: gpu_shader_2D_point_uniform_size_varying_color_outline_aa.

[Jeroen Bakker]

Commit: 0e8fd2b064feb471eff80b44ee736b9c24d0f03a
Author: Jeroen Bakker
Date:   Mon Jan 10 09:17:54 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB0e8fd2b064feb471eff80b44ee736b9c24d0f03a

gpu_shader_2D_point_uniform_size_varying_color_outline_aa.

===================================================================

M	source/blender/gpu/CMakeLists.txt
A	source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_varying_color_outline_aa_info.hh
M	source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh

===================================================================

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 97216989596..5482d397a8c 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -448,6 +448,7 @@ shaders/infos/gpu_shader_2D_uv_edges_info.hh
 shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
 shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_aa_info.hh
 shaders/infos/gpu_shader_2D_point_uniform_size_uniform_color_outline_aa_info.hh
+shaders/infos/gpu_shader_2D_point_uniform_size_varying_color_outline_aa_info.hh
 #shaders/infos/gpu_shader_todo_info.hh
 )
 
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_varying_color_outline_aa_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_varying_color_outline_aa_info.hh
new file mode 100644
index 00000000000..262f0eef130
--- /dev/null
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_uniform_size_varying_color_outline_aa_info.hh
@@ -0,0 +1,19 @@
+#include "gpu_interface_info.hh"
+#include "gpu_shader_create_info.hh"
+
+GPU_SHADER_INTERFACE_INFO(smooth_radii_color_outline_iface, "")
+    .smooth(Type::VEC4, "radii")
+    .smooth(Type::VEC4, "fillColor");
+
+GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_varying_color_outline_aa)
+    .vertex_in(0, Type::VEC2, "pos")
+    .vertex_in(1, Type::VEC4, "color")
+    .vertex_out(smooth_radii_color_outline_iface)
+    .fragment_out(0, Type::VEC4, "fragColor")
+    .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
+    .push_constant(16, Type::VEC4, "outlineColor")
+    .push_constant(20, Type::FLOAT, "size")
+    .push_constant(21, Type::FLOAT, "outlineWidth")
+    .vertex_source("gpu_shader_2D_point_uniform_size_varying_color_outline_aa_vert.glsl")
+    .fragment_source("gpu_shader_point_varying_color_outline_aa_frag.glsl")
+    .do_static_compilation(true);
\ No newline at end of file
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
index e46b16ddecc..f7e2e421ea9 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -10,30 +10,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_multi_rect_color)
     .fragment_source("datatoc_gpu_shader_image_varying_color_frag.glsl")
     .do_static_compilation(true);
 
-GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_outline_aa)
-    .vertex_source("gpu_shader_2D_point_uniform_size_outline_aa_vert.glsl")
-    .fragment_source("gpu_shader_point_uniform_color_outline_aa_frag.glsl")
-    .do_static_compilation(true);
-/*
-    [GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA] =
-        {
-            .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_UNIFORM_COLOR_OUTLINE_AA",
-            .vert = datatoc_gpu_shader_2D_point_uniform_size_outline_aa_vert_glsl,
-            .frag = datatoc_gpu_shader_point_uniform_color_outline_aa_frag_glsl,
-},
-*/
-GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_varying_color_outline_aa)
-    .vertex_source("gpu_shader_2D_point_uniform_size_varying_color_outline_aa_vert.glsl")
-    .fragment_source("gpu_shader_point_varying_color_outline_aa_frag.glsl")
-    .do_static_compilation(true);
-/*
-    [GPU_SHADER_2D_POINT_UNIFORM_SIZE_VARYING_COLOR_OUTLINE_AA] =
-        {
-            .name = "GPU_SHADER_2D_POINT_UNIFORM_SIZE_VARYING_COLOR_OUTLINE_AA",
-            .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_CREATE_INFO(gpu_shader_3D_point_fixed_size_uniform_color)
     .vertex_source("gpu_shader_3D_vert.glsl")
     .fragment_source("gpu_shader_point_uniform_color_frag.glsl")