[Bf-blender-cvs] [46c0da6e69c] master: Fix T74964: Stereo Viewport Rendering Not Working

[Jeroen Bakker]

Commit: 46c0da6e69c38973e5616bb0a0f7f2ff7b43d5fa
Author: Jeroen Bakker
Date:   Mon Mar 23 09:09:33 2020 +0100
Branches: master
https://developer.blender.org/rB46c0da6e69c38973e5616bb0a0f7f2ff7b43d5fa

Fix T74964: Stereo Viewport Rendering Not Working

On some platforms the stereo viewport rendering was not working. The
issue was that the fragment shader and vertex shaded didn't match. Some
platforms will remove the non-matching in/out parameters and blender
needs to provide only the optimal set of parameters. Other platform
still want to receive data for the parameters that aren't used.

This fix uses the correct vertex shader that matches the fragment shader
making both platforms render the same result.

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

M	source/blender/gpu/intern/gpu_shader.c

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

diff --git a/source/blender/gpu/intern/gpu_shader.c b/source/blender/gpu/intern/gpu_shader.c
index 21de07a62f1..c6ffcfa2d86 100644
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@ -1014,7 +1014,7 @@ static const GPUShaderStages builtin_shader_stages[GPU_SHADER_BUILTIN_LEN] = {
         },
     [GPU_SHADER_2D_IMAGE_OVERLAYS_STEREO_MERGE] =
         {
-            .vert = datatoc_gpu_shader_2D_image_vert_glsl,
+            .vert = datatoc_gpu_shader_2D_vert_glsl,
             .frag = datatoc_gpu_shader_image_overlays_stereo_merge_frag_glsl,
         },
     [GPU_SHADER_2D_IMAGE] =