Changeset 58453c3 in opengl-game for vulkan-game.cpp

Timestamp:

May 20, 2021, 3:50:12 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

567fa88

Parents:

c163d81

git-author:

Dmitry Portnoy <dportnoy@…> (05/20/21 15:48:15)

git-committer:

Dmitry Portnoy <dportnoy@…> (05/20/21 15:50:12)

Message:

Remove the swapChainImages parameter from the GraphicsPipeline_Vulkan constructor and modify createDescriptorPool(), createDescriptorSets(), and updateDescriptorInfo() to accept a size paramter instead of accepting a vector of swap chain images and getting the size from that

File:

• vulkan-game.cpp (modified) (15 diffs)

vulkan-game.cpp

@@ -194 +194 @@
    modelPipeline.createDescriptorSetLayout();
    modelPipeline.createPipeline("shaders/model-vert.spv", "shaders/model-frag.spv");
-   modelPipeline.createDescriptorPool(swapChainImages);
-   modelPipeline.createDescriptorSets(swapChainImages);
+   modelPipeline.createDescriptorPool(swapChainImages.size());
+   modelPipeline.createDescriptorSets(swapChainImages.size());
 
    // START UNREVIEWED SECTION
@@ -458 +458 @@
    shipPipeline.createDescriptorSetLayout();
    shipPipeline.createPipeline("shaders/ship-vert.spv", "shaders/ship-frag.spv");
-   shipPipeline.createDescriptorPool(swapChainImages);
-   shipPipeline.createDescriptorSets(swapChainImages);
+   shipPipeline.createDescriptorPool(swapChainImages.size());
+   shipPipeline.createDescriptorSets(swapChainImages.size());
 
    asteroidPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::pos));
@@ -478 +478 @@
    asteroidPipeline.createDescriptorSetLayout();
    asteroidPipeline.createPipeline("shaders/asteroid-vert.spv", "shaders/asteroid-frag.spv");
-   asteroidPipeline.createDescriptorPool(swapChainImages);
-   asteroidPipeline.createDescriptorSets(swapChainImages);
+   asteroidPipeline.createDescriptorPool(swapChainImages.size());
+   asteroidPipeline.createDescriptorSets(swapChainImages.size());
 
    laserPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&LaserVertex::pos));
@@ -498 +498 @@
    laserPipeline.createDescriptorSetLayout();
    laserPipeline.createPipeline("shaders/laser-vert.spv", "shaders/laser-frag.spv");
-   laserPipeline.createDescriptorPool(swapChainImages);
-   laserPipeline.createDescriptorSets(swapChainImages);
+   laserPipeline.createDescriptorPool(swapChainImages.size());
+   laserPipeline.createDescriptorSets(swapChainImages.size());
 
    explosionPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ExplosionVertex::particleStartVelocity));
@@ -516 +516 @@
    explosionPipeline.createDescriptorSetLayout();
    explosionPipeline.createPipeline("shaders/explosion-vert.spv", "shaders/explosion-frag.spv");
-   explosionPipeline.createDescriptorPool(swapChainImages);
-   explosionPipeline.createDescriptorSets(swapChainImages);
+   explosionPipeline.createDescriptorPool(swapChainImages.size());
+   explosionPipeline.createDescriptorSets(swapChainImages.size());
 
    // END UNREVIEWED SECTION
@@ -619 +619 @@
    modelPipeline = GraphicsPipeline_Vulkan<ModelVertex>(
       VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, physicalDevice, device, renderPass,
-      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 24, 24);
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 24, 24);
 
    createBufferSet(objects_modelPipeline.capacity * sizeof(SSBO_ModelObject),
@@ -628 +628 @@
    shipPipeline = GraphicsPipeline_Vulkan<ModelVertex>(
       VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, physicalDevice, device, renderPass,
-      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 138, 138);
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 138, 138);
 
    createBufferSet(objects_shipPipeline.capacity * sizeof(SSBO_ModelObject),
@@ -637 +637 @@
    asteroidPipeline = GraphicsPipeline_Vulkan<ModelVertex>(
       VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, physicalDevice, device, renderPass,
-      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 24, 36);
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 24, 36);
 
    createBufferSet(objects_asteroidPipeline.capacity * sizeof(SSBO_Asteroid),
@@ -646 +646 @@
    laserPipeline = GraphicsPipeline_Vulkan<LaserVertex>(
       VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, physicalDevice, device, renderPass,
-      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 8, 18);
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 8, 18);
 
    createBufferSet(objects_laserPipeline.capacity * sizeof(SSBO_Laser),
@@ -656 +656 @@
       VK_PRIMITIVE_TOPOLOGY_POINT_LIST, physicalDevice, device, renderPass,
       { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height },
-      swapChainImages, EXPLOSION_PARTICLE_COUNT, EXPLOSION_PARTICLE_COUNT);
+      EXPLOSION_PARTICLE_COUNT, EXPLOSION_PARTICLE_COUNT);
 
    createBufferSet(objects_explosionPipeline.capacity * sizeof(SSBO_Explosion),
@@ -2226 +2226 @@
    modelPipeline.updateRenderPass(renderPass);
    modelPipeline.createPipeline("shaders/model-vert.spv", "shaders/model-frag.spv");
-   modelPipeline.createDescriptorPool(swapChainImages);
-   modelPipeline.createDescriptorSets(swapChainImages);
+   modelPipeline.createDescriptorPool(swapChainImages.size());
+   modelPipeline.createDescriptorSets(swapChainImages.size());
 
    createBufferSet(sizeof(UBO_VP_mats),
@@ -2235 +2235 @@
    shipPipeline.updateRenderPass(renderPass);
    shipPipeline.createPipeline("shaders/ship-vert.spv", "shaders/ship-frag.spv");
-   shipPipeline.createDescriptorPool(swapChainImages);
-   shipPipeline.createDescriptorSets(swapChainImages);
+   shipPipeline.createDescriptorPool(swapChainImages.size());
+   shipPipeline.createDescriptorSets(swapChainImages.size());
 
    createBufferSet(sizeof(UBO_VP_mats),
@@ -2244 +2244 @@
    asteroidPipeline.updateRenderPass(renderPass);
    asteroidPipeline.createPipeline("shaders/asteroid-vert.spv", "shaders/asteroid-frag.spv");
-   asteroidPipeline.createDescriptorPool(swapChainImages);
-   asteroidPipeline.createDescriptorSets(swapChainImages);
+   asteroidPipeline.createDescriptorPool(swapChainImages.size());
+   asteroidPipeline.createDescriptorSets(swapChainImages.size());
 
    createBufferSet(sizeof(UBO_VP_mats),
@@ -2253 +2253 @@
    laserPipeline.updateRenderPass(renderPass);
    laserPipeline.createPipeline("shaders/laser-vert.spv", "shaders/laser-frag.spv");
-   laserPipeline.createDescriptorPool(swapChainImages);
-   laserPipeline.createDescriptorSets(swapChainImages);
+   laserPipeline.createDescriptorPool(swapChainImages.size());
+   laserPipeline.createDescriptorSets(swapChainImages.size());
 
    createBufferSet(sizeof(UBO_Explosion),
@@ -2262 +2262 @@
    explosionPipeline.updateRenderPass(renderPass);
    explosionPipeline.createPipeline("shaders/explosion-vert.spv", "shaders/explosion-frag.spv");
-   explosionPipeline.createDescriptorPool(swapChainImages);
-   explosionPipeline.createDescriptorSets(swapChainImages);
+   explosionPipeline.createDescriptorPool(swapChainImages.size());
+   explosionPipeline.createDescriptorSets(swapChainImages.size());
 
    imageIndex = 0;