diff options
Diffstat (limited to 'source/blender/gpu/intern/gpu_shader_builtin.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_builtin.c | 14 |
1 files changed, 12 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..931c3750ac8 100644 --- a/source/blender/gpu/intern/gpu_shader_builtin.c +++ b/source/blender/gpu/intern/gpu_shader_builtin.c @@ -192,8 +192,18 @@ 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", +#ifdef __APPLE__ + /* GPUShaderCreateInfo is disabled on MacOS due to mismatch with OCIO shader. See + * T95052 for more details. */ + .vert = "gpu_shader_2D_image_vert.glsl", + .frag = "gpu_shader_image_overlays_merge_frag.glsl", +#else + .create_info = "gpu_shader_2D_image_overlays_merge", +#endif + }, [GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] = {.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE", .create_info = "gpu_shader_2D_image_overlays_stereo_merge"}, |