Changeset cae7a2c in opengl-game

Timestamp:

Jul 24, 2019, 2:59:33 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

de32fda

Parents:

d9ef6ab

Message:

Use an index buffer to avoid having duplicate points in the vertex buffer

File:

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

vulkan-game.cpp

@@ +1 @@
+/*
+DESIGN GUIDE
+
+I should store multiple buffers (e.g. vertex and index buffers) in the same VkBuffer and use offsets into it
+*/
+
 #include "game-gui-glfw.hpp"
 
@@ -85 +91 @@
 
 const vector<Vertex> vertices = {
-   {{ 0.0f, -0.5f}, {1.0f, 1.0f, 1.0f}},
-   {{ 0.5f,  0.5f}, {0.0f, 1.0f, 0.0f}},
-   {{-0.5f,  0.5f}, {0.0f, 0.0f, 1.0f}}
+   {{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}},
+   {{ 0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}},
+   {{ 0.5f,  0.5f}, {0.0f, 0.0f, 1.0f}},
+   {{-0.5f,  0.5f}, {1.0f, 1.0f, 1.0f}}
+};
+
+const vector<uint16_t> indices = {
+   0, 1, 2, 2, 3, 0 
 };
 
@@ -153 +164 @@
       VkBuffer vertexBuffer;
       VkDeviceMemory vertexBufferMemory;
+      VkBuffer indexBuffer;
+      VkDeviceMemory indexBufferMemory;
 
       vector<VkFramebuffer> swapChainFramebuffers;
@@ -194 +207 @@
          createCommandPool();
          createVertexBuffer();
+         createIndexBuffer();
          createCommandBuffers();
          createSyncObjects();
@@ -879 +893 @@
       }
 
+      void createIndexBuffer() {
+         VkDeviceSize bufferSize = sizeof(indices[0]) * indices.size();
+
+         VkBuffer stagingBuffer;
+         VkDeviceMemory stagingBufferMemory;
+         createBuffer(bufferSize, 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, bufferSize, 0, &data);
+         memcpy(data, indices.data(), (size_t)bufferSize);
+         vkUnmapMemory(device, stagingBufferMemory);
+
+         createBuffer(bufferSize, VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
+            VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, indexBuffer, indexBufferMemory);
+
+         copyBuffer(stagingBuffer, indexBuffer, bufferSize);
+
+         vkDestroyBuffer(device, stagingBuffer, nullptr);
+         vkFreeMemory(device, stagingBufferMemory, nullptr);
+      }
+
       void createBuffer(VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags properties,
             VkBuffer& buffer, VkDeviceMemory& bufferMemory) {
@@ -996 +1033 @@
             vkCmdBindVertexBuffers(commandBuffers[i], 0, 1, vertexBuffers, offsets);
 
-            vkCmdDraw(commandBuffers[i], static_cast<uint32_t>(vertices.size()), 1, 0, 0);
+            vkCmdBindIndexBuffer(commandBuffers[i], indexBuffer, 0, VK_INDEX_TYPE_UINT16);
+
+            vkCmdDrawIndexed(commandBuffers[i], static_cast<uint32_t>(indices.size()), 1, 0, 0, 0);
             vkCmdEndRenderPass(commandBuffers[i]);
 
@@ -1124 +1163 @@
          cleanupSwapChain();
 
+         vkDestroyBuffer(device, indexBuffer, nullptr);
+         vkFreeMemory(device, indexBufferMemory, nullptr);
+
          vkDestroyBuffer(device, vertexBuffer, nullptr);
          vkFreeMemory(device, vertexBufferMemory, nullptr);