Changeset b794178 in opengl-game for graphics-pipeline_vulkan.hpp

Timestamp:

Oct 17, 2019, 9:30:18 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

e83b155

Parents:

771b33a

Message:

In vulkangame, add the ability to create vulkan resoirces and descriptor sets for shader uniforms (images and ubos)

File:

• graphics-pipeline_vulkan.hpp (modified) (1 diff)

graphics-pipeline_vulkan.hpp

@@ -8 +8 @@
 #include <vulkan/vulkan.h>
 
+// TODO: Maybe change the name of this struct so I can call the list something other than descriptorInfoList
+struct DescriptorInfo {
+   VkDescriptorType type;
+   VkShaderStageFlags stageFlags;
+
+   // Only one of the below properties should be set
+   vector<VkDescriptorBufferInfo>* bufferDataList;
+   VkDescriptorImageInfo* imageData;
+};
+
 class GraphicsPipeline_Vulkan : public GraphicsPipeline {
    public:
-      GraphicsPipeline_Vulkan(VkDevice device, Viewport viewport, int vertexSize);
+      GraphicsPipeline_Vulkan(VkDevice device, VkRenderPass renderPass, Viewport viewport, int vertexSize);
       ~GraphicsPipeline_Vulkan();
 
+      // Maybe I should rename these to addVertexAttribute (addVaryingAttribute) and addUniformAttribute
+
       void addAttribute(VkFormat format, size_t offset);
+
+      void addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, vector<VkDescriptorBufferInfo>* bufferData);
+      void addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, VkDescriptorImageInfo* imageData);
+
       void createPipeline(string vertShaderFile, string fragShaderFile);
+      void createDescriptorSetLayout();
+      void createDescriptorPool(vector<VkImage>& swapChainImages);
+      void createDescriptorSets(vector<VkImage>& swapChainImages);
+
+      void cleanup();
+      void cleanupBuffers();
    
    private:
-      VkDevice device;
-      VkVertexInputBindingDescription bindingDescription;
-      vector<VkVertexInputAttributeDescription> attributeDescriptions;
-
       VkShaderModule createShaderModule(const vector<char>& code);
       vector<char> readFile(const string& filename);
+
+      VkDevice device;
+      VkRenderPass renderPass;
+
+      VkPipeline pipeline;
+      VkPipelineLayout pipelineLayout;
+
+      VkVertexInputBindingDescription bindingDescription;
+
+      vector<VkVertexInputAttributeDescription> attributeDescriptions;
+      vector<DescriptorInfo> descriptorInfoList;
+
+      VkDescriptorSetLayout descriptorSetLayout;
+      VkDescriptorPool descriptorPool;
+      vector<VkDescriptorSet> descriptorSets;
 };