Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-24 04:15:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

shader_recompiler: Add workaround for drivers with unexpected unorm rounding behavior. (#2310)

Browse source
This commit is contained in:
squidbus 2025-02-04 01:01:59 -08:00 • committed by GitHub
parent b6ad512e34
commit b879dd59c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shader_recompiler/frontend/translate/export.cpp
View file

@ -17,7 +17,11 @@ u32 SwizzleMrtComponent(const FragmentRuntimeInfo::PsColorBuffer& color_buffer,
void Translator::ExportMrtValue(IR::Attribute attribute, u32 comp, const IR::F32& value, void Translator::ExportMrtValue(IR::Attribute attribute, u32 comp, const IR::F32& value,
const FragmentRuntimeInfo::PsColorBuffer& color_buffer) { const FragmentRuntimeInfo::PsColorBuffer& color_buffer) {
const auto converted = ApplyWriteNumberConversion(ir, value, color_buffer.num_conversion); auto converted = ApplyWriteNumberConversion(ir, value, color_buffer.num_conversion);
if (color_buffer.needs_unorm_fixup) {
// FIXME: Fix-up for GPUs where float-to-unorm rounding is off from expected.
converted = ir.FPSub(converted, ir.Imm32(1.f / 127500.f));
}
ir.SetAttribute(attribute, converted, comp); ir.SetAttribute(attribute, converted, comp);
} }

1
src/shader_recompiler/runtime_info.h
View file

@ -185,6 +185,7 @@ struct FragmentRuntimeInfo {
AmdGpu::NumberConversion num_conversion; AmdGpu::NumberConversion num_conversion;
AmdGpu::CompMapping swizzle; AmdGpu::CompMapping swizzle;
AmdGpu::Liverpool::ShaderExportFormat export_format; AmdGpu::Liverpool::ShaderExportFormat export_format;
bool needs_unorm_fixup;
auto operator<=>(const PsColorBuffer&) const noexcept = default; auto operator<=>(const PsColorBuffer&) const noexcept = default;
}; };

11
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
View file

@ -330,6 +330,16 @@ bool PipelineCache::RefreshGraphicsKey() {
continue; continue;
} }
// Metal seems to have an issue where 8-bit unorm/snorm/sRGB outputs to render target
// need a bias applied to round correctly; detect and set the flag for that here.
const auto needs_unorm_fixup = instance.GetDriverID() == vk::DriverId::eMoltenvk &&
(col_buf.GetNumberFmt() == AmdGpu::NumberFormat::Unorm ||
col_buf.GetNumberFmt() == AmdGpu::NumberFormat::Snorm ||
col_buf.GetNumberFmt() == AmdGpu::NumberFormat::Srgb) &&
(col_buf.GetDataFmt() == AmdGpu::DataFormat::Format8 ||
col_buf.GetDataFmt() == AmdGpu::DataFormat::Format8_8 ||
col_buf.GetDataFmt() == AmdGpu::DataFormat::Format8_8_8_8);
key.color_formats[remapped_cb] = key.color_formats[remapped_cb] =
LiverpoolToVK::SurfaceFormat(col_buf.GetDataFmt(), col_buf.GetNumberFmt()); LiverpoolToVK::SurfaceFormat(col_buf.GetDataFmt(), col_buf.GetNumberFmt());
key.color_buffers[remapped_cb] = { key.color_buffers[remapped_cb] = {
@ -337,6 +347,7 @@ bool PipelineCache::RefreshGraphicsKey() {
.num_conversion = col_buf.GetNumberConversion(), .num_conversion = col_buf.GetNumberConversion(),
.swizzle = col_buf.Swizzle(), .swizzle = col_buf.Swizzle(),
.export_format = regs.color_export_format.GetFormat(cb), .export_format = regs.color_export_format.GetFormat(cb),
.needs_unorm_fixup = needs_unorm_fixup,
}; };
} }