[Bf-blender-cvs] [e2ce3aeb905] tmp-T95052: Disabling Create info.
Jeroen Bakker
noreply at git.blender.org
Fri Jan 21 12:34:00 CET 2022
Commit: e2ce3aeb905167a5e9e7fffd38b89b1f464bec5f
Author: Jeroen Bakker
Date: Fri Jan 21 12:33:56 2022 +0100
Branches: tmp-T95052
https://developer.blender.org/rBe2ce3aeb905167a5e9e7fffd38b89b1f464bec5f
Disabling Create info.
===================================================================
M source/blender/gpu/intern/gpu_shader_builtin.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c
index 13f1774df03..829028c6245 100644
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -192,8 +192,14 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
.create_info = "gpu_shader_2D_flat_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_MERGE] =
+ {
+ .name = "GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE",
+ /* Create Info has been disabled as the shader seems to fail for MacOS. See T95052. */
+ /* .create_info = "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_IMAGE_OVERLAYS_STEREO_MERGE] =
{.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
.create_info = "gpu_shader_2D_image_overlays_stereo_merge"},
More information about the Bf-blender-cvs
mailing list