archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-06 06:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fix visibility of blit destination targets

Browse source
This commit is contained in:
kd-11 2019-10-12 16:36:41 +03:00 • committed by kd-11
parent 0c35595ce2
commit e166dbccc8
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1636,14 +1636,23 @@ namespace rsx
} }
} }
if (options.skip_texture_merge)
{
return {};
}
auto result = texture_cache_helpers::merge_cache_resources<sampled_image_descriptor>( auto result = texture_cache_helpers::merge_cache_resources<sampled_image_descriptor>(
overlapping_fbos, overlapping_locals, attr, scale, extended_dimension, encoded_remap, remap, _pool); overlapping_fbos, overlapping_locals, attr, scale, extended_dimension, encoded_remap, remap, _pool);
if (options.skip_texture_merge)
{
switch (result.external_subresource_desc.op)
{
case deferred_request_command::copy_image_static:
case deferred_request_command::copy_image_dynamic:
return result;
default:
break;
}
return {};
}
if (!result.external_subresource_desc.sections_to_copy.empty() && if (!result.external_subresource_desc.sections_to_copy.empty() &&
(_pool == 0 || result.atlas_covers_target_area())) (_pool == 0 || result.atlas_covers_target_area()))
{ {
@ -1813,6 +1822,7 @@ namespace rsx
attr2.address += (attr2.pitch * attr2.height); attr2.address += (attr2.pitch * attr2.height);
attr2.width = std::max(attr2.width / 2, 1); attr2.width = std::max(attr2.width / 2, 1);
attr2.height = std::max(attr2.height / 2, 1); attr2.height = std::max(attr2.height / 2, 1);
attr2.slice_h = attr2.height;
if (is_swizzled) if (is_swizzled)
{ {