summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-03-20 10:19:30 +0100
committerGitHub <noreply@github.com>2022-03-20 10:19:30 +0100
commit150f6db4d19e7e8ca11fde0b50977e0a41f36444 (patch)
tree4435e20f748e513628772c4ed53897a455c4d1ef /src/video_core
parentMerge pull request #8040 from Morph1984/handle-table (diff)
parenttexture_cache: Ensure has_blacklisted is always initialized (diff)
downloadyuzu-150f6db4d19e7e8ca11fde0b50977e0a41f36444.tar
yuzu-150f6db4d19e7e8ca11fde0b50977e0a41f36444.tar.gz
yuzu-150f6db4d19e7e8ca11fde0b50977e0a41f36444.tar.bz2
yuzu-150f6db4d19e7e8ca11fde0b50977e0a41f36444.tar.lz
yuzu-150f6db4d19e7e8ca11fde0b50977e0a41f36444.tar.xz
yuzu-150f6db4d19e7e8ca11fde0b50977e0a41f36444.tar.zst
yuzu-150f6db4d19e7e8ca11fde0b50977e0a41f36444.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/texture_cache/texture_cache.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index 198bb0cfb..72eeb8bbd 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -343,7 +343,7 @@ template <bool has_blacklists>
void TextureCache<P>::FillImageViews(DescriptorTable<TICEntry>& table,
std::span<ImageViewId> cached_image_view_ids,
std::span<ImageViewInOut> views) {
- bool has_blacklisted;
+ bool has_blacklisted = false;
do {
has_deleted_images = false;
if constexpr (has_blacklists) {
@@ -1725,7 +1725,7 @@ void TextureCache<P>::SynchronizeAliases(ImageId image_id) {
});
const auto& resolution = Settings::values.resolution_info;
for (const AliasedImage* const aliased : aliased_images) {
- if (!resolution.active | !any_rescaled) {
+ if (!resolution.active || !any_rescaled) {
CopyImage(image_id, aliased->id, aliased->copies);
continue;
}
@@ -1736,19 +1736,7 @@ void TextureCache<P>::SynchronizeAliases(ImageId image_id) {
continue;
}
ScaleUp(aliased_image);
-
- const bool both_2d{image.info.type == ImageType::e2D &&
- aliased_image.info.type == ImageType::e2D};
- auto copies = aliased->copies;
- for (auto copy : copies) {
- copy.extent.width = std::max<u32>(
- (copy.extent.width * resolution.up_scale) >> resolution.down_shift, 1);
- if (both_2d) {
- copy.extent.height = std::max<u32>(
- (copy.extent.height * resolution.up_scale) >> resolution.down_shift, 1);
- }
- }
- CopyImage(image_id, aliased->id, copies);
+ CopyImage(image_id, aliased->id, aliased->copies);
}
}