Changeset e5d4aca in opengl-game

Timestamp:

Aug 22, 2019, 2:19:56 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

6544020

Parents:

c8c6da8

Message:

Create separate descriptor pools and descriptor sets for each shader group and start removing unnecessary elements from the overlay shaders

Files:

• DESIGN.txt (added)
• TODO.txt (modified) (1 diff)
• shaders/overlay.frag (modified) (2 diffs)
• shaders/overlay.vert (modified) (2 diffs)
• vulkan-game.cpp (modified) (8 diffs)

TODO.txt

@@ -18 +18 @@
    -Maybe separate out the camera controls
 -Turn the game into more of an overhead view RTS where you can use the mouse to select and move ships
+
+Apparently a new pipeline is required for every type of shader
+However, it seems like I should only need one swap chain 
+Seems like I'll have to create a new set of framebuffers and a new set of command buffers as well
+
+I will definitely have to create new command buffers, since that's where I specify the vertex buffers and
+index buffer for the draw operation
+
+We'll need to have a separate command buffer for every framebuffer in the swapchain
+
+Actually, I could probably just have multiple vkCmdDraw calls in each command buffer and rebind to a different
+pipeline between each one

shaders/overlay.frag

@@ -2 +2 @@
 #extension GL_ARB_separate_shader_objects : enable
 
-layout(binding = 1) uniform sampler2D texSampler;
-layout(binding = 2) uniform sampler2D uiTexSampler;
+layout(binding = 0) uniform sampler2D uiTexSampler;
 
 layout(location = 0) in vec3 fragColor;
@@ -12 +11 @@
 
 void main() {
+   outColor = texture(uiTexSampler, fragTexCoord);
+
    if (isOverlay == 1) {
       outColor = texture(uiTexSampler, fragTexCoord);
    } else {
-      outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0);
+      outColor = vec4(fragColor * texture(uiTexSampler, fragTexCoord).rgb, 1.0);
    }
 }

shaders/overlay.vert

@@ -1 +1 @@
 #version 450
 #extension GL_ARB_separate_shader_objects : enable
-
-layout (binding = 0) uniform UniformBufferObject {
-   mat4 model;
-   mat4 view;
-   mat4 proj;
-} ubo;
 
 layout(location = 0) in vec3 inPosition;
@@ -17 +11 @@
 
 void main() {
-   if (gl_VertexIndex < 8) {
-      gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
+   if (gl_VertexIndex < 0) {
       fragColor = inColor;
       isOverlay = 0;
    } else {
-      gl_Position = vec4(inPosition, 1.0);
-      fragColor = vec3(1.0, 1.0, 1.0);
+      fragColor = inColor;
       isOverlay = 1;
    }
 
    fragTexCoord = inTexCoord;
+   gl_Position = vec4(inPosition, 1.0);
 }

vulkan-game.cpp

@@ -332 +332 @@
          createRenderPass();
 
-         createDescriptorSetLayout(scenePipeline);
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", scenePipeline);
-
-         createDescriptorSetLayout(overlayPipeline);
-         createGraphicsPipeline("shaders/vert.spv", "shaders/frag.spv", overlayPipeline);
-
          createCommandPool();
-         createDepthResources();
-         createFramebuffers();
 
          createImageResources("textures/texture.jpg", textureImage, textureImageMemory, textureImageView);
          createImageResourcesFromSDLTexture(uiOverlay, sdlOverlayImage, sdlOverlayImageMemory, sdlOverlayImageView);
          createTextureSampler();
+
+         createSceneDescriptorSetLayout(scenePipeline);
+         createOverlayDescriptorSetLayout(overlayPipeline);
 
          createShaderBuffers(scenePipeline, {
@@ -357 +352 @@
             {{-0.5f,  0.5f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
          }, {
-            0,  1,  2,  2,  3,  0,
-            4,  5,  6,  6,  7,  4
+            0, 1, 2, 2, 3, 0,
+            4, 5, 6, 6, 7, 4
          });
 
          createShaderBuffers(overlayPipeline, {
-            // Filler vertices to increase the overlay vertex indices to at least 8
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-            {{-1.0f, -1.0f,  3.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-
-            {{-1.0f,  1.0f,  0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
-            {{ 1.0f,  1.0f,  0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
-            {{ 1.0f, -1.0f,  0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-            {{-1.0f, -1.0f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+            {{-1.0f,  1.0f,  0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+            {{ 1.0f,  1.0f,  0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f}},
+            {{ 1.0f, -1.0f,  0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f}},
+            {{-1.0f, -1.0f,  0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f}}
          }, {
-            8,  9, 10, 10, 11,  8
+            0, 1, 2, 2,3, 0
          });
 
-         createUniformBuffers();
-
-         createDescriptorPool(scenePipeline);
-         createDescriptorSets(scenePipeline);
-
-         createDescriptorPool(overlayPipeline);
-         createDescriptorSets(overlayPipeline);
-
-         createCommandBuffers();
+         createBufferResources();
+
          createSyncObjects();
       }
@@ -794 +772 @@
       }
 
-      void createDescriptorSetLayout(GraphicsPipelineInfo& info) {
+      void createSceneDescriptorSetLayout(GraphicsPipelineInfo& info) {
          VkDescriptorSetLayoutBinding uboLayoutBinding = {};
          uboLayoutBinding.binding = 0;
@@ -817 +795 @@
 
          array<VkDescriptorSetLayoutBinding, 3> bindings = { uboLayoutBinding, samplerLayoutBinding, overlaySamplerLayoutBinding };
+         VkDescriptorSetLayoutCreateInfo layoutInfo = {};
+         layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
+         layoutInfo.bindingCount = static_cast<uint32_t>(bindings.size());
+         layoutInfo.pBindings = bindings.data();
+
+         if (vkCreateDescriptorSetLayout(device, &layoutInfo, nullptr, &info.descriptorSetLayout) != VK_SUCCESS) {
+            throw runtime_error("failed to create descriptor set layout!");
+         }
+      }
+
+      void createOverlayDescriptorSetLayout(GraphicsPipelineInfo& info) {
+         VkDescriptorSetLayoutBinding samplerLayoutBinding = {};
+         samplerLayoutBinding.binding = 0;
+         samplerLayoutBinding.descriptorCount = 1;
+         samplerLayoutBinding.descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+         samplerLayoutBinding.pImmutableSamplers = nullptr;
+         samplerLayoutBinding.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT;
+
+         array<VkDescriptorSetLayoutBinding, 1> bindings = { samplerLayoutBinding };
          VkDescriptorSetLayoutCreateInfo layoutInfo = {};
          layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
@@ -1512 +1509 @@
       }
 
-      void createDescriptorPool(GraphicsPipelineInfo& info) {
+      void createSceneDescriptorPool(GraphicsPipelineInfo& info) {
          array<VkDescriptorPoolSize, 3> poolSizes = {};
          poolSizes[0].type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
@@ -1532 +1529 @@
       }
 
-      void createDescriptorSets(GraphicsPipelineInfo& info) {
+      void createSceneDescriptorSets(GraphicsPipelineInfo& info) {
          vector<VkDescriptorSetLayout> layouts(swapChainImages.size(), info.descriptorSetLayout);
 
@@ -1593 +1590 @@
             descriptorWrites[2].pImageInfo = &overlayImageInfo;
             descriptorWrites[2].pTexelBufferView = nullptr;
+
+            vkUpdateDescriptorSets(device, static_cast<uint32_t>(descriptorWrites.size()), descriptorWrites.data(), 0, nullptr);
+         }
+      }
+
+      void createOverlayDescriptorPool(GraphicsPipelineInfo& info) {
+         array<VkDescriptorPoolSize, 1> poolSizes = {};
+         poolSizes[0].type = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+         poolSizes[0].descriptorCount = static_cast<uint32_t>(swapChainImages.size());
+
+         VkDescriptorPoolCreateInfo poolInfo = {};
+         poolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+         poolInfo.poolSizeCount = static_cast<uint32_t>(poolSizes.size());
+         poolInfo.pPoolSizes = poolSizes.data();
+         poolInfo.maxSets = static_cast<uint32_t>(swapChainImages.size());
+
+         if (vkCreateDescriptorPool(device, &poolInfo, nullptr, &info.descriptorPool) != VK_SUCCESS) {
+            throw runtime_error("failed to create descriptor pool!");
+         }
+      }
+
+      void createOverlayDescriptorSets(GraphicsPipelineInfo& info) {
+         vector<VkDescriptorSetLayout> layouts(swapChainImages.size(), info.descriptorSetLayout);
+
+         VkDescriptorSetAllocateInfo allocInfo = {};
+         allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+         allocInfo.descriptorPool = info.descriptorPool;
+         allocInfo.descriptorSetCount = static_cast<uint32_t>(swapChainImages.size());
+         allocInfo.pSetLayouts = layouts.data();
+
+         info.descriptorSets.resize(swapChainImages.size());
+         if (vkAllocateDescriptorSets(device, &allocInfo, info.descriptorSets.data()) != VK_SUCCESS) {
+            throw runtime_error("failed to allocate descriptor sets!");
+         }
+
+         for (size_t i = 0; i < swapChainImages.size(); i++) {
+            VkDescriptorImageInfo imageInfo = {};
+            imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+            imageInfo.imageView = sdlOverlayImageView;
+            imageInfo.sampler = textureSampler;
+
+            array<VkWriteDescriptorSet, 1> descriptorWrites = {};
+
+            descriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
+            descriptorWrites[0].dstSet = info.descriptorSets[i];
+            descriptorWrites[0].dstBinding = 0;
+            descriptorWrites[0].dstArrayElement = 0;
+            descriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
+            descriptorWrites[0].descriptorCount = 1;
+            descriptorWrites[0].pBufferInfo = nullptr;
+            descriptorWrites[0].pImageInfo = &imageInfo;
+            descriptorWrites[0].pTexelBufferView = nullptr;
 
             vkUpdateDescriptorSets(device, static_cast<uint32_t>(descriptorWrites.size()), descriptorWrites.data(), 0, nullptr);
@@ -1845 +1894 @@
          createRenderPass();
 
-         createGraphicsPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv", scenePipeline);
-         createGraphicsPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv", overlayPipeline);
-
+         createBufferResources();
+      }
+
+      void createBufferResources() {
          createDepthResources();
          createFramebuffers();
          createUniformBuffers();
 
-         createDescriptorPool(scenePipeline);
-         createDescriptorSets(scenePipeline);
-
-         createDescriptorPool(overlayPipeline);
-         createDescriptorSets(overlayPipeline);
+         createGraphicsPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv", scenePipeline);
+         createSceneDescriptorPool(scenePipeline);
+         createSceneDescriptorSets(scenePipeline);
+
+         createGraphicsPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv", overlayPipeline);
+         createOverlayDescriptorPool(overlayPipeline);
+         createOverlayDescriptorSets(overlayPipeline);
 
          createCommandBuffers();