[Bf-blender-cvs] [5f0e0c94cc8] tmp-gpu-shader-descriptor-2: gpu_shader_2D_point_varying_size_varying_color.

[Jeroen Bakker]

Commit: 5f0e0c94cc82c692829fd0e6208359f85bedd0eb
Author: Jeroen Bakker
Date:   Mon Jan 10 08:16:52 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rB5f0e0c94cc82c692829fd0e6208359f85bedd0eb

gpu_shader_2D_point_varying_size_varying_color.

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

M       source/blender/gpu/CMakeLists.txt
A       
source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_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 334978e82be..cae7b7eecf6 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_point_varying_size_varying_color_info.hh
 #shaders/infos/gpu_shader_todo_info.hh
 )
 
diff --git 
a/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
 
b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
new file mode 100644
index 00000000000..c0a2cb19d1e
--- /dev/null
+++ 
b/source/blender/gpu/shaders/infos/gpu_shader_2D_point_varying_size_varying_color_info.hh
@@ -0,0 +1,13 @@
+#include "gpu_interface_info.hh"
+#include "gpu_shader_create_info.hh"
+
+GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_varying_size_varying_color)
+    .vertex_in(0, Type::VEC2, "pos")
+    .vertex_in(1, Type::FLOAT, "size")
+    .vertex_in(2, Type::VEC4, "color")
+    .vertex_out(smooth_color_iface)
+    .fragment_out(0, Type::VEC4, "fragColor")
+    .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
+    .vertex_source("gpu_shader_2D_point_varying_size_varying_color_vert.glsl")
+    .fragment_source("gpu_shader_point_varying_color_frag.glsl")
+    .do_static_compilation(true);
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 9d43d0e2d35..ec3e595cd10 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -10,11 +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_varying_size_varying_color)
-    .vertex_source("gpu_shader_2D_point_varying_size_varying_color_vert.glsl")
-    .fragment_source("gpu_shader_point_varying_color_frag.glsl")
-    .do_static_compilation(true);
-
 GPU_SHADER_CREATE_INFO(gpu_shader_2D_point_uniform_size_uniform_color_aa)
     .vertex_source("gpu_shader_2D_point_uniform_size_aa_vert.glsl")
     .fragment_source("gpu_shader_point_uniform_color_aa_frag.glsl")

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs