lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-24 10:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Texture Cache: Fix Rescaling on Multisample

Browse source
This commit is contained in:
Fernando Sahmkow 2021-09-20 22:18:15 +02:00
parent 19ca0c9ab5
commit ea82bd4b7e
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View file

@ -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, cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT,
0, nullptr, nullptr, read_barriers); 0, nullptr, nullptr, read_barriers);
if (is_resolve) { 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, cmdbuf.ResolveImage(src_image, VK_IMAGE_LAYOUT_GENERAL, dst_image,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, resolve_info);
MakeImageResolve(dst_region, src_region, dst_layers, src_layers));
} else { } else {
const bool is_linear = filter == Fermi2D::Filter::Bilinear; const bool is_linear = filter == Fermi2D::Filter::Bilinear;
const VkFilter vk_filter = is_linear ? VK_FILTER_LINEAR : VK_FILTER_NEAREST; const VkFilter vk_filter = is_linear ? VK_FILTER_LINEAR : VK_FILTER_NEAREST;
@ -1149,6 +1150,9 @@ bool Image::ScaleUp() {
if (aspect_mask == 0) { if (aspect_mask == 0) {
aspect_mask = ImageAspectMask(info.format); aspect_mask = ImageAspectMask(info.format);
} }
if (info.num_samples > 1) {
return true;
}
const PixelFormat format = StorageFormat(info.format); const PixelFormat format = StorageFormat(info.format);
const auto format_info = MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, false, format); const auto format_info = MaxwellToVK::SurfaceFormat(device, FormatType::Optimal, false, format);
const auto similar = device.GetSupportedFormat( const auto similar = device.GetSupportedFormat(

4
src/video_core/texture_cache/image_info.cpp
View file

@ -101,7 +101,7 @@ ImageInfo::ImageInfo(const TICEntry& config) noexcept {
// FIXME: Call this without passing *this // FIXME: Call this without passing *this
layer_stride = CalculateLayerStride(*this); layer_stride = CalculateLayerStride(*this);
maybe_unaligned_layer_stride = CalculateLayerSize(*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; type = ImageType::e3D;
size.depth = rt.depth; size.depth = rt.depth;
} else { } else {
rescaleable = block.depth == 0 && size.height > 256 && num_samples == 1; rescaleable = block.depth == 0 && size.height > 256;
type = ImageType::e2D; type = ImageType::e2D;
resources.layers = rt.depth; resources.layers = rt.depth;
} }

17
src/video_core/texture_cache/texture_cache.h
View file

@ -476,17 +476,26 @@ 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);
if (is_src_rescaled != is_dst_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)) { if (ImageCanRescale(src_image)) {
ScaleUp(src_image); ScaleUp(src_image);
is_src_rescaled = True(src_image.flags & ImageFlagBits::Rescaled); 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);
} }
} }