Changeset 7d2b0b9 in opengl-game

Timestamp:

Oct 3, 2019, 3:44:55 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

3de31cf

Parents:

4d84c72

Message:

Add and begin implementing a GraphicsPipeline class to hold info for the Vulkan graphics pipeline

Files:

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

VulkanGame.vcxproj

@@ -135 +135 @@
     <ClCompile Include="FileStackWalker.cpp" />
     <ClCompile Include="game-gui-sdl.cpp" />
+    <ClCompile Include="graphics-pipeline_vulkan.cpp" />
     <ClCompile Include="logger.cpp" />
     <ClCompile Include="main-vulkan.cpp" />
@@ -148 +149 @@
     <ClInclude Include="game-gui-sdl.hpp" />
     <ClInclude Include="game-gui.hpp" />
+    <ClInclude Include="graphics-pipeline.hpp" />
+    <ClInclude Include="graphics-pipeline_vulkan.hpp" />
     <ClInclude Include="logger.hpp" />
     <ClInclude Include="StackWalker.h" />

vulkan-game.cpp

@@ -105 +105 @@
    createRenderPass();
    createCommandPool();
+
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device));
+   graphicsPipelines.back().createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv");
+
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device));
+   graphicsPipelines.back().createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv");
+
+   cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl;
 }
 

vulkan-game.hpp

@@ -3 +3 @@
 
 #include "game-gui-sdl.hpp"
+#include "graphics-pipeline_vulkan.hpp"
 
 #ifdef NDEBUG
@@ -19 +20 @@
    private:
       GameGui* gui;
+
+      vector<GraphicsPipeline_Vulkan> graphicsPipelines;
 
       SDL_version sdlVersion;

vulkan-ref.cpp

@@ -863 +863 @@
 
       void createGraphicsPipeline(string vertShaderFile, string fragShaderFile, GraphicsPipelineInfo& info) {
-         auto vertShaderCode = readFile(vertShaderFile);
-         auto fragShaderCode = readFile(fragShaderFile);
+/*** START OF REFACTORED CODE ***/
+         vector<char> vertShaderCode = readFile(vertShaderFile);
+         vector<char> fragShaderCode = readFile(fragShaderFile);
 
          VkShaderModule vertShaderModule = createShaderModule(vertShaderCode);
@@ -885 +886 @@
          VkPipelineVertexInputStateCreateInfo vertexInputInfo = {};
          vertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
+/*** END OF REFACTORED CODE ***/
 
          vertexInputInfo.vertexBindingDescriptionCount = 1;
@@ -995 +997 @@
          }
 
+/*** START OF REFACTORED CODE ***/
          vkDestroyShaderModule(device, vertShaderModule, nullptr);
          vkDestroyShaderModule(device, fragShaderModule, nullptr);
+/*** END OF REFACTORED CODE ***/
       }