mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-05 06:21:26 +12:00
rsx: Allow swizzle flag to propagate as an override to surface properties
This commit is contained in:
parent
45f416c4f1
commit
b00b8ae71b
1 changed files with 3 additions and 3 deletions
|
@ -1820,7 +1820,7 @@ namespace rsx
|
||||||
rsx_log.warning("A texture was found in cache for address 0x%x, but swizzle flag does not match", attr.address);
|
rsx_log.warning("A texture was found in cache for address 0x%x, but swizzle flag does not match", attr.address);
|
||||||
cached_texture->unprotect();
|
cached_texture->unprotect();
|
||||||
cached_texture->set_dirty(true);
|
cached_texture->set_dirty(true);
|
||||||
return {};
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return{ cached_texture->get_view(encoded_remap, remap), cached_texture->get_context(), cached_texture->get_format_class(), scale, cached_texture->get_image_type() };
|
return{ cached_texture->get_view(encoded_remap, remap), cached_texture->get_context(), cached_texture->get_format_class(), scale, cached_texture->get_image_type() };
|
||||||
|
@ -1834,7 +1834,7 @@ namespace rsx
|
||||||
(
|
(
|
||||||
std::remove_if(overlapping_locals.begin(), overlapping_locals.end(), [](const auto& e)
|
std::remove_if(overlapping_locals.begin(), overlapping_locals.end(), [](const auto& e)
|
||||||
{
|
{
|
||||||
return (e->get_context() != rsx::texture_upload_context::blit_engine_dst);
|
return e->is_dirty() || (e->get_context() != rsx::texture_upload_context::blit_engine_dst);
|
||||||
}),
|
}),
|
||||||
overlapping_locals.end()
|
overlapping_locals.end()
|
||||||
);
|
);
|
||||||
|
@ -3084,7 +3084,7 @@ namespace rsx
|
||||||
update_cache_tag();
|
update_cache_tag();
|
||||||
|
|
||||||
// Set swizzle flag
|
// Set swizzle flag
|
||||||
cached_dest->set_swizzled(raster_type == rsx::surface_raster_type::swizzle);
|
cached_dest->set_swizzled(raster_type == rsx::surface_raster_type::swizzle || dst.swizzled);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue