Skip to content

Commit c27a971

Browse files
committed
Add descriptor pool
1 parent 54a2272 commit c27a971

File tree

8 files changed

+1713
-10
lines changed

8 files changed

+1713
-10
lines changed

docs/codes/0300_descriptor1/main.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ class HelloTriangleApplication {
6464
vk::raii::Buffer m_vertexBuffer{ nullptr };
6565
vk::raii::DeviceMemory m_indexBufferMemory{ nullptr };
6666
vk::raii::Buffer m_indexBuffer{ nullptr };
67-
std::vector<vk::raii::Buffer> m_uniformBuffers;
6867
std::vector<vk::raii::DeviceMemory> m_uniformBuffersMemory;
68+
std::vector<vk::raii::Buffer> m_uniformBuffers;
6969
std::vector<void*> m_uniformBuffersMapped;
7070
vk::raii::SwapchainKHR m_swapChain{ nullptr };
7171
std::vector<vk::Image> m_swapChainImages;
@@ -648,6 +648,7 @@ class HelloTriangleApplication {
648648
colorBlending.setAttachments( colorBlendAttachment );
649649

650650
vk::PipelineLayoutCreateInfo pipelineLayoutInfo;
651+
pipelineLayoutInfo.setSetLayouts(*m_descriptorSetLayout);
651652
m_pipelineLayout = m_device.createPipelineLayout( pipelineLayoutInfo );
652653

653654
vk::GraphicsPipelineCreateInfo pipelineInfo;
@@ -791,11 +792,11 @@ class HelloTriangleApplication {
791792
// Only reset the fence if we are submitting work
792793
m_device.resetFences( *m_inFlightFences[currentFrame] );
793794

795+
updateUniformBuffer(currentFrame);
796+
794797
m_commandBuffers[currentFrame].reset();
795798
recordCommandBuffer(m_commandBuffers[currentFrame], imageIndex);
796799

797-
updateUniformBuffer(currentFrame);
798-
799800
vk::SubmitInfo submitInfo;
800801

801802
submitInfo.setWaitSemaphores( *m_imageAvailableSemaphores[currentFrame] );

0 commit comments

Comments
 (0)