From fed60962d6c0ab9b3200efdcf1126b36ed1215c3 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Wed, 30 May 2018 08:02:59 -0500
Subject: [PATCH] [Vulkan] Regenerate shaders, and explicitly require the
 extensions they depend on.

---
 src/xenia/gpu/vulkan/shaders/bin/dummy_frag.h |  13 +++++++++++--
 .../gpu/vulkan/shaders/bin/dummy_frag.txt     |   5 ++++-
 .../vulkan/shaders/bin/line_quad_list_geom.h  |  10 ++++++++--
 .../shaders/bin/line_quad_list_geom.txt       |   4 +++-
 .../gpu/vulkan/shaders/bin/point_list_geom.h  |  11 ++++++++++-
 .../vulkan/shaders/bin/point_list_geom.txt    |   5 ++++-
 .../gpu/vulkan/shaders/bin/quad_list_geom.h   |  13 +++++++++++--
 .../gpu/vulkan/shaders/bin/quad_list_geom.txt |   5 ++++-
 .../gpu/vulkan/shaders/bin/rect_list_geom.h   |  10 ++++++++--
 .../gpu/vulkan/shaders/bin/rect_list_geom.txt |   4 +++-
 src/xenia/gpu/vulkan/shaders/dummy.frag       |   3 +++
 .../gpu/vulkan/shaders/line_quad_list.geom    |   2 ++
 src/xenia/gpu/vulkan/shaders/point_list.geom  |   3 +++
 src/xenia/gpu/vulkan/shaders/quad_list.geom   |   3 +++
 src/xenia/gpu/vulkan/shaders/rect_list.geom   |   2 ++
 .../ui/vulkan/shaders/bin/blit_color_frag.h   |   2 +-
 .../ui/vulkan/shaders/bin/blit_color_frag.spv | Bin 1000 -> 1000 bytes
 .../ui/vulkan/shaders/bin/blit_color_frag.txt |   2 +-
 .../ui/vulkan/shaders/bin/blit_depth_frag.h   |   2 +-
 .../ui/vulkan/shaders/bin/blit_depth_frag.spv | Bin 912 -> 912 bytes
 .../ui/vulkan/shaders/bin/blit_depth_frag.txt |   2 +-
 src/xenia/ui/vulkan/shaders/bin/blit_vert.h   |   2 +-
 src/xenia/ui/vulkan/shaders/bin/blit_vert.spv | Bin 2072 -> 2072 bytes
 src/xenia/ui/vulkan/shaders/bin/blit_vert.txt |   2 +-
 .../ui/vulkan/shaders/bin/immediate_frag.h    |   2 +-
 .../ui/vulkan/shaders/bin/immediate_frag.spv  | Bin 1524 -> 1524 bytes
 .../ui/vulkan/shaders/bin/immediate_frag.txt  |   2 +-
 .../ui/vulkan/shaders/bin/immediate_vert.h    |   2 +-
 .../ui/vulkan/shaders/bin/immediate_vert.spv  | Bin 1512 -> 1512 bytes
 .../ui/vulkan/shaders/bin/immediate_vert.txt  |   2 +-
 30 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.h b/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.h
index af1fdcf0d..0c321e8f7 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: dummy.frag
 const uint8_t dummy_frag[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, 0x2B, 0x00, 0x00, 0x00,
     0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x47, 0x4C, 0x53, 0x4C,
@@ -11,7 +11,16 @@ const uint8_t dummy_frag[] = {
     0x6D, 0x61, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x2D, 0x00, 0x00, 0x00,
     0x31, 0x00, 0x00, 0x00, 0x10, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00,
-    0xC2, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
+    0xC2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x09, 0x00, 0x47, 0x4C, 0x5F, 0x41,
+    0x52, 0x42, 0x5F, 0x65, 0x78, 0x70, 0x6C, 0x69, 0x63, 0x69, 0x74, 0x5F,
+    0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x5F, 0x6C, 0x6F, 0x63, 0x61, 0x74,
+    0x69, 0x6F, 0x6E, 0x00, 0x04, 0x00, 0x09, 0x00, 0x47, 0x4C, 0x5F, 0x41,
+    0x52, 0x42, 0x5F, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x65, 0x5F,
+    0x73, 0x68, 0x61, 0x64, 0x65, 0x72, 0x5F, 0x6F, 0x62, 0x6A, 0x65, 0x63,
+    0x74, 0x73, 0x00, 0x00, 0x04, 0x00, 0x09, 0x00, 0x47, 0x4C, 0x5F, 0x41,
+    0x52, 0x42, 0x5F, 0x73, 0x68, 0x61, 0x64, 0x69, 0x6E, 0x67, 0x5F, 0x6C,
+    0x61, 0x6E, 0x67, 0x75, 0x61, 0x67, 0x65, 0x5F, 0x34, 0x32, 0x30, 0x70,
+    0x61, 0x63, 0x6B, 0x00, 0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x6D, 0x61, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00,
     0x10, 0x00, 0x00, 0x00, 0x63, 0x6F, 0x6E, 0x73, 0x74, 0x73, 0x5F, 0x74,
     0x79, 0x70, 0x65, 0x00, 0x06, 0x00, 0x07, 0x00, 0x10, 0x00, 0x00, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.txt b/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.txt
index e7f1da916..c7c429294 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/dummy_frag.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 50
 ; Schema: 0
                OpCapability Shader
@@ -10,6 +10,9 @@
                OpEntryPoint Fragment %main "main" %in_interpolators %oC
                OpExecutionMode %main OriginUpperLeft
                OpSource GLSL 450
+               OpSourceExtension "GL_ARB_explicit_attrib_location"
+               OpSourceExtension "GL_ARB_separate_shader_objects"
+               OpSourceExtension "GL_ARB_shading_language_420pack"
                OpName %main "main"
                OpName %consts_type "consts_type"
                OpMemberName %consts_type 0 "float_consts"
diff --git a/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.h b/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.h
index 95a29320d..d5046f860 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: line_quad_list.geom
 const uint8_t line_quad_list_geom[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x02, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00,
     0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x47, 0x4C, 0x53, 0x4C,
@@ -16,7 +16,13 @@ const uint8_t line_quad_list_geom[] = {
     0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x1C, 0x00, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x1A, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00,
+    0x02, 0x00, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x09, 0x00,
+    0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x65, 0x78, 0x70, 0x6C, 0x69,
+    0x63, 0x69, 0x74, 0x5F, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x5F, 0x6C,
+    0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x04, 0x00, 0x09, 0x00,
+    0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x73, 0x65, 0x70, 0x61, 0x72,
+    0x61, 0x74, 0x65, 0x5F, 0x73, 0x68, 0x61, 0x64, 0x65, 0x72, 0x5F, 0x6F,
+    0x62, 0x6A, 0x65, 0x63, 0x74, 0x73, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00,
     0x04, 0x00, 0x00, 0x00, 0x6D, 0x61, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00,
     0x05, 0x00, 0x06, 0x00, 0x08, 0x00, 0x00, 0x00, 0x67, 0x6C, 0x5F, 0x50,
     0x65, 0x72, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x00, 0x00, 0x00, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.txt b/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.txt
index 1c7932e75..67bef9604 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 83
 ; Schema: 0
                OpCapability Geometry
@@ -13,6 +13,8 @@
                OpExecutionMode %main OutputLineStrip
                OpExecutionMode %main OutputVertices 5
                OpSource GLSL 450
+               OpSourceExtension "GL_ARB_explicit_attrib_location"
+               OpSourceExtension "GL_ARB_separate_shader_objects"
                OpName %main "main"
                OpName %gl_PerVertex "gl_PerVertex"
                OpMemberName %gl_PerVertex 0 "gl_Position"
diff --git a/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.h b/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.h
index a1627b4c3..b4e31a57d 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: point_list.geom
 const uint8_t point_list_geom[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x02, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x47, 0x4C, 0x53, 0x4C, 0x2E, 0x73, 0x74, 0x64, 0x2E, 0x34, 0x35, 0x30,
@@ -16,6 +16,15 @@ const uint8_t point_list_geom[] = {
     0x04, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00,
     0x04, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00,
+    0x04, 0x00, 0x09, 0x00, 0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x65,
+    0x78, 0x70, 0x6C, 0x69, 0x63, 0x69, 0x74, 0x5F, 0x61, 0x74, 0x74, 0x72,
+    0x69, 0x62, 0x5F, 0x6C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00,
+    0x04, 0x00, 0x09, 0x00, 0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x73,
+    0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x65, 0x5F, 0x73, 0x68, 0x61, 0x64,
+    0x65, 0x72, 0x5F, 0x6F, 0x62, 0x6A, 0x65, 0x63, 0x74, 0x73, 0x00, 0x00,
+    0x04, 0x00, 0x09, 0x00, 0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x73,
+    0x68, 0x61, 0x64, 0x69, 0x6E, 0x67, 0x5F, 0x6C, 0x61, 0x6E, 0x67, 0x75,
+    0x61, 0x67, 0x65, 0x5F, 0x34, 0x32, 0x30, 0x70, 0x61, 0x63, 0x6B, 0x00,
     0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x6D, 0x61, 0x69, 0x6E,
     0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00,
     0x70, 0x6F, 0x73, 0x00, 0x05, 0x00, 0x06, 0x00, 0x0A, 0x00, 0x00, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.txt b/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.txt
index 230b47edf..3a26e517c 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 116
 ; Schema: 0
                OpCapability Geometry
@@ -12,6 +12,9 @@
                OpExecutionMode %main OutputTriangleStrip
                OpExecutionMode %main OutputVertices 4
                OpSource GLSL 450
+               OpSourceExtension "GL_ARB_explicit_attrib_location"
+               OpSourceExtension "GL_ARB_separate_shader_objects"
+               OpSourceExtension "GL_ARB_shading_language_420pack"
                OpName %main "main"
                OpName %pos "pos"
                OpName %gl_PerVertex "gl_PerVertex"
diff --git a/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.h b/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.h
index 62885a479..fc8540095 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: quad_list.geom
 const uint8_t quad_list_geom[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x02, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00,
     0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x47, 0x4C, 0x53, 0x4C,
@@ -16,7 +16,16 @@ const uint8_t quad_list_geom[] = {
     0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x1D, 0x00, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x1A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00,
+    0x02, 0x00, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x09, 0x00,
+    0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x65, 0x78, 0x70, 0x6C, 0x69,
+    0x63, 0x69, 0x74, 0x5F, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x5F, 0x6C,
+    0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x04, 0x00, 0x09, 0x00,
+    0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x73, 0x65, 0x70, 0x61, 0x72,
+    0x61, 0x74, 0x65, 0x5F, 0x73, 0x68, 0x61, 0x64, 0x65, 0x72, 0x5F, 0x6F,
+    0x62, 0x6A, 0x65, 0x63, 0x74, 0x73, 0x00, 0x00, 0x04, 0x00, 0x09, 0x00,
+    0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x73, 0x68, 0x61, 0x64, 0x69,
+    0x6E, 0x67, 0x5F, 0x6C, 0x61, 0x6E, 0x67, 0x75, 0x61, 0x67, 0x65, 0x5F,
+    0x34, 0x32, 0x30, 0x70, 0x61, 0x63, 0x6B, 0x00, 0x05, 0x00, 0x04, 0x00,
     0x04, 0x00, 0x00, 0x00, 0x6D, 0x61, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00,
     0x05, 0x00, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00,
     0x05, 0x00, 0x05, 0x00, 0x13, 0x00, 0x00, 0x00, 0x69, 0x6E, 0x70, 0x75,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.txt b/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.txt
index 10b8bccbc..f7325b903 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 75
 ; Schema: 0
                OpCapability Geometry
@@ -13,6 +13,9 @@
                OpExecutionMode %main OutputTriangleStrip
                OpExecutionMode %main OutputVertices 4
                OpSource GLSL 450
+               OpSourceExtension "GL_ARB_explicit_attrib_location"
+               OpSourceExtension "GL_ARB_separate_shader_objects"
+               OpSourceExtension "GL_ARB_shading_language_420pack"
                OpName %main "main"
                OpName %i "i"
                OpName %input_index "input_index"
diff --git a/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.h b/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.h
index 77b442a1a..2672a6839 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: rect_list.geom
 const uint8_t rect_list_geom[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0xD1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x02, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, 0x18, 0x00, 0x00, 0x00,
     0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x47, 0x4C, 0x53, 0x4C,
@@ -16,7 +16,13 @@ const uint8_t rect_list_geom[] = {
     0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x03, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x1D, 0x00, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00,
     0x1A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00,
-    0x02, 0x00, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00,
+    0x02, 0x00, 0x00, 0x00, 0xC2, 0x01, 0x00, 0x00, 0x04, 0x00, 0x09, 0x00,
+    0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x65, 0x78, 0x70, 0x6C, 0x69,
+    0x63, 0x69, 0x74, 0x5F, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x5F, 0x6C,
+    0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x00, 0x04, 0x00, 0x09, 0x00,
+    0x47, 0x4C, 0x5F, 0x41, 0x52, 0x42, 0x5F, 0x73, 0x65, 0x70, 0x61, 0x72,
+    0x61, 0x74, 0x65, 0x5F, 0x73, 0x68, 0x61, 0x64, 0x65, 0x72, 0x5F, 0x6F,
+    0x62, 0x6A, 0x65, 0x63, 0x74, 0x73, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00,
     0x04, 0x00, 0x00, 0x00, 0x6D, 0x61, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00,
     0x05, 0x00, 0x06, 0x00, 0x08, 0x00, 0x00, 0x00, 0x6C, 0x65, 0x66, 0x74,
     0x5F, 0x61, 0x6C, 0x69, 0x67, 0x6E, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.txt b/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.txt
index c8dcc0012..12f61c051 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 209
 ; Schema: 0
                OpCapability Geometry
@@ -13,6 +13,8 @@
                OpExecutionMode %main OutputTriangleStrip
                OpExecutionMode %main OutputVertices 6
                OpSource GLSL 450
+               OpSourceExtension "GL_ARB_explicit_attrib_location"
+               OpSourceExtension "GL_ARB_separate_shader_objects"
                OpName %main "main"
                OpName %left_aligned "left_aligned"
                OpName %gl_PerVertex "gl_PerVertex"
diff --git a/src/xenia/gpu/vulkan/shaders/dummy.frag b/src/xenia/gpu/vulkan/shaders/dummy.frag
index 0a963f786..325576f0f 100644
--- a/src/xenia/gpu/vulkan/shaders/dummy.frag
+++ b/src/xenia/gpu/vulkan/shaders/dummy.frag
@@ -3,6 +3,9 @@
 
 #version 450 core
 #extension all : warn
+#extension GL_ARB_shading_language_420pack : require
+#extension GL_ARB_separate_shader_objects : require
+#extension GL_ARB_explicit_attrib_location : require
 
 layout(set = 0, binding = 1) uniform consts_type {
   vec4 float_consts[512];
diff --git a/src/xenia/gpu/vulkan/shaders/line_quad_list.geom b/src/xenia/gpu/vulkan/shaders/line_quad_list.geom
index cae058f1a..7f8863853 100644
--- a/src/xenia/gpu/vulkan/shaders/line_quad_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/line_quad_list.geom
@@ -3,6 +3,8 @@
 
 #version 450 core
 #extension all : warn
+#extension GL_ARB_separate_shader_objects : require
+#extension GL_ARB_explicit_attrib_location : require
 
 in gl_PerVertex {
   vec4 gl_Position;
diff --git a/src/xenia/gpu/vulkan/shaders/point_list.geom b/src/xenia/gpu/vulkan/shaders/point_list.geom
index cf1d42a93..52b29581e 100644
--- a/src/xenia/gpu/vulkan/shaders/point_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/point_list.geom
@@ -3,6 +3,9 @@
 
 #version 450 core
 #extension all : warn
+#extension GL_ARB_shading_language_420pack : require
+#extension GL_ARB_separate_shader_objects : require
+#extension GL_ARB_explicit_attrib_location : require
 
 layout(push_constant) uniform push_consts_type {
   vec4 window_scale;
diff --git a/src/xenia/gpu/vulkan/shaders/quad_list.geom b/src/xenia/gpu/vulkan/shaders/quad_list.geom
index 55f88921f..b340b55da 100644
--- a/src/xenia/gpu/vulkan/shaders/quad_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/quad_list.geom
@@ -3,6 +3,9 @@
 
 #version 450 core
 #extension all : warn
+#extension GL_ARB_shading_language_420pack : require
+#extension GL_ARB_separate_shader_objects : require
+#extension GL_ARB_explicit_attrib_location : require
 
 in gl_PerVertex {
   vec4 gl_Position;
diff --git a/src/xenia/gpu/vulkan/shaders/rect_list.geom b/src/xenia/gpu/vulkan/shaders/rect_list.geom
index e9118b108..b08e66c5e 100644
--- a/src/xenia/gpu/vulkan/shaders/rect_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/rect_list.geom
@@ -3,6 +3,8 @@
 
 #version 450 core
 #extension all : warn
+#extension GL_ARB_separate_shader_objects : require
+#extension GL_ARB_explicit_attrib_location : require
 
 in gl_PerVertex {
   vec4 gl_Position;
diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.h b/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.h
index 3efec06b9..e91b12124 100644
--- a/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.h
+++ b/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: blit_color.frag
 const uint8_t blit_color_frag[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x47, 0x4C, 0x53, 0x4C, 0x2E, 0x73, 0x74, 0x64, 0x2E, 0x34, 0x35, 0x30,
diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.spv b/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.spv
index 103f11a051bd7e0c1bc70dc6cf8ef00fc2d52bbf..52ffa72dcd18596da1c9aa6215d28de0f51c69e4 100644
GIT binary patch
delta 18
ZcmaFC{(_y8nMs+Qfq{{MZ6oJ>W&kG(1G)eJ

delta 18
ZcmaFC{(_y8nMs+Qfq{{Mc_Zh2W&kGq1GfMG

diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.txt b/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.txt
index a4ecbfcdd..5720bad67 100644
--- a/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.txt
+++ b/src/xenia/ui/vulkan/shaders/bin/blit_color_frag.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 36
 ; Schema: 0
                OpCapability Shader
diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.h b/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.h
index c18af5d0d..0da5a0196 100644
--- a/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.h
+++ b/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: blit_depth.frag
 const uint8_t blit_depth_frag[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x47, 0x4C, 0x53, 0x4C, 0x2E, 0x73, 0x74, 0x64, 0x2E, 0x34, 0x35, 0x30,
diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.spv b/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.spv
index c08db472efae8dcb03ea4cd1ce022dce45384940..eacc087e244b3befa76e83be0ead3a43cd0feb19 100644
GIT binary patch
delta 18
ZcmbQhK7pN+nMs+Qfq{{MZ6jwpGXNT^0<r)A

delta 18
ZcmbQhK7pN+nMs+Qfq{{Mc_U{#GXNT#0<Qo7

diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.txt b/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.txt
index b9be56d93..8115204b6 100644
--- a/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.txt
+++ b/src/xenia/ui/vulkan/shaders/bin/blit_depth_frag.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 30
 ; Schema: 0
                OpCapability Shader
diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_vert.h b/src/xenia/ui/vulkan/shaders/bin/blit_vert.h
index 2cbfebdaf..1524dc49d 100644
--- a/src/xenia/ui/vulkan/shaders/bin/blit_vert.h
+++ b/src/xenia/ui/vulkan/shaders/bin/blit_vert.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: blit.vert
 const uint8_t blit_vert[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x4C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x47, 0x4C, 0x53, 0x4C, 0x2E, 0x73, 0x74, 0x64, 0x2E, 0x34, 0x35, 0x30,
diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_vert.spv b/src/xenia/ui/vulkan/shaders/bin/blit_vert.spv
index c03e2147ef420fddd8b32525b01749fe0f6f683f..afaeeb7949d8c616493b3b93f607d20bf062ad74 100644
GIT binary patch
delta 18
ZcmbOsFhhWonMs+Qfq{{MZ6hZ?2LK!J0$~6E

delta 18
ZcmbOsFhhWonMs+Qfq{{Mc_Sx32LK!40$u<B

diff --git a/src/xenia/ui/vulkan/shaders/bin/blit_vert.txt b/src/xenia/ui/vulkan/shaders/bin/blit_vert.txt
index 5b8db5d05..5da250bf8 100644
--- a/src/xenia/ui/vulkan/shaders/bin/blit_vert.txt
+++ b/src/xenia/ui/vulkan/shaders/bin/blit_vert.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 76
 ; Schema: 0
                OpCapability Shader
diff --git a/src/xenia/ui/vulkan/shaders/bin/immediate_frag.h b/src/xenia/ui/vulkan/shaders/bin/immediate_frag.h
index 97d56df87..5f45083c7 100644
--- a/src/xenia/ui/vulkan/shaders/bin/immediate_frag.h
+++ b/src/xenia/ui/vulkan/shaders/bin/immediate_frag.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: immediate.frag
 const uint8_t immediate_frag[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, 0x2B, 0x00, 0x00, 0x00,
     0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x47, 0x4C, 0x53, 0x4C,
diff --git a/src/xenia/ui/vulkan/shaders/bin/immediate_frag.spv b/src/xenia/ui/vulkan/shaders/bin/immediate_frag.spv
index 1bfe4a6f7d753664c1584e21b187783908a7b1fb..7e3dda1d64f2926f0c404866b4c9eef4bbdfd84e 100644
GIT binary patch
delta 18
Zcmeyu{e_#8nMs+Qfq{{MZ6oJvRsbnI1Lyz%

delta 18
Zcmeyu{e_#8nMs+Qfq{{Mc_Zg*Rsbn31LXh!

diff --git a/src/xenia/ui/vulkan/shaders/bin/immediate_frag.txt b/src/xenia/ui/vulkan/shaders/bin/immediate_frag.txt
index 4053358fe..343b7f698 100644
--- a/src/xenia/ui/vulkan/shaders/bin/immediate_frag.txt
+++ b/src/xenia/ui/vulkan/shaders/bin/immediate_frag.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 56
 ; Schema: 0
                OpCapability Shader
diff --git a/src/xenia/ui/vulkan/shaders/bin/immediate_vert.h b/src/xenia/ui/vulkan/shaders/bin/immediate_vert.h
index 03551e7b5..90d42fba1 100644
--- a/src/xenia/ui/vulkan/shaders/bin/immediate_vert.h
+++ b/src/xenia/ui/vulkan/shaders/bin/immediate_vert.h
@@ -1,7 +1,7 @@
 // generated from `xb genspirv`
 // source: immediate.vert
 const uint8_t immediate_vert[] = {
-    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00, 0x08, 0x00,
+    0x03, 0x02, 0x23, 0x07, 0x00, 0x00, 0x01, 0x00, 0x06, 0x00, 0x08, 0x00,
     0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00,
     0x01, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00,
     0x47, 0x4C, 0x53, 0x4C, 0x2E, 0x73, 0x74, 0x64, 0x2E, 0x34, 0x35, 0x30,
diff --git a/src/xenia/ui/vulkan/shaders/bin/immediate_vert.spv b/src/xenia/ui/vulkan/shaders/bin/immediate_vert.spv
index 6462549b01e7955818cb49eab47c04ba9569e8f5..0b0a9f3cb121531c56f46ebfee7d45ebb8b4e51d 100644
GIT binary patch
delta 18
ZcmaFC{eqj5nMs+Qfq{{MZ6oJ>RsbiB1H=FT

delta 18
ZcmaFC{eqj5nMs+Qfq{{Mc_Zh2Rsbh{1Hk|Q

diff --git a/src/xenia/ui/vulkan/shaders/bin/immediate_vert.txt b/src/xenia/ui/vulkan/shaders/bin/immediate_vert.txt
index 02b4ebca0..3ce63ea14 100644
--- a/src/xenia/ui/vulkan/shaders/bin/immediate_vert.txt
+++ b/src/xenia/ui/vulkan/shaders/bin/immediate_vert.txt
@@ -1,6 +1,6 @@
 ; SPIR-V
 ; Version: 1.0
-; Generator: Khronos Glslang Reference Front End; 3
+; Generator: Khronos Glslang Reference Front End; 6
 ; Bound: 48
 ; Schema: 0
                OpCapability Shader