[Bf-blender-cvs] [651ae585cad] tmp-gpu-shader-descriptor-2: gpu_shader_2D_uv_verts.

[Jeroen Bakker]

Commit: 651ae585cad6388672555604991e330981554107
Author: Jeroen Bakker
Date:   Mon Jan 10 09:42:58 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB651ae585cad6388672555604991e330981554107

gpu_shader_2D_uv_verts.

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

M	source/blender/gpu/CMakeLists.txt
A	source/blender/gpu/shaders/infos/gpu_shader_2D_uv_verts_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 5482d397a8c..5e165277d69 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -445,6 +445,7 @@ shaders/infos/gpu_shader_2D_uv_faces_stretch_info.hh
 shaders/infos/gpu_shader_2D_uv_faces_info.hh
 shaders/infos/gpu_shader_2D_uv_facedots_info.hh
 shaders/infos/gpu_shader_2D_uv_edges_info.hh
+shaders/infos/gpu_shader_2D_uv_verts_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
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_uv_verts_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_uv_verts_info.hh
new file mode 100644
index 00000000000..1ed90477d54
--- /dev/null
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_uv_verts_info.hh
@@ -0,0 +1,23 @@
+#include "gpu_interface_info.hh"
+#include "gpu_shader_create_info.hh"
+
+GPU_SHADER_INTERFACE_INFO(smooth_radii_fill_color_outline_iface, "")
+    .smooth(Type::VEC4, "fillColor")
+    .smooth(Type::VEC4, "outlineColor")
+    .smooth(Type::VEC4, "radii");
+
+GPU_SHADER_CREATE_INFO(gpu_shader_2D_uv_verts)
+    .vertex_in(0, Type::VEC2, "pos")
+    .vertex_in(1, Type::INT, "flag")
+    .vertex_out(smooth_radii_fill_color_outline_iface)
+    .fragment_out(0, Type::VEC4, "fragColor")
+    .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
+    .push_constant(16, Type::VEC4, "vertColor")
+    .push_constant(20, Type::VEC4, "selectColor")
+    .push_constant(24, Type::VEC4, "pinnedColor")
+    .push_constant(28, Type::FLOAT, "pointSize")
+    .push_constant(29, Type::FLOAT, "outlineWidth")
+    .vertex_source("gpu_shader_2D_edituvs_points_vert.glsl")
+    .fragment_source("gpu_shader_point_varying_color_varying_outline_aa_frag.glsl")
+    .additional_info("gpu_srgb_to_framebuffer_space")
+    .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 f7e2e421ea9..e1c5ee7a5e6 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -189,18 +189,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_uv_uniform_color)
             .defs = "#define UV_POS\n",
 },
 */
-GPU_SHADER_CREATE_INFO(gpu_shader_2D_uv_verts)
-    .vertex_source("gpu_shader_2D_edituvs_points_vert.glsl")
-    .fragment_source("gpu_shader_point_varying_color_varying_outline_aa_frag.glsl")
-    .do_static_compilation(true);
-/*
-    [GPU_SHADER_2D_UV_VERTS] =
-        {
-            .name = "GPU_SHADER_2D_UV_VERTS",
-            .vert = datatoc_gpu_shader_2D_edituvs_points_vert_glsl,
-            .frag = datatoc_gpu_shader_point_varying_color_varying_outline_aa_frag_glsl,
-},
-*/
 GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)
     .vertex_source("gpu_shader_gpencil_stroke_vert.glsl")
     .geometry_source("gpu_shader_gpencil_stroke_geom.glsl")