From 10af2e8937c178c88ebfd8097fce5512538a7132 Mon Sep 17 00:00:00 2001
From: squidbus <175574877+squidbus@users.noreply.github.com>
Date: Sat, 28 Sep 2024 19:28:45 -0700
Subject: [PATCH] shader_recompiler: Fix GetAttribute SPIR-V output type.

---
 .../backend/spirv/emit_spirv_context_get_set.cpp | 16 ++++++++++------
 .../backend/spirv/spirv_emit_context.cpp         | 16 ++++++++++------
 .../backend/spirv/spirv_emit_context.h           |  1 +
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
index b5442f68a..4dd82b316 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp
@@ -187,17 +187,21 @@ Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, u32 comp) {
                 // Attribute is disabled or varying component is not written
                 return ctx.ConstF32(comp == 3 ? 1.0f : 0.0f);
             }
-            if (param.is_default) {
-                return ctx.OpCompositeExtract(param.component_type, param.id, comp);
-            }
 
-            if (param.num_components > 1) {
+            Id result;
+            if (param.is_default) {
+                result = ctx.OpCompositeExtract(param.component_type, param.id, comp);
+            } else if (param.num_components > 1) {
                 const Id pointer{
                     ctx.OpAccessChain(param.pointer_type, param.id, ctx.ConstU32(comp))};
-                return ctx.OpLoad(param.component_type, pointer);
+                result = ctx.OpLoad(param.component_type, pointer);
             } else {
-                return ctx.OpLoad(param.component_type, param.id);
+                result = ctx.OpLoad(param.component_type, param.id);
             }
+            if (param.is_integer) {
+                result = ctx.OpBitcast(ctx.F32[1], result);
+            }
+            return result;
         } else {
             const auto step_rate = EmitReadStepRate(ctx, param.id.value);
             const auto offset = ctx.OpIAdd(
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
index a0fe273c0..05b308b05 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -162,11 +162,11 @@ EmitContext::SpirvAttribute EmitContext::GetAttributeInfo(AmdGpu::NumberFormat f
     case AmdGpu::NumberFormat::Sscaled:
     case AmdGpu::NumberFormat::Uscaled:
     case AmdGpu::NumberFormat::Srgb:
-        return {id, output ? output_f32 : input_f32, F32[1], 4};
+        return {id, output ? output_f32 : input_f32, F32[1], 4, false};
     case AmdGpu::NumberFormat::Uint:
-        return {id, output ? output_u32 : input_u32, U32[1], 4};
+        return {id, output ? output_u32 : input_u32, U32[1], 4, true};
     case AmdGpu::NumberFormat::Sint:
-        return {id, output ? output_s32 : input_s32, S32[1], 4};
+        return {id, output ? output_s32 : input_s32, S32[1], 4, true};
     default:
         break;
     }
@@ -237,9 +237,13 @@ void EmitContext::DefineInputs() {
                                                                                              : 1;
                 // Note that we pass index rather than Id
                 input_params[input.binding] = {
-                    rate_idx, input_u32,
-                    U32[1],   input.num_components,
-                    false,    input.instance_data_buf,
+                    rate_idx,
+                    input_u32,
+                    U32[1],
+                    input.num_components,
+                    true,
+                    false,
+                    input.instance_data_buf,
                 };
             } else {
                 Id id{DefineInput(type, input.binding)};
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
index e244daec3..3dfc8bd61 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
@@ -236,6 +236,7 @@ public:
         Id pointer_type;
         Id component_type;
         u32 num_components;
+        bool is_integer{};
         bool is_default{};
         s32 buffer_handle{-1};
     };