zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-31 04:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add a very basic present shader using a blit

Browse source 
- avoid dealing with image layout transitions for the blit by using VK_IMAGE_LAYOUT_GENERAL for now
This commit is contained in:
Magnus Norddahl 2019-02-26 12:25:17 +01:00
parent 854526dee4
commit 347339b254
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/rendering/vulkan/renderer/vk_renderpass.cpp
View file

@ -117,9 +117,9 @@ VkRenderPassSetup::VkRenderPassSetup()
void VkRenderPassSetup::CreateRenderPass() void VkRenderPassSetup::CreateRenderPass()
{ {
RenderPassBuilder builder; RenderPassBuilder builder;
builder.addRgba16fAttachment(false, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); builder.addRgba16fAttachment(false, VK_IMAGE_LAYOUT_GENERAL);
builder.addSubpass(); builder.addSubpass();
builder.addSubpassColorAttachmentRef(0, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); builder.addSubpassColorAttachmentRef(0, VK_IMAGE_LAYOUT_GENERAL);
builder.addExternalSubpassDependency(); builder.addExternalSubpassDependency();
RenderPass = builder.create(GetVulkanFrameBuffer()->device); RenderPass = builder.create(GetVulkanFrameBuffer()->device);
} }

25
src/rendering/vulkan/system/vk_framebuffer.cpp
View file

@ -107,6 +107,31 @@ void VulkanFrameBuffer::Update()
mRenderState->EndRenderPass(); mRenderState->EndRenderPass();
//DrawPresentTexture(mOutputLetterbox, true); //DrawPresentTexture(mOutputLetterbox, true);
{
auto sceneColor = mRenderPassManager->SceneColor.get();
PipelineBarrier barrier0;
barrier0.addImage(sceneColor, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_GENERAL, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT);
barrier0.execute(mPresentCommands.get(), VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
VkImageBlit blit = {};
blit.srcOffsets[0] = { 0, 0, 0 };
blit.srcOffsets[1] = { sceneColor->width, sceneColor->height, 1 };
blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
blit.srcSubresource.mipLevel = 0;
blit.srcSubresource.baseArrayLayer = 0;
blit.srcSubresource.layerCount = 1;
blit.dstOffsets[0] = { 0, 0, 0 };
blit.dstOffsets[1] = { (int32_t)device->swapChain->actualExtent.width, (int32_t)device->swapChain->actualExtent.height, 1 };
blit.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
blit.dstSubresource.mipLevel = 0;
blit.dstSubresource.baseArrayLayer = 0;
blit.dstSubresource.layerCount = 1;
mPresentCommands->blitImage(
sceneColor->image, VK_IMAGE_LAYOUT_GENERAL,
device->swapChain->swapChainImages[device->presentImageIndex], VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR,
1, &blit, VK_FILTER_NEAREST);
}
mPresentCommands->end(); mPresentCommands->end();