blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

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.
This commit is contained in:
Jeroen Bakker 2022-05-02 12:15:21 +02:00
parent 1b0da28038
commit 38394e1a32
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/gpu/intern/gpu_shader_builtin.c
View File

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