octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Vulkan: fix regression.

This commit is contained in:
FernandoS27 2021-10-23 15:56:44 +02:00 committed by Fernando Sahmkow
parent 87abab71ff
commit c97c46747d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View File

@ -1221,9 +1221,12 @@ bool Image::BlitScaleHelper(bool scale_up) {
const auto& resolution = runtime->resolution; const auto& resolution = runtime->resolution;
const u32 scaled_width = resolution.ScaleUp(info.size.width); const u32 scaled_width = resolution.ScaleUp(info.size.width);
const u32 scaled_height = is_2d ? resolution.ScaleUp(info.size.height) : info.size.height; const u32 scaled_height = is_2d ? resolution.ScaleUp(info.size.height) : info.size.height;
if (!scale_view) { std::unique_ptr<ImageView>& blit_view = scale_up ? scale_view : normal_view;
std::unique_ptr<Framebuffer>& blit_framebuffer =
scale_up ? scale_framebuffer : normal_framebuffer;
if (!blit_view) {
const auto view_info = ImageViewInfo(ImageViewType::e2D, info.format); const auto view_info = ImageViewInfo(ImageViewType::e2D, info.format);
scale_view = std::make_unique<ImageView>(*runtime, view_info, NULL_IMAGE_ID, *this); blit_view = std::make_unique<ImageView>(*runtime, view_info, NULL_IMAGE_ID, *this);
} }
const u32 src_width = scale_up ? info.size.width : scaled_width; const u32 src_width = scale_up ? info.size.width : scaled_width;
@ -1239,27 +1242,27 @@ bool Image::BlitScaleHelper(bool scale_up) {
.end = {static_cast<s32>(dst_width), static_cast<s32>(dst_height)}, .end = {static_cast<s32>(dst_width), static_cast<s32>(dst_height)},
}; };
const VkExtent2D extent{ const VkExtent2D extent{
.width = scaled_width, .width = std::max(scaled_width, info.size.width),
.height = scaled_height, .height = std::max(scaled_height, info.size.width),
}; };
auto* view_ptr = scale_view.get(); auto* view_ptr = blit_view.get();
if (aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT) { if (aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT) {
if (!scale_framebuffer) { if (!blit_framebuffer) {
scale_framebuffer = std::make_unique<Framebuffer>(*runtime, view_ptr, nullptr, extent); blit_framebuffer = std::make_unique<Framebuffer>(*runtime, view_ptr, nullptr, extent);
} }
const auto color_view = scale_view->Handle(Shader::TextureType::Color2D); const auto color_view = blit_view->Handle(Shader::TextureType::Color2D);
runtime->blit_image_helper.BlitColor(scale_framebuffer.get(), color_view, dst_region, runtime->blit_image_helper.BlitColor(blit_framebuffer.get(), color_view, dst_region,
src_region, operation, BLIT_OPERATION); src_region, operation, BLIT_OPERATION);
} else if (!runtime->device.IsBlitDepthStencilSupported() && } else if (!runtime->device.IsBlitDepthStencilSupported() &&
aspect_mask == (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { aspect_mask == (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) {
if (!scale_framebuffer) { if (!blit_framebuffer) {
scale_framebuffer = std::make_unique<Framebuffer>(*runtime, nullptr, view_ptr, extent); blit_framebuffer = std::make_unique<Framebuffer>(*runtime, nullptr, view_ptr, extent);
} }
runtime->blit_image_helper.BlitDepthStencil( runtime->blit_image_helper.BlitDepthStencil(blit_framebuffer.get(), blit_view->DepthView(),
scale_framebuffer.get(), scale_view->DepthView(), scale_view->StencilView(), dst_region, blit_view->StencilView(), dst_region,
src_region, operation, BLIT_OPERATION); src_region, operation, BLIT_OPERATION);
} else { } else {
// TODO: Use helper blits where applicable // TODO: Use helper blits where applicable
flags &= ~ImageFlagBits::Rescaled; flags &= ~ImageFlagBits::Rescaled;