From 573ab82fbf02c4a6706491c80999441502e10a42 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 3 Jul 2018 14:31:05 +0100
Subject: [PATCH] Match varying names in case some GL driver doesn't link by
 location

---
 renderdoc/data/glsl/mesh.geom | 8 ++++----
 renderdoc/data/glsl/mesh.vert | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/renderdoc/data/glsl/mesh.geom b/renderdoc/data/glsl/mesh.geom
index 7bf94e27e..1d3dc7ba3 100644
--- a/renderdoc/data/glsl/mesh.geom
+++ b/renderdoc/data/glsl/mesh.geom
@@ -32,8 +32,8 @@ layout(triangle_strip, max_vertices = 3) out;
 layout (location = 0) in vec4 IN_secondary[3];
 layout (location = 1) in vec4 IN_norm[3];
 
-layout (location = 0) out vec4 OUT_secondary;
-layout (location = 1) out vec4 OUT_norm;
+layout (location = 0) out vec4 secondary;
+layout (location = 1) out vec4 norm;
 
 #ifndef OPENGL_ES
 in gl_PerVertex
@@ -58,8 +58,8 @@ void main()
     for(int i=0; i < 3; i++)
     {
 		gl_Position = gl_in[i].gl_Position;
-		OUT_secondary = IN_secondary[i];
-		OUT_norm = vec4(faceNormal.xyz, 1);
+		secondary = IN_secondary[i];
+		norm = vec4(faceNormal.xyz, 1);
         EmitVertex();
     }
     EndPrimitive();
diff --git a/renderdoc/data/glsl/mesh.vert b/renderdoc/data/glsl/mesh.vert
index 89fc694bb..cc8a82c4c 100644
--- a/renderdoc/data/glsl/mesh.vert
+++ b/renderdoc/data/glsl/mesh.vert
@@ -33,7 +33,7 @@ out gl_PerVertex
 };
 #endif
 
-layout (location = 0) out vec4 OUT_secondary;
+layout (location = 0) out vec4 secondary;
 layout (location = 1) out vec4 norm;
 
 void main(void)
@@ -60,7 +60,7 @@ void main(void)
 
 	gl_Position = Mesh.mvp * pos;
 	gl_Position.xy += Mesh.pointSpriteSize.xy*0.01f*psprite[VERTEX_ID%4]*gl_Position.w;
-	OUT_secondary = IN_secondary;
+	secondary = IN_secondary;
 	norm = vec4(0, 0, 1, 1);
 
 #ifdef VULKAN