mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 16:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

video_core: restored presenter aspect calculations

Browse Source
This commit is contained in:
psucien 2024-11-23 11:13:24 +01:00
parent 5976300788
commit ed1282edcc
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,8 +75,8 @@ bool CanBlitToSwapchain(const vk::PhysicalDevice physical_device, vk::Format for
return MakeImageBlit(frame_width, frame_height, swapchain_width, swapchain_height, 0, 0); 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, static std::tuple<s32, s32, s32, s32> FitImage(s32 frame_width, s32 frame_height,
s32 swapchain_height) { s32 swapchain_width, s32 swapchain_height) {
float frame_aspect = static_cast<float>(frame_width) / frame_height; float frame_aspect = static_cast<float>(frame_width) / frame_height;
float swapchain_aspect = static_cast<float>(swapchain_width) / swapchain_height; float swapchain_aspect = static_cast<float>(swapchain_width) / swapchain_height;
@ -89,8 +89,16 @@ bool CanBlitToSwapchain(const vk::PhysicalDevice physical_device, vk::Format for
dst_width = static_cast<s32>(swapchain_height * frame_aspect); dst_width = static_cast<s32>(swapchain_height * frame_aspect);
} }
s32 offset_x = (swapchain_width - dst_width) / 2; const s32 offset_x = (swapchain_width - dst_width) / 2;
s32 offset_y = (swapchain_height - dst_height) / 2; const s32 offset_y = (swapchain_height - dst_height) / 2;
return {dst_width, dst_height, offset_x, offset_y};
}
[[nodiscard]] vk::ImageBlit MakeImageBlitFit(s32 frame_width, s32 frame_height, s32 swapchain_width,
s32 swapchain_height) {
const auto [dst_width, dst_height, offset_x, offset_y] =
FitImage(frame_width, frame_height, swapchain_width, swapchain_height);
return MakeImageBlit(frame_width, frame_height, dst_width, dst_height, offset_x, offset_y); return MakeImageBlit(frame_width, frame_height, dst_width, dst_height, offset_x, offset_y);
} }
@ -552,12 +560,15 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
cmdbuf.bindPipeline(vk::PipelineBindPoint::eGraphics, *pp_pipeline); cmdbuf.bindPipeline(vk::PipelineBindPoint::eGraphics, *pp_pipeline);
const auto& [width, height, offset_x, offset_y] =
FitImage(image.info.size.width, image.info.size.height, frame->width, frame->height);
const std::array viewports = { const std::array viewports = {
vk::Viewport{ vk::Viewport{
.x = 0.0f, .x = 1.0f * offset_x,
.y = 0.0f, .y = 1.0f * offset_y,
.width = 1.0f * frame->width, .width = 1.0f * width,
.height = 1.0f * frame->height, .height = 1.0f * height,
.minDepth = 0.0f, .minDepth = 0.0f,
.maxDepth = 1.0f, .maxDepth = 1.0f,
}, },
@ -565,7 +576,7 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
const std::array scissors = { const std::array scissors = {
vk::Rect2D{ vk::Rect2D{
.offset = {0, 0}, .offset = {offset_x, offset_y},
.extent = {frame->width, frame->height}, .extent = {frame->width, frame->height},
}, },
}; };
@ -580,7 +591,7 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
const std::array attachments = {vk::RenderingAttachmentInfo{ const std::array attachments = {vk::RenderingAttachmentInfo{
.imageView = frame->image_view, .imageView = frame->image_view,
.imageLayout = vk::ImageLayout::eColorAttachmentOptimal, .imageLayout = vk::ImageLayout::eColorAttachmentOptimal,
.loadOp = vk::AttachmentLoadOp::eDontCare, .loadOp = vk::AttachmentLoadOp::eClear,
.storeOp = vk::AttachmentStoreOp::eStore, .storeOp = vk::AttachmentStoreOp::eStore,
}}; }};