Changeset 5b02676 in opengl-game for vulkan-ref.cpp

Timestamp:

Oct 4, 2019, 8:10:09 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

83b5b4b

Parents:

ee75487

Message:

Make vulkangame and openglgame compile on OSX with the new GraphicsPipeline classes

File:

• vulkan-ref.cpp (modified) (9 diffs)

vulkan-ref.cpp

@@ -61 +61 @@
     vector<VkPresentModeKHR> presentModes;
 };
-/*** END OF REFACTORED CODE ***/
 
 struct Vertex {
@@ -73 +72 @@
    glm::vec2 texCoord;
 };
+/*** END OF REFACTORED CODE ***/
 
 struct UniformBufferObject {
@@ -174 +174 @@
       vector<VkImage> swapChainImages;
       VkFormat swapChainImageFormat;
-      VkExtent2D swapChainExtent;
+/*** END OF REFACTORED CODE ***/
+      VkExtent2D swapChainExtent; // (This was taken out of vulkan-game for now and replaced with Viewport)
+/*** START OF REFACTORED CODE ***/
       vector<VkImageView> swapChainImageViews;
 /*** END OF REFACTORED CODE ***/
@@ -369 +371 @@
             sceneIndices.data(), sizeof(uint16_t), sceneIndices.size());
 
+/*** START OF REFACTORED CODE ***/
          addAttributeDescription(scenePipeline, VK_FORMAT_R32G32B32_SFLOAT, offset_of(&Vertex::pos));
          addAttributeDescription(scenePipeline, VK_FORMAT_R32G32B32_SFLOAT, offset_of(&Vertex::color));
          addAttributeDescription(scenePipeline, VK_FORMAT_R32G32_SFLOAT, offset_of(&Vertex::texCoord));
+/*** END OF REFACTORED CODE ***/
 
          addDescriptorInfo(scenePipeline, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList, nullptr);
@@ -394 +398 @@
             overlayIndices.data(), sizeof(uint16_t), overlayIndices.size());
 
+/*** START OF REFACTORED CODE ***/
          addAttributeDescription(overlayPipeline, VK_FORMAT_R32G32B32_SFLOAT, offset_of(&OverlayVertex::pos));
          addAttributeDescription(overlayPipeline, VK_FORMAT_R32G32_SFLOAT, offset_of(&OverlayVertex::texCoord));
+/*** END OF REFACTORED CODE ***/
 
          addDescriptorInfo(overlayPipeline, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr, &overlayImageInfo);
@@ -809 +815 @@
             const void* vertexData, int vertexSize, size_t numVertices,
             const void* indexData, int indexSize, size_t numIndices) {
+/*** START OF REFACTORED CODE ***/
          // Since there is only one array of vertex data, we use binding = 0
          // I'll probably do that for the foreseeable future
@@ -816 +823 @@
          info.bindingDescription.stride = vertexSize;
          info.bindingDescription.inputRate = VK_VERTEX_INPUT_RATE_VERTEX;
+/*** END OF REFACTORED CODE ***/
 
          info.numVertices = numVertices;
@@ -886 +894 @@
          VkPipelineVertexInputStateCreateInfo vertexInputInfo = {};
          vertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO;
-/*** END OF REFACTORED CODE ***/
 
          vertexInputInfo.vertexBindingDescriptionCount = 1;
@@ -968 +975 @@
          pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
          pipelineLayoutInfo.setLayoutCount = 1;
+/*** END OF REFACTORED CODE ***/
          pipelineLayoutInfo.pSetLayouts = &info.descriptorSetLayout;
          pipelineLayoutInfo.pushConstantRangeCount = 0;