From fab390b8608d844ebe644d7ca1cebc6b356d5112 Mon Sep 17 00:00:00 2001
From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com>
Date: Fri, 30 Aug 2024 00:20:47 +0300
Subject: [PATCH] spirv: More correct texel buffer usage

---
 src/shader_recompiler/backend/spirv/emit_spirv.cpp             | 1 +
 .../backend/spirv/emit_spirv_context_get_set.cpp               | 3 ++-
 src/shader_recompiler/backend/spirv/spirv_emit_context.cpp     | 1 +
 src/shader_recompiler/backend/spirv/spirv_emit_context.h       | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
index 161d4ec9..98eac081 100644
--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp
+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp
@@ -187,6 +187,7 @@ void DefineEntryPoint(const IR::Program& program, EmitContext& ctx, Id main) {
     ctx.AddCapability(spv::Capability::Int64);
     if (info.has_storage_images || info.has_image_buffers) {
         ctx.AddCapability(spv::Capability::StorageImageExtendedFormats);
+        ctx.AddCapability(spv::Capability::StorageImageReadWithoutFormat);
         ctx.AddCapability(spv::Capability::StorageImageWriteWithoutFormat);
     }
     if (info.has_texel_buffers) {
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 4566439c..7bdc98de 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
@@ -266,7 +266,8 @@ Id EmitLoadBufferFormatF32(EmitContext& ctx, IR::Inst* inst, u32 handle, Id addr
     const auto& buffer = ctx.texture_buffers[handle];
     const Id tex_buffer = ctx.OpLoad(buffer.image_type, buffer.id);
     const Id coord = ctx.OpIAdd(ctx.U32[1], address, buffer.coord_offset);
-    Id texel = ctx.OpImageFetch(buffer.result_type, tex_buffer, coord);
+    Id texel = buffer.is_storage ? ctx.OpImageRead(buffer.result_type, tex_buffer, coord)
+                                 : ctx.OpImageFetch(buffer.result_type, tex_buffer, coord);
     if (buffer.is_integer) {
         texel = ctx.OpBitcast(ctx.F32[4], texel);
     }
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
index e4019604..51315139 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -406,6 +406,7 @@ void EmitContext::DefineTextureBuffers() {
             .image_type = image_type,
             .result_type = sampled_type[4],
             .is_integer = is_integer,
+            .is_storage = desc.is_written,
         });
         interfaces.push_back(id);
     }
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
index 5391108f..d3646382 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
@@ -215,6 +215,7 @@ public:
         Id image_type;
         Id result_type;
         bool is_integer;
+        bool is_storage;
     };
 
     u32& binding;