VERY experimental Nintendo Switch 2 emulator
C++
spirv: Fix TXQ with MSAA textures
ameerjbbb60f60d26e
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_image.cppindex 3b969d915e..02073c420e 100644--- a/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp+++ b/src/shader_recompiler/backend/spirv/emit_spirv_image.cpp@@ -201,6 +201,13 @@ Id Image(EmitContext& ctx, const IR::Value& index, IR::TextureInstInfo info) {}}+bool IsTextureMsaa(EmitContext& ctx, const IR::TextureInstInfo& info) {+ if (info.type == TextureType::Buffer) {+ return false;+ }+ return ctx.textures.at(info.descriptor_index).is_multisample;+}+Id Decorate(EmitContext& ctx, IR::Inst* inst, Id sample) {const auto info{inst->Flags<IR::TextureInstInfo>()};if (info.relaxed_precision != 0) {@@ -452,24 +459,26 @@ Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, const IR::Value& iconst Id zero{ctx.u32_zero_value};const bool skip_mips{skip_mips_val.U1()};const auto mips{[&] { return skip_mips ? zero : ctx.OpImageQueryLevels(ctx.U32[1], image); }};+ const bool is_msaa{IsTextureMsaa(ctx, info)};+ const bool uses_lod{!is_msaa && info.type != TextureType::Buffer};+ const auto query{[&](Id type) {+ return uses_lod ? ctx.OpImageQuerySizeLod(type, image, lod)+ : ctx.OpImageQuerySize(type, image);+ }};switch (info.type) {case TextureType::Color1D:- return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySizeLod(ctx.U32[1], image, lod),- zero, zero, mips());+ return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[1]), zero, zero, mips());case TextureType::ColorArray1D:case TextureType::Color2D:case TextureType::ColorCube:case TextureType::Color2DRect:- return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySizeLod(ctx.U32[2], image, lod),- zero, mips());+ return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[2]), zero, mips());case TextureType::ColorArray2D:case TextureType::Color3D:case TextureType::ColorArrayCube:- return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySizeLod(ctx.U32[3], image, lod),- mips());+ return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[3]), mips());case TextureType::Buffer:- return ctx.OpCompositeConstruct(ctx.U32[4], ctx.OpImageQuerySize(ctx.U32[1], image), zero,- zero, mips());+ return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[1]), zero, zero, mips());}throw LogicError("Unspecified image type {}", info.type.Value());}diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cppindex 3b97721e1d..d48d4860e4 100644--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp@@ -1288,6 +1288,7 @@ void EmitContext::DefineTextures(const Info& info, u32& binding, u32& scaling_in.pointer_type = pointer_type,.image_type = image_type,.count = desc.count,+ .is_multisample = desc.is_multisample,});if (profile.supported_spirv >= 0x00010400) {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.hindex dbc5c55b90..768a4fbb5a 100644--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h@@ -35,6 +35,7 @@ struct TextureDefinition {Id pointer_type;Id image_type;u32 count;+ bool is_multisample;};struct TextureBufferDefinition {