VERY experimental Nintendo Switch 2 emulator
C++
Revert "shader_recompiler: use only ConstOffset for OpImageFetch"
Liam0466d1dedb24
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cppindex 44281e4079..64a4e0e552 100644--- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp+++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp@@ -60,11 +60,10 @@ public:Add(spv::ImageOperandsMask::ConstOffsets, offsets);}- explicit ImageOperands(EmitContext& ctx, const IR::Value& offset, Id lod, Id ms) {+ explicit ImageOperands(Id lod, Id ms) {if (Sirit::ValidId(lod)) {Add(spv::ImageOperandsMask::Lod, lod);}- AddOffset(ctx, offset, ImageFetchOffsetAllowed);if (Sirit::ValidId(ms)) {Add(spv::ImageOperandsMask::Sample, ms);}@@ -312,6 +311,37 @@ Id ImageGatherSubpixelOffset(EmitContext& ctx, const IR::TextureInstInfo& info,return coords;}}++void AddOffsetToCoordinates(EmitContext& ctx, const IR::TextureInstInfo& info, Id& coords,+ Id offset) {+ if (!Sirit::ValidId(offset)) {+ return;+ }++ Id result_type{};+ switch (info.type) {+ case TextureType::Buffer:+ case TextureType::Color1D:+ case TextureType::ColorArray1D: {+ result_type = ctx.U32[1];+ break;+ }+ case TextureType::Color2D:+ case TextureType::Color2DRect:+ case TextureType::ColorArray2D: {+ result_type = ctx.U32[2];+ break;+ }+ case TextureType::Color3D: {+ result_type = ctx.U32[3];+ break;+ }+ case TextureType::ColorCube:+ case TextureType::ColorArrayCube:+ return;+ }+ coords = ctx.OpIAdd(result_type, coords, offset);+}} // Anonymous namespaceId EmitBindlessImageSampleImplicitLod(EmitContext&) {@@ -494,9 +524,10 @@ Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index,operands.Span());}-Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,- const IR::Value& offset, Id lod, Id ms) {+Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id offset,+ Id lod, Id ms) {const auto info{inst->Flags<IR::TextureInstInfo>()};+ AddOffsetToCoordinates(ctx, info, coords, offset);if (info.type == TextureType::Buffer) {lod = Id{};}@@ -504,7 +535,7 @@ Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id c// This image is multisampled, lod must be implicitlod = Id{};}- const ImageOperands operands(ctx, offset, lod, ms);+ const ImageOperands operands(lod, ms);return Emit(&EmitContext::OpImageSparseFetch, &EmitContext::OpImageFetch, ctx, inst, ctx.F32[4],TextureImage(ctx, info, index), coords, operands.MaskOptional(), operands.Span());}diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.hindex 08fcabd582..5c01b10127 100644--- a/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h+++ b/src/shader_recompiler/backend/spirv/emit_spirv_instructions.h@@ -537,8 +537,8 @@ Id EmitImageGather(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Idconst IR::Value& offset, const IR::Value& offset2);Id EmitImageGatherDref(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,const IR::Value& offset, const IR::Value& offset2, Id dref);-Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords,- const IR::Value& offset, Id lod, Id ms);+Id EmitImageFetch(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords, Id offset,+ Id lod, Id ms);Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id lod,const IR::Value& skip_mips);Id EmitImageQueryLod(EmitContext& ctx, IR::Inst* inst, const IR::Value& index, Id coords);