From e2ce3aeb905167a5e9e7fffd38b89b1f464bec5f Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 21 Jan 2022 12:33:56 +0100 Subject: Disabling Create info. --- source/blender/gpu/intern/gpu_shader_builtin.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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"}, -- cgit v1.2.3