blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

GPU: Disable create info for 2d image overlay merge. 

This shader needs to use the same interface as the OCIO shader. On Linux
and Windows this seems to be the case. On MacOS however there is a
mismatch that makes the overlay texture to be completely black when
switching to workbench in the Shader workspace.

This is just a temporarily work-around as this should be solved. Due to
the poor GPU debugging facilities on Mac we haven't been able to
pin-point the root cause.
This commit is contained in:
Jeroen Bakker 2022-01-21 14:24:30 +01:00
parent f6888b530a
commit 93065a67c6
Notes: blender-bot 2024-03-22 15:57:27 +01:00 
Referenced by issue #95052, 3DViewport is missing overlay.
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"},