From ff373a83a4547d0bef6c22644ad4fc918d632f74 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sat, 20 Feb 2016 20:44:11 -0800
Subject: [PATCH] Private->Function variables, fragment output, geometry shader
 tweaks.

---
 src/xenia/gpu/spirv_shader_translator.cc      |  42 ++++++++++++------
 src/xenia/gpu/spirv_shader_translator.h       |   9 ++--
 .../vulkan/shaders/bin/line_quad_list_geom.h  |   4 +-
 .../shaders/bin/line_quad_list_geom.spv       | Bin 2344 -> 0 bytes
 .../shaders/bin/line_quad_list_geom.txt       |   4 +-
 .../gpu/vulkan/shaders/bin/point_list_geom.h  |   4 +-
 .../vulkan/shaders/bin/point_list_geom.spv    | Bin 2420 -> 0 bytes
 .../vulkan/shaders/bin/point_list_geom.txt    |   4 +-
 .../gpu/vulkan/shaders/bin/quad_list_geom.h   |   4 +-
 .../gpu/vulkan/shaders/bin/quad_list_geom.spv | Bin 2084 -> 0 bytes
 .../gpu/vulkan/shaders/bin/quad_list_geom.txt |   4 +-
 .../gpu/vulkan/shaders/bin/rect_list_geom.h   |   4 +-
 .../gpu/vulkan/shaders/bin/rect_list_geom.spv | Bin 5204 -> 0 bytes
 .../gpu/vulkan/shaders/bin/rect_list_geom.txt |   4 +-
 .../gpu/vulkan/shaders/line_quad_list.geom    |   6 +--
 src/xenia/gpu/vulkan/shaders/point_list.geom  |   6 +--
 src/xenia/gpu/vulkan/shaders/quad_list.geom   |   6 +--
 src/xenia/gpu/vulkan/shaders/rect_list.geom   |   6 +--
 18 files changed, 60 insertions(+), 47 deletions(-)
 delete mode 100644 src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.spv
 delete mode 100644 src/xenia/gpu/vulkan/shaders/bin/point_list_geom.spv
 delete mode 100644 src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.spv
 delete mode 100644 src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.spv

diff --git a/src/xenia/gpu/spirv_shader_translator.cc b/src/xenia/gpu/spirv_shader_translator.cc
index f8cf69af9..f46d76bbd 100644
--- a/src/xenia/gpu/spirv_shader_translator.cc
+++ b/src/xenia/gpu/spirv_shader_translator.cc
@@ -83,19 +83,19 @@ void SpirvShaderTranslator::StartTranslation() {
 
   registers_type_ =
       b.makeArrayType(vec4_float_type_, b.makeUintConstant(64), 0);
-  registers_ptr_ = b.createVariable(spv::StorageClass::StorageClassPrivate,
+  registers_ptr_ = b.createVariable(spv::StorageClass::StorageClassFunction,
                                     registers_type_, "r");
 
-  aL_ = b.createVariable(spv::StorageClass::StorageClassPrivate,
+  aL_ = b.createVariable(spv::StorageClass::StorageClassFunction,
                          vec4_uint_type_, "aL");
 
-  p0_ = b.createVariable(spv::StorageClass::StorageClassPrivate, bool_type_,
+  p0_ = b.createVariable(spv::StorageClass::StorageClassFunction, bool_type_,
                          "p0");
-  ps_ = b.createVariable(spv::StorageClass::StorageClassPrivate, float_type_,
+  ps_ = b.createVariable(spv::StorageClass::StorageClassFunction, float_type_,
                          "ps");
-  pv_ = b.createVariable(spv::StorageClass::StorageClassPrivate,
+  pv_ = b.createVariable(spv::StorageClass::StorageClassFunction,
                          vec4_float_type_, "pv");
-  a0_ = b.createVariable(spv::StorageClass::StorageClassPrivate,
+  a0_ = b.createVariable(spv::StorageClass::StorageClassFunction,
                          b.makeUintType(32), "a0");
 
   // Uniform constants.
@@ -110,7 +110,7 @@ void SpirvShaderTranslator::StartTranslation() {
       {float_consts_type, loop_consts_type, bool_consts_type}, "consts_type");
   b.addDecoration(consts_struct_type, spv::Decoration::DecorationBlock);
 
-  // Constants member decorations
+  // Constants member decorations.
   b.addMemberDecoration(consts_struct_type, 0,
                         spv::Decoration::DecorationOffset, 0);
   b.addMemberDecoration(consts_struct_type, 0,
@@ -144,11 +144,11 @@ void SpirvShaderTranslator::StartTranslation() {
     b.addDecoration(consts_, spv::Decoration::DecorationBinding, 1);
   }
 
-  // Interpolators
+  // Interpolators.
   Id interpolators_type =
       b.makeArrayType(vec4_float_type_, b.makeUintConstant(16), 0);
   if (is_vertex_shader()) {
-    // Vertex inputs/outputs
+    // Vertex inputs/outputs.
     for (const auto& binding : vertex_bindings()) {
       for (const auto& attrib : binding.attributes) {
         Id attrib_type = 0;
@@ -204,13 +204,22 @@ void SpirvShaderTranslator::StartTranslation() {
     b.addDecoration(pos_, spv::Decoration::DecorationBuiltIn,
                     spv::BuiltIn::BuiltInPosition);
   } else {
-    // Pixel inputs/outputs
+    // Pixel inputs from vertex shader.
     interpolators_ = b.createVariable(spv::StorageClass::StorageClassInput,
                                       interpolators_type, "interpolators");
     b.addDecoration(interpolators_, spv::Decoration::DecorationNoPerspective);
     b.addDecoration(interpolators_, spv::Decoration::DecorationLocation, 0);
 
-    // Copy interpolators to r[0..16]
+    // Pixel fragment outputs (one per render target).
+    Id frag_outputs_type =
+        b.makeArrayType(vec4_float_type_, b.makeUintConstant(4), 0);
+    frag_outputs_ = b.createVariable(spv::StorageClass::StorageClassOutput,
+                                     frag_outputs_type, "o");
+    b.addDecoration(frag_outputs_, spv::Decoration::DecorationLocation, 0);
+
+    // TODO(benvanik): frag depth, etc.
+
+    // Copy interpolators to r[0..16].
     b.createNoResultOp(spv::Op::OpCopyMemorySized,
                        {registers_ptr_, interpolators_,
                         b.makeUintConstant(16 * 4 * sizeof(float))});
@@ -916,7 +925,7 @@ Id SpirvShaderTranslator::LoadFromOperand(const InstructionOperand& op) {
   switch (op.storage_source) {
     case InstructionStorageSource::kRegister:
       storage_pointer = registers_ptr_;
-      storage_class = spv::StorageClass::StorageClassPrivate;
+      storage_class = spv::StorageClass::StorageClassFunction;
       storage_type = vec4_float_type_;
       storage_offsets.push_back(storage_index);
       break;
@@ -1040,7 +1049,7 @@ void SpirvShaderTranslator::StoreToResult(Id source_value_id,
   switch (result.storage_target) {
     case InstructionStorageTarget::kRegister:
       storage_pointer = registers_ptr_;
-      storage_class = spv::StorageClass::StorageClassPrivate;
+      storage_class = spv::StorageClass::StorageClassFunction;
       storage_type = vec4_float_type_;
       storage_offsets.push_back(storage_index);
       storage_array = true;
@@ -1068,7 +1077,12 @@ void SpirvShaderTranslator::StoreToResult(Id source_value_id,
       break;
     case InstructionStorageTarget::kColorTarget:
       assert_true(is_pixel_shader());
-      // TODO(benvanik): result.storage_index
+      assert_not_zero(frag_outputs_);
+      storage_pointer = frag_outputs_;
+      storage_class = spv::StorageClass::StorageClassOutput;
+      storage_type = vec4_float_type_;
+      storage_offsets.push_back(storage_index);
+      storage_array = true;
       break;
     case InstructionStorageTarget::kDepth:
       assert_true(is_pixel_shader());
diff --git a/src/xenia/gpu/spirv_shader_translator.h b/src/xenia/gpu/spirv_shader_translator.h
index f56325fc6..aabd6fec1 100644
--- a/src/xenia/gpu/spirv_shader_translator.h
+++ b/src/xenia/gpu/spirv_shader_translator.h
@@ -54,8 +54,6 @@ class SpirvShaderTranslator : public ShaderTranslator {
   void ProcessAluInstruction(const ParsedAluInstruction& instr) override;
 
  private:
-  void SetupPushConstants();
-
   void ProcessVectorAluInstruction(const ParsedAluInstruction& instr);
   void ProcessScalarAluInstruction(const ParsedAluInstruction& instr);
 
@@ -80,22 +78,23 @@ class SpirvShaderTranslator : public ShaderTranslator {
   std::unique_ptr<spv::Builder> builder_;
   spv::Id glsl_std_450_instruction_set_ = 0;
 
-  // Types
+  // Types.
   spv::Id float_type_ = 0, bool_type_ = 0;
   spv::Id vec2_float_type_ = 0, vec3_float_type_ = 0, vec4_float_type_ = 0;
   spv::Id vec4_uint_type_ = 0;
   spv::Id vec4_bool_type_ = 0;
 
-  // Constants
+  // Constants.
   spv::Id vec4_float_zero_ = 0, vec4_float_one_ = 0;
 
-  // Array of AMD registers
+  // Array of AMD registers.
   // These values are all pointers.
   spv::Id registers_ptr_ = 0, registers_type_ = 0;
   spv::Id consts_ = 0, a0_ = 0, aL_ = 0, p0_ = 0;
   spv::Id ps_ = 0, pv_ = 0;  // IDs of previous results
   spv::Id pos_ = 0;
   spv::Id interpolators_ = 0;
+  spv::Id frag_outputs_ = 0;
 
   // Map of {binding -> {offset -> spv input}}
   std::map<uint32_t, std::map<uint32_t, spv::Id>> vertex_binding_map_;
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 cb3511e37..af848e905 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
@@ -62,12 +62,12 @@ const uint8_t line_quad_list_geom[] = {
     0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00,
     0x03, 0x00, 0x00, 0x00, 0x47, 0x00, 0x03, 0x00, 0x10, 0x00, 0x00, 0x00,
     0x02, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, 0x22, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x47, 0x00, 0x04, 0x00, 0x22, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x24, 0x00, 0x00, 0x00,
     0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00,
     0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x16, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
     0x17, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.spv b/src/xenia/gpu/vulkan/shaders/bin/line_quad_list_geom.spv
deleted file mode 100644
index c8ade8408f0e7a26a1eff170df2428d68b8686c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2344
zcmZ{l>rPWq5QR6i1rg;U0$vb{ct;VnAc~*}T2wS9B>p9hHs&PQ8hSLu$MZ4tMf_vp
z`u6FHJE*4_XV%Q@nOU>X!BX#Re+WJL9SN^P@r;IE{X#&W>gsA&FG&xEKIMl{-`?4t
z@8s|2Yl{nlVJMVPF*Y0qA}R}iY-BC`$0a8v7bRCEBg!B?9_@0pWybT4O(n52vMZ93
ze$4kxLsWDs?NQNegNl9F+kMmAf7{&8n+JmO7Jh7E?M{|w?Uua#F&{qBpSALx>}!)e
z$LOWl#$NVmGwbAy*1M+qmLebW=s8m4{M8db&*7f<|JRe)zk8PB{!}Y2w4%-zlv}Xe
zY~&4QE=Ql-p)FxQ?7RIr-~Eyw2v@=-;lpR}@%Rk)leOZJu%$EXl*igWIN(Fu$L#oc
z8|wNO8(&?sV4sulfO#j3Iq!Xu$7A2&KHgE<$3D)m7oKSeXX%B{y}<0nm^0pi&x~nm
z=AID;xL{An>XWWYCRIZpPsGK0T-H}q#H7NU;@|-ZGfW8|mF7IY>F!=#gIHBL$E4{8
zx0NntPx!`#hoq|#YSIHdEa9Ohdq`_~j#2rUlQ~XElZTI<W75>aPfsx4Dn8<TquA61
z^LK%Hz@CBc)A?t+cCo8+ya)2Zo~J6C8JK5Ax~L6@QoJjC^qQ6CEceH3VD1hdx!fDM
z)VVATHm@tPdnEWd3+CO%N9}7}n=|H7lg(Wluga#^l6H%q9rED&DNjXuUCh|ggoM3u
zAIPe*;Wa5Cwytb;cUr=olC!2tU~;I#?)basI_#A??2h-97<G70&r7I74t2of5Qp1!
z34A?E!L#s_&mQL_-?b5QxFJk$YWf@;Zc2!m!@TU21DG6hxFy?lQVt996Ela~vQrLV
za?Ih5Y&f_E9PUc+n*%uIuqaILnk41G|6jz+;hyZ21DG6hSeETN?$15kmk=|D2eMNR
zU~<f1MK&Cmhr5KsLkWI!0H++*gz3%umvVR{Ow1e}%T76f$uWm@*{+jvcoK8|aM%z|
zIe?3t;$7Mlh6D4M!&BM#%>kTpcqUA5=1)1)g^8KNmh6-Rm>hF>F57id4lm><=6iT4
fJLLc-$M>);8xEd@dw3<mZw_EM{E+;TEK7a^b_R#;

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 669037053..613a25522 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
@@ -42,10 +42,10 @@
                OpMemberDecorate %16 1 BuiltIn PointSize
                OpMemberDecorate %16 2 BuiltIn ClipDistance
                OpDecorate %16 Block
-               OpMemberDecorate %34 0 Location 1
+               OpMemberDecorate %34 0 Location 0
                OpDecorate %34 Stream 0
                OpDecorate %36 Stream 0
-               OpMemberDecorate %37 0 Location 1
+               OpMemberDecorate %37 0 Location 0
           %2 = OpTypeVoid
           %3 = OpTypeFunction %2
           %6 = OpTypeFloat 32
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 4669a9c42..a8e13aaa5 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.h
@@ -67,12 +67,12 @@ const uint8_t point_list_geom[] = {
     0x27, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x47, 0x00, 0x04, 0x00, 0x29, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, 0x4A, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x47, 0x00, 0x04, 0x00, 0x4A, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x4C, 0x00, 0x00, 0x00,
     0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00,
     0x4D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x16, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00,
     0x17, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.spv b/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.spv
deleted file mode 100644
index 882c394309d161e495ba0eadb0779f9b418aba61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2420
zcmZ{ldvBCg5Qh)!ZZCpd<ffo?D=JqjARvlB3zZ@kC{+2EEV40gQg<76HI0A47vQ__
z2}t}H`aOt{nD{*BJwx6ooXzaa{N{3I=FGOO%?Bq_+Qern-A(n`nKtuDN&ar(-NMhp
zx1<UDQ(9VHU7j0_AIzOTa{@JOOD$QpZBNr#Yoq_ts|Mmbpd-*Sw378!(!MLp?JOha
z_#H%R`=DXlk1W>WV|{;6L<gjKM+e(9w)No%+eCUB`RBEJEB%Le`wz$c4OGw?SJpNh
zRpV+n0G-VK_LlK#FkY>G@9P&f@5Odyty*8KM&sV#r+%)%-oSIC*0c|OeN+cqlYLZ>
zH65yb|5uZ^=f5?Hzo{l|udk_<XKlU?pL6hP@SwlZyT4{bV%OpIR2F;Vo;|iR2Aqc3
zr=8zw`0M!IZ{v*|bK^BJVxEZcZL2{JN!N(-4Ln<F_6oBnF?smei<q0V#J90x+G9S=
zJTaSQo|s89Phd;*sO)=q)ZNL@y~nwDW*}?RM=X5Q-Qm!Ui5W!9E~>WfS$eP+<-JG~
z@Gi8E9FuT$_qWUU6kJT&gZ@^=`QjWadi41|`c`n`#b(N!Bd0cfw!xjDKHjk%ZcpOp
zi|+1<dFM`ex9Hxf{to0Z-ruUe-lM*^$kq}5{>{)w`+G&M`)*TH9c$k3{}|aB>}E=z
z!0qJ_yxEJn4ud&MZPu>t+le{Pqj2wW)-kWokj?EZ=HU8>Y1j92D5XcwLO)UKmyT0|
zz9%7l!~;83^d|O2@zXc_P8Yu#o6Ps00W+sLjM2y5zJ%MaHL8DAbZbz*3b#*vqPJ_v
zzMZ{&S8QT4cwUE#8T&olSTX0O?*5AD>+b4no||y>*q2+#n;>yx)mI8;?%PE+<}5RF
z_Ria5{=Y#waAT+7(~v!=yF31!4Bg%EHx;@w@$Z)U0<Y!n?S|~xos=$+NBbT~+eL2m
z4s~PPKmTt;jJs)!Z-1cJjIj=NWot0^3u^cGY!CA1#C74bkVpGRaP4yQy4MFGb3CPU
z_xaO;x#utOQU4I?LdGgbAIFfb{}x^O_QxSH$>UqZJ^nBD9&2_^?$!c#x;tM(V*2QB
zuJe$%y8V9x+4mD-v|oVq5r15;i^$fXEo!`k+^lgPT}<-*efQhMd&dG~4o_g0k;UvK
zuq(*(kSDN3<atQH73SePe+!w@9LDHl&sX6~&=JVDb0+Gwe}|kY-GSWQ*c*3twcz^u
tn^6Cg8-3eZWZy>~GyehEnLpxA-}*;L%)N@;5o_*F7yU1C{sWzZ{sk~OpBVrE

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 0eecef563..ea6523102 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/point_list_geom.txt
@@ -46,10 +46,10 @@
                OpDecorate %39 Block
                OpDecorate %39 Stream 0
                OpDecorate %41 Stream 0
-               OpMemberDecorate %74 0 Location 1
+               OpMemberDecorate %74 0 Location 0
                OpDecorate %74 Stream 0
                OpDecorate %76 Stream 0
-               OpMemberDecorate %77 0 Location 1
+               OpMemberDecorate %77 0 Location 0
           %2 = OpTypeVoid
           %3 = OpTypeFunction %2
           %6 = OpTypeFloat 32
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 7a27bde3a..f168ce835 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.h
@@ -67,11 +67,11 @@ const uint8_t quad_list_geom[] = {
     0x0B, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x47, 0x00, 0x03, 0x00,
     0x27, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00,
     0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x39, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x39, 0x00, 0x00, 0x00,
     0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00,
     0x3B, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x48, 0x00, 0x05, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x1E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00,
+    0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00,
     0x02, 0x00, 0x00, 0x00, 0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00,
     0x02, 0x00, 0x00, 0x00, 0x15, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00,
     0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.spv b/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.spv
deleted file mode 100644
index a57165e8afcbae1d14f3f1d47613a26fa566156b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2084
zcmZ{l*-lhJ5QZCO0Yq73b3q)$9mEX~MHB?Z3ocAZyd|Sd%t>&Dz-WwDzLKxtW9WMr
zH8Jt~dQOuGYM&HU_1DsMs_G1d&Z({tI(WLnv(P$&p_3;B`Kg>&a=rlX4Q2d8*x20K
zoIPmn%+Af<LJfVPAd9yC&=a*H`rB$&7rzW$hnAqn&;TCVN1|MeGGdHRwsUQ^GsyZE
zc&zUWMU+6=?<isG#+E@Po+0J>-n-^@R^O?8h?qH}R(-Wwi+<&B5&mX(`$cX4Wo^HS
zBd5$G?$Opb$eLNB4%!uQdl2!g-rUMQn(EMIec0A^v%U4~pjoZIu5ouE_CUW9o>y8v
zf88nWIeMq~|L)ZG?>mdJ=j4h*uqXHNZN24swOO_1V#I($1G1;is6p4>H(Nb>h<-Fi
z%#&iAX;zOR;W=4S?|P$GIK+GhF?sT{b}=_-gTKa#ZBUD{GxMmsM@ct6^{f4!)T{P;
zQjgm2Ntk);i)R9|Ht!Nkcd6T#q#KiZkYa|Y+PWus2j4|`gt#)i0-3jh-UXM$r*nG`
zvM1>S$VF(FEQ4_K48tpsM?ZDHAN|JpI|?_aSjsbo?7d0%o3^&3pGLOM87eZ~@61|^
z(^tDSkHf85pHVVY;L;ej$y~OMRM!RM4#>Kua=X|>z8fi~Wh;hD*sRNWFA<~eti_CR
zR_!t7y$UAo`&#2QxOa-1L*3sTG3_(CJelh^;pR{Jo!nl5>pu_IuAbiO9<sCX{zbU4
zViS0}FJi_%fEz1jE$Z%1>wOAwcl0&SGTdEC@9_w^0}?k@-S11x+^e~4%mTe}e)isD
z{vRMExUtU6-$Z%R{asADb9JZH9}%su^Z!YXV{miHzmw}Y`~>9D-Urt%U&ik4^+V?P
zOa<=k$sDt1zwlA_8#I@($|?3Nva!}-P440<d92NEOiZ8Te?G_c_np*}Z5ml@m8zWk
z4ai*(_x<#ngwI0SyvKd;pP757k9pPgNqKK0r@ZdVUC6xRelz-2;B$~R^SVd=?=-JI
z=2h1x<y}E;<t-5t!V}1uuR!`Z>orK+cy~$tD_h|#oQwUGr=07^_VW`pIGd-CSgJvr
PSo^G<%QtfVh8Ceea|?_>

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 4a1ed2b02..ee4a83586 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/quad_list_geom.txt
@@ -45,10 +45,10 @@
                OpMemberDecorate %39 1 BuiltIn PointSize
                OpMemberDecorate %39 2 BuiltIn ClipDistance
                OpDecorate %39 Block
-               OpMemberDecorate %57 0 Location 1
+               OpMemberDecorate %57 0 Location 0
                OpDecorate %57 Stream 0
                OpDecorate %59 Stream 0
-               OpMemberDecorate %60 0 Location 1
+               OpMemberDecorate %60 0 Location 0
           %2 = OpTypeVoid
           %3 = OpTypeFunction %2
           %6 = OpTypeInt 32 1
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 511aeb2d0..b9598cfa9 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.h
+++ b/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.h
@@ -66,12 +66,12 @@ const uint8_t rect_list_geom[] = {
     0x20, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x47, 0x00, 0x04, 0x00, 0x22, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, 0x2F, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x47, 0x00, 0x04, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x31, 0x00, 0x00, 0x00,
     0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00,
     0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00,
-    0x01, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x14, 0x00, 0x02, 0x00, 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00,
     0x07, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00,
diff --git a/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.spv b/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.spv
deleted file mode 100644
index 8074f71f5d7169723c5b2ea2533ccd7f0d20bc8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5204
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

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 b1a8ecc30..b047926f5 100644
--- a/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.txt
+++ b/src/xenia/gpu/vulkan/shaders/bin/rect_list_geom.txt
@@ -45,10 +45,10 @@
                OpDecorate %32 Block
                OpDecorate %32 Stream 0
                OpDecorate %34 Stream 0
-               OpMemberDecorate %47 0 Location 1
+               OpMemberDecorate %47 0 Location 0
                OpDecorate %47 Stream 0
                OpDecorate %49 Stream 0
-               OpMemberDecorate %50 0 Location 1
+               OpMemberDecorate %50 0 Location 0
           %2 = OpTypeVoid
           %3 = OpTypeFunction %2
           %6 = OpTypeBool
diff --git a/src/xenia/gpu/vulkan/shaders/line_quad_list.geom b/src/xenia/gpu/vulkan/shaders/line_quad_list.geom
index 3cfd5535f..d514bf456 100644
--- a/src/xenia/gpu/vulkan/shaders/line_quad_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/line_quad_list.geom
@@ -1,7 +1,7 @@
 // NOTE: This file is compiled and embedded into the exe.
 //       Use `xenia-build genspirv` and check in any changes under bin/.
 
-#version 450
+#version 450 core
 #extension all : warn
 
 in gl_PerVertex {
@@ -19,8 +19,8 @@ out gl_PerVertex {
 struct VertexData {
   vec4 o[16];
 };
-layout(location = 1) in VertexData in_vtx[];
-layout(location = 1) out VertexData out_vtx;
+layout(location = 0) in VertexData in_vtx[];
+layout(location = 0) out VertexData out_vtx;
 
 layout(lines_adjacency) in;
 layout(line_strip, max_vertices = 5) out;
diff --git a/src/xenia/gpu/vulkan/shaders/point_list.geom b/src/xenia/gpu/vulkan/shaders/point_list.geom
index 6855b4511..579b540da 100644
--- a/src/xenia/gpu/vulkan/shaders/point_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/point_list.geom
@@ -1,7 +1,7 @@
 // NOTE: This file is compiled and embedded into the exe.
 //       Use `xenia-build genspirv` and check in any changes under bin/.
 
-#version 450
+#version 450 core
 #extension all : warn
 
 in gl_PerVertex {
@@ -19,8 +19,8 @@ out gl_PerVertex {
 struct VertexData {
   vec4 o[16];
 };
-layout(location = 1) in VertexData in_vtx[];
-layout(location = 1) out VertexData out_vtx;
+layout(location = 0) in VertexData in_vtx[];
+layout(location = 0) out VertexData out_vtx;
 
 // TODO(benvanik): fetch default point size from register and use that if
 //     the VS doesn't write oPointSize.
diff --git a/src/xenia/gpu/vulkan/shaders/quad_list.geom b/src/xenia/gpu/vulkan/shaders/quad_list.geom
index d3b208f0a..e10acc71f 100644
--- a/src/xenia/gpu/vulkan/shaders/quad_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/quad_list.geom
@@ -1,7 +1,7 @@
 // NOTE: This file is compiled and embedded into the exe.
 //       Use `xenia-build genspirv` and check in any changes under bin/.
 
-#version 450
+#version 450 core
 #extension all : warn
 
 in gl_PerVertex {
@@ -19,8 +19,8 @@ out gl_PerVertex {
 struct VertexData {
   vec4 o[16];
 };
-layout(location = 1) in VertexData in_vtx[];
-layout(location = 1) out VertexData out_vtx;
+layout(location = 0) in VertexData in_vtx[];
+layout(location = 0) out VertexData out_vtx;
 
 layout(lines_adjacency) in;
 layout(triangle_strip, max_vertices = 4) out;
diff --git a/src/xenia/gpu/vulkan/shaders/rect_list.geom b/src/xenia/gpu/vulkan/shaders/rect_list.geom
index 5e7422f9c..d796919d3 100644
--- a/src/xenia/gpu/vulkan/shaders/rect_list.geom
+++ b/src/xenia/gpu/vulkan/shaders/rect_list.geom
@@ -1,7 +1,7 @@
 // NOTE: This file is compiled and embedded into the exe.
 //       Use `xenia-build genspirv` and check in any changes under bin/.
 
-#version 450
+#version 450 core
 #extension all : warn
 
 in gl_PerVertex {
@@ -19,8 +19,8 @@ out gl_PerVertex {
 struct VertexData {
   vec4 o[16];
 };
-layout(location = 1) in VertexData in_vtx[];
-layout(location = 1) out VertexData out_vtx;
+layout(location = 0) in VertexData in_vtx[];
+layout(location = 0) out VertexData out_vtx;
 
 layout(triangles) in;
 layout(triangle_strip, max_vertices = 6) out;