[Bf-blender-cvs] [38394e1a321] blender-v3.2-release: GPU: Remove OCIO workaround for Apple.

[Jeroen Bakker]

Commit: 38394e1a321ef0d139c0040cbd36c7627276c28e
Author: Jeroen Bakker
Date:   Mon May 2 12:15:21 2022 +0200
Branches: blender-v3.2-release
https://developer.blender.org/rB38394e1a321ef0d139c0040cbd36c7627276c28e

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.

===================================================================

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 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] =
         {