mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-02 22:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fixup for aspect mismatch

Browse source
This commit is contained in:
kd-11 2019-10-20 14:53:02 +03:00 • committed by kd-11
commit 996534c559
1 changed files with 4 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

40
rpcs3/Emu/RSX/Common/texture_cache.h
View file

@ -1613,49 +1613,17 @@ namespace rsx
u32 gcm_format = attr.gcm_format; u32 gcm_format = attr.gcm_format;
const bool gcm_format_is_depth = texture_cache_helpers::is_gcm_depth_format(attr.gcm_format); const bool gcm_format_is_depth = texture_cache_helpers::is_gcm_depth_format(attr.gcm_format);
if (gcm_format_is_depth && !last->is_depth_texture()) if (!gcm_format_is_depth && last->is_depth_texture())
{ {
// Request for a depth format, but only a color format exists // While the copy routines can perform a typeless cast, prefer to not cross the aspect barrier if possible
const auto actual_format = last->get_gcm_format(); gcm_format = texture_cache_helpers::get_compatible_depth_format(attr.gcm_format);
bool resolved = false;
switch (attr.gcm_format)
{
case CELL_GCM_TEXTURE_A8R8G8B8:
case CELL_GCM_TEXTURE_D8R8G8B8:
{
// Compatible with D24S8_UINT
if (actual_format == CELL_GCM_TEXTURE_DEPTH24_D8)
{
gcm_format = CELL_GCM_TEXTURE_DEPTH24_D8;
resolved = true;
}
break;
}
case CELL_GCM_TEXTURE_X16:
{
// Compatible with DEPTH16_UNORM
if (actual_format == CELL_GCM_TEXTURE_DEPTH16)
{
gcm_format = CELL_GCM_TEXTURE_DEPTH16;
resolved = true;
}
break;
}
}
if (!resolved)
{
LOG_ERROR(RSX, "Reading texture with gcm format 0x%x as unexpected cast with format 0x%x",
actual_format, attr.gcm_format);
}
} }
auto new_attr = attr; auto new_attr = attr;
new_attr.gcm_format = gcm_format; new_attr.gcm_format = gcm_format;
return { last->get_raw_texture(), deferred_request_command::copy_image_static, new_attr, {}, return { last->get_raw_texture(), deferred_request_command::copy_image_static, new_attr, {},
last->get_context(), last->get_format_type(), scale, extended_dimension, remap }; last->get_context(), texture_cache_helpers::get_format_class(gcm_format), scale, extended_dimension, remap };
} }
} }