claude_code/procedural-3d-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated samples to explicitly call drawUI (updated ImGUI version), some code cleanup, removed no-longer necessary UI setup

Browse source 
Refs #496
This commit is contained in:
saschawillems 2018-08-30 21:08:02 +02:00
parent 350e3d03a3
commit c1c4f06a23
59 changed files with 133 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

23
examples/subpasses/subpasses.cpp
View file

@ -121,8 +121,6 @@ public:
FrameBufferAttachment position, normal, albedo;
} attachments;
VkRenderPass uiRenderPass;
VulkanExample() : VulkanExampleBase(ENABLE_VALIDATION)
{
title = "Subpasses";
@ -166,8 +164,6 @@ public:
vkDestroyDescriptorSetLayout(device, descriptorSetLayouts.composition, nullptr);
vkDestroyDescriptorSetLayout(device, descriptorSetLayouts.transparent, nullptr);
vkDestroyRenderPass(device, uiRenderPass, nullptr);
textures.glass.destroy();
models.scene.destroy();
models.transparent.destroy();
@ -440,11 +436,6 @@ public:
renderPassInfo.pDependencies = dependencies.data();
VK_CHECK_RESULT(vkCreateRenderPass(device, &renderPassInfo, nullptr, &renderPass));
// Create custom overlay render pass
attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD;
attachments[0].initialLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR;
VK_CHECK_RESULT(vkCreateRenderPass(device, &renderPassInfo, nullptr, &uiRenderPass));
}
void buildCommandBuffers()
@ -528,6 +519,8 @@ public:
vks::debugmarker::endRegion(drawCmdBuffers[i]);
}
drawUI(drawCmdBuffers[i]);
vkCmdEndRenderPass(drawCmdBuffers[i]);
VK_CHECK_RESULT(vkEndCommandBuffer(drawCmdBuffers[i]));
@ -1079,17 +1072,7 @@ public:
// UI overlay configuration needs to be adjusted for this example (renderpass setup, attachment count, etc.)
virtual void OnSetupUIOverlay(vks::UIOverlayCreateInfo &createInfo)
{
createInfo.renderPass = uiRenderPass;
createInfo.framebuffers = frameBuffers;
createInfo.subpassCount = 3;
createInfo.attachmentCount = 4;
createInfo.clearValues = {
{ { 0.0f, 0.0f, 0.0f, 0.0f } },
{ { 0.0f, 0.0f, 0.0f, 0.0f } },
{ { 0.0f, 0.0f, 0.0f, 0.0f } },
{ { 0.0f, 0.0f, 0.0f, 0.0f } },
{ { 1.0f, 0 } },
};
createInfo.targetSubpass = 2;
}
virtual void OnUpdateUIOverlay(vks::UIOverlay *overlay)