Changeset 87c8f1a in opengl-game for vulkan-game.cpp

Timestamp:

Nov 1, 2019, 5:11:45 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

d2d9286

Parents:

34bdf3a

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (11/01/19 17:09:16)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (11/01/19 17:11:45)

Message:

In vaulkangame, define vertex buffer and index buffer data and transfer it to the gpu

File:

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

vulkan-game.cpp

@@ -21 +21 @@
    gui = nullptr;
    window = nullptr;
+
+   currentFrame = 0;
+   framebufferResized = false;
 }
 
@@ -138 +141 @@
    createUniformBuffers();
 
-   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, renderPass,
+   vector<Vertex> sceneVertices = {
+      {{-0.5f, -0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+      {{ 0.5f, -0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+      {{ 0.5f,  0.5f, -0.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+      {{-0.5f,  0.5f, -0.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
+
+      {{-0.5f, -0.5f,  0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+      {{ 0.5f, -0.5f,  0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+      {{ 0.5f,  0.5f,  0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+      {{-0.5f,  0.5f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+   };
+   vector<uint16_t> sceneIndices = {
+      0, 1, 2, 2, 3, 0,
+      4, 5, 6, 6, 7, 4
+   };
+
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(physicalDevice, device, renderPass,
       { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(Vertex)));
+
+   graphicsPipelines.back().bindData(sceneVertices, sceneIndices, commandPool, graphicsQueue);
 
    graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&Vertex::pos));
@@ -155 +176 @@
    graphicsPipelines.back().createDescriptorSets(swapChainImages);
 
-   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, renderPass,
+   vector<OverlayVertex> overlayVertices = {
+      {{-1.0f,  1.0f,  0.0f}, {0.0f, 1.0f}},
+      {{ 1.0f,  1.0f,  0.0f}, {1.0f, 1.0f}},
+      {{ 1.0f, -1.0f,  0.0f}, {1.0f, 0.0f}},
+      {{-1.0f, -1.0f,  0.0f}, {0.0f, 0.0f}}
+   };
+   vector<uint16_t> overlayIndices = {
+      0, 1, 2, 2, 3, 0
+   };
+
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(physicalDevice, device, renderPass,
       { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(OverlayVertex)));
+
+   graphicsPipelines.back().bindData(overlayVertices, overlayIndices, commandPool, graphicsQueue);
 
    graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&OverlayVertex::pos));
@@ -238 +271 @@
 
 void VulkanGame::renderScene() {
+   vkWaitForFences(device, 1, &inFlightFences[currentFrame], VK_TRUE, numeric_limits<uint64_t>::max());
+
+   uint32_t imageIndex;
+
+   currentFrame = (currentFrame + 1) % MAX_FRAMES_IN_FLIGHT;
+   currentFrame = (currentFrame + 1) % MAX_FRAMES_IN_FLIGHT;
 }