[Bf-blender-cvs] [867f1209e02] tmp-gpu-shader-descriptor-2: gpu_shader_2D_uv_uniform_color.

[Jeroen Bakker]

Commit: 867f1209e029861dac1cb6d30506a5d50b606176
Author: Jeroen Bakker
Date:   Mon Jan 10 09:49:00 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB867f1209e029861dac1cb6d30506a5d50b606176

gpu_shader_2D_uv_uniform_color.

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

M	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/shaders/infos/gpu_shader_2D_uv_verts_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_uv_verts_info.hh
index 1ed90477d54..be6671d02cb 100644
--- 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
@@ -20,4 +20,15 @@ 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")
     .additional_info("gpu_srgb_to_framebuffer_space")
+    .do_static_compilation(true);
+
+GPU_SHADER_CREATE_INFO(gpu_shader_2D_uv_uniform_color)
+    .vertex_in(0, Type::VEC2, "u")
+    .fragment_out(0, Type::VEC4, "fragColor")
+    .vertex_source("gpu_shader_2D_vert.glsl")
+    .fragment_source("gpu_shader_uniform_color_frag.glsl")
+    .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
+    .push_constant(16, Type::VEC4, "color")
+    .define("pos u")
+    .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 e1c5ee7a5e6..0362a3d4741 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -174,20 +174,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_2D_nodelink_inst)
             .defs = "#define USE_INSTANCE\n",
 },
 
-*/
-GPU_SHADER_CREATE_INFO(gpu_shader_2D_uv_uniform_color)
-    .vertex_source("gpu_shader_2D_vert.glsl")
-    .fragment_source("gpu_shader_uniform_color_frag.glsl")
-    .define("UV_POS")
-    .do_static_compilation(true);
-/*
-    [GPU_SHADER_2D_UV_UNIFORM_COLOR] =
-        {
-            .name = "GPU_SHADER_2D_UV_UNIFORM_COLOR",
-            .vert = datatoc_gpu_shader_2D_vert_glsl,
-            .frag = datatoc_gpu_shader_uniform_color_frag_glsl,
-            .defs = "#define UV_POS\n",
-},
 */
 GPU_SHADER_CREATE_INFO(gpu_shader_gpencil_stroke)
     .vertex_source("gpu_shader_gpencil_stroke_vert.glsl")