[Bf-blender-cvs] [98589683485] tmp-gpu-shader-descriptor-2: gpu_shader_2D_area_edges.

[Jeroen Bakker]

Commit: 9858968348511d73503cbd98dfcf13308588b9ca
Author: Jeroen Bakker
Date:   Mon Jan 10 11:21:25 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB9858968348511d73503cbd98dfcf13308588b9ca

gpu_shader_2D_area_edges.

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

M	source/blender/gpu/CMakeLists.txt
A	source/blender/gpu/shaders/infos/gpu_shader_2D_area_edges_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 5e165277d69..c83aa5ac676 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -450,6 +450,7 @@ 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_2D_area_edges_info.hh
 #shaders/infos/gpu_shader_todo_info.hh
 )
 
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_edges_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_edges_info.hh
new file mode 100644
index 00000000000..98e6464e1f1
--- /dev/null
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_edges_info.hh
@@ -0,0 +1,16 @@
+#include "gpu_shader_create_info.hh"
+
+GPU_SHADER_INTERFACE_INFO(smooth_uv_iface, "").smooth(Type::VEC2, "uv");
+
+GPU_SHADER_CREATE_INFO(gpu_shader_2D_area_edges)
+    .vertex_in(0, Type::VEC2, "pos")
+    .vertex_out(smooth_uv_iface)
+    .fragment_out(0, Type::VEC4, "fragColor")
+    .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
+    .push_constant(16, Type::VEC4, "rect")
+    .push_constant(20, Type::VEC4, "color")
+    .push_constant(24, Type::FLOAT, "scale")
+    .push_constant(25, Type::INT, "cornerLen")
+    .vertex_source("gpu_shader_2D_area_borders_vert.glsl")
+    .fragment_source("gpu_shader_2D_area_borders_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 0362a3d4741..79165782a46 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -97,18 +97,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_instance_varying_color_varying_size)
             .defs = "#define UNIFORM_SCALE\n",
 },
 
-*/
-GPU_SHADER_CREATE_INFO(gpu_shader_2D_area_edges)
-    .vertex_source("gpu_shader_2D_area_borders_vert.glsl")
-    .fragment_source("gpu_shader_2D_area_borders_frag.glsl")
-    .do_static_compilation(true);
-/*
-    [GPU_SHADER_2D_AREA_EDGES] =
-        {
-            .name = "GPU_SHADER_2D_AREA_EDGES",
-            .vert = datatoc_gpu_shader_2D_area_borders_vert_glsl,
-            .frag = datatoc_gpu_shader_2D_area_borders_frag_glsl,
-},
 */
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_widget_base)
     .vertex_source("gpu_shader_2D_widget_base_vert.glsl")