summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2021-09-20 22:18:15 +0200
committerFernando Sahmkow <fsahmkow27@gmail.com>2021-11-16 22:11:30 +0100
commitea82bd4b7e4c4f23a40f8a35858d8b74950fc347 (patch)
treed1ff5b2aae66e1f95d36bc9393086a5eb10015f1
parentTextureCache: Base fixes on rescaling. (diff)
downloadyuzu-ea82bd4b7e4c4f23a40f8a35858d8b74950fc347.tar
yuzu-ea82bd4b7e4c4f23a40f8a35858d8b74950fc347.tar.gz
yuzu-ea82bd4b7e4c4f23a40f8a35858d8b74950fc347.tar.bz2
yuzu-ea82bd4b7e4c4f23a40f8a35858d8b74950fc347.tar.lz
yuzu-ea82bd4b7e4c4f23a40f8a35858d8b74950fc347.tar.xz
yuzu-ea82bd4b7e4c4f23a40f8a35858d8b74950fc347.tar.zst
yuzu-ea82bd4b7e4c4f23a40f8a35858d8b74950fc347.zip
-rw-r--r--src/video_core/renderer_vulkan/vk_texture_cache.cpp8
-rw-r--r--src/video_core/texture_cache/image_info.cpp4
-rw-r--r--src/video_core/texture_cache/texture_cache.h17
3 files changed, 21 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 5b4f51a31..4f0bab274 100644
--- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp
@@ -860,9 +860,10 @@ void TextureCacheRuntime::BlitImage(Framebuffer* dst_framebuffer, ImageView& dst
cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
0, nullptr, nullptr, read_barriers);
if (is_resolve) {
+ VkImageResolve resolve_info =
+ MakeImageResolve(dst_region, src_region, dst_layers, src_layers);
cmdbuf.ResolveImage(src_image, VK_IMAGE_LAYOUT_GENERAL, dst_image,
- VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
- MakeImageResolve(dst_region, src_region, dst_layers, src_layers));
+ VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, resolve_info);
} else {
const bool is_linear = filter == Fermi2D::Filter::Bilinear;
const VkFilter vk_filter = is_linear ? VK_FILTER_LINEAR : VK_FILTER_NEAREST;
@@ -1149,6 +1150,9 @@ bool Image::ScaleUp() {
if (aspect_mask == 0) {
aspect_mask = ImageAspectMask(info.format);
}
+ if (info.num_samples > 1) {
+ return true;
+ }
const PixelFormat format = StorageFormat(info.format);
const auto format_info = MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, false, format);
const auto similar = device.GetSupportedFormat(
diff --git a/src/video_core/texture_cache/image_info.cpp b/src/video_core/texture_cache/image_info.cpp
index bdf306bf9..7fa8fd4fe 100644
--- a/src/video_core/texture_cache/image_info.cpp
+++ b/src/video_core/texture_cache/image_info.cpp
@@ -101,7 +101,7 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
// FIXME: Call this without passing *this
layer_stride = CalculateLayerStride(*this);
maybe_unaligned_layer_stride = CalculateLayerSize(*this);
- rescaleable &= (block.depth == 0) && resources.levels == 1 && num_samples == 1;
+ rescaleable &= (block.depth == 0) && resources.levels == 1;
}
}
@@ -134,7 +134,7 @@ ImageInfo::ImageInfo(const Tegra::Engines::Maxwell3D::Regs& regs, size_t index)
type = ImageType::e3D;
size.depth = rt.depth;
} else {
- rescaleable = block.depth == 0 && size.height > 256 && num_samples == 1;
+ rescaleable = block.depth == 0 && size.height > 256;
type = ImageType::e2D;
resources.layers = rt.depth;
}
diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h
index a543776fd..b60f840c1 100644
--- a/src/video_core/texture_cache/texture_cache.h
+++ b/src/video_core/texture_cache/texture_cache.h
@@ -476,17 +476,26 @@ void TextureCache<P>::BlitImage(const Tegra::Engines::Fermi2D::Surface& dst,
Image& dst_image = slot_images[dst_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_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled);
if (is_src_rescaled != is_dst_rescaled) {
- if (ImageCanRescale(dst_image)) {
- ScaleUp(dst_image);
- is_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled);
- }
if (ImageCanRescale(src_image)) {
ScaleUp(src_image);
is_src_rescaled = True(src_image.flags & ImageFlagBits::Rescaled);
+ if (is_resolve) {
+ dst_image.info.rescaleable = true;
+ for (const auto& alias : dst_image.aliased_images) {
+ Image& other_image = slot_images[alias.id];
+ other_image.info.rescaleable = true;
+ }
+ }
+ }
+ if (ImageCanRescale(dst_image)) {
+ ScaleUp(dst_image);
+ is_dst_rescaled = True(dst_image.flags & ImageFlagBits::Rescaled);
}
}