Index: graphics-pipeline_vulkan.hpp =================================================================== --- graphics-pipeline_vulkan.hpp (revision 5a1ace07fab99988e1cc16659663dd54921b15f4) +++ graphics-pipeline_vulkan.hpp (revision 2d8729794fc0b2af68f5b1a9b152e2e96258b598) @@ -31,5 +31,5 @@ }; -template +template class GraphicsPipeline_Vulkan : public GraphicsPipeline { public: @@ -99,11 +99,12 @@ /*** PUBLIC METHODS ***/ -template -GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan() { +template +GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan() { } // TODO: Verify that vertex capacity and index capacity are both > 0 -template -GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan(VkPhysicalDevice physicalDevice, VkDevice device, +template +GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan( + VkPhysicalDevice physicalDevice, VkDevice device, VkRenderPass renderPass, Viewport viewport, size_t vertexCapacity, size_t indexCapacity) { this->physicalDevice = physicalDevice; @@ -134,20 +135,20 @@ } -template -GraphicsPipeline_Vulkan::~GraphicsPipeline_Vulkan() { -} - -template -size_t GraphicsPipeline_Vulkan::getNumVertices() { +template +GraphicsPipeline_Vulkan::~GraphicsPipeline_Vulkan() { +} + +template +size_t GraphicsPipeline_Vulkan::getNumVertices() { return numVertices; } -template -void GraphicsPipeline_Vulkan::updateRenderPass(VkRenderPass renderPass) { +template +void GraphicsPipeline_Vulkan::updateRenderPass(VkRenderPass renderPass) { this->renderPass = renderPass; } -template -void GraphicsPipeline_Vulkan::addAttribute(VkFormat format, size_t offset) { +template +void GraphicsPipeline_Vulkan::addAttribute(VkFormat format, size_t offset) { VkVertexInputAttributeDescription attributeDesc = {}; @@ -160,16 +161,16 @@ } -template -void GraphicsPipeline_Vulkan::addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, vector* bufferData) { +template +void GraphicsPipeline_Vulkan::addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, vector* bufferData) { this->descriptorInfoList.push_back({ type, stageFlags, bufferData, nullptr }); } -template -void GraphicsPipeline_Vulkan::addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, VkDescriptorImageInfo* imageData) { +template +void GraphicsPipeline_Vulkan::addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, VkDescriptorImageInfo* imageData) { this->descriptorInfoList.push_back({ type, stageFlags, nullptr, imageData }); } -template -void GraphicsPipeline_Vulkan::createPipeline(string vertShaderFile, string fragShaderFile) { +template +void GraphicsPipeline_Vulkan::createPipeline(string vertShaderFile, string fragShaderFile) { vector vertShaderCode = readFile(vertShaderFile); vector fragShaderCode = readFile(fragShaderFile); @@ -308,6 +309,6 @@ } -template -void GraphicsPipeline_Vulkan::createDescriptorSetLayout() { +template +void GraphicsPipeline_Vulkan::createDescriptorSetLayout() { vector bindings(this->descriptorInfoList.size()); @@ -330,6 +331,6 @@ } -template -void GraphicsPipeline_Vulkan::createDescriptorPool(vector& swapChainImages) { +template +void GraphicsPipeline_Vulkan::createDescriptorPool(vector& swapChainImages) { vector poolSizes(this->descriptorInfoList.size()); @@ -350,6 +351,6 @@ } -template -void GraphicsPipeline_Vulkan::createDescriptorSets(vector& swapChainImages) { +template +void GraphicsPipeline_Vulkan::createDescriptorSets(vector& swapChainImages) { vector layouts(swapChainImages.size(), this->descriptorSetLayout); @@ -396,6 +397,6 @@ } -template -void GraphicsPipeline_Vulkan::createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage) { +template +void GraphicsPipeline_Vulkan::createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage) { vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, @@ -411,6 +412,6 @@ } -template -void GraphicsPipeline_Vulkan::addVertices(const vector& vertices, vector indices, +template +void GraphicsPipeline_Vulkan::addVertices(const vector& vertices, vector indices, VkCommandPool commandPool, VkQueue graphicsQueue) { @@ -431,6 +432,6 @@ } -template -void GraphicsPipeline_Vulkan::cleanup() { +template +void GraphicsPipeline_Vulkan::cleanup() { vkDestroyPipeline(device, pipeline, nullptr); vkDestroyDescriptorPool(device, descriptorPool, nullptr); @@ -438,6 +439,6 @@ } -template -void GraphicsPipeline_Vulkan::cleanupBuffers() { +template +void GraphicsPipeline_Vulkan::cleanupBuffers() { vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); @@ -450,6 +451,6 @@ /*** PRIVATE METHODS ***/ -template -VkShaderModule GraphicsPipeline_Vulkan::createShaderModule(const vector& code) { +template +VkShaderModule GraphicsPipeline_Vulkan::createShaderModule(const vector& code) { VkShaderModuleCreateInfo createInfo = {}; createInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO; @@ -465,6 +466,6 @@ } -template -vector GraphicsPipeline_Vulkan::readFile(const string& filename) { +template +vector GraphicsPipeline_Vulkan::readFile(const string& filename) { ifstream file(filename, ios::ate | ios::binary); @@ -484,6 +485,6 @@ } -template -void GraphicsPipeline_Vulkan::resizeVertexBuffer(VkCommandPool commandPool, VkQueue graphicsQueue) { +template +void GraphicsPipeline_Vulkan::resizeVertexBuffer(VkCommandPool commandPool, VkQueue graphicsQueue) { VkBuffer newVertexBuffer; VkDeviceMemory newVertexBufferMemory; @@ -503,6 +504,6 @@ } -template -void GraphicsPipeline_Vulkan::resizeIndexBuffer(VkCommandPool commandPool, VkQueue graphicsQueue) { +template +void GraphicsPipeline_Vulkan::resizeIndexBuffer(VkCommandPool commandPool, VkQueue graphicsQueue) { VkBuffer newIndexBuffer; VkDeviceMemory newIndexBufferMemory; Index: vulkan-game.cpp =================================================================== --- vulkan-game.cpp (revision 5a1ace07fab99988e1cc16659663dd54921b15f4) +++ vulkan-game.cpp (revision 2d8729794fc0b2af68f5b1a9b152e2e96258b598) @@ -202,5 +202,5 @@ uniformBuffers_scenePipeline, uniformBuffersMemory_scenePipeline, uniformBufferInfoList_scenePipeline); // TODO: Calculate the size of this buffer (and all the other SSBOs) based on the number of objects - createBufferSet(10 * sizeof(SBO_SceneObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, + createBufferSet(10 * sizeof(SSBO_ModelObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, storageBuffers_scenePipeline, storageBuffersMemory_scenePipeline, storageBufferInfoList_scenePipeline); @@ -221,4 +221,6 @@ }), { 0, 1, 2, 2, 3, 0 + }, { + mat4(1.0f) }); @@ -231,4 +233,6 @@ }), { 0, 1, 2, 2, 3, 0 + }, { + mat4(1.0f) }); @@ -252,5 +256,5 @@ }, { 0, 1, 2, 2, 3, 0 - }); + }, {}); overlayPipeline.createDescriptorSetLayout(); @@ -266,5 +270,5 @@ createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, uniformBuffers_shipPipeline, uniformBuffersMemory_shipPipeline, uniformBufferInfoList_shipPipeline); - createBufferSet(10 * sizeof(SBO_SceneObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, + createBufferSet(10 * sizeof(SSBO_ModelObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, storageBuffers_shipPipeline, storageBuffersMemory_shipPipeline, storageBufferInfoList_shipPipeline); @@ -506,4 +510,6 @@ 132, 133, 134, 135, 136, 137, + }, { + mat4(1.0f) }); @@ -520,5 +526,5 @@ createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, uniformBuffers_asteroidPipeline, uniformBuffersMemory_asteroidPipeline, uniformBufferInfoList_asteroidPipeline); - createBufferSet(10 * sizeof(SBO_Asteroid), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, + createBufferSet(10 * sizeof(SSBO_Asteroid), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, storageBuffers_asteroidPipeline, storageBuffersMemory_asteroidPipeline, storageBufferInfoList_asteroidPipeline); @@ -587,4 +593,8 @@ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + }, { + mat4(1.0f), + 10.0f, + 0 }); @@ -620,14 +630,14 @@ void VulkanGame::initGraphicsPipelines() { - modelPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, + overlayPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, + { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 4, 6); + + modelPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 16, 24); - overlayPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, - { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 4, 6); - - shipPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, + shipPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 138, 138); - asteroidPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, + asteroidPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 24, 36); } @@ -707,4 +717,6 @@ }), { 0, 1, 2, 2, 3, 0 + }, { + mat4(1.0f) }); @@ -1449,5 +1461,5 @@ createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, uniformBuffers_scenePipeline, uniformBuffersMemory_scenePipeline, uniformBufferInfoList_scenePipeline); - createBufferSet(10 * sizeof(SBO_SceneObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, + createBufferSet(10 * sizeof(SSBO_ModelObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, storageBuffers_scenePipeline, storageBuffersMemory_scenePipeline, storageBufferInfoList_scenePipeline); @@ -1464,5 +1476,5 @@ createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, uniformBuffers_shipPipeline, uniformBuffersMemory_shipPipeline, uniformBufferInfoList_shipPipeline); - createBufferSet(10 * sizeof(SBO_SceneObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, + createBufferSet(10 * sizeof(SSBO_ModelObject), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, storageBuffers_shipPipeline, storageBuffersMemory_shipPipeline, storageBufferInfoList_shipPipeline); @@ -1474,5 +1486,5 @@ createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, uniformBuffers_asteroidPipeline, uniformBuffersMemory_asteroidPipeline, uniformBufferInfoList_asteroidPipeline); - createBufferSet(10 * sizeof(SBO_Asteroid), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, + createBufferSet(10 * sizeof(SSBO_Asteroid), VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, storageBuffers_asteroidPipeline, storageBuffersMemory_asteroidPipeline, storageBufferInfoList_asteroidPipeline); Index: vulkan-game.hpp =================================================================== --- vulkan-game.hpp (revision 5a1ace07fab99988e1cc16659663dd54921b15f4) +++ vulkan-game.hpp (revision 2d8729794fc0b2af68f5b1a9b152e2e96258b598) @@ -50,8 +50,9 @@ // TODO: Change the index type to uint32_t and check the Vulkan Tutorial loading model section as a reference // TODO: Create a typedef for index type so I can easily change uin16_t to something else later -template +template struct SceneObject { vector vertices; vector indices; + SSBOType ssbo; mat4 model_base; @@ -64,9 +65,9 @@ }; -struct SBO_SceneObject { +struct SSBO_ModelObject { alignas(16) mat4 model; }; -struct SBO_Asteroid { +struct SSBO_Asteroid { alignas(16) mat4 model; alignas(4) float hp; @@ -146,13 +147,13 @@ // TODO: Create a struct that holds the buffers, memory, and info objects (Probably in VulkanUtils) - GraphicsPipeline_Vulkan overlayPipeline; - - vector> overlayObjects; + GraphicsPipeline_Vulkan overlayPipeline; + + vector> overlayObjects; // TODO: Rename all the variables related to modelPipeline to use the same pipelie name - GraphicsPipeline_Vulkan modelPipeline; - - vector> modelObjects; + GraphicsPipeline_Vulkan modelPipeline; + + vector> modelObjects; vector uniformBuffers_scenePipeline; @@ -165,9 +166,9 @@ UBO_VP_mats object_VP_mats; - SBO_SceneObject so_Object; - - GraphicsPipeline_Vulkan shipPipeline; - - vector> shipObjects; + SSBO_ModelObject so_Object; + + GraphicsPipeline_Vulkan shipPipeline; + + vector> shipObjects; vector uniformBuffers_shipPipeline; @@ -180,9 +181,9 @@ UBO_VP_mats ship_VP_mats; - SBO_SceneObject so_Ship; - - GraphicsPipeline_Vulkan asteroidPipeline; - - vector> asteroidObjects; + SSBO_ModelObject so_Ship; + + GraphicsPipeline_Vulkan asteroidPipeline; + + vector> asteroidObjects; vector uniformBuffers_asteroidPipeline; @@ -195,5 +196,5 @@ UBO_VP_mats asteroid_VP_mats; - SBO_Asteroid so_Asteroid; + SSBO_Asteroid so_Asteroid; Uint64 curTime, prevTime; @@ -231,7 +232,8 @@ void createSyncObjects(); - template - void addObject(vector>& objects, GraphicsPipeline_Vulkan& pipeline, - const vector& vertices, vector indices); + template + void addObject(vector>& objects, + GraphicsPipeline_Vulkan& pipeline, + const vector& vertices, vector indices, SSBOType ssbo); template @@ -244,6 +246,6 @@ vector centerObject(vector vertices); - template - void transformObject(SceneObject& obj, mat4 mat); + template + void transformObject(SceneObject& obj, mat4 mat); void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags, @@ -261,7 +263,8 @@ }; -template -void VulkanGame::addObject(vector>& objects, GraphicsPipeline_Vulkan& pipeline, - const vector& vertices, vector indices) { +template +void VulkanGame::addObject(vector>& objects, + GraphicsPipeline_Vulkan& pipeline, + const vector& vertices, vector indices, SSBOType ssbo) { size_t numVertices = pipeline.getNumVertices(); @@ -270,5 +273,5 @@ } - objects.push_back({ vertices, indices, mat4(1.0f), mat4(1.0f) }); + objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f) }); pipeline.addVertices(vertices, indices, commandPool, graphicsQueue); @@ -341,6 +344,6 @@ } -template -void VulkanGame::transformObject(SceneObject& obj, mat4 mat) { +template +void VulkanGame::transformObject(SceneObject& obj, mat4 mat) { obj.model_transform = mat * obj.model_transform; }