[Bf-blender-cvs] [e39a1525a52] tmp-gpu-shader-descriptor-2: Moved missing shaders to gpu_shader_todo_info.hh
Jeroen Bakker
noreply at git.blender.org
Mon Jan 10 13:32:50 CET 2022
Commit: e39a1525a5272adc06c167cac139930710eb0f52
Author: Jeroen Bakker
Date: Mon Jan 10 08:08:24 2022 +0100
Branches: tmp-gpu-shader-descriptor-2
https://developer.blender.org/rBe39a1525a5272adc06c167cac139930710eb0f52
Moved missing shaders to gpu_shader_todo_info.hh
===================================================================
M source/blender/gpu/CMakeLists.txt
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 7b433da3f55..334978e82be 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -420,7 +420,6 @@ 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_simple_lighting_info.hh !TODO
shaders/infos/gpu_shader_2D_checker_info.hh
shaders/infos/gpu_shader_2D_diag_stripes_info.hh
shaders/infos/gpu_shader_2D_uniform_color_info.hh
@@ -435,7 +434,6 @@ 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_2D_image_multi_rect_color_info.hh !TODO
#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
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 dba928c1fad..9d43d0e2d35 100644
--- a/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_todo_info.hh
@@ -1,5 +1,15 @@
#include "gpu_shader_create_info.hh"
+GPU_SHADER_CREATE_INFO(gpu_shader_simple_lighting)
+ .vertex_source("gpu_shader_3D_normal_vert.glsl")
+ .fragment_source("gpu_shader_simple_lighting_frag.glsl")
+ .do_static_compilation(true);
+
+GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_multi_rect_color)
+ .vertex_source("datatoc_gpu_shader_2D_image_multi_rect_vert.glsl")
+ .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")
More information about the Bf-blender-cvs
mailing list