summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_vulkan
diff options
context:
space:
mode:
authorGravatar Kelebek12023-10-11 10:29:19 +0100
committerGravatar Kelebek12023-10-11 10:29:19 +0100
commit8c769b71a17c531530d720aeacf859f97fa4c5e2 (patch)
treedfe01251b1fdcb15ff12105a97ae941a291a5b0f /src/video_core/renderer_vulkan
parentMerge pull request #11716 from Squall-Leonhart/Z327444 (diff)
downloadyuzu-8c769b71a17c531530d720aeacf859f97fa4c5e2.tar.gz
yuzu-8c769b71a17c531530d720aeacf859f97fa4c5e2.tar.xz
yuzu-8c769b71a17c531530d720aeacf859f97fa4c5e2.zip
Do not set rescaled flag when rescaling is disabled
Diffstat (limited to 'src/video_core/renderer_vulkan')
-rw-r--r--src/video_core/renderer_vulkan/vk_texture_cache.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
index 00ab47268..1b8bb9662 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -1530,15 +1530,15 @@ bool Image::IsRescaled() const noexcept {
1530} 1530}
1531 1531
1532bool Image::ScaleUp(bool ignore) { 1532bool Image::ScaleUp(bool ignore) {
1533 const auto& resolution = runtime->resolution;
1534 if (!resolution.active) {
1535 return false;
1536 }
1533 if (True(flags & ImageFlagBits::Rescaled)) { 1537 if (True(flags & ImageFlagBits::Rescaled)) {
1534 return false; 1538 return false;
1535 } 1539 }
1536 ASSERT(info.type != ImageType::Linear); 1540 ASSERT(info.type != ImageType::Linear);
1537 flags |= ImageFlagBits::Rescaled; 1541 flags |= ImageFlagBits::Rescaled;
1538 const auto& resolution = runtime->resolution;
1539 if (!resolution.active) {
1540 return false;
1541 }
1542 has_scaled = true; 1542 has_scaled = true;
1543 if (!scaled_image) { 1543 if (!scaled_image) {
1544 const bool is_2d = info.type == ImageType::e2D; 1544 const bool is_2d = info.type == ImageType::e2D;
@@ -1567,15 +1567,15 @@ bool Image::ScaleUp(bool ignore) {
1567} 1567}
1568 1568
1569bool Image::ScaleDown(bool ignore) { 1569bool Image::ScaleDown(bool ignore) {
1570 const auto& resolution = runtime->resolution;
1571 if (!resolution.active) {
1572 return false;
1573 }
1570 if (False(flags & ImageFlagBits::Rescaled)) { 1574 if (False(flags & ImageFlagBits::Rescaled)) {
1571 return false; 1575 return false;
1572 } 1576 }
1573 ASSERT(info.type != ImageType::Linear); 1577 ASSERT(info.type != ImageType::Linear);
1574 flags &= ~ImageFlagBits::Rescaled; 1578 flags &= ~ImageFlagBits::Rescaled;
1575 const auto& resolution = runtime->resolution;
1576 if (!resolution.active) {
1577 return false;
1578 }
1579 current_image = *original_image; 1579 current_image = *original_image;
1580 if (ignore) { 1580 if (ignore) {
1581 return true; 1581 return true;