aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpineappleEA <pineaea@gmail.com>2022-02-05 03:19:02 +0100
committerpineappleEA <pineaea@gmail.com>2022-02-05 03:19:02 +0100
commitab1aed5e32e05e86c41a47b59e0f9aaf31a9845c (patch)
tree4d3cef00810753ec878555a72e92994136dc2586
parent2b28da9e5f69d527ada7b808ff14d8294cb41853 (diff)
early-access version 2479EA-2479
-rwxr-xr-xREADME.md2
-rwxr-xr-xsrc/video_core/texture_cache/texture_cache.h18
2 files changed, 4 insertions, 16 deletions
diff --git a/README.md b/README.md
index 4e4c41828..ba23f211f 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
1yuzu emulator early access 1yuzu emulator early access
2============= 2=============
3 3
4This is the source code for early-access 2478. 4This is the source code for early-access 2479.
5 5
6## Legal Notice 6## Legal Notice
7 7
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 00dcd66b7..efc1c4525 100755
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -369,7 +369,7 @@ template <bool has_blacklists>
369void TextureCache<P>::FillImageViews(DescriptorTable<TICEntry>& table, 369void TextureCache<P>::FillImageViews(DescriptorTable<TICEntry>& table,
370 std::span<ImageViewId> cached_image_view_ids, 370 std::span<ImageViewId> cached_image_view_ids,
371 std::span<ImageViewInOut> views) { 371 std::span<ImageViewInOut> views) {
372 bool has_blacklisted; 372 bool has_blacklisted = false;
373 do { 373 do {
374 has_deleted_images = false; 374 has_deleted_images = false;
375 if constexpr (has_blacklists) { 375 if constexpr (has_blacklists) {
@@ -1763,7 +1763,7 @@ void TextureCache<P>::SynchronizeAliases(ImageId image_id) {
1763 }); 1763 });
1764 const auto& resolution = Settings::values.resolution_info; 1764 const auto& resolution = Settings::values.resolution_info;
1765 for (const AliasedImage* const aliased : aliased_images) { 1765 for (const AliasedImage* const aliased : aliased_images) {
1766 if (!resolution.active | !any_rescaled) { 1766 if (!resolution.active || !any_rescaled) {
1767 CopyImage(image_id, aliased->id, aliased->copies); 1767 CopyImage(image_id, aliased->id, aliased->copies);
1768 continue; 1768 continue;
1769 } 1769 }
@@ -1774,19 +1774,7 @@ void TextureCache<P>::SynchronizeAliases(ImageId image_id) {
1774 continue; 1774 continue;
1775 } 1775 }
1776 ScaleUp(aliased_image); 1776 ScaleUp(aliased_image);
1777 1777 CopyImage(image_id, aliased->id, aliased->copies);
1778 const bool both_2d{image.info.type == ImageType::e2D &&
1779 aliased_image.info.type == ImageType::e2D};
1780 auto copies = aliased->copies;
1781 for (auto copy : copies) {
1782 copy.extent.width = std::max<u32>(
1783 (copy.extent.width * resolution.up_scale) >> resolution.down_shift, 1);
1784 if (both_2d) {
1785 copy.extent.height = std::max<u32>(
1786 (copy.extent.height * resolution.up_scale) >> resolution.down_shift, 1);
1787 }
1788 }
1789 CopyImage(image_id, aliased->id, copies);
1790 } 1778 }
1791} 1779}
1792 1780