fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GPU] Fix RT view and pipeline sRGB mismatch

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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;