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 1

clang-format

Browse source
This commit is contained in:
Lander Gallastegi 2024-09-16 03:03:51 +02:00
parent 31c44909dd
commit eb5c47e228
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -253,10 +253,17 @@ Frame* RendererVulkan::PrepareFrameInternal(VideoCore::Image& image, bool is_eop
{}, {}, pre_barrier); {}, {}, pre_barrier);
// 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.
<<<<<<< HEAD
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,
MakeImageBlitFit(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);
=======
cmdbuf.blitImage(image.image, image.layout, frame->image, vk::ImageLayout::eTransferDstOptimal,
MakeImageBlitFit(image.info.size.width, image.info.size.height, frame->width,
frame->height),
vk::Filter::eLinear);
>>>>>>> 228571f9 (clang-format)
const vk::ImageMemoryBarrier post_barrier{ const vk::ImageMemoryBarrier post_barrier{
.srcAccessMask = vk::AccessFlagBits::eTransferWrite, .srcAccessMask = vk::AccessFlagBits::eTransferWrite,
@ -292,7 +299,7 @@ void RendererVulkan::Present(Frame* frame) {
window.getHeight() != swapchain.GetExtent().height) { window.getHeight() != swapchain.GetExtent().height) {
swapchain.Recreate(window.getWidth(), window.getHeight()); swapchain.Recreate(window.getWidth(), window.getHeight());
} }
ImGui::Core::NewFrame(); ImGui::Core::NewFrame();
swapchain.AcquireNextImage(); swapchain.AcquireNextImage();
@ -365,10 +372,11 @@ void RendererVulkan::Present(Frame* frame) {
vk::PipelineStageFlagBits::eTransfer, vk::PipelineStageFlagBits::eTransfer,
vk::DependencyFlagBits::eByRegion, {}, {}, pre_barriers); vk::DependencyFlagBits::eByRegion, {}, {}, pre_barriers);
cmdbuf.blitImage(frame->image, vk::ImageLayout::eTransferSrcOptimal, swapchain_image, cmdbuf.blitImage(
vk::ImageLayout::eTransferDstOptimal, frame->image, vk::ImageLayout::eTransferSrcOptimal, swapchain_image,
MakeImageBlitStretch(frame->width, frame->height, extent.width, extent.height), vk::ImageLayout::eTransferDstOptimal,
vk::Filter::eLinear); MakeImageBlitStretch(frame->width, frame->height, extent.width, extent.height),
vk::Filter::eLinear);
cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eAllCommands, cmdbuf.pipelineBarrier(vk::PipelineStageFlagBits::eAllCommands,
vk::PipelineStageFlagBits::eAllCommands, vk::PipelineStageFlagBits::eAllCommands,