[Bf-blender-cvs] [e6a8c874ba5] tmp-gpu-shader-descriptor-2: Switched builtin shaders to use create infos.
Jeroen Bakker
noreply at git.blender.org
Tue Jan 11 10:29:09 CET 2022
Commit: e6a8c874ba5a85529c51db89e215a80cbb3e651f
Author: Jeroen Bakker
Date: Tue Jan 11 10:28:40 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rBe6a8c874ba5a85529c51db89e215a80cbb3e651f
Switched builtin shaders to use create infos.
===================================================================
M source/blender/gpu/CMakeLists.txt
M source/blender/gpu/intern/gpu_shader_builtin.c
M source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
R087 source/blender/gpu/shaders/infos/gpu_shader_2D_area_edges_info.hh source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
R081 source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_info.hh source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh
===================================================================
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 7a1b394516f..fd30c3311bb 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -409,7 +409,6 @@ set(SHADER_CREATE_INFOS
shaders/infos/gpu_clip_planes_info.hh
shaders/infos/gpu_srgb_to_framebuffer_space_info.hh
-#shaders/infos/gpu_shader_3D_flat_color_info.hh !Disabled due to world_clipping
shaders/infos/gpu_shader_3D_image_modulate_alpha_info.hh
shaders/infos/gpu_shader_2D_checker_info.hh
shaders/infos/gpu_shader_2D_diag_stripes_info.hh
@@ -420,21 +419,22 @@ shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh
shaders/infos/gpu_shader_2D_image_overlays_stereo_merge_info.hh
shaders/infos/gpu_shader_2D_image_info.hh
shaders/infos/gpu_shader_2D_image_color_info.hh
-shaders/infos/gpu_shader_2D_image_desaturate_info.hh
+shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh
shaders/infos/gpu_shader_2D_image_shuffle_color_info.hh
shaders/infos/gpu_shader_2D_image_rect_color_info.hh
shaders/infos/gpu_shader_text_info.hh
shaders/infos/gpu_shader_keyframe_shape_info.hh
+#shaders/infos/gpu_shader_3D_flat_color_info.hh !Disabled due to world_clipping
#shaders/infos/gpu_shader_3D_uniform_color_info.hh !Disabled due to world clipping
-shaders/infos/gpu_shader_3D_smooth_color_info.hh
-shaders/infos/gpu_shader_3D_depth_only_info.hh
+#shaders/infos/gpu_shader_3D_smooth_color_info.hh
+#shaders/infos/gpu_shader_3D_depth_only_info.hh
#shaders/infos/gpu_shader_3D_polyline_info.hh !TODO
#shaders/infos/gpu_shader_2D_line_dashed_uniform_color_info.hh
#shaders/infos/gpu_shader_3D_line_dashed_uniform_color_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
-shaders/infos/gpu_shader_2D_area_edges_info.hh
+shaders/infos/gpu_shader_2D_area_borders_info.hh
shaders/infos/gpu_shader_instance_varying_color_varying_size_info.hh
shaders/infos/gpu_shader_3D_point_info.hh
shaders/infos/gpu_shader_2D_nodelink_info.hh
diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index 12fd234121c..c67afdc1577 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -156,14 +156,12 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
[GPU_SHADER_TEXT] =
{
.name = "GPU_SHADER_TEXT",
- .vert = datatoc_gpu_shader_text_vert_glsl,
- .frag = datatoc_gpu_shader_text_frag_glsl,
+ .create_info = "gpu_shader_text",
},
[GPU_SHADER_KEYFRAME_SHAPE] =
{
.name = "GPU_SHADER_KEYFRAME_SHAPE",
- .vert = datatoc_gpu_shader_keyframe_shape_vert_glsl,
- .frag = datatoc_gpu_shader_keyframe_shape_frag_glsl,
+ .create_info = "gpu_shader_keyframe_shape",
},
[GPU_SHADER_SIMPLE_LIGHTING] =
{
@@ -173,21 +171,19 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
},
[GPU_SHADER_3D_IMAGE_MODULATE_ALPHA] =
{
- .vert = datatoc_gpu_shader_3D_image_vert_glsl,
- .frag = datatoc_gpu_shader_image_modulate_alpha_frag_glsl,
+ .name = "GPU_SHADER_3D_IMAGE_MODULATE_ALPHA",
+ .create_info = "gpu_shader_3D_image_modulate_alpha",
},
[GPU_SHADER_2D_CHECKER] =
{
.name = "GPU_SHADER_2D_CHECKER",
- .vert = datatoc_gpu_shader_2D_vert_glsl,
- .frag = datatoc_gpu_shader_checker_frag_glsl,
+ .create_info = "gpu_shader_2D_checker",
},
[GPU_SHADER_2D_DIAG_STRIPES] =
{
.name = "GPU_SHADER_2D_DIAG_STRIPES",
- .vert = datatoc_gpu_shader_2D_vert_glsl,
- .frag = datatoc_gpu_shader_diag_stripes_frag_glsl,
+ .create_info = "gpu_shader_2D_diag_stripes",
},
[GPU_SHADER_2D_UNIFORM_COLOR] =
@@ -196,60 +192,28 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
.vert = datatoc_gpu_shader_2D_vert_glsl,
.frag = datatoc_gpu_shader_uniform_color_frag_glsl,
},
- [GPU_SHADER_2D_FLAT_COLOR] =
- {
- .name = "GPU_SHADER_2D_FLAT_COLOR",
- .vert = datatoc_gpu_shader_2D_flat_color_vert_glsl,
- .frag = datatoc_gpu_shader_flat_color_frag_glsl,
- },
- [GPU_SHADER_2D_SMOOTH_COLOR] =
- {
- .name = "GPU_SHADER_2D_SMOOTH_COLOR",
- .vert = datatoc_gpu_shader_2D_smooth_color_vert_glsl,
- .frag = datatoc_gpu_shader_2D_smooth_color_frag_glsl,
- },
- [GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE] =
- {
- .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
- .vert = datatoc_gpu_shader_2D_image_vert_glsl,
- .frag = datatoc_gpu_shader_image_overlays_merge_frag_glsl,
- },
+ [GPU_SHADER_2D_FLAT_COLOR] = {.name = "GPU_SHADER_2D_FLAT_COLOR",
+ .create_info = "gpu_shader_2D_uniform_color"},
+ [GPU_SHADER_2D_SMOOTH_COLOR] = {.name = "GPU_SHADER_2D_SMOOTH_COLOR",
+ .create_info = "gpu_shader_2D_smooth_color"},
+ [GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE] = {.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
+ .create_info = "gpu_shader_2D_image_overlays_merge"},
[GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] =
- {
- .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
- .vert = datatoc_gpu_shader_2D_vert_glsl,
- .frag = datatoc_gpu_shader_image_overlays_stereo_merge_frag_glsl,
- },
- [GPU_SHADER_2D_IMAGE] =
- {
- .name = "GPU_SHADER_2D_IMAGE",
- .vert = datatoc_gpu_shader_2D_image_vert_glsl,
- .frag = datatoc_gpu_shader_image_frag_glsl,
- },
- [GPU_SHADER_2D_IMAGE_COLOR] =
- {
- .name = "GPU_SHADER_2D_IMAGE_COLOR",
- .vert = datatoc_gpu_shader_2D_image_vert_glsl,
- .frag = datatoc_gpu_shader_image_color_frag_glsl,
- },
- [GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] =
- {
- .name = "GPU_SHADER_2D_IMAGE_DESATURATE_COLOR",
- .vert = datatoc_gpu_shader_2D_image_vert_glsl,
- .frag = datatoc_gpu_shader_image_desaturate_frag_glsl,
- },
+ {.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
+ .create_info = "gpu_shader_2D_image_overlays_stereo_merge"},
+ [GPU_SHADER_2D_IMAGE] = {.name = "GPU_SHADER_2D_IMAGE", .create_info = "gpu_shader_2D_image"},
+ [GPU_SHADER_2D_IMAGE_COLOR] = {.name = "GPU_SHADER_2D_IMAGE_COLOR",
+ .create_info = "gpu_shader_2D_image_color"},
+ [GPU_SHADER_2D_IMAGE_DESATURATE_COLOR] = {.name = "GPU_SHADER_2D_IMAGE_DESATURATE_COLOR",
+ .create_info =
+ "gpu_shader_2D_image_desaturate_color"},
[GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR] =
{
.name = "GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR",
- .vert = datatoc_gpu_shader_2D_image_vert_glsl,
- .frag = datatoc_gpu_shader_image_shuffle_color_frag_glsl,
- },
- [GPU_SHADER_2D_IMAGE_RECT_COLOR] =
- {
- .name = "GPU_SHADER_2D_IMAGE_RECT_COLOR",
- .vert = datatoc_gpu_shader_2D_image_rect_vert_glsl,
- .frag = datatoc_gpu_shader_image_color_frag_glsl,
+ .create_info = "gpu_shader_2D_image_shuffle_color",
},
+ [GPU_SHADER_2D_IMAGE_RECT_COLOR] = {.name = "GPU_SHADER_2D_IMAGE_RECT_COLOR",
+ .create_info = "gpu_shader_2D_image_rect_color"},
[GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR] =
{
.name = "GPU_SHADER_2D_IMAGE_MULTI_RECT_COLOR",
@@ -377,8 +341,7 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
[GPU_SHADER_2D_AREA_BORDERS] =
{
.name = "GPU_SHADER_2D_AREA_BORDERS",
- .vert = datatoc_gpu_shader_2D_area_borders_vert_glsl,
- .frag = datatoc_gpu_shader_2D_area_borders_frag_glsl,
+ .create_info = "gpu_shader_2D_area_borders"
},
[GPU_SHADER_2D_WIDGET_BASE] =
{
diff --git a/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
index 8dd0517c4e3..ad8f22381a1 100644
--- a/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_3D_flat_color_vert.glsl
@@ -5,15 +5,7 @@ uniform mat4 ModelMatrix;
# endif
in vec3 pos;
-<<<<<<< HEAD
-# if defined(USE_COLOR_U32)
-in uint color;
-# else
in vec4 color;
-# endif
-=======
-in vec4 color;
->>>>>>> master
flat out vec4 finalColor;
#endif
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_borders_info.hh
similarity index 87%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_area_edges_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
index 98e6464e1f1..4e904eaa43a 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_area_edges_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_area_borders_info.hh
@@ -2,7 +2,7 @@
GPU_SHADER_INTERFACE_INFO(smooth_uv_iface, "").smooth(Type::VEC2, "uv");
-GPU_SHADER_CREATE_INFO(gpu_shader_2D_area_edges)
+GPU_SHADER_CREATE_INFO(gpu_shader_2D_area_borders)
.vertex_in(0, Type::VEC2, "pos")
.vertex_out(smooth_uv_iface)
.fragment_out(0, Type::VEC4, "fragColor")
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info.hh
similarity index 81%
rename from source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_info.hh
rename to source/blender/gpu/shaders/infos/gpu_shader_2D_image_desaturate_color_info
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list