[Bf-blender-cvs] [e72f81b7504] tmp-gpu-shader-descriptor-2: gpu_shader_instance_varying_color_varying_size.

[Jeroen Bakker]

Commit: e72f81b750490cc7a694d22d33ae957cc5ad22b9
Author: Jeroen Bakker
Date:   Mon Jan 10 11:33:35 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rBe72f81b750490cc7a694d22d33ae957cc5ad22b9

gpu_shader_instance_varying_color_varying_size.

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

M	source/blender/gpu/CMakeLists.txt
A	source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_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 c83aa5ac676..b60bf8fd561 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -451,6 +451,7 @@ 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_instance_varying_color_varying_size_info.hh
 #shaders/infos/gpu_shader_todo_info.hh
 )
 
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
new file mode 100644
index 00000000000..bbc1ddec792
--- /dev/null
+++ b/source/blender/gpu/shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
@@ -0,0 +1,15 @@
+#include "gpu_interface_info.hh"
+#include "gpu_shader_create_info.hh"
+
+GPU_SHADER_CREATE_INFO(gpu_shader_instance_varying_color_varying_size)
+    .vertex_in(0, Type::VEC3, "pos")
+    .vertex_in(1, Type::MAT4, "InstanceModelMatrix")
+    .vertex_in(2, Type::VEC4, "color")
+    .vertex_in(3, Type::FLOAT, "size")
+    .vertex_out(flat_color_iface)
+    .fragment_out(0, Type::VEC4, "fragColor")
+    .push_constant(0, Type::MAT4, "ViewProjectionMatrix")
+    .vertex_source("gpu_shader_instance_variying_size_variying_color_vert.glsl")
+    .fragment_source("gpu_shader_flat_color_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 79165782a46..04a38760fb4 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -82,21 +82,6 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_outline_aa
             .frag = datatoc_gpu_shader_point_uniform_color_outline_aa_frag_glsl,
 },
 
-*/
-GPU_SHADER_CREATE_INFO(gpu_shader_instance_varying_color_varying_size)
-    .vertex_source("gpu_shader_instance_varying_size_varying_color_vert.glsl")
-    .fragment_source("gpu_shader_flat_color_frag.glsl")
-    .define("UNIFORM_SCALED")
-    .do_static_compilation(true);
-/*
-    [GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE] =
-        {
-            .name = "GPU_SHADER_INSTANCE_VARIYING_COLOR_VARIYING_SIZE",
-            .vert = datatoc_gpu_shader_instance_variying_size_variying_color_vert_glsl,
-            .frag = datatoc_gpu_shader_flat_color_frag_glsl,
-            .defs = "#define UNIFORM_SCALE\n",
-},
-
 */
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_widget_base)
     .vertex_source("gpu_shader_2D_widget_base_vert.glsl")