diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2022-05-02 13:15:21 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2022-05-02 13:15:21 +0300 |
| commit | 38394e1a321ef0d139c0040cbd36c7627276c28e (patch) | |
| tree | 48c9b5137fc741f40038faf54d510bdf31fbd0e8 | |
| parent | 1b0da28038bbe3d75a511f6b1394508cbd1bb766 (diff) | |
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.
| -rw-r--r-- | source/blender/gpu/intern/gpu_shader_builtin.c | 7 |
1 files changed, 0 insertions, 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] = { |