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

Remove duplicated attachment declarations

Browse Source
This commit is contained in:
Quang Ngô 2025-01-18 13:48:02 +07:00
parent e1cf02b891
commit b7b4dde5e3
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -602,6 +602,13 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
.pImageMemoryBarriers = &pre_barrier, .pImageMemoryBarriers = &pre_barrier,
}); });
const std::array attachments = {vk::RenderingAttachmentInfo{
.imageView = frame->image_view,
.imageLayout = vk::ImageLayout::eColorAttachmentOptimal,
.loadOp = vk::AttachmentLoadOp::eClear,
.storeOp = vk::AttachmentStoreOp::eStore,
}};
if (image_id != VideoCore::NULL_IMAGE_ID) { if (image_id != VideoCore::NULL_IMAGE_ID) {
auto& image = texture_cache.GetImage(image_id); auto& image = texture_cache.GetImage(image_id);
image.Transit(vk::ImageLayout::eShaderReadOnlyOptimal, vk::AccessFlagBits2::eShaderRead, {}, image.Transit(vk::ImageLayout::eShaderReadOnlyOptimal, vk::AccessFlagBits2::eShaderRead, {},
@ -662,13 +669,6 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
cmdbuf.pushConstants(*pp_pipeline_layout, vk::ShaderStageFlagBits::eFragment, 0, cmdbuf.pushConstants(*pp_pipeline_layout, vk::ShaderStageFlagBits::eFragment, 0,
sizeof(PostProcessSettings), &pp_settings); sizeof(PostProcessSettings), &pp_settings);
const std::array attachments = {vk::RenderingAttachmentInfo{
.imageView = frame->image_view,
.imageLayout = vk::ImageLayout::eColorAttachmentOptimal,
.loadOp = vk::AttachmentLoadOp::eClear,
.storeOp = vk::AttachmentStoreOp::eStore,
}};
vk::RenderingInfo rendering_info{ vk::RenderingInfo rendering_info{
.renderArea = .renderArea =
vk::Rect2D{ vk::Rect2D{
@ -684,13 +684,6 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
cmdbuf.endRendering(); cmdbuf.endRendering();
} else { } else {
// Fix display of garbage images on startup on some drivers // Fix display of garbage images on startup on some drivers
const std::array attachments = {vk::RenderingAttachmentInfo{
.imageView = frame->image_view,
.imageLayout = vk::ImageLayout::eColorAttachmentOptimal,
.loadOp = vk::AttachmentLoadOp::eClear,
.storeOp = vk::AttachmentStoreOp::eStore,
}};
vk::RenderingInfo rendering_info{ vk::RenderingInfo rendering_info{
.renderArea = .renderArea =
vk::Rect2D{ vk::Rect2D{
@ -701,7 +694,6 @@ Frame* Presenter::PrepareFrameInternal(VideoCore::ImageId image_id, bool is_eop)
.colorAttachmentCount = attachments.size(), .colorAttachmentCount = attachments.size(),
.pColorAttachments = attachments.data(), .pColorAttachments = attachments.data(),
}; };
cmdbuf.beginRendering(rendering_info); cmdbuf.beginRendering(rendering_info);
cmdbuf.endRendering(); cmdbuf.endRendering();
} }