Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-14 08:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

video_core: restored presenter aspect calculations (#1583)

Browse source 
* video_core: restored presenter aspect calculations

* code simplification
This commit is contained in:
psucien 2024-11-23 11:46:31 +01:00 • committed by GitHub
parent 5976300788
commit d7d28aa8da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,13 +75,13 @@ 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 vk::Rect2D FitImage(s32 frame_width, s32 frame_height, s32 swapchain_width,
s32 swapchain_height) { 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;
s32 dst_width = swapchain_width; u32 dst_width = swapchain_width;
s32 dst_height = swapchain_height; u32 dst_height = swapchain_height;
if (frame_aspect > swapchain_aspect) { if (frame_aspect > swapchain_aspect) {
dst_height = static_cast<s32>(swapchain_width / frame_aspect); dst_height = static_cast<s32>(swapchain_width / frame_aspect);
@ -89,10 +89,18 @@ 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 MakeImageBlit(frame_width, frame_height, dst_width, dst_height, offset_x, offset_y); return vk::Rect2D{{offset_x, offset_y}, {dst_width, dst_height}};
}
[[nodiscard]] vk::ImageBlit MakeImageBlitFit(s32 frame_width, s32 frame_height, s32 swapchain_width,
s32 swapchain_height) {
const auto& dst_rect = FitImage(frame_width, frame_height, swapchain_width, swapchain_height);
return MakeImageBlit(frame_width, frame_height, dst_rect.extent.width, dst_rect.extent.height,
dst_rect.offset.x, dst_rect.offset.y);
} }
static vk::Format FormatToUnorm(vk::Format fmt) { static vk::Format FormatToUnorm(vk::Format fmt) {
@ -552,25 +560,22 @@ 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& dst_rect =
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 * dst_rect.offset.x,
.y = 0.0f, .y = 1.0f * dst_rect.offset.y,
.width = 1.0f * frame->width, .width = 1.0f * dst_rect.extent.width,
.height = 1.0f * frame->height, .height = 1.0f * dst_rect.extent.height,
.minDepth = 0.0f, .minDepth = 0.0f,
.maxDepth = 1.0f, .maxDepth = 1.0f,
}, },
}; };
const std::array scissors = {
vk::Rect2D{
.offset = {0, 0},
.extent = {frame->width, frame->height},
},
};
cmdbuf.setViewport(0, viewports); cmdbuf.setViewport(0, viewports);
cmdbuf.setScissor(0, scissors); cmdbuf.setScissor(0, {dst_rect});
cmdbuf.pushDescriptorSetKHR(vk::PipelineBindPoint::eGraphics, *pp_pipeline_layout, 0, cmdbuf.pushDescriptorSetKHR(vk::PipelineBindPoint::eGraphics, *pp_pipeline_layout, 0,
set_writes); set_writes);
@ -580,7 +585,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,
}}; }};