diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-05-09 11:38:53 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-05-09 11:38:53 +0300 |
| commit | b651754890c550e3f174f28399e48012e36ec358 (patch) | |
| tree | a16d79a0cbd3d3ddca77606f36cc673bb2345b6f /source/blender/gpu/shaders | |
| parent | 6b95e75d2fc14ace9e9ec33b045a2ab18a51c78c (diff) | |
| parent | cc3c15fbddc78bb5377571125cccf57ba7ec3b9a (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/gpu/shaders')
4 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh index e74e7df1a09..0a4da8d17fe 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_depth_only_info.hh @@ -18,4 +18,5 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_depth_only) GPU_SHADER_CREATE_INFO(gpu_shader_3D_depth_only_clipped) .additional_info("gpu_shader_3D_depth_only") - .additional_info("gpu_clip_planes"); + .additional_info("gpu_clip_planes") + .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh index d23c8985a5d..17d865dbaea 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_flat_color_info.hh @@ -21,4 +21,5 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_flat_color) GPU_SHADER_CREATE_INFO(gpu_shader_3D_flat_color_clipped) .additional_info("gpu_shader_3D_flat_color") - .additional_info("gpu_clip_planes"); + .additional_info("gpu_clip_planes") + .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh index 1f9c0056f7d..895787e4f1e 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_point_info.hh @@ -41,4 +41,5 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_aa) GPU_SHADER_CREATE_INFO(gpu_shader_3D_point_uniform_size_uniform_color_aa_clipped) .additional_info("gpu_shader_3D_point_uniform_size_uniform_color_aa") - .additional_info("gpu_clip_planes"); + .additional_info("gpu_clip_planes") + .do_static_compilation(true); diff --git a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh index a0c21a4ac7c..4cabe110999 100644 --- a/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh +++ b/source/blender/gpu/shaders/infos/gpu_shader_3D_smooth_color_info.hh @@ -21,4 +21,5 @@ GPU_SHADER_CREATE_INFO(gpu_shader_3D_smooth_color) GPU_SHADER_CREATE_INFO(gpu_shader_3D_smooth_color_clipped) .additional_info("gpu_shader_3D_smooth_color") - .additional_info("gpu_clip_planes"); + .additional_info("gpu_clip_planes") + .do_static_compilation(true); |