From a6a4ae6cd93d32b89da23e2a7d38113759f8db44 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 28 Feb 2016 12:15:56 +0100
Subject: [PATCH] Use gl_VertexIndex / gl_InstanceIndex instead of ID variants
 on vulkan

---
 renderdoc/data/spv/blit.vert | 2 +-
 renderdoc/data/spv/mesh.vert | 2 +-
 renderdoc/data/spv/text.vert | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderdoc/data/spv/blit.vert b/renderdoc/data/spv/blit.vert
index 60c5e611a..ff14c5509 100644
--- a/renderdoc/data/spv/blit.vert
+++ b/renderdoc/data/spv/blit.vert
@@ -36,5 +36,5 @@ void main(void)
                                   vec4(-1.0,  1.0, 0.5, 1.0),
                                   vec4( 1.0,  1.0, 0.5, 1.0));
 
-    gl_Position = verts[gl_VertexID];
+    gl_Position = verts[gl_VertexIndex];
 }
diff --git a/renderdoc/data/spv/mesh.vert b/renderdoc/data/spv/mesh.vert
index 609f920ec..d88c30404 100644
--- a/renderdoc/data/spv/mesh.vert
+++ b/renderdoc/data/spv/mesh.vert
@@ -56,7 +56,7 @@ void main(void)
 		pos.y = -pos.y;
 
 	gl_Position = Mesh.mvp * pos;
-	gl_Position.xy += Mesh.pointSpriteSize.xy*0.01f*psprite[gl_VertexID%4]*gl_Position.w;
+	gl_Position.xy += Mesh.pointSpriteSize.xy*0.01f*psprite[gl_VertexIndex%4]*gl_Position.w;
 	OUT.secondary = secondary;
 	OUT.norm = vec4(0, 0, 1, 1);
 
diff --git a/renderdoc/data/spv/text.vert b/renderdoc/data/spv/text.vert
index 02c9838d0..2e1496c8c 100644
--- a/renderdoc/data/spv/text.vert
+++ b/renderdoc/data/spv/text.vert
@@ -42,8 +42,8 @@ void main(void)
                                   vec3( 0.0,  1.0, 0.5),
                                   vec3( 1.0,  1.0, 0.5));
 
-	vec3 pos = verts[gl_VertexID];
-	uint strindex = gl_InstanceID;
+	vec3 pos = verts[gl_VertexIndex];
+	uint strindex = gl_InstanceIndex;
 	
 	vec2 charPos = vec2(strindex + pos.x + general.TextPosition.x, pos.y + general.TextPosition.y);