better solution for patch attr locations. Trees still broken

Author: baggins183

src/shader_recompiler/backend/spirv/spirv_emit_context.cpp

@@ -379,16 +379,12 @@ void EmitContext::DefineInputs() {
             input_params[i] = {id, input_f32, F32[1], 4};
         }
 
+        u32 patch_base_location = runtime_info.vs_info.hs_output_cp_stride >> 4;
         for (size_t index = 0; index < 30; ++index) {
             if (!(info.uses_patches & (1U << index))) {
                 continue;
             }
-            const Id id{
-                DefineInput(F32[4], 31 - index)}; // TODO: this should usually work, but might
-            // overlap with per-vertex outputs.
-            // Safer solution might require recompiling for every hull/domain permutation to make
-            // sure patch variables match in location
-            Decorate(id, spv::Decoration::Patch);
+            const Id id{DefineInput(F32[4], patch_base_location + index)};
             Name(id, fmt::format("patch_in{}", index));
             patches[index] = id;
         }
@@ -456,14 +452,12 @@ void EmitContext::DefineOutputs() {
             output_params[i] = {id, output_f32, F32[1], 4};
         }
 
-        // TODO is it ok to share output locations between patch consts and
-        // per-vertex output attrs?
-        // spirv-val doesn't complain so idk
+        u32 patch_base_location = runtime_info.hs_info.hs_output_cp_stride >> 4;
         for (size_t index = 0; index < 30; ++index) {
             if (!(info.uses_patches & (1U << index))) {
                 continue;
             }
-            const Id id{DefineOutput(F32[4], 31 - index)};
+            const Id id{DefineOutput(F32[4], patch_base_location + index)};
             Decorate(id, spv::Decoration::Patch);
             Name(id, fmt::format("patch_out{}", index));
             patches[index] = id;

src/shader_recompiler/runtime_info.h

@@ -101,7 +101,7 @@ struct HullRuntimeInfo {
 
     // from tess constants buffer
     u32 ls_stride;
-    u32 hs_cp_stride;
+    u32 hs_output_cp_stride;
     u32 hs_num_patch;
     u32 hs_output_base;
     u32 patch_const_size;
@@ -117,7 +117,7 @@ struct HullRuntimeInfo {
 
     void InitFromTessConstants(Shader::TessellationDataConstantBuffer& tess_constants) {
         ls_stride = tess_constants.m_lsStride;
-        hs_cp_stride = tess_constants.m_hsCpStride;
+        hs_output_cp_stride = tess_constants.m_hsCpStride;
         hs_num_patch = tess_constants.m_hsNumPatch;
         hs_output_base = tess_constants.m_hsOutputBase;
         patch_const_size = tess_constants.m_patchConstSize;