Disabling Create info.

Test to see if order of vertex_in matters.
2022-01-21 12:33:56 +01:00 · 2022-01-21 11:57:31 +01:00
2 changed files with 10 additions and 4 deletions
--- a/source/blender/gpu/intern/gpu_shader_builtin.c
+++ b/source/blender/gpu/intern/gpu_shader_builtin.c
@@ -192,8 +192,14 @@ 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",
+            /* Create Info has been disabled as the shader seems to fail for MacOS. See T95052. */
+            /* .create_info = "gpu_shader_2D_image_overlays_merge", */
+            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .frag = datatoc_gpu_shader_image_overlays_merge_frag_glsl,
+        },
    [GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] =
        {.name = "GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE",
         .create_info = "gpu_shader_2D_image_overlays_stereo_merge"},
--- a/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh
+++ b/source/blender/gpu/shaders/infos/gpu_shader_2D_image_overlays_merge_info.hh
@@ -25,8 +25,8 @@
 #include "gpu_shader_create_info.hh"

 GPU_SHADER_CREATE_INFO(gpu_shader_2D_image_overlays_merge)
-    .vertex_in(0, Type::VEC2, "pos")
-    .vertex_in(1, Type::VEC2, "texCoord")
+    .vertex_in(0, Type::VEC2, "texCoord")
+    .vertex_in(1, Type::VEC2, "pos")
    .vertex_out(smooth_tex_coord_interp_iface)
    .fragment_out(0, Type::VEC4, "fragColor")
    .push_constant(0, Type::MAT4, "ModelViewProjectionMatrix")
Author	SHA1	Message	Date
Jeroen Bakker	e2ce3aeb90	Disabling Create info.	2022-01-21 12:33:56 +01:00
Jeroen Bakker	4150ce36e2	Test to see if order of vertex_in matters.	2022-01-21 11:57:31 +01:00