yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

texture_cache: Fix image resolves when src/dst are not both scaled

This commit is contained in:
ameerj 2021-10-11 23:55:53 -04:00 committed by Fernando Sahmkow
parent 49c0c7efd2
commit b14f2c7c82
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_core/texture_cache/texture_cache.h
View File

@ -475,12 +475,10 @@ void TextureCache<P>::BlitImage(const Tegra::Engines::Fermi2D::Surface& dst,
Image& dst_image = slot_images[dst_id]; Image& dst_image = slot_images[dst_id];
Image& src_image = slot_images[src_id]; Image& src_image = slot_images[src_id];
bool is_resolve = src_image.info.num_samples != 1 && dst_image.info.num_samples == 1;
bool is_src_rescaled = True(src_image.flags & ImageFlagBits::Rescaled); bool is_src_rescaled = True(src_image.flags & ImageFlagBits::Rescaled);
bool is_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled); bool is_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled);
const bool is_resolve = src_image.info.num_samples != 1 && dst_image.info.num_samples == 1;
if (is_src_rescaled != is_dst_rescaled) { if (is_src_rescaled != is_dst_rescaled) {
if (ImageCanRescale(src_image)) { if (ImageCanRescale(src_image)) {
ScaleUp(src_image); ScaleUp(src_image);
@ -498,7 +496,13 @@ void TextureCache<P>::BlitImage(const Tegra::Engines::Fermi2D::Surface& dst,
is_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled); is_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled);
} }
} }
if (is_resolve && (is_src_rescaled != is_dst_rescaled)) {
// A resolve requires both images to be the same dimensions. Resize down if needed.
ScaleDown(src_image);
ScaleDown(dst_image);
is_src_rescaled = True(src_image.flags & ImageFlagBits::Rescaled);
is_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled);
}
const auto& resolution = Settings::values.resolution_info; const auto& resolution = Settings::values.resolution_info;
const auto scale_up = [&](u32 value) -> u32 { const auto scale_up = [&](u32 value) -> u32 {
if (value == 0) { if (value == 0) {
@ -506,7 +510,6 @@ void TextureCache<P>::BlitImage(const Tegra::Engines::Fermi2D::Surface& dst,
} }
return std::max<u32>((value * resolution.up_scale) >> resolution.down_shift, 1U); return std::max<u32>((value * resolution.up_scale) >> resolution.down_shift, 1U);
}; };
const auto scale_region = [&](Region2D& region) { const auto scale_region = [&](Region2D& region) {
region.start.x = scale_up(region.start.x); region.start.x = scale_up(region.start.x);
region.start.y = scale_up(region.start.y); region.start.y = scale_up(region.start.y);