mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-01-15 11:25:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

shader_recompiler: Fix some image view type issues. (#2118)

Browse source
This commit is contained in:
squidbus 2025-01-10 12:35:03 -08:00 committed by GitHub
parent 562ed2a025
commit e656093d85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/shader_recompiler/backend/spirv/emit_spirv_image.cpp
View file

@ -174,13 +174,12 @@ Id EmitImageQueryDimensions(EmitContext& ctx, IR::Inst* inst, u32 handle, Id lod
const auto sharp = ctx.info.images[handle & 0xFFFF].GetSharp(ctx.info); const auto sharp = ctx.info.images[handle & 0xFFFF].GetSharp(ctx.info);
const Id zero = ctx.u32_zero_value; const Id zero = ctx.u32_zero_value;
const auto mips{[&] { return has_mips ? ctx.OpImageQueryLevels(ctx.U32[1], image) : zero; }}; const auto mips{[&] { return has_mips ? ctx.OpImageQueryLevels(ctx.U32[1], image) : zero; }};
const bool uses_lod{texture.bound_type != AmdGpu::ImageType::Color2DMsaa && const bool uses_lod{texture.view_type != AmdGpu::ImageType::Color2DMsaa && !texture.is_storage};
!texture.is_storage};
const auto query{[&](Id type) { const auto query{[&](Id type) {
return uses_lod ? ctx.OpImageQuerySizeLod(type, image, lod) return uses_lod ? ctx.OpImageQuerySizeLod(type, image, lod)
: ctx.OpImageQuerySize(type, image); : ctx.OpImageQuerySize(type, image);
}}; }};
switch (texture.bound_type) { switch (texture.view_type) {
case AmdGpu::ImageType::Color1D: case AmdGpu::ImageType::Color1D:
return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[1]), zero, zero, mips()); return ctx.OpCompositeConstruct(ctx.U32[4], query(ctx.U32[1]), zero, zero, mips());
case AmdGpu::ImageType::Color1DArray: case AmdGpu::ImageType::Color1DArray:

4
src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
View file

@ -773,7 +773,7 @@ spv::ImageFormat GetFormat(const AmdGpu::Image& image) {
Id ImageType(EmitContext& ctx, const ImageResource& desc, Id sampled_type) { Id ImageType(EmitContext& ctx, const ImageResource& desc, Id sampled_type) {
const auto image = desc.GetSharp(ctx.info); const auto image = desc.GetSharp(ctx.info);
const auto format = desc.is_atomic ? GetFormat(image) : spv::ImageFormat::Unknown; const auto format = desc.is_atomic ? GetFormat(image) : spv::ImageFormat::Unknown;
const auto type = image.GetBoundType(desc.is_array); const auto type = image.GetViewType(desc.is_array);
const u32 sampled = desc.is_written ? 2 : 1; const u32 sampled = desc.is_written ? 2 : 1;
switch (type) { switch (type) {
case AmdGpu::ImageType::Color1D: case AmdGpu::ImageType::Color1D:
@ -814,7 +814,7 @@ void EmitContext::DefineImagesAndSamplers() {
.sampled_type = is_storage ? sampled_type : TypeSampledImage(image_type), .sampled_type = is_storage ? sampled_type : TypeSampledImage(image_type),
.pointer_type = pointer_type, .pointer_type = pointer_type,
.image_type = image_type, .image_type = image_type,
.bound_type = sharp.GetBoundType(image_desc.is_array), .view_type = sharp.GetViewType(image_desc.is_array),
.is_integer = is_integer, .is_integer = is_integer,
.is_storage = is_storage, .is_storage = is_storage,
}); });

2
src/shader_recompiler/backend/spirv/spirv_emit_context.h
View file

@ -222,7 +222,7 @@ public:
Id sampled_type; Id sampled_type;
Id pointer_type; Id pointer_type;
Id image_type; Id image_type;
AmdGpu::ImageType bound_type; AmdGpu::ImageType view_type;
bool is_integer = false; bool is_integer = false;
bool is_storage = false; bool is_storage = false;
}; };

20
src/shader_recompiler/ir/passes/resource_tracking_pass.cpp
View file

@ -558,13 +558,14 @@ void PatchTextureBufferArgs(IR::Block& block, IR::Inst& inst, Info& info) {
} }
void PatchImageSampleArgs(IR::Block& block, IR::Inst& inst, Info& info, void PatchImageSampleArgs(IR::Block& block, IR::Inst& inst, Info& info,
const AmdGpu::Image& image) { const ImageResource& image_res, const AmdGpu::Image& image) {
const auto handle = inst.Arg(0); const auto handle = inst.Arg(0);
const auto sampler_res = info.samplers[(handle.U32() >> 16) & 0xFFFF]; const auto sampler_res = info.samplers[(handle.U32() >> 16) & 0xFFFF];
auto sampler = sampler_res.GetSharp(info); auto sampler = sampler_res.GetSharp(info);
IR::IREmitter ir{block, IR::Block::InstructionList::s_iterator_to(inst)}; IR::IREmitter ir{block, IR::Block::InstructionList::s_iterator_to(inst)};
const auto inst_info = inst.Flags<IR::TextureInstInfo>(); const auto inst_info = inst.Flags<IR::TextureInstInfo>();
const auto view_type = image.GetViewType(image_res.is_array);
IR::Inst* body1 = inst.Arg(1).InstRecursive(); IR::Inst* body1 = inst.Arg(1).InstRecursive();
IR::Inst* body2 = inst.Arg(2).InstRecursive(); IR::Inst* body2 = inst.Arg(2).InstRecursive();
@ -611,7 +612,7 @@ void PatchImageSampleArgs(IR::Block& block, IR::Inst& inst, Info& info,
return ir.BitFieldExtract(IR::U32{arg}, ir.Imm32(off), ir.Imm32(6), true); return ir.BitFieldExtract(IR::U32{arg}, ir.Imm32(off), ir.Imm32(6), true);
}; };
switch (image.GetType()) { switch (view_type) {
case AmdGpu::ImageType::Color1D: case AmdGpu::ImageType::Color1D:
case AmdGpu::ImageType::Color1DArray: case AmdGpu::ImageType::Color1DArray:
return read(0); return read(0);
@ -631,7 +632,7 @@ void PatchImageSampleArgs(IR::Block& block, IR::Inst& inst, Info& info,
if (!inst_info.has_derivatives) { if (!inst_info.has_derivatives) {
return {}; return {};
} }
switch (image.GetType()) { switch (view_type) {
case AmdGpu::ImageType::Color1D: case AmdGpu::ImageType::Color1D:
case AmdGpu::ImageType::Color1DArray: case AmdGpu::ImageType::Color1DArray:
// du/dx, du/dy // du/dx, du/dy
@ -675,7 +676,7 @@ void PatchImageSampleArgs(IR::Block& block, IR::Inst& inst, Info& info,
// Now we can load body components as noted in Table 8.9 Image Opcodes with Sampler // Now we can load body components as noted in Table 8.9 Image Opcodes with Sampler
const IR::Value coords = [&] -> IR::Value { const IR::Value coords = [&] -> IR::Value {
switch (image.GetType()) { switch (view_type) {
case AmdGpu::ImageType::Color1D: // x case AmdGpu::ImageType::Color1D: // x
addr_reg = addr_reg + 1; addr_reg = addr_reg + 1;
return get_coord(addr_reg - 1, 0); return get_coord(addr_reg - 1, 0);
@ -745,17 +746,18 @@ void PatchImageArgs(IR::Block& block, IR::Inst& inst, Info& info) {
// Sample instructions must be handled separately using address register data. // Sample instructions must be handled separately using address register data.
if (inst.GetOpcode() == IR::Opcode::ImageSampleRaw) { if (inst.GetOpcode() == IR::Opcode::ImageSampleRaw) {
PatchImageSampleArgs(block, inst, info, image); PatchImageSampleArgs(block, inst, info, image_res, image);
return; return;
} }
IR::IREmitter ir{block, IR::Block::InstructionList::s_iterator_to(inst)}; IR::IREmitter ir{block, IR::Block::InstructionList::s_iterator_to(inst)};
const auto inst_info = inst.Flags<IR::TextureInstInfo>(); const auto inst_info = inst.Flags<IR::TextureInstInfo>();
const auto view_type = image.GetViewType(image_res.is_array);
// Now that we know the image type, adjust texture coordinate vector. // Now that we know the image type, adjust texture coordinate vector.
IR::Inst* body = inst.Arg(1).InstRecursive(); IR::Inst* body = inst.Arg(1).InstRecursive();
const auto [coords, arg] = [&] -> std::pair<IR::Value, IR::Value> { const auto [coords, arg] = [&] -> std::pair<IR::Value, IR::Value> {
switch (image.GetType()) { switch (view_type) {
case AmdGpu::ImageType::Color1D: // x, [lod] case AmdGpu::ImageType::Color1D: // x, [lod]
return {body->Arg(0), body->Arg(1)}; return {body->Arg(0), body->Arg(1)};
case AmdGpu::ImageType::Color1DArray: // x, slice, [lod] case AmdGpu::ImageType::Color1DArray: // x, slice, [lod]
@ -772,12 +774,12 @@ void PatchImageArgs(IR::Block& block, IR::Inst& inst, Info& info) {
case AmdGpu::ImageType::Color3D: // x, y, z, [lod] case AmdGpu::ImageType::Color3D: // x, y, z, [lod]
return {ir.CompositeConstruct(body->Arg(0), body->Arg(1), body->Arg(2)), body->Arg(3)}; return {ir.CompositeConstruct(body->Arg(0), body->Arg(1), body->Arg(2)), body->Arg(3)};
default: default:
UNREACHABLE_MSG("Unknown image type {}", image.GetType()); UNREACHABLE_MSG("Unknown image type {}", view_type);
} }
}(); }();
const auto has_ms = image.GetType() == AmdGpu::ImageType::Color2DMsaa || const auto has_ms = view_type == AmdGpu::ImageType::Color2DMsaa ||
image.GetType() == AmdGpu::ImageType::Color2DMsaaArray; view_type == AmdGpu::ImageType::Color2DMsaaArray;
ASSERT(!inst_info.has_lod || !has_ms); ASSERT(!inst_info.has_lod || !has_ms);
const auto lod = inst_info.has_lod ? IR::U32{arg} : IR::U32{}; const auto lod = inst_info.has_lod ? IR::U32{arg} : IR::U32{};
const auto ms = has_ms ? IR::U32{arg} : IR::U32{}; const auto ms = has_ms ? IR::U32{arg} : IR::U32{};

2
src/shader_recompiler/specialization.h
View file

@ -113,7 +113,7 @@ struct StageSpecialization {
}); });
ForEachSharp(binding, images, info->images, ForEachSharp(binding, images, info->images,
[](auto& spec, const auto& desc, AmdGpu::Image sharp) { [](auto& spec, const auto& desc, AmdGpu::Image sharp) {
spec.type = sharp.GetBoundType(desc.is_array); spec.type = sharp.GetViewType(desc.is_array);
spec.is_integer = AmdGpu::IsInteger(sharp.GetNumberFmt()); spec.is_integer = AmdGpu::IsInteger(sharp.GetNumberFmt());
spec.is_storage = desc.is_written; spec.is_storage = desc.is_written;
if (spec.is_storage) { if (spec.is_storage) {

17
src/video_core/amdgpu/resource.h
View file

@ -254,9 +254,12 @@ struct Image {
return 1; return 1;
} }
bool IsCube() const noexcept {
return static_cast<ImageType>(type) == ImageType::Cube;
}
ImageType GetType() const noexcept { ImageType GetType() const noexcept {
const auto img_type = static_cast<ImageType>(type); return IsCube() ? ImageType::Color2DArray : static_cast<ImageType>(type);
return img_type == ImageType::Cube ? ImageType::Color2DArray : img_type;
} }
DataFormat GetDataFmt() const noexcept { DataFormat GetDataFmt() const noexcept {
@ -288,8 +291,12 @@ struct Image {
GetDataFmt() <= DataFormat::FormatFmask64_8; GetDataFmt() <= DataFormat::FormatFmask64_8;
} }
[[nodiscard]] ImageType GetBoundType(const bool is_array) const noexcept { [[nodiscard]] ImageType GetViewType(const bool is_array) const noexcept {
const auto base_type = GetType(); const auto base_type = GetType();
if (IsCube()) {
// Cube needs to remain array type regardless of instruction array specifier.
return base_type;
}
if (base_type == ImageType::Color1DArray && !is_array) { if (base_type == ImageType::Color1DArray && !is_array) {
return ImageType::Color1D; return ImageType::Color1D;
} }
@ -303,7 +310,7 @@ struct Image {
} }
[[nodiscard]] u32 NumViewLevels(const bool is_array) const noexcept { [[nodiscard]] u32 NumViewLevels(const bool is_array) const noexcept {
switch (GetBoundType(is_array)) { switch (GetViewType(is_array)) {
case ImageType::Color2DMsaa: case ImageType::Color2DMsaa:
case ImageType::Color2DMsaaArray: case ImageType::Color2DMsaaArray:
return 1; return 1;
@ -313,7 +320,7 @@ struct Image {
} }
[[nodiscard]] u32 NumViewLayers(const bool is_array) const noexcept { [[nodiscard]] u32 NumViewLayers(const bool is_array) const noexcept {
switch (GetBoundType(is_array)) { switch (GetViewType(is_array)) {
case ImageType::Color1D: case ImageType::Color1D:
case ImageType::Color2D: case ImageType::Color2D:
case ImageType::Color2DMsaa: case ImageType::Color2DMsaa:

2
src/video_core/texture_cache/image_view.cpp
View file

@ -45,7 +45,7 @@ ImageViewInfo::ImageViewInfo(const AmdGpu::Image& image, const Shader::ImageReso
range.base.layer = image.base_array; range.base.layer = image.base_array;
range.extent.levels = image.NumViewLevels(desc.is_array); range.extent.levels = image.NumViewLevels(desc.is_array);
range.extent.layers = image.NumViewLayers(desc.is_array); range.extent.layers = image.NumViewLayers(desc.is_array);
type = ConvertImageViewType(image.GetBoundType(desc.is_array)); type = ConvertImageViewType(image.GetViewType(desc.is_array));
if (!is_storage) { if (!is_storage) {
mapping = Vulkan::LiverpoolToVK::ComponentMapping(image.DstSelect()); mapping = Vulkan::LiverpoolToVK::ComponentMapping(image.DstSelect());