Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-19 18:04:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Respect aspect ratio when blitting to frame

Browse source
This commit is contained in:
Lander Gallastegi 2024-09-16 01:10:53 +02:00
parent 161e3fb785
commit 010ae4a1d4
1 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/video_core/renderer_vulkan/renderer_vulkan.cpp
View file

@ -33,8 +33,8 @@ bool CanBlitToSwapchain(const vk::PhysicalDevice physical_device, vk::Format for
}; };
} }
[[nodiscard]] vk::ImageBlit MakeImageBlit(s32 frame_width, s32 frame_height, s32 swapchain_width, [[nodiscard]] vk::ImageBlit MakeImageBlit(s32 frame_width, s32 frame_height, s32 dst_width,
s32 swapchain_height) { s32 dst_height, s32 offset_x, s32 offset_y) {
return vk::ImageBlit{ return vk::ImageBlit{
.srcSubresource = MakeImageSubresourceLayers(), .srcSubresource = MakeImageSubresourceLayers(),
.srcOffsets = .srcOffsets =
@ -54,19 +54,44 @@ bool CanBlitToSwapchain(const vk::PhysicalDevice physical_device, vk::Format for
.dstOffsets = .dstOffsets =
std::array{ std::array{
vk::Offset3D{ vk::Offset3D{
.x = 0, .x = offset_x,
.y = 0, .y = offset_y,
.z = 0, .z = 0,
}, },
vk::Offset3D{ vk::Offset3D{
.x = swapchain_width, .x = offset_x + dst_width,
.y = swapchain_height, .y = offset_y + dst_height,
.z = 1, .z = 1,
}, },
}, },
}; };
} }
[[nodiscard]] vk::ImageBlit MakeImageBlitStretch(s32 frame_width, s32 frame_height,
s32 swapchain_width, s32 swapchain_height) {
return MakeImageBlit(frame_width, frame_height, swapchain_width, swapchain_height, 0, 0);
}
[[nodiscard]] vk::ImageBlit MakeImageBlitFit(s32 frame_width, s32 frame_height, s32 swapchain_width,
s32 swapchain_height) {
float frame_aspect = static_cast<float>(frame_width) / frame_height;
float swapchain_aspect = static_cast<float>(swapchain_width) / swapchain_height;
s32 dst_width = swapchain_width;
s32 dst_height = swapchain_height;
if (frame_aspect > swapchain_aspect) {
dst_height = static_cast<s32>(swapchain_width / frame_aspect);
} else {
dst_width = static_cast<s32>(swapchain_height * frame_aspect);
}
s32 offset_x = (swapchain_width - dst_width) / 2;
s32 offset_y = (swapchain_height - dst_height) / 2;
return MakeImageBlit(frame_width, frame_height, dst_width, dst_height, offset_x, offset_y);
}
RendererVulkan::RendererVulkan(Frontend::WindowSDL& window_, AmdGpu::Liverpool* liverpool_) RendererVulkan::RendererVulkan(Frontend::WindowSDL& window_, AmdGpu::Liverpool* liverpool_)
: window{window_}, liverpool{liverpool_}, : window{window_}, liverpool{liverpool_},
instance{window, Config::getGpuId(), Config::vkValidationEnabled(), instance{window, Config::getGpuId(), Config::vkValidationEnabled(),
@ -230,7 +255,7 @@ Frame* RendererVulkan::PrepareFrameInternal(VideoCore::Image& image, bool is_eop
// Post-processing (Anti-aliasing, FSR etc) goes here. For now just blit to the frame image. // Post-processing (Anti-aliasing, FSR etc) goes here. For now just blit to the frame image.
cmdbuf.blitImage( cmdbuf.blitImage(
image.image, image.last_state.layout, frame->image, vk::ImageLayout::eTransferDstOptimal, image.image, image.last_state.layout, frame->image, vk::ImageLayout::eTransferDstOptimal,
MakeImageBlit(image.info.size.width, image.info.size.height, frame->width, frame->height), MakeImageBlitFit(image.info.size.width, image.info.size.height, frame->width, frame->height),
vk::Filter::eLinear); vk::Filter::eLinear);
const vk::ImageMemoryBarrier post_barrier{ const vk::ImageMemoryBarrier post_barrier{
@ -342,7 +367,7 @@ void RendererVulkan::Present(Frame* frame) {
cmdbuf.blitImage(frame->image, vk::ImageLayout::eTransferSrcOptimal, swapchain_image, cmdbuf.blitImage(frame->image, vk::ImageLayout::eTransferSrcOptimal, swapchain_image,
vk::ImageLayout::eTransferDstOptimal, vk::ImageLayout::eTransferDstOptimal,
MakeImageBlit(frame->width, frame->height, extent.width, extent.height), MakeImageBlitStretch(frame->width, frame->height, extent.width, extent.height),
vk::Filter::eLinear); vk::Filter::eLinear);
cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eAllCommands, cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eAllCommands,