From 38394e1a321ef0d139c0040cbd36c7627276c28e Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 2 May 2022 12:15:21 +0200 Subject: GPU: Remove OCIO workaround for Apple. OCIO shader was ported to use GPUShaderCreateInfo a while ago. That made this workaround not needed anymore. Best to remove it before the release. --- source/blender/gpu/intern/gpu_shader_builtin.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/source/blender/gpu/intern/gpu_shader_builtin.c b/source/blender/gpu/intern/gpu_shader_builtin.c index 1a3215f1bb5..13238a03688 100644 --- a/source/blender/gpu/intern/gpu_shader_builtin.c +++ b/source/blender/gpu/intern/gpu_shader_builtin.c @@ -185,14 +185,7 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = { [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 = datatoc_gpu_shader_2D_image_vert_glsl, - .frag = datatoc_gpu_shader_image_overlays_merge_frag_glsl, -#else .create_info = "gpu_shader_2D_image_overlays_merge", -#endif }, [GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] = { -- cgit v1.2.3