Changeset 0ae182f in opengl-game

Timestamp:

Nov 11, 2019, 2:19:32 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

5a23277

Parents:

1f25a71

Message:

In vulkangame, finish implementing recreateSwapChain()

Files:

• VulkanGame.vcxproj (modified) (2 diffs)
• graphics-pipeline_vulkan.cpp (modified) (1 diff)
• graphics-pipeline_vulkan.hpp (modified) (1 diff)
• vulkan-game.cpp (modified) (3 diffs)
• vulkan-ref.cpp (modified) (2 diffs)

VulkanGame.vcxproj

@@ -159 +159 @@
   </ItemGroup>
   <ItemGroup>
+    <None Include="assets\laser.xcf" />
     <None Include="shaders\overlay.frag" />
     <None Include="shaders\overlay.vert" />
@@ -164 +165 @@
     <None Include="shaders\scene.vert" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="assets\images\spaceship.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Font Include="assets\fonts\lazy.ttf" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

graphics-pipeline_vulkan.cpp

@@ -27 +27 @@
 
 GraphicsPipeline_Vulkan::~GraphicsPipeline_Vulkan() {
+}
+
+void GraphicsPipeline_Vulkan::updateRenderPass(VkRenderPass renderPass) {
+   this->renderPass = renderPass;
 }
 

graphics-pipeline_vulkan.hpp

@@ -23 +23 @@
          Viewport viewport, int vertexSize);
       ~GraphicsPipeline_Vulkan();
+
+      void updateRenderPass(VkRenderPass renderPass);
 
       template<class VertexType, class IndexType>

vulkan-game.cpp

@@ -74 +74 @@
 }
 
-// TODO: Make some more initi functions, or call this initUI if the
+// TODO: Make some more init functions, or call this initUI if the
 // amount of things initialized here keeps growing
 bool VulkanGame::initWindow(int width, int height, unsigned char guiFlags) {
@@ -252 +252 @@
    graphicsPipelines.back().createDescriptorPool(swapChainImages);
    graphicsPipelines.back().createDescriptorSets(swapChainImages);
-
-   // TODO: Creating the descriptor pool and descriptor sets might need to be redone when the
-   // swap chain is recreated
 
    cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl;
@@ -958 +955 @@
    vkDeviceWaitIdle(device);
 
-   //cleanupSwapChain();
+   cleanupSwapChain();
+
+   createSwapChain();
+   createImageViews();
+   createRenderPass();
+
+   VulkanUtils::createDepthImage(device, physicalDevice, commandPool, findDepthFormat(), swapChainExtent,
+      depthImage, graphicsQueue);
+   createFramebuffers();
+   createUniformBuffers();
+
+   graphicsPipelines[0].updateRenderPass(renderPass);
+   graphicsPipelines[0].createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv");
+   graphicsPipelines[0].createDescriptorPool(swapChainImages);
+   graphicsPipelines[0].createDescriptorSets(swapChainImages);
+
+   graphicsPipelines[1].updateRenderPass(renderPass);
+   graphicsPipelines[1].createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv");
+   graphicsPipelines[1].createDescriptorPool(swapChainImages);
+   graphicsPipelines[1].createDescriptorSets(swapChainImages);
+
+   createCommandBuffers();
 }
 

vulkan-ref.cpp

@@ -1894 +1894 @@
 
          vkDeviceWaitIdle(device);
-/*** END OF REFACTORED CODE ***/
 
          cleanupSwapChain();
@@ -1901 +1900 @@
          createImageViews();
          createRenderPass();
-
          createBufferResources();
-/*** START OF REFACTORED CODE ***/
       }