ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GPU] Separate range arguments for fixed16 RG and RGBA in GetResolveInfo 

On Vulkan, when snorm16 in unsupported, these formats may be emulated as float16, which natively can represent a wide range of numbers including -32 to 32 with blending. However, R16G16_SNORM and R16G16B16A16_SNORM are two separate formats, which may have different support on the device.
This commit is contained in:
Triang3l 2022-06-20 12:29:45 +03:00
parent 3b4845511d
commit 207e11c8d2
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/xenia/gpu/d3d12/d3d12_render_target_cache.cc
View File

@ -1329,10 +1329,11 @@ bool D3D12RenderTargetCache::Resolve(const Memory& memory,
bool draw_resolution_scaled = IsDrawResolutionScaled(); bool draw_resolution_scaled = IsDrawResolutionScaled();
draw_util::ResolveInfo resolve_info; draw_util::ResolveInfo resolve_info;
bool fixed_16_truncated_to_minus_1_to_1 = IsFixed16TruncatedToMinus1To1();
if (!draw_util::GetResolveInfo( if (!draw_util::GetResolveInfo(
register_file(), memory, trace_writer_, draw_resolution_scale_x(), register_file(), memory, trace_writer_, draw_resolution_scale_x(),
draw_resolution_scale_y(), IsFixed16TruncatedToMinus1To1(), draw_resolution_scale_y(), fixed_16_truncated_to_minus_1_to_1,
resolve_info)) { fixed_16_truncated_to_minus_1_to_1, resolve_info)) {
return false; return false;
} }

8
src/xenia/gpu/draw_util.cc
View File

@ -764,7 +764,8 @@ const ResolveCopyShaderInfo
bool GetResolveInfo(const RegisterFile& regs, const Memory& memory, bool GetResolveInfo(const RegisterFile& regs, const Memory& memory,
TraceWriter& trace_writer, uint32_t draw_resolution_scale_x, TraceWriter& trace_writer, uint32_t draw_resolution_scale_x,
uint32_t draw_resolution_scale_y, uint32_t draw_resolution_scale_y,
bool fixed_16_truncated_to_minus_1_to_1, bool fixed_rg16_truncated_to_minus_1_to_1,
bool fixed_rgba16_truncated_to_minus_1_to_1,
ResolveInfo& info_out) { ResolveInfo& info_out) {
auto rb_copy_control = regs.Get<reg::RB_COPY_CONTROL>(); auto rb_copy_control = regs.Get<reg::RB_COPY_CONTROL>();
info_out.rb_copy_control = rb_copy_control; info_out.rb_copy_control = rb_copy_control;
@ -1093,8 +1094,9 @@ bool GetResolveInfo(const RegisterFile& regs, const Memory& memory,
color_edram_info.format = uint32_t(color_info.color_format); color_edram_info.format = uint32_t(color_info.color_format);
color_edram_info.format_is_64bpp = is_64bpp; color_edram_info.format_is_64bpp = is_64bpp;
color_edram_info.duplicate_second_pixel = uint32_t(duplicate_second_pixel); color_edram_info.duplicate_second_pixel = uint32_t(duplicate_second_pixel);
if (fixed_16_truncated_to_minus_1_to_1 && if ((fixed_rg16_truncated_to_minus_1_to_1 &&
(color_info.color_format == xenos::ColorRenderTargetFormat::k_16_16 || color_info.color_format == xenos::ColorRenderTargetFormat::k_16_16) ||
(fixed_rgba16_truncated_to_minus_1_to_1 &&
color_info.color_format == color_info.color_format ==
xenos::ColorRenderTargetFormat::k_16_16_16_16)) { xenos::ColorRenderTargetFormat::k_16_16_16_16)) {
// The texture expects 0x8001 = -32, 0x7FFF = 32, but the hack making // The texture expects 0x8001 = -32, 0x7FFF = 32, but the hack making

5
src/xenia/gpu/draw_util.h
View File

@ -517,14 +517,15 @@ struct ResolveInfo {
}; };
// Returns false if there was an error obtaining the info making it totally // Returns false if there was an error obtaining the info making it totally
// invalid. fixed_16_truncated_to_minus_1_to_1 is false if 16_16 and 16_16_16_16 // invalid. fixed_rg[ba]16_truncated_to_minus_1_to_1 is false if 16_16[_16_16]
// color render target formats are properly emulated as -32...32, true if // color render target formats are properly emulated as -32...32, true if
// emulated as snorm, with range limited to -1...1, but with correct blending // emulated as snorm, with range limited to -1...1, but with correct blending
// within that range. // within that range.
bool GetResolveInfo(const RegisterFile& regs, const Memory& memory, bool GetResolveInfo(const RegisterFile& regs, const Memory& memory,
TraceWriter& trace_writer, uint32_t draw_resolution_scale_x, TraceWriter& trace_writer, uint32_t draw_resolution_scale_x,
uint32_t draw_resolution_scale_y, uint32_t draw_resolution_scale_y,
bool fixed_16_truncated_to_minus_1_to_1, bool fixed_rg16_truncated_to_minus_1_to_1,
bool fixed_rgba16_truncated_to_minus_1_to_1,
ResolveInfo& info_out); ResolveInfo& info_out);
// Taking user configuration - stretching or letterboxing, overscan region to // Taking user configuration - stretching or letterboxing, overscan region to