Changeset 771b33a in opengl-game for vulkan-game.cpp

Timestamp:

Oct 4, 2019, 8:39:46 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

b794178

Parents:

0b1b52d

Message:

In openglgame, port over some more of the pipeline creation code and the functionality to specify and initialize varying attributes

File:

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

vulkan-game.cpp

@@ -8 +8 @@
 #include "logger.hpp"
 
+#include "utils.hpp"
 #include "vulkan-utils.hpp"
 
@@ -106 +107 @@
    createCommandPool();
 
-   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device));
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, viewport, sizeof(Vertex)));
+
+   graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&Vertex::pos));
+   graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&Vertex::color));
+   graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32_SFLOAT, offset_of(&Vertex::texCoord));
+
    graphicsPipelines.back().createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv");
 
-   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device));
+   graphicsPipelines.push_back(GraphicsPipeline_Vulkan(device, viewport, sizeof(OverlayVertex)));
+
+   graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&OverlayVertex::pos));
+   graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32_SFLOAT, offset_of(&OverlayVertex::texCoord));
+
    graphicsPipelines.back().createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv");
 
@@ -427 +437 @@
 
    swapChainImageFormat = surfaceFormat.format;
-   swapChainExtent = extent;
+   viewport = { 0, 0, (int)extent.width, (int)extent.height };
 }