Skip to content

Commit fdfe089

Browse files
committed
Minor cleanup
1 parent 33bdcd5 commit fdfe089

File tree

5 files changed

+5
-11
lines changed

5 files changed

+5
-11
lines changed

base/vulkanexamplebase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ void VulkanExampleBase::submitFrame(bool skipQueueSubmit)
727727
VK_CHECK_RESULT(vkQueueSubmit(queue, 1, &submitInfo, waitFences[currentBuffer]));
728728
}
729729

730-
VkPresentInfoKHR presentInfo{ VK_STRUCTURE_TYPE_PRESENT_INFO_KHR };
730+
VkPresentInfoKHR presentInfo{ .sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR };
731731
presentInfo.waitSemaphoreCount = 1;
732732
presentInfo.pWaitSemaphores = &renderCompleteSemaphores[currentImageIndex];
733733
presentInfo.swapchainCount = 1;

examples/gears/gears.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,6 @@ class VulkanExample : public VulkanExampleBase
241241
camera.setRotation(glm::vec3(0.0f, 0.0f, 0.0f));
242242
camera.setPerspective(60.0f, (float)width / (float)height, 0.001f, 256.0f);
243243
timerSpeed *= 0.25f;
244-
settings.overlay = false;
245244
}
246245

247246
~VulkanExample()

examples/multithreading/multithreading.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,12 +453,9 @@ class VulkanExample : public VulkanExampleBase
453453
{
454454
if (!prepared)
455455
return;
456-
// Needs fence wait on primary cmd!
457456
VulkanExampleBase::prepareFrame();
458457
updateCommandBuffer();
459458
updateMatrices();
460-
// @todo: maybe find a better way than passing the cmd buffer like this
461-
// Or use drawCmdBuffes from base
462459
VulkanExampleBase::submitFrame();
463460
}
464461

examples/shaderobjects/shaderobjects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ class VulkanExample: public VulkanExampleBase
435435
vkCmdBindShadersEXT(cmdBuffer, 2, stages, shaders);
436436
scene.draw(cmdBuffer);
437437

438-
// @todo: Currently disabled, the UI needs to be adopated to work with shader objects
438+
// @todo: Currently disabled, the UI needs to be adopted to work with shader objects
439439
// drawUI(cmdBuffer);
440440

441441
// End dynamic rendering

examples/shadowmappingcascade/shadowmappingcascade.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,11 @@ class VulkanExample : public VulkanExampleBase
342342
/*
343343
Descriptor pool
344344
*/
345-
// @todo: fix counts
346345
std::vector<VkDescriptorPoolSize> poolSizes = {
347-
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 32),
348-
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 32)
346+
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, maxConcurrentFrames * 3),
347+
vks::initializers::descriptorPoolSize(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, maxConcurrentFrames)
349348
};
350-
VkDescriptorPoolCreateInfo descriptorPoolInfo =
351-
vks::initializers::descriptorPoolCreateInfo(static_cast<uint32_t>(poolSizes.size()), poolSizes.data(), 4 + SHADOW_MAP_CASCADE_COUNT);
349+
VkDescriptorPoolCreateInfo descriptorPoolInfo = vks::initializers::descriptorPoolCreateInfo(static_cast<uint32_t>(poolSizes.size()), poolSizes.data(), maxConcurrentFrames);
352350
VK_CHECK_RESULT(vkCreateDescriptorPool(device, &descriptorPoolInfo, nullptr, &descriptorPool));
353351

354352
/*

0 commit comments

Comments
 (0)