Changeset e3bef3a in opengl-game

Timestamp:

Nov 12, 2019, 6:55:07 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

cd487fb

Parents:

5a23277

Message:

Finish the rewrite of the original vulkangame project

Files:

• graphics-pipeline_vulkan.cpp (modified) (1 diff)
• graphics-pipeline_vulkan.hpp (modified) (5 diffs)
• vulkan-game.cpp (modified) (3 diffs)
• vulkan-game.hpp (modified) (1 diff)
• vulkan-ref.cpp (modified) (7 diffs)
• vulkan-utils.hpp (modified) (2 diffs)

graphics-pipeline_vulkan.cpp

@@ -4 +4 @@
 #include <stdexcept>
 #include <iostream>
-
-#include "vulkan-utils.hpp"
 
 using namespace std;

graphics-pipeline_vulkan.hpp

@@ -4 +4 @@
 #include "graphics-pipeline.hpp"
 
+#include <iostream>
 #include <vector>
 
 #include <vulkan/vulkan.h>
+
+#include "vulkan-utils.hpp"
+
+using namespace std;
+
+// TODO: Remove any instances of cout and instead throw exceptions
 
 // TODO: Maybe change the name of this struct so I can call the list something other than descriptorInfoList
@@ -26 +33 @@
       void updateRenderPass(VkRenderPass renderPass);
 
-      template<class VertexType, class IndexType>
-      void bindData(const vector<VertexType>& vertices, const vector<IndexType>& indices,
+      template<class VertexType>
+      void bindData(const vector<VertexType>& vertices, const vector<uint16_t>& indices,
          VkCommandPool commandPool, VkQueue graphicsQueue);
 
@@ -48 +55 @@
 
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage);
+
+      template<class VertexType>
+      bool addObject(const vector<VertexType>& vertices, vector<uint16_t>& indices, VkCommandPool commandPool,
+         VkQueue graphicsQueue);
 
       void cleanup();
@@ -83 +94 @@
 };
 
-// TODO: Probably better to template the whole class and to also combine this function
-// and the constructor since I call this right after the constructor anyway
-template<class VertexType, class IndexType>
-void GraphicsPipeline_Vulkan::bindData(const vector<VertexType>& vertices, const vector<IndexType>& indices,
+// TODO: Probably better to template the whole class
+// TODO: Change the index type to uint32_t and check the Vulkan Tutorial loading model section as a reference
+
+// TODO: combine this function and the constructor since I call this right after the constructor anyway
+template<class VertexType>
+void GraphicsPipeline_Vulkan::bindData(const vector<VertexType>& vertices, const vector<uint16_t>& indices,
       VkCommandPool commandPool, VkQueue graphicsQueue) {
    numVertices = vertices.size();
@@ -94 +107 @@
    numIndices = indices.size();
    indexCapacity = numIndices * 2;
-   createIndexBuffer(indices.data(), sizeof(IndexType), commandPool, graphicsQueue);
+   createIndexBuffer(indices.data(), sizeof(uint16_t), commandPool, graphicsQueue);
+}
+
+template<class VertexType>
+bool GraphicsPipeline_Vulkan::addObject(const vector<VertexType>& vertices, vector<uint16_t>& indices,
+      VkCommandPool commandPool, VkQueue graphicsQueue) {
+   cout << "Adding object to pipeline..." << endl;
+
+   if (numVertices + vertices.size() > vertexCapacity) {
+      cout << "ERROR: Need to resize vertex buffers" << endl;
+   } else if (numIndices + indices.size() > indexCapacity) {
+      cout << "ERROR: Need to resize index buffers" << endl;
+   } else {
+      cout << "Added object to scene" << endl;
+
+      for (uint16_t& idx : indices) {
+         idx += numVertices;
+      }
+
+      VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, vertices, vertexBuffer, numVertices,
+         graphicsQueue);
+      numVertices += vertices.size();
+
+      VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, indices, indexBuffer, numIndices,
+         graphicsQueue);
+      numIndices += indices.size();
+
+      return true;
+   }
+
+   return false;
 }
 

vulkan-game.cpp

@@ -254 +254 @@
 
    cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl;
+
+   numPlanes = 2;
 
    createCommandBuffers();
@@ -281 +283 @@
                framebufferResized = true;
                break;
-            case UI_EVENT_KEY:
+            case UI_EVENT_KEYDOWN:
                if (e.key.keycode == SDL_SCANCODE_ESCAPE) {
                   quit = true;
+               } else if (e.key.keycode == SDL_SCANCODE_SPACE) {
+                  cout << "Adding a plane" << endl;
+                  float zOffset = -0.5f + (0.5f * numPlanes);
+                  vector<Vertex> vertices = {
+                     {{-0.5f, -0.5f,  zOffset}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+                     {{ 0.5f, -0.5f,  zOffset}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+                     {{ 0.5f,  0.5f,  zOffset}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+                     {{-0.5f,  0.5f,  zOffset}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+                  };
+                  vector<uint16_t> indices = {
+                     0, 1, 2, 2, 3, 0
+                  };
+
+                  if (graphicsPipelines[0].addObject(vertices, indices, commandPool, graphicsQueue)) {
+                     vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
+                     createCommandBuffers();
+
+                     numPlanes++;
+                  }
                } else {
                   cout << "Key event detected" << endl;
@@ -943 +964 @@
 }
 
+// TODO: Fix the crash that happens when alt-tabbing
 void VulkanGame::recreateSwapChain() {
    cout << "Recreating swap chain" << endl;

vulkan-game.hpp

@@ -97 +97 @@
 
       size_t currentFrame;
+      size_t numPlanes = 0; // temp
 
       bool framebufferResized;

vulkan-ref.cpp

@@ -27 +27 @@
 using namespace glm;
 
-/*** START OF REFACTORED CODE ***/
 const int SCREEN_WIDTH = 800;
 const int SCREEN_HEIGHT = 600;
@@ -217 +216 @@
 
       size_t currentFrame = 0;
-/*** END OF REFACTORED CODE ***/
-
       size_t numPlanes = 0; // temp
 
-/*** START OF REFACTORED CODE ***/
       bool framebufferResized = false;
 
@@ -1465 +1461 @@
          vkBindBufferMemory(device, buffer, bufferMemory, 0);
       }
-/*** END OF REFACTORED CODE ***/
 
       void copyDataToBuffer(const void* srcData, VkBuffer dst, VkDeviceSize dstOffset, VkDeviceSize dataSize) {
@@ -1485 +1480 @@
       }
 
-/*** START OF REFACTORED CODE ***/
       void copyBuffer(VkBuffer srcBuffer, VkBuffer dstBuffer, VkDeviceSize srcOffset, VkDeviceSize dstOffset,
             VkDeviceSize size) {
@@ -1689 +1683 @@
          }
       }
-/*** END OF REFACTORED CODE ***/
 
       bool addObjectToScene(GraphicsPipelineInfo& info,
@@ -1722 +1715 @@
       }
 
-/*** START OF REFACTORED CODE ***/
       void mainLoop() {
          // TODO: Create some generic event-handling functions in game-gui-*
@@ -2075 +2067 @@
    return EXIT_SUCCESS;
 }
-/*** END OF REFACTORED CODE ***/

vulkan-utils.hpp

@@ -87 +87 @@
             uint32_t width, uint32_t height, VkQueue graphicsQueue);
 
+      template<class DataType>
+      static void copyDataToBuffer(VkDevice device, VkPhysicalDevice physicalDevice, VkCommandPool commandPool,
+            const vector<DataType>& srcData, VkBuffer dstBuffer, size_t dstVertexOffset, VkQueue graphicsQueue);
+
       static void copyBuffer(VkDevice device, VkCommandPool commandPool, VkBuffer srcBuffer, VkBuffer dstBuffer,
             VkDeviceSize srcOffset, VkDeviceSize dstOffset, VkDeviceSize size, VkQueue graphicsQueue);
@@ -95 +99 @@
 };
 
+template<class DataType>
+void VulkanUtils::copyDataToBuffer(VkDevice device, VkPhysicalDevice physicalDevice, VkCommandPool commandPool,
+      const vector<DataType>& srcData, VkBuffer dstBuffer, size_t dstVertexOffset, VkQueue graphicsQueue) {
+   VkDeviceSize srcDataSize = srcData.size() * sizeof(DataType);
+
+   VkBuffer stagingBuffer;
+   VkDeviceMemory stagingBufferMemory;
+   createBuffer(device, physicalDevice, srcDataSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
+      VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+      stagingBuffer, stagingBufferMemory);
+
+   void* data;
+   vkMapMemory(device, stagingBufferMemory, 0, srcDataSize, 0, &data);
+   memcpy(data, srcData.data(), (size_t)srcDataSize);
+   vkUnmapMemory(device, stagingBufferMemory);
+
+   copyBuffer(device, commandPool, stagingBuffer, dstBuffer, 0, dstVertexOffset * sizeof(DataType), srcDataSize,
+      graphicsQueue);
+
+   vkDestroyBuffer(device, stagingBuffer, nullptr);
+   vkFreeMemory(device, stagingBufferMemory, nullptr);
+}
+
 #endif // _VULKAN_UTILS_H