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] Fix RT view and pipeline sRGB mismatch

This commit is contained in:
Triang3l 2021-06-14 17:30:56 +03:00
parent f15e3d07e7
commit 357aa1cdd3
5 changed files with 66 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/gpu/d3d12/d3d12_command_processor.cc
View File

@ -1928,6 +1928,7 @@ bool D3D12CommandProcessor::IssueDraw(xenos::PrimitiveType primitive_type,
if (host_render_targets_used) {
bound_depth_and_color_render_target_bits =
render_target_cache_->GetLastUpdateBoundRenderTargets(
render_target_cache_->gamma_render_target_as_srgb(),
bound_depth_and_color_render_target_formats);
} else {
bound_depth_and_color_render_target_bits = 0;

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

@ -1858,9 +1858,10 @@ DXGI_FORMAT D3D12RenderTargetCache::GetColorDrawDXGIFormat(
xenos::ColorRenderTargetFormat format) const {
switch (format) {
case xenos::ColorRenderTargetFormat::k_8_8_8_8:
case xenos::ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
// sRGB is handled in a different way, not via the RenderTargetKey format.
return DXGI_FORMAT_R8G8B8A8_UNORM;
case xenos::ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
return gamma_render_target_as_srgb_ ? DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
: DXGI_FORMAT_R8G8B8A8_UNORM;
case xenos::ColorRenderTargetFormat::k_16_16:
return DXGI_FORMAT_R16G16_SNORM;
case xenos::ColorRenderTargetFormat::k_16_16_16_16:
@ -1954,20 +1955,6 @@ DXGI_FORMAT D3D12RenderTargetCache::GetDepthSRVStencilDXGIFormat(
}
}
xenos::ColorRenderTargetFormat
D3D12RenderTargetCache::GetHostRelevantColorFormat(
xenos::ColorRenderTargetFormat format) const {
switch (format) {
case xenos::ColorRenderTargetFormat::k_8_8_8_8_GAMMA:
// Currently handled in the shader (with incorrect blending), but even if
// handling is changed (to true sRGB), it will still be able to alias it
// with R8G8B8A8_UNORM.
return xenos::ColorRenderTargetFormat::k_8_8_8_8;
default:
return format;
}
}
RenderTargetCache::RenderTarget* D3D12RenderTargetCache::CreateRenderTarget(
RenderTargetKey key) {
ID3D12Device* device =
@ -1990,7 +1977,7 @@ RenderTargetCache::RenderTarget* D3D12RenderTargetCache::CreateRenderTarget(
assert_true(resource_desc.Format != DXGI_FORMAT_UNKNOWN);
if (resource_desc.Format == DXGI_FORMAT_UNKNOWN) {
XELOGE("D3D12RenderTargetCache: Unknown {} render target format {}",
key.is_depth ? "depth" : "color", key.host_relevant_format);
key.is_depth ? "depth" : "color", key.resource_format);
return nullptr;
}
if (key.msaa_samples == xenos::MsaaSamples::k2X && !msaa_2x_supported()) {
@ -2228,16 +2215,16 @@ D3D12RenderTargetCache::GetOrCreateTransferPipelines(TransferShaderKey key) {
bool dest_is_color = (mode.output == TransferOutput::kColor);
xenos::ColorRenderTargetFormat dest_color_format =
xenos::ColorRenderTargetFormat(key.dest_host_relevant_format);
xenos::ColorRenderTargetFormat(key.dest_resource_format);
xenos::DepthRenderTargetFormat dest_depth_format =
xenos::DepthRenderTargetFormat(key.dest_host_relevant_format);
xenos::DepthRenderTargetFormat(key.dest_resource_format);
bool dest_is_64bpp =
dest_is_color && xenos::IsColorRenderTargetFormat64bpp(dest_color_format);
xenos::ColorRenderTargetFormat source_color_format =
xenos::ColorRenderTargetFormat(key.source_host_relevant_format);
xenos::ColorRenderTargetFormat(key.source_resource_format);
xenos::DepthRenderTargetFormat source_depth_format =
xenos::DepthRenderTargetFormat(key.source_host_relevant_format);
xenos::DepthRenderTargetFormat(key.source_resource_format);
// If not source_is_color, it's depth / stencil - 40-sample columns are
// swapped as opposed to color destination.
bool source_is_color = (rs & kTransferUsedRootParameterColorSRVBit) != 0;
@ -4920,8 +4907,8 @@ void D3D12RenderTargetCache::PerformTransfersAndResolveClears(
uint32_t rt_sort_index = 0;
TransferShaderKey new_transfer_shader_key;
new_transfer_shader_key.dest_msaa_samples = dest_rt_key.msaa_samples;
new_transfer_shader_key.dest_host_relevant_format =
dest_rt_key.host_relevant_format;
new_transfer_shader_key.dest_resource_format =
dest_rt_key.resource_format;
uint32_t stencil_clear_rectangle_count = 0;
for (uint32_t j = 0; j <= uint32_t(need_stencil_bit_draws); ++j) {
// j == 0 - color or depth.
@ -4958,8 +4945,8 @@ void D3D12RenderTargetCache::PerformTransfersAndResolveClears(
RenderTargetKey source_rt_key = source_d3d12_rt.key();
new_transfer_shader_key.source_msaa_samples =
source_rt_key.msaa_samples;
new_transfer_shader_key.source_host_relevant_format =
source_rt_key.host_relevant_format;
new_transfer_shader_key.source_resource_format =
source_rt_key.resource_format;
bool host_depth_source_is_copy =
host_depth_source_d3d12_rt == &dest_d3d12_rt;
new_transfer_shader_key.host_depth_source_is_copy =
@ -6492,7 +6479,7 @@ void D3D12RenderTargetCache::DumpRenderTargets(uint32_t dump_base,
any_sources_32bpp_64bpp[size_t(rt_key.Is64bpp())] = true;
DumpPipelineKey pipeline_key;
pipeline_key.msaa_samples = rt_key.msaa_samples;
pipeline_key.host_relevant_format = rt_key.host_relevant_format;
pipeline_key.resource_format = rt_key.resource_format;
pipeline_key.is_depth = rt_key.is_depth;
dump_invocations_.emplace_back(rectangle, pipeline_key);
}

13
src/xenia/gpu/d3d12/d3d12_render_target_cache.h
View File

@ -224,9 +224,6 @@ class D3D12RenderTargetCache final : public RenderTargetCache {
return D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION;
}
xenos::ColorRenderTargetFormat GetHostRelevantColorFormat(
xenos::ColorRenderTargetFormat format) const override;
RenderTarget* CreateRenderTarget(RenderTargetKey key) override;
bool IsHostDepthEncodingDifferent(
@ -418,14 +415,14 @@ class D3D12RenderTargetCache final : public RenderTargetCache {
union TransferShaderKey {
struct {
xenos::MsaaSamples dest_msaa_samples : xenos::kMsaaSamplesBits;
uint32_t dest_host_relevant_format : xenos::kRenderTargetFormatBits;
uint32_t dest_resource_format : xenos::kRenderTargetFormatBits;
xenos::MsaaSamples source_msaa_samples : xenos::kMsaaSamplesBits;
// Always 1x when host_depth_source_is_copy is true not to create the same
// pipeline for different MSAA sample counts as it doesn't matter in this
// case.
xenos::MsaaSamples host_depth_source_msaa_samples
: xenos::kMsaaSamplesBits;
uint32_t source_host_relevant_format : xenos::kRenderTargetFormatBits;
uint32_t source_resource_format : xenos::kRenderTargetFormatBits;
// If host depth is also fetched, whether it's pre-copied to the EDRAM
// buffer (but since it's just a scratch buffer, with tiles laid out
// linearly with the same pitch as in the original render target; also no
@ -557,7 +554,7 @@ class D3D12RenderTargetCache final : public RenderTargetCache {
union DumpPipelineKey {
struct {
xenos::MsaaSamples msaa_samples : 2;
uint32_t host_relevant_format : 4;
uint32_t resource_format : 4;
// Last bit because this affects the root signature - after sorting, only
// change it at most once. Depth buffers have an additional stencil SRV.
uint32_t is_depth : 1;
@ -580,11 +577,11 @@ class D3D12RenderTargetCache final : public RenderTargetCache {
xenos::ColorRenderTargetFormat GetColorFormat() const {
assert_false(is_depth);
return xenos::ColorRenderTargetFormat(host_relevant_format);
return xenos::ColorRenderTargetFormat(resource_format);
}
xenos::DepthRenderTargetFormat GetDepthFormat() const {
assert_true(is_depth);
return xenos::DepthRenderTargetFormat(host_relevant_format);
return xenos::DepthRenderTargetFormat(resource_format);
}
};

56
src/xenia/gpu/render_target_cache.cc
View File

@ -424,7 +424,7 @@ bool RenderTargetCache::Update(bool is_rasterization_done,
uint32_t depth_and_color_rts_used_bits = 0;
// depth_and_color_rts_used_bits -> EDRAM base.
uint32_t edram_bases[1 + xenos::kMaxColorRenderTargets];
uint32_t host_relevant_formats[1 + xenos::kMaxColorRenderTargets];
uint32_t resource_formats[1 + xenos::kMaxColorRenderTargets];
uint32_t rts_are_64bpp = 0;
uint32_t color_rts_are_gamma = 0;
if (is_rasterization_done) {
@ -438,7 +438,7 @@ bool RenderTargetCache::Update(bool is_rasterization_done,
std::min(rb_depth_info.depth_base, xenos::kEdramTileCount);
// With pixel shader interlock, always the same addressing disregarding
// the format.
host_relevant_formats[0] =
resource_formats[0] =
interlock_barrier_only ? 0 : uint32_t(rb_depth_info.depth_format);
}
if (regs.Get<reg::RB_MODECONTROL>().edram_mode ==
@ -468,20 +468,19 @@ bool RenderTargetCache::Update(bool is_rasterization_done,
if (color_format == xenos::ColorRenderTargetFormat::k_8_8_8_8_GAMMA) {
color_rts_are_gamma |= uint32_t(1) << rt_index;
}
xenos::ColorRenderTargetFormat color_host_relevant_format;
xenos::ColorRenderTargetFormat color_resource_format;
if (interlock_barrier_only) {
// Only changes in mapping between coordinates and addresses are
// interesting (along with access overlap between draw calls), thus
// only pixel size is relevant.
color_host_relevant_format =
color_resource_format =
is_64bpp ? xenos::ColorRenderTargetFormat::k_16_16_16_16
: xenos::ColorRenderTargetFormat::k_8_8_8_8;
} else {
color_host_relevant_format = GetHostRelevantColorFormat(
color_resource_format = GetColorResourceFormat(
xenos::GetStorageColorFormat(color_format));
}
host_relevant_formats[rt_bit_index] =
uint32_t(color_host_relevant_format);
resource_formats[rt_bit_index] = uint32_t(color_resource_format);
}
}
}
@ -659,7 +658,7 @@ bool RenderTargetCache::Update(bool is_rasterization_done,
rt_key.pitch_tiles_at_32bpp = pitch_tiles_at_32bpp;
rt_key.msaa_samples = msaa_samples;
rt_key.is_depth = rt_bit_index == 0;
rt_key.host_relevant_format = host_relevant_formats[rt_bit_index];
rt_key.resource_format = resource_formats[rt_bit_index];
if (!interlock_barrier_only) {
RenderTarget* render_target = GetOrCreateRenderTarget(rt_key);
if (!render_target) {
@ -801,10 +800,11 @@ bool RenderTargetCache::Update(bool is_rasterization_done,
}
uint32_t RenderTargetCache::GetLastUpdateBoundRenderTargets(
uint32_t* depth_and_color_formats_out) const {
bool distinguish_gamma_formats,
uint32_t* depth_and_color_resource_formats_out) const {
if (GetPath() != Path::kHostRenderTargets) {
if (depth_and_color_formats_out) {
std::memset(depth_and_color_formats_out, 0,
if (depth_and_color_resource_formats_out) {
std::memset(depth_and_color_resource_formats_out, 0,
sizeof(uint32_t) * (1 + xenos::kMaxColorRenderTargets));
}
return 0;
@ -814,15 +814,19 @@ uint32_t RenderTargetCache::GetLastUpdateBoundRenderTargets(
const RenderTarget* render_target =
last_update_accumulated_render_targets_[i];
if (!render_target) {
if (depth_and_color_formats_out) {
depth_and_color_formats_out[i] = 0;
if (depth_and_color_resource_formats_out) {
depth_and_color_resource_formats_out[i] = 0;
}
continue;
}
rts_used |= uint32_t(1) << i;
if (depth_and_color_formats_out) {
depth_and_color_formats_out[i] =
render_target->key().host_relevant_format;
if (depth_and_color_resource_formats_out) {
depth_and_color_resource_formats_out[i] =
(distinguish_gamma_formats && i &&
(last_update_accumulated_color_targets_are_gamma_ &
(uint32_t(1) << (i - 1))))
? uint32_t(xenos::ColorRenderTargetFormat::k_8_8_8_8_GAMMA)
: render_target->key().resource_format;
}
}
return rts_used;
@ -1083,7 +1087,7 @@ bool RenderTargetCache::PrepareHostRenderTargetsResolveClear(
depth_render_target_key.pitch_tiles_at_32bpp = pitch_tiles_at_32bpp;
depth_render_target_key.msaa_samples = msaa_samples;
depth_render_target_key.is_depth = 1;
depth_render_target_key.host_relevant_format =
depth_render_target_key.resource_format =
resolve_info.depth_edram_info.format;
depth_render_target = GetOrCreateRenderTarget(depth_render_target_key);
if (!depth_render_target) {
@ -1098,9 +1102,8 @@ bool RenderTargetCache::PrepareHostRenderTargetsResolveClear(
color_render_target_key.pitch_tiles_at_32bpp = pitch_tiles_at_32bpp;
color_render_target_key.msaa_samples = msaa_samples;
color_render_target_key.is_depth = 0;
color_render_target_key.host_relevant_format =
uint32_t(GetHostRelevantColorFormat(xenos::ColorRenderTargetFormat(
resolve_info.color_edram_info.format)));
color_render_target_key.resource_format = uint32_t(GetColorResourceFormat(
xenos::ColorRenderTargetFormat(resolve_info.color_edram_info.format)));
color_render_target = GetOrCreateRenderTarget(color_render_target_key);
if (!color_render_target) {
color_render_target_key = RenderTargetKey();
@ -1161,8 +1164,8 @@ RenderTargetCache::PrepareFullEdram1280xRenderTargetForSnapshotRestoration(
}
RenderTargetKey render_target_key;
render_target_key.pitch_tiles_at_32bpp = kPitchTilesAt32bpp;
render_target_key.host_relevant_format = uint32_t(
GetHostRelevantColorFormat(xenos::GetStorageColorFormat(color_format)));
render_target_key.resource_format =
uint32_t(GetColorResourceFormat(color_format));
RenderTarget* render_target = GetOrCreateRenderTarget(render_target_key);
if (!render_target) {
return nullptr;
@ -1214,14 +1217,14 @@ RenderTargetCache::RenderTarget* RenderTargetCache::GetOrCreateRenderTarget(
"Created a {}x{} {}xMSAA {} render target with guest format {} at "
"EDRAM base {}",
width, height, uint32_t(1) << uint32_t(key.msaa_samples),
key.is_depth ? "depth" : "color", key.host_relevant_format,
key.is_depth ? "depth" : "color", key.resource_format,
key.base_tiles);
} else {
XELOGE(
"Failed to create a {}x{} {}xMSAA {} render target with guest format "
"{} at EDRAM base {}",
width, height, uint32_t(1) << uint32_t(key.msaa_samples),
key.is_depth ? "depth" : "color", key.host_relevant_format,
key.is_depth ? "depth" : "color", key.resource_format,
key.base_tiles);
}
// Insert even if failed to create, not to try to create again.
@ -1339,8 +1342,7 @@ void RenderTargetCache::ChangeOwnership(
nullptr, resolve_clear_cutout)) {
RenderTargetKey transfer_host_depth_source =
host_depth_encoding_different
? it->second
.host_depth_render_targets[dest.host_relevant_format]
? it->second.host_depth_render_targets[dest.resource_format]
: RenderTargetKey();
if (transfer_host_depth_source == transfer_source) {
// Same render target, don't provide a separate host depth source.
@ -1385,7 +1387,7 @@ void RenderTargetCache::ChangeOwnership(
// Claim the current range.
it->second.render_target = dest;
if (host_depth_encoding_different) {
it->second.host_depth_render_targets[dest.host_relevant_format] = dest;
it->second.host_depth_render_targets[dest.resource_format] = dest;
}
// Check if can merge with the next range after claiming.
std::map<uint32_t, OwnershipRange>::iterator it_next;

36
src/xenia/gpu/render_target_cache.h
View File

@ -181,8 +181,10 @@ class RenderTargetCache {
// Returns bits where 0 is whether a depth render target is currently bound on
// the host and 1... are whether the same applies to color render targets, and
// "host-relevant" formats of each.
// formats (resource formats, but if needed, with gamma taken into account) of
// each.
uint32_t GetLastUpdateBoundRenderTargets(
bool distinguish_gamma_formats,
uint32_t* depth_and_color_formats_out = nullptr) const;
protected:
@ -223,11 +225,8 @@ class RenderTargetCache {
uint32_t pitch_tiles_at_32bpp : 8; // 19
xenos::MsaaSamples msaa_samples : xenos::kMsaaSamplesBits; // 21
uint32_t is_depth : 1; // 22
// Not always the original format - blending precision ignored, formats
// handled through the same render targets on the host are normalized, and
// with pixel shader interlock, replaced with some single 32bpp or 64bpp
// format because it's only needed for addressing.
uint32_t host_relevant_format : xenos::kRenderTargetFormatBits; // 26
// Ignoring the blending precision and sRGB.
uint32_t resource_format : xenos::kRenderTargetFormatBits; // 26
};
uint32_t key = 0;
struct Hasher {
@ -250,11 +249,11 @@ class RenderTargetCache {
xenos::ColorRenderTargetFormat GetColorFormat() const {
assert_false(is_depth);
return xenos::ColorRenderTargetFormat(host_relevant_format);
return xenos::ColorRenderTargetFormat(resource_format);
}
xenos::DepthRenderTargetFormat GetDepthFormat() const {
assert_true(is_depth);
return xenos::DepthRenderTargetFormat(host_relevant_format);
return xenos::DepthRenderTargetFormat(resource_format);
}
bool Is64bpp() const {
if (is_depth) {
@ -436,15 +435,6 @@ class RenderTargetCache {
uint32_t GetRenderTargetHeight(uint32_t pitch_tiles_at_32bpp,
xenos::MsaaSamples msaa_samples) const;
// Normalizes the format if it's fine to use the same render target textures
// for the provided and the returned guest formats.
// xenos::GetStorageColorFormat is supposed to be done before calling, so
// redoing what it does in the implementations is not needed.
virtual xenos::ColorRenderTargetFormat GetHostRelevantColorFormat(
xenos::ColorRenderTargetFormat format) const {
return format;
}
virtual RenderTarget* CreateRenderTarget(RenderTargetKey key) = 0;
// Whether depth buffer is encoded differently on the host, thus after
@ -567,7 +557,7 @@ class RenderTargetCache {
return false;
}
if (host_depth_encoding_different && !key.is_depth &&
host_depth_render_targets[key.host_relevant_format] != key) {
host_depth_render_targets[key.resource_format] != key) {
// Depth encoding is the same, but different addressing is needed.
return false;
}
@ -582,6 +572,16 @@ class RenderTargetCache {
}
};
static constexpr xenos::ColorRenderTargetFormat GetColorResourceFormat(
xenos::ColorRenderTargetFormat format) {
// sRGB, if used on the host, is a view property or global state - linear
// and sRGB host render targets can share data directly without transfers.
if (format == xenos::ColorRenderTargetFormat::k_8_8_8_8_GAMMA) {
return xenos::ColorRenderTargetFormat::k_8_8_8_8;
}
return xenos::GetStorageColorFormat(format);
}
RenderTarget* GetOrCreateRenderTarget(RenderTargetKey key);
// Checks if changing ownership of the range to the specified render target