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

Don't use base class semaphores, Code cleanup and reorder

Browse source
This commit is contained in:
Sascha Willems 2018-12-01 16:21:56 +01:00
parent c5e16e2ee1
commit 32bc5b3a75
1 changed files with 57 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

98
examples/commandbuffers/commandbuffers.cpp
View file

@ -55,9 +55,12 @@ public:
VkDescriptorSetLayout descriptorSetLayout; VkDescriptorSetLayout descriptorSetLayout;
VkDescriptorSet descriptorSet; VkDescriptorSet descriptorSet;
VkCommandPool commandPool;
// Single command buffer scenario // Single command buffer scenario
VkFence waitFence; VkFence waitFence;
VkCommandPool commandPool; VkSemaphore renderCompleteSemaphore;
VkSemaphore presentCompleteSemaphore;
VkCommandBuffer commandBuffer; VkCommandBuffer commandBuffer;
/// @todo: Multiple command buffers ("render ahead") /// @todo: Multiple command buffers ("render ahead")
@ -260,46 +263,6 @@ public:
VK_CHECK_RESULT(vkEndCommandBuffer(commandBuffer)); VK_CHECK_RESULT(vkEndCommandBuffer(commandBuffer));
} }
void draw()
{
// Acquire the next image from the swap chain
{
VkResult acquire = swapChain.acquireNextImage(semaphores.presentComplete, &currentBuffer);
if ((acquire == VK_ERROR_OUT_OF_DATE_KHR) || (acquire == VK_SUBOPTIMAL_KHR)) {
windowResize();
}
else {
VK_CHECK_RESULT(acquire);
}
}
// (Re-)record command buffer
if (!paused) {
recordCommandBuffer();
}
// Command buffer to be sumitted to the queue
submitInfo.commandBufferCount = 1;
submitInfo.pCommandBuffers = &commandBuffer;
// Submit to queue
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, waitFence));
// Present
{
VkResult present = swapChain.queuePresent(queue, currentBuffer, semaphores.renderComplete);
if (!((present == VK_SUCCESS) || (present == VK_SUBOPTIMAL_KHR))) {
if (present == VK_ERROR_OUT_OF_DATE_KHR) {
windowResize();
return;
}
else {
VK_CHECK_RESULT(present);
}
}
}
}
void loadAssets() void loadAssets()
{ {
models.scene.loadFromFile(getAssetPath() + "models/samplescene.dae", vertexLayout, 0.35f, vulkanDevice, queue); models.scene.loadFromFile(getAssetPath() + "models/samplescene.dae", vertexLayout, 0.35f, vulkanDevice, queue);
@ -317,6 +280,11 @@ public:
VkFenceCreateInfo fenceCI{ VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, nullptr, VK_FENCE_CREATE_SIGNALED_BIT }; VkFenceCreateInfo fenceCI{ VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, nullptr, VK_FENCE_CREATE_SIGNALED_BIT };
VK_CHECK_RESULT(vkCreateFence(device, &fenceCI, nullptr, &waitFence)); VK_CHECK_RESULT(vkCreateFence(device, &fenceCI, nullptr, &waitFence));
// Semaphores are used to order queue submissions
VkSemaphoreCreateInfo semaphoreCI { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, nullptr, 0 };
VK_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreCI, nullptr, &presentCompleteSemaphore));
VK_CHECK_RESULT(vkCreateSemaphore(device, &semaphoreCI, nullptr, &renderCompleteSemaphore));
// Create a single command pool for the applications main thread // Create a single command pool for the applications main thread
VkCommandPoolCreateInfo commandPoolCI{}; VkCommandPoolCreateInfo commandPoolCI{};
commandPoolCI.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; commandPoolCI.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO;
@ -336,6 +304,54 @@ public:
prepared = true; prepared = true;
} }
void draw()
{
// Acquire the next image from the swap chain
{
VkResult acquire = swapChain.acquireNextImage(presentCompleteSemaphore, &currentBuffer);
if ((acquire == VK_ERROR_OUT_OF_DATE_KHR) || (acquire == VK_SUBOPTIMAL_KHR)) {
windowResize();
}
else {
VK_CHECK_RESULT(acquire);
}
}
// (Re-)record command buffer
if (!paused) {
recordCommandBuffer();
}
// Submit the command buffer to the graphics queue
const VkPipelineStageFlags waitStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
VkSubmitInfo submitInfo{};
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
submitInfo.pWaitDstStageMask = &waitStageMask;
submitInfo.pWaitSemaphores = &presentCompleteSemaphore;
submitInfo.waitSemaphoreCount = 1;
submitInfo.pSignalSemaphores = &renderCompleteSemaphore;
submitInfo.signalSemaphoreCount = 1;
submitInfo.pCommandBuffers = &commandBuffer;
submitInfo.commandBufferCount = 1;
// Submit to queue
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, waitFence));
// Present
{
VkResult present = swapChain.queuePresent(queue, currentBuffer, renderCompleteSemaphore);
if (!((present == VK_SUCCESS) || (present == VK_SUBOPTIMAL_KHR))) {
if (present == VK_ERROR_OUT_OF_DATE_KHR) {
windowResize();
return;
}
else {
VK_CHECK_RESULT(present);
}
}
}
}
virtual void render() virtual void render()
{ {
if (!prepared) { if (!prepared) {