Changeset 1187ef5 in opengl-game for vulkan-game.cpp

Timestamp:

Aug 20, 2019, 8:36:41 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

ad31ec7

Parents:

28c13da

Message:

Minor code reformatting

File:

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

vulkan-game.cpp

@@ -192 +192 @@
 
       VkRenderPass renderPass;
+
       VkCommandPool commandPool;
+      vector<VkCommandBuffer> commandBuffers;
+
+      // The images and the sampler are used to store data for specific attributes. I probably
+      // want to keep them separate from the GraphicsPipelineInfo objects and start passing
+      // references to them once I start defining uniform and varying attributes in GraphicsPipelineInfo objects
 
       VkImage depthImage;
@@ -212 +218 @@
       VkSampler textureSampler;
 
+      // These are currently to store the MVP matrix
+      // I should figure out if it makes sense to use them for other uniforms in the future
+      // If not, I should rename them to better indicate their puprose.
+      // I should also decide if I can use these for all shaders, or if I need a separapte set of buffers for each one
+      vector<VkBuffer> uniformBuffers;
+      vector<VkDeviceMemory> uniformBuffersMemory;
+
       GraphicsPipelineInfo scenePipeline;
       GraphicsPipelineInfo overlayPipeline;
-
-      vector<VkBuffer> uniformBuffers;
-      vector<VkDeviceMemory> uniformBuffersMemory;
-
-      vector<VkCommandBuffer> commandBuffers;
 
       vector<VkSemaphore> imageAvailableSemaphores;
@@ -323 +331 @@
          createDepthResources();
          createFramebuffers();
+
          createImageResources("textures/texture.jpg", textureImage, textureImageMemory, textureImageView);
          createImageResourcesFromSDLTexture(uiOverlay, sdlOverlayImage, sdlOverlayImageMemory, sdlOverlayImageView);
@@ -1632 +1641 @@
       }
 
-      void createGraphicsPipelineCommands(GraphicsPipelineInfo& info, size_t imageIdx) {
-         vkCmdBindPipeline(commandBuffers[imageIdx], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline);
-         vkCmdBindDescriptorSets(commandBuffers[imageIdx], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipelineLayout, 0, 1,
-            &info.descriptorSets[imageIdx], 0, nullptr);
+      void createGraphicsPipelineCommands(GraphicsPipelineInfo& info, uint32_t currentImage) {
+         vkCmdBindPipeline(commandBuffers[currentImage], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipeline);
+         vkCmdBindDescriptorSets(commandBuffers[currentImage], VK_PIPELINE_BIND_POINT_GRAPHICS, info.pipelineLayout, 0, 1,
+            &info.descriptorSets[currentImage], 0, nullptr);
 
          VkBuffer vertexBuffers[] = { info.vertexBuffer };
          VkDeviceSize offsets[] = { 0 };
-         vkCmdBindVertexBuffers(commandBuffers[imageIdx], 0, 1, vertexBuffers, offsets);
-
-         vkCmdBindIndexBuffer(commandBuffers[imageIdx], info.indexBuffer, 0, VK_INDEX_TYPE_UINT16);
-
-         vkCmdDrawIndexed(commandBuffers[imageIdx], static_cast<uint32_t>(info.numIndices), 1, 0, 0, 0);
+         vkCmdBindVertexBuffers(commandBuffers[currentImage], 0, 1, vertexBuffers, offsets);
+
+         vkCmdBindIndexBuffer(commandBuffers[currentImage], info.indexBuffer, 0, VK_INDEX_TYPE_UINT16);
+
+         vkCmdDrawIndexed(commandBuffers[currentImage], static_cast<uint32_t>(info.numIndices), 1, 0, 0, 0);
       }
 
@@ -1660 +1669 @@
          for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
             if (vkCreateSemaphore(device, &semaphoreInfo, nullptr, &imageAvailableSemaphores[i]) != VK_SUCCESS ||
-               vkCreateSemaphore(device, &semaphoreInfo, nullptr, &renderFinishedSemaphores[i]) != VK_SUCCESS ||
-               vkCreateFence(device, &fenceInfo, nullptr, &inFlightFences[i]) != VK_SUCCESS) {
+                vkCreateSemaphore(device, &semaphoreInfo, nullptr, &renderFinishedSemaphores[i]) != VK_SUCCESS ||
+                vkCreateFence(device, &fenceInfo, nullptr, &inFlightFences[i]) != VK_SUCCESS) {
                throw runtime_error("failed to create synchronization objects for a frame!");
             }
@@ -1684 +1693 @@
                }
                if (e.type == SDL_WINDOWEVENT) {
-                  if (e.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) {
-                     framebufferResized = true;
-                  } else if (e.window.event == SDL_WINDOWEVENT_MINIMIZED) {
+                  if (e.window.event == SDL_WINDOWEVENT_SIZE_CHANGED ||
+                      e.window.event == SDL_WINDOWEVENT_MINIMIZED) {
                      framebufferResized = true;
                   }