Index: aphics-pipeline_vulkan.cpp =================================================================== --- graphics-pipeline_vulkan.cpp (revision cd487fb0c5641b29746b810d236ba7681bd75081) +++ (revision ) @@ -1,381 +1,0 @@ -#include "graphics-pipeline_vulkan.hpp" - -#include -#include - -using namespace std; - -GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan(VkPhysicalDevice physicalDevice, VkDevice device, - VkRenderPass renderPass, Viewport viewport, int vertexSize) { - this->physicalDevice = physicalDevice; - this->device = device; - this->renderPass = renderPass; - this->viewport = viewport; - - // Since there is only one array of vertex data, we use binding = 0 - // I'll probably do that for the foreseeable future - // I can calculate the stride myself given info about all the varying attributes - this->bindingDescription.binding = 0; - this->bindingDescription.stride = vertexSize; - this->bindingDescription.inputRate = VK_VERTEX_INPUT_RATE_VERTEX; -} - -GraphicsPipeline_Vulkan::~GraphicsPipeline_Vulkan() { -} - -void GraphicsPipeline_Vulkan::updateRenderPass(VkRenderPass renderPass) { - this->renderPass = renderPass; -} - -void GraphicsPipeline_Vulkan::createVertexBuffer(const void* bufferData, int vertexSize, - VkCommandPool commandPool, VkQueue graphicsQueue) { - VkDeviceSize bufferSize = numVertices * vertexSize; - VkDeviceSize bufferCapacity = vertexCapacity * vertexSize; - - VkBuffer stagingBuffer; - VkDeviceMemory stagingBufferMemory; - VulkanUtils::createBuffer(device, physicalDevice, bufferSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, - stagingBuffer, stagingBufferMemory); - - void* data; - vkMapMemory(device, stagingBufferMemory, 0, bufferSize, 0, &data); - memcpy(data, bufferData, (size_t) bufferSize); - vkUnmapMemory(device, stagingBufferMemory); - - VulkanUtils::createBuffer(device, physicalDevice, bufferCapacity, - VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, - VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vertexBuffer, vertexBufferMemory); - - VulkanUtils::copyBuffer(device, commandPool, stagingBuffer, vertexBuffer, 0, 0, bufferSize, graphicsQueue); - - vkDestroyBuffer(device, stagingBuffer, nullptr); - vkFreeMemory(device, stagingBufferMemory, nullptr); -} - -void GraphicsPipeline_Vulkan::createIndexBuffer(const void* bufferData, int indexSize, - VkCommandPool commandPool, VkQueue graphicsQueue) { - VkDeviceSize bufferSize = numIndices * indexSize; - VkDeviceSize bufferCapacity = indexCapacity * indexSize; - - VkBuffer stagingBuffer; - VkDeviceMemory stagingBufferMemory; - VulkanUtils::createBuffer(device, physicalDevice, bufferSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, - VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, - stagingBuffer, stagingBufferMemory); - - void* data; - vkMapMemory(device, stagingBufferMemory, 0, bufferSize, 0, &data); - memcpy(data, bufferData, (size_t) bufferSize); - vkUnmapMemory(device, stagingBufferMemory); - - VulkanUtils::createBuffer(device, physicalDevice, bufferCapacity, - VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT, - VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, indexBuffer, indexBufferMemory); - - VulkanUtils::copyBuffer(device, commandPool, stagingBuffer, indexBuffer, 0, 0, bufferSize, graphicsQueue); - - vkDestroyBuffer(device, stagingBuffer, nullptr); - vkFreeMemory(device, stagingBufferMemory, nullptr); -} - -void GraphicsPipeline_Vulkan::addAttribute(VkFormat format, size_t offset) { - VkVertexInputAttributeDescription attributeDesc = {}; - - attributeDesc.binding = 0; - attributeDesc.location = this->attributeDescriptions.size(); - attributeDesc.format = format; - attributeDesc.offset = offset; - - this->attributeDescriptions.push_back(attributeDesc); -} - -void GraphicsPipeline_Vulkan::addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, vector* bufferData) { - this->descriptorInfoList.push_back({ type, stageFlags, bufferData, nullptr }); -} - -void GraphicsPipeline_Vulkan::addDescriptorInfo(VkDescriptorType type, VkShaderStageFlags stageFlags, VkDescriptorImageInfo* imageData) { - this->descriptorInfoList.push_back({ type, stageFlags, nullptr, imageData }); -} - -void GraphicsPipeline_Vulkan::createPipeline(string vertShaderFile, string fragShaderFile) { - vector vertShaderCode = readFile(vertShaderFile); - vector fragShaderCode = readFile(fragShaderFile); - - VkShaderModule vertShaderModule = createShaderModule(vertShaderCode); - VkShaderModule fragShaderModule = createShaderModule(fragShaderCode); - - VkPipelineShaderStageCreateInfo vertShaderStageInfo = {}; - vertShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; - vertShaderStageInfo.stage = VK_SHADER_STAGE_VERTEX_BIT; - vertShaderStageInfo.module = vertShaderModule; - vertShaderStageInfo.pName = "main"; - - VkPipelineShaderStageCreateInfo fragShaderStageInfo = {}; - fragShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; - fragShaderStageInfo.stage = VK_SHADER_STAGE_FRAGMENT_BIT; - fragShaderStageInfo.module = fragShaderModule; - fragShaderStageInfo.pName = "main"; - - VkPipelineShaderStageCreateInfo shaderStages[] = { vertShaderStageInfo, fragShaderStageInfo }; - - VkPipelineVertexInputStateCreateInfo vertexInputInfo = {}; - vertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; - - vertexInputInfo.vertexBindingDescriptionCount = 1; - vertexInputInfo.vertexAttributeDescriptionCount = static_cast(this->attributeDescriptions.size()); - vertexInputInfo.pVertexBindingDescriptions = &this->bindingDescription; - vertexInputInfo.pVertexAttributeDescriptions = this->attributeDescriptions.data(); - - VkPipelineInputAssemblyStateCreateInfo inputAssembly = {}; - inputAssembly.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - inputAssembly.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; - inputAssembly.primitiveRestartEnable = VK_FALSE; - - VkViewport viewport = {}; - viewport.x = (float)this->viewport.x; - viewport.y = (float)this->viewport.y; - viewport.width = (float)this->viewport.width; - viewport.height = (float)this->viewport.height; - viewport.minDepth = 0.0f; - viewport.maxDepth = 1.0f; - - VkRect2D scissor = {}; - scissor.offset = { 0, 0 }; - scissor.extent = { (uint32_t)this->viewport.width, (uint32_t)this->viewport.height }; - - VkPipelineViewportStateCreateInfo viewportState = {}; - viewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; - viewportState.viewportCount = 1; - viewportState.pViewports = &viewport; - viewportState.scissorCount = 1; - viewportState.pScissors = &scissor; - - VkPipelineRasterizationStateCreateInfo rasterizer = {}; - rasterizer.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; - rasterizer.depthClampEnable = VK_FALSE; - rasterizer.rasterizerDiscardEnable = VK_FALSE; - rasterizer.polygonMode = VK_POLYGON_MODE_FILL; - rasterizer.lineWidth = 1.0f; - rasterizer.cullMode = VK_CULL_MODE_BACK_BIT; - rasterizer.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE; - rasterizer.depthBiasEnable = VK_FALSE; - - VkPipelineMultisampleStateCreateInfo multisampling = {}; - multisampling.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; - multisampling.sampleShadingEnable = VK_FALSE; - multisampling.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - - VkPipelineColorBlendAttachmentState colorBlendAttachment = {}; - colorBlendAttachment.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT; - colorBlendAttachment.blendEnable = VK_TRUE; - colorBlendAttachment.colorBlendOp = VK_BLEND_OP_ADD; - colorBlendAttachment.srcColorBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA; - colorBlendAttachment.dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; - colorBlendAttachment.alphaBlendOp = VK_BLEND_OP_ADD; - colorBlendAttachment.srcAlphaBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA; - colorBlendAttachment.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; - - VkPipelineColorBlendStateCreateInfo colorBlending = {}; - colorBlending.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; - colorBlending.logicOpEnable = VK_FALSE; - colorBlending.logicOp = VK_LOGIC_OP_COPY; - colorBlending.attachmentCount = 1; - colorBlending.pAttachments = &colorBlendAttachment; - colorBlending.blendConstants[0] = 0.0f; - colorBlending.blendConstants[1] = 0.0f; - colorBlending.blendConstants[2] = 0.0f; - colorBlending.blendConstants[3] = 0.0f; - - VkPipelineDepthStencilStateCreateInfo depthStencil = {}; - depthStencil.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; - depthStencil.depthTestEnable = VK_TRUE; - depthStencil.depthWriteEnable = VK_TRUE; - depthStencil.depthCompareOp = VK_COMPARE_OP_LESS; - depthStencil.depthBoundsTestEnable = VK_FALSE; - depthStencil.minDepthBounds = 0.0f; - depthStencil.maxDepthBounds = 1.0f; - depthStencil.stencilTestEnable = VK_FALSE; - depthStencil.front = {}; - depthStencil.back = {}; - - VkPipelineLayoutCreateInfo pipelineLayoutInfo = {}; - pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; - pipelineLayoutInfo.setLayoutCount = 1; - pipelineLayoutInfo.pSetLayouts = &this->descriptorSetLayout; - pipelineLayoutInfo.pushConstantRangeCount = 0; - - if (vkCreatePipelineLayout(this->device, &pipelineLayoutInfo, nullptr, &this->pipelineLayout) != VK_SUCCESS) { - throw runtime_error("failed to create pipeline layout!"); - } - - VkGraphicsPipelineCreateInfo pipelineInfo = {}; - pipelineInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; - pipelineInfo.stageCount = 2; - pipelineInfo.pStages = shaderStages; - pipelineInfo.pVertexInputState = &vertexInputInfo; - pipelineInfo.pInputAssemblyState = &inputAssembly; - pipelineInfo.pViewportState = &viewportState; - pipelineInfo.pRasterizationState = &rasterizer; - pipelineInfo.pMultisampleState = &multisampling; - pipelineInfo.pDepthStencilState = &depthStencil; - pipelineInfo.pColorBlendState = &colorBlending; - pipelineInfo.pDynamicState = nullptr; - pipelineInfo.layout = this->pipelineLayout; - pipelineInfo.renderPass = this->renderPass; - pipelineInfo.subpass = 0; - pipelineInfo.basePipelineHandle = VK_NULL_HANDLE; - pipelineInfo.basePipelineIndex = -1; - - if (vkCreateGraphicsPipelines(this->device, VK_NULL_HANDLE, 1, &pipelineInfo, nullptr, &this->pipeline) != VK_SUCCESS) { - throw runtime_error("failed to create graphics pipeline!"); - } - - vkDestroyShaderModule(this->device, vertShaderModule, nullptr); - vkDestroyShaderModule(this->device, fragShaderModule, nullptr); -} - -void GraphicsPipeline_Vulkan::createDescriptorSetLayout() { - vector bindings(this->descriptorInfoList.size()); - - for (size_t i = 0; i < bindings.size(); i++) { - bindings[i].binding = i; - bindings[i].descriptorCount = 1; - bindings[i].descriptorType = this->descriptorInfoList[i].type; - bindings[i].stageFlags = this->descriptorInfoList[i].stageFlags; - bindings[i].pImmutableSamplers = nullptr; - } - - VkDescriptorSetLayoutCreateInfo layoutInfo = {}; - layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; - layoutInfo.bindingCount = static_cast(bindings.size()); - layoutInfo.pBindings = bindings.data(); - - if (vkCreateDescriptorSetLayout(this->device, &layoutInfo, nullptr, &this->descriptorSetLayout) != VK_SUCCESS) { - throw runtime_error("failed to create descriptor set layout!"); - } -} - -void GraphicsPipeline_Vulkan::createDescriptorPool(vector& swapChainImages) { - vector poolSizes(this->descriptorInfoList.size()); - - for (size_t i = 0; i < poolSizes.size(); i++) { - poolSizes[i].type = this->descriptorInfoList[i].type; - poolSizes[i].descriptorCount = static_cast(swapChainImages.size()); - } - - VkDescriptorPoolCreateInfo poolInfo = {}; - poolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; - poolInfo.poolSizeCount = static_cast(poolSizes.size()); - poolInfo.pPoolSizes = poolSizes.data(); - poolInfo.maxSets = static_cast(swapChainImages.size()); - - if (vkCreateDescriptorPool(this->device, &poolInfo, nullptr, &this->descriptorPool) != VK_SUCCESS) { - throw runtime_error("failed to create descriptor pool!"); - } -} - -void GraphicsPipeline_Vulkan::createDescriptorSets(vector& swapChainImages) { - vector layouts(swapChainImages.size(), this->descriptorSetLayout); - - VkDescriptorSetAllocateInfo allocInfo = {}; - allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; - allocInfo.descriptorPool = this->descriptorPool; - allocInfo.descriptorSetCount = static_cast(swapChainImages.size()); - allocInfo.pSetLayouts = layouts.data(); - - this->descriptorSets.resize(swapChainImages.size()); - if (vkAllocateDescriptorSets(device, &allocInfo, this->descriptorSets.data()) != VK_SUCCESS) { - throw runtime_error("failed to allocate descriptor sets!"); - } - - for (size_t i = 0; i < swapChainImages.size(); i++) { - vector descriptorWrites(this->descriptorInfoList.size()); - - for (size_t j = 0; j < descriptorWrites.size(); j++) { - descriptorWrites[j].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; - descriptorWrites[j].dstSet = this->descriptorSets[i]; - descriptorWrites[j].dstBinding = j; - descriptorWrites[j].dstArrayElement = 0; - descriptorWrites[j].descriptorType = this->descriptorInfoList[j].type; - descriptorWrites[j].descriptorCount = 1; - descriptorWrites[j].pBufferInfo = nullptr; - descriptorWrites[j].pImageInfo = nullptr; - descriptorWrites[j].pTexelBufferView = nullptr; - - switch (descriptorWrites[j].descriptorType) { - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: - descriptorWrites[j].pBufferInfo = &(*this->descriptorInfoList[j].bufferDataList)[i]; - break; - case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: - descriptorWrites[j].pImageInfo = this->descriptorInfoList[j].imageData; - break; - default: - throw runtime_error("Unknown descriptor type: " + to_string(descriptorWrites[j].descriptorType)); - } - } - - vkUpdateDescriptorSets(this->device, static_cast(descriptorWrites.size()), descriptorWrites.data(), 0, nullptr); - } -} - -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, - &descriptorSets[currentImage], 0, nullptr); - - VkBuffer vertexBuffers[] = { vertexBuffer }; - VkDeviceSize offsets[] = { 0 }; - vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets); - - vkCmdBindIndexBuffer(commandBuffer, indexBuffer, 0, VK_INDEX_TYPE_UINT16); - - vkCmdDrawIndexed(commandBuffer, static_cast(numIndices), 1, 0, 0, 0); -} - -VkShaderModule GraphicsPipeline_Vulkan::createShaderModule(const vector& code) { - VkShaderModuleCreateInfo createInfo = {}; - createInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO; - createInfo.codeSize = code.size(); - createInfo.pCode = reinterpret_cast(code.data()); - - VkShaderModule shaderModule; - if (vkCreateShaderModule(this->device, &createInfo, nullptr, &shaderModule) != VK_SUCCESS) { - throw runtime_error("failed to create shader module!"); - } - - return shaderModule; -} - -vector GraphicsPipeline_Vulkan::readFile(const string& filename) { - ifstream file(filename, ios::ate | ios::binary); - - if (!file.is_open()) { - throw runtime_error("failed to open file!"); - } - - size_t fileSize = (size_t)file.tellg(); - vector buffer(fileSize); - - file.seekg(0); - file.read(buffer.data(), fileSize); - - file.close(); - - return buffer; -} - -void GraphicsPipeline_Vulkan::cleanup() { - vkDestroyPipeline(device, pipeline, nullptr); - vkDestroyDescriptorPool(device, descriptorPool, nullptr); - vkDestroyPipelineLayout(device, pipelineLayout, nullptr); -} - -void GraphicsPipeline_Vulkan::cleanupBuffers() { - vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); - - vkDestroyBuffer(device, vertexBuffer, nullptr); - vkFreeMemory(device, vertexBufferMemory, nullptr); - vkDestroyBuffer(device, indexBuffer, nullptr); - vkFreeMemory(device, indexBufferMemory, nullptr); -} Index: graphics-pipeline_vulkan.hpp =================================================================== --- graphics-pipeline_vulkan.hpp (revision cd487fb0c5641b29746b810d236ba7681bd75081) +++ graphics-pipeline_vulkan.hpp (revision b8777b71951e1e62f58596dcb0b1cab6239cd405) @@ -4,4 +4,5 @@ #include "graphics-pipeline.hpp" +#include #include #include @@ -23,6 +24,14 @@ }; +template +struct SceneObject { + vector vertices; + vector indices; // TODO: Create a typedef for index type so I can easily change uin16_t to something else later +}; + +template class GraphicsPipeline_Vulkan : public GraphicsPipeline { public: + GraphicsPipeline_Vulkan(); GraphicsPipeline_Vulkan(VkPhysicalDevice physicalDevice, VkDevice device, VkRenderPass renderPass, Viewport viewport, int vertexSize); @@ -31,5 +40,4 @@ void updateRenderPass(VkRenderPass renderPass); - template void bindData(const vector& vertices, const vector& indices, VkCommandPool commandPool, VkQueue graphicsQueue); @@ -54,5 +62,4 @@ void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage); - template bool addObject(const vector& vertices, vector& indices, VkCommandPool commandPool, VkQueue graphicsQueue); @@ -62,7 +69,4 @@ private: - VkShaderModule createShaderModule(const vector& code); - vector readFile(const string& filename); - VkPhysicalDevice physicalDevice; VkDevice device; @@ -90,5 +94,43 @@ VkBuffer indexBuffer; VkDeviceMemory indexBufferMemory; + + vector> objects; + + VkShaderModule createShaderModule(const vector& code); + vector readFile(const string& filename); + + void resizeDataBuffers(); }; + +/*** PUBLIC METHODS ***/ + +template +GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan() { +} + +template +GraphicsPipeline_Vulkan::GraphicsPipeline_Vulkan(VkPhysicalDevice physicalDevice, VkDevice device, + VkRenderPass renderPass, Viewport viewport, int vertexSize) { + this->physicalDevice = physicalDevice; + this->device = device; + this->renderPass = renderPass; + this->viewport = viewport; + + // Since there is only one array of vertex data, we use binding = 0 + // I'll probably do that for the foreseeable future + // I can calculate the stride myself given info about all the varying attributes + this->bindingDescription.binding = 0; + this->bindingDescription.stride = vertexSize; + this->bindingDescription.inputRate = VK_VERTEX_INPUT_RATE_VERTEX; +} + +template +GraphicsPipeline_Vulkan::~GraphicsPipeline_Vulkan() { +} + +template +void GraphicsPipeline_Vulkan::updateRenderPass(VkRenderPass renderPass) { + this->renderPass = renderPass; +} // TODO: Probably better to template the whole class @@ -96,6 +138,9 @@ // TODO: combine this function and the constructor since I call this right after the constructor anyway -template -void GraphicsPipeline_Vulkan::bindData(const vector& vertices, const vector& indices, +// TODO: Creating the initial buffers could occur in the constructor and instead of calling this function +// and passing in vertices and indices, addObject() could be called instead and this function could be +// removed +template +void GraphicsPipeline_Vulkan::bindData(const vector& vertices, const vector& indices, VkCommandPool commandPool, VkQueue graphicsQueue) { numVertices = vertices.size(); @@ -109,28 +154,416 @@ template -bool GraphicsPipeline_Vulkan::addObject(const vector& vertices, vector& indices, +void GraphicsPipeline_Vulkan::createVertexBuffer(const void* bufferData, int vertexSize, VkCommandPool commandPool, VkQueue graphicsQueue) { - - if (numVertices + vertices.size() > vertexCapacity) { - throw runtime_error("ERROR: Need to resize vertex buffers"); - } else if (numIndices + indices.size() > indexCapacity) { - throw runtime_error("ERROR: Need to resize index buffers"); - } else { - for (uint16_t& idx : indices) { - idx += numVertices; + VkDeviceSize bufferSize = numVertices * vertexSize; + VkDeviceSize bufferCapacity = vertexCapacity * vertexSize; + + VkBuffer stagingBuffer; + VkDeviceMemory stagingBufferMemory; + VulkanUtils::createBuffer(device, physicalDevice, bufferSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, + stagingBuffer, stagingBufferMemory); + + void* data; + vkMapMemory(device, stagingBufferMemory, 0, bufferSize, 0, &data); + memcpy(data, bufferData, (size_t) bufferSize); + vkUnmapMemory(device, stagingBufferMemory); + + VulkanUtils::createBuffer(device, physicalDevice, bufferCapacity, + VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vertexBuffer, vertexBufferMemory); + + VulkanUtils::copyBuffer(device, commandPool, stagingBuffer, vertexBuffer, 0, 0, bufferSize, graphicsQueue); + + vkDestroyBuffer(device, stagingBuffer, nullptr); + vkFreeMemory(device, stagingBufferMemory, nullptr); +} + +template +void GraphicsPipeline_Vulkan::createIndexBuffer(const void* bufferData, int indexSize, + VkCommandPool commandPool, VkQueue graphicsQueue) { + VkDeviceSize bufferSize = numIndices * indexSize; + VkDeviceSize bufferCapacity = indexCapacity * indexSize; + + VkBuffer stagingBuffer; + VkDeviceMemory stagingBufferMemory; + VulkanUtils::createBuffer(device, physicalDevice, bufferSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, + VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, + stagingBuffer, stagingBufferMemory); + + void* data; + vkMapMemory(device, stagingBufferMemory, 0, bufferSize, 0, &data); + memcpy(data, bufferData, (size_t) bufferSize); + vkUnmapMemory(device, stagingBufferMemory); + + VulkanUtils::createBuffer(device, physicalDevice, bufferCapacity, + VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, indexBuffer, indexBufferMemory); + + VulkanUtils::copyBuffer(device, commandPool, stagingBuffer, indexBuffer, 0, 0, bufferSize, graphicsQueue); + + vkDestroyBuffer(device, stagingBuffer, nullptr); + vkFreeMemory(device, stagingBufferMemory, nullptr); +} + +template +void GraphicsPipeline_Vulkan::addAttribute(VkFormat format, size_t offset) { + VkVertexInputAttributeDescription attributeDesc = {}; + + attributeDesc.binding = 0; + attributeDesc.location = this->attributeDescriptions.size(); + attributeDesc.format = format; + attributeDesc.offset = offset; + + this->attributeDescriptions.push_back(attributeDesc); +} + +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) { + this->descriptorInfoList.push_back({ type, stageFlags, nullptr, imageData }); +} + +template +void GraphicsPipeline_Vulkan::createPipeline(string vertShaderFile, string fragShaderFile) { + vector vertShaderCode = readFile(vertShaderFile); + vector fragShaderCode = readFile(fragShaderFile); + + VkShaderModule vertShaderModule = createShaderModule(vertShaderCode); + VkShaderModule fragShaderModule = createShaderModule(fragShaderCode); + + VkPipelineShaderStageCreateInfo vertShaderStageInfo = {}; + vertShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; + vertShaderStageInfo.stage = VK_SHADER_STAGE_VERTEX_BIT; + vertShaderStageInfo.module = vertShaderModule; + vertShaderStageInfo.pName = "main"; + + VkPipelineShaderStageCreateInfo fragShaderStageInfo = {}; + fragShaderStageInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO; + fragShaderStageInfo.stage = VK_SHADER_STAGE_FRAGMENT_BIT; + fragShaderStageInfo.module = fragShaderModule; + fragShaderStageInfo.pName = "main"; + + VkPipelineShaderStageCreateInfo shaderStages[] = { vertShaderStageInfo, fragShaderStageInfo }; + + VkPipelineVertexInputStateCreateInfo vertexInputInfo = {}; + vertexInputInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; + + vertexInputInfo.vertexBindingDescriptionCount = 1; + vertexInputInfo.vertexAttributeDescriptionCount = static_cast(this->attributeDescriptions.size()); + vertexInputInfo.pVertexBindingDescriptions = &this->bindingDescription; + vertexInputInfo.pVertexAttributeDescriptions = this->attributeDescriptions.data(); + + VkPipelineInputAssemblyStateCreateInfo inputAssembly = {}; + inputAssembly.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + inputAssembly.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; + inputAssembly.primitiveRestartEnable = VK_FALSE; + + VkViewport viewport = {}; + viewport.x = (float)this->viewport.x; + viewport.y = (float)this->viewport.y; + viewport.width = (float)this->viewport.width; + viewport.height = (float)this->viewport.height; + viewport.minDepth = 0.0f; + viewport.maxDepth = 1.0f; + + VkRect2D scissor = {}; + scissor.offset = { 0, 0 }; + scissor.extent = { (uint32_t)this->viewport.width, (uint32_t)this->viewport.height }; + + VkPipelineViewportStateCreateInfo viewportState = {}; + viewportState.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; + viewportState.viewportCount = 1; + viewportState.pViewports = &viewport; + viewportState.scissorCount = 1; + viewportState.pScissors = &scissor; + + VkPipelineRasterizationStateCreateInfo rasterizer = {}; + rasterizer.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; + rasterizer.depthClampEnable = VK_FALSE; + rasterizer.rasterizerDiscardEnable = VK_FALSE; + rasterizer.polygonMode = VK_POLYGON_MODE_FILL; + rasterizer.lineWidth = 1.0f; + rasterizer.cullMode = VK_CULL_MODE_BACK_BIT; + rasterizer.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE; + rasterizer.depthBiasEnable = VK_FALSE; + + VkPipelineMultisampleStateCreateInfo multisampling = {}; + multisampling.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; + multisampling.sampleShadingEnable = VK_FALSE; + multisampling.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; + + VkPipelineColorBlendAttachmentState colorBlendAttachment = {}; + colorBlendAttachment.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT; + colorBlendAttachment.blendEnable = VK_TRUE; + colorBlendAttachment.colorBlendOp = VK_BLEND_OP_ADD; + colorBlendAttachment.srcColorBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA; + colorBlendAttachment.dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; + colorBlendAttachment.alphaBlendOp = VK_BLEND_OP_ADD; + colorBlendAttachment.srcAlphaBlendFactor = VK_BLEND_FACTOR_SRC_ALPHA; + colorBlendAttachment.dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA; + + VkPipelineColorBlendStateCreateInfo colorBlending = {}; + colorBlending.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; + colorBlending.logicOpEnable = VK_FALSE; + colorBlending.logicOp = VK_LOGIC_OP_COPY; + colorBlending.attachmentCount = 1; + colorBlending.pAttachments = &colorBlendAttachment; + colorBlending.blendConstants[0] = 0.0f; + colorBlending.blendConstants[1] = 0.0f; + colorBlending.blendConstants[2] = 0.0f; + colorBlending.blendConstants[3] = 0.0f; + + VkPipelineDepthStencilStateCreateInfo depthStencil = {}; + depthStencil.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; + depthStencil.depthTestEnable = VK_TRUE; + depthStencil.depthWriteEnable = VK_TRUE; + depthStencil.depthCompareOp = VK_COMPARE_OP_LESS; + depthStencil.depthBoundsTestEnable = VK_FALSE; + depthStencil.minDepthBounds = 0.0f; + depthStencil.maxDepthBounds = 1.0f; + depthStencil.stencilTestEnable = VK_FALSE; + depthStencil.front = {}; + depthStencil.back = {}; + + VkPipelineLayoutCreateInfo pipelineLayoutInfo = {}; + pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; + pipelineLayoutInfo.setLayoutCount = 1; + pipelineLayoutInfo.pSetLayouts = &this->descriptorSetLayout; + pipelineLayoutInfo.pushConstantRangeCount = 0; + + if (vkCreatePipelineLayout(this->device, &pipelineLayoutInfo, nullptr, &this->pipelineLayout) != VK_SUCCESS) { + throw runtime_error("failed to create pipeline layout!"); + } + + VkGraphicsPipelineCreateInfo pipelineInfo = {}; + pipelineInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; + pipelineInfo.stageCount = 2; + pipelineInfo.pStages = shaderStages; + pipelineInfo.pVertexInputState = &vertexInputInfo; + pipelineInfo.pInputAssemblyState = &inputAssembly; + pipelineInfo.pViewportState = &viewportState; + pipelineInfo.pRasterizationState = &rasterizer; + pipelineInfo.pMultisampleState = &multisampling; + pipelineInfo.pDepthStencilState = &depthStencil; + pipelineInfo.pColorBlendState = &colorBlending; + pipelineInfo.pDynamicState = nullptr; + pipelineInfo.layout = this->pipelineLayout; + pipelineInfo.renderPass = this->renderPass; + pipelineInfo.subpass = 0; + pipelineInfo.basePipelineHandle = VK_NULL_HANDLE; + pipelineInfo.basePipelineIndex = -1; + + if (vkCreateGraphicsPipelines(this->device, VK_NULL_HANDLE, 1, &pipelineInfo, nullptr, &this->pipeline) != VK_SUCCESS) { + throw runtime_error("failed to create graphics pipeline!"); + } + + vkDestroyShaderModule(this->device, vertShaderModule, nullptr); + vkDestroyShaderModule(this->device, fragShaderModule, nullptr); +} + +template +void GraphicsPipeline_Vulkan::createDescriptorSetLayout() { + vector bindings(this->descriptorInfoList.size()); + + for (size_t i = 0; i < bindings.size(); i++) { + bindings[i].binding = i; + bindings[i].descriptorCount = 1; + bindings[i].descriptorType = this->descriptorInfoList[i].type; + bindings[i].stageFlags = this->descriptorInfoList[i].stageFlags; + bindings[i].pImmutableSamplers = nullptr; + } + + VkDescriptorSetLayoutCreateInfo layoutInfo = {}; + layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO; + layoutInfo.bindingCount = static_cast(bindings.size()); + layoutInfo.pBindings = bindings.data(); + + if (vkCreateDescriptorSetLayout(this->device, &layoutInfo, nullptr, &this->descriptorSetLayout) != VK_SUCCESS) { + throw runtime_error("failed to create descriptor set layout!"); + } +} + +template +void GraphicsPipeline_Vulkan::createDescriptorPool(vector& swapChainImages) { + vector poolSizes(this->descriptorInfoList.size()); + + for (size_t i = 0; i < poolSizes.size(); i++) { + poolSizes[i].type = this->descriptorInfoList[i].type; + poolSizes[i].descriptorCount = static_cast(swapChainImages.size()); + } + + VkDescriptorPoolCreateInfo poolInfo = {}; + poolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO; + poolInfo.poolSizeCount = static_cast(poolSizes.size()); + poolInfo.pPoolSizes = poolSizes.data(); + poolInfo.maxSets = static_cast(swapChainImages.size()); + + if (vkCreateDescriptorPool(this->device, &poolInfo, nullptr, &this->descriptorPool) != VK_SUCCESS) { + throw runtime_error("failed to create descriptor pool!"); + } +} + +template +void GraphicsPipeline_Vulkan::createDescriptorSets(vector& swapChainImages) { + vector layouts(swapChainImages.size(), this->descriptorSetLayout); + + VkDescriptorSetAllocateInfo allocInfo = {}; + allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; + allocInfo.descriptorPool = this->descriptorPool; + allocInfo.descriptorSetCount = static_cast(swapChainImages.size()); + allocInfo.pSetLayouts = layouts.data(); + + this->descriptorSets.resize(swapChainImages.size()); + if (vkAllocateDescriptorSets(device, &allocInfo, this->descriptorSets.data()) != VK_SUCCESS) { + throw runtime_error("failed to allocate descriptor sets!"); + } + + for (size_t i = 0; i < swapChainImages.size(); i++) { + vector descriptorWrites(this->descriptorInfoList.size()); + + for (size_t j = 0; j < descriptorWrites.size(); j++) { + descriptorWrites[j].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; + descriptorWrites[j].dstSet = this->descriptorSets[i]; + descriptorWrites[j].dstBinding = j; + descriptorWrites[j].dstArrayElement = 0; + descriptorWrites[j].descriptorType = this->descriptorInfoList[j].type; + descriptorWrites[j].descriptorCount = 1; + descriptorWrites[j].pBufferInfo = nullptr; + descriptorWrites[j].pImageInfo = nullptr; + descriptorWrites[j].pTexelBufferView = nullptr; + + switch (descriptorWrites[j].descriptorType) { + case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: + descriptorWrites[j].pBufferInfo = &(*this->descriptorInfoList[j].bufferDataList)[i]; + break; + case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: + descriptorWrites[j].pImageInfo = this->descriptorInfoList[j].imageData; + break; + default: + throw runtime_error("Unknown descriptor type: " + to_string(descriptorWrites[j].descriptorType)); + } } - VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, vertices, vertexBuffer, numVertices, - graphicsQueue); - numVertices += vertices.size(); - - VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, indices, indexBuffer, numIndices, - graphicsQueue); - numIndices += indices.size(); - - return true; - } - - return false; + vkUpdateDescriptorSets(this->device, static_cast(descriptorWrites.size()), descriptorWrites.data(), 0, nullptr); + } +} + +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, + &descriptorSets[currentImage], 0, nullptr); + + VkBuffer vertexBuffers[] = { vertexBuffer }; + VkDeviceSize offsets[] = { 0 }; + vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets); + + vkCmdBindIndexBuffer(commandBuffer, indexBuffer, 0, VK_INDEX_TYPE_UINT16); + + vkCmdDrawIndexed(commandBuffer, static_cast(numIndices), 1, 0, 0, 0); +} + +template +bool GraphicsPipeline_Vulkan::addObject(const vector& vertices, vector& indices, + VkCommandPool commandPool, VkQueue graphicsQueue) { + + if (numVertices + vertices.size() > vertexCapacity || + numIndices + indices.size() > indexCapacity) { + resizeDataBuffers(); + + throw runtime_error("ERROR: Need to resize data buffers"); + } + + for (uint16_t& idx : indices) { + idx += numVertices; + } + + VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, vertices, vertexBuffer, numVertices, + graphicsQueue); + numVertices += vertices.size(); + + VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, indices, indexBuffer, numIndices, + graphicsQueue); + numIndices += indices.size(); + + return true; +} + +template +void GraphicsPipeline_Vulkan::cleanup() { + vkDestroyPipeline(device, pipeline, nullptr); + vkDestroyDescriptorPool(device, descriptorPool, nullptr); + vkDestroyPipelineLayout(device, pipelineLayout, nullptr); +} + +template +void GraphicsPipeline_Vulkan::cleanupBuffers() { + vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr); + + vkDestroyBuffer(device, vertexBuffer, nullptr); + vkFreeMemory(device, vertexBufferMemory, nullptr); + vkDestroyBuffer(device, indexBuffer, nullptr); + vkFreeMemory(device, indexBufferMemory, nullptr); +} + +/*** PRIVATE METHODS ***/ + +template +VkShaderModule GraphicsPipeline_Vulkan::createShaderModule(const vector& code) { + VkShaderModuleCreateInfo createInfo = {}; + createInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO; + createInfo.codeSize = code.size(); + createInfo.pCode = reinterpret_cast(code.data()); + + VkShaderModule shaderModule; + if (vkCreateShaderModule(this->device, &createInfo, nullptr, &shaderModule) != VK_SUCCESS) { + throw runtime_error("failed to create shader module!"); + } + + return shaderModule; +} + +template +vector GraphicsPipeline_Vulkan::readFile(const string& filename) { + ifstream file(filename, ios::ate | ios::binary); + + if (!file.is_open()) { + throw runtime_error("failed to open file!"); + } + + size_t fileSize = (size_t)file.tellg(); + vector buffer(fileSize); + + file.seekg(0); + file.read(buffer.data(), fileSize); + + file.close(); + + return buffer; +} + +template +void GraphicsPipeline_Vulkan::resizeDataBuffers() { + + vkDestroyBuffer(device, vertexBuffer, nullptr); + vkFreeMemory(device, vertexBufferMemory, nullptr); + vkDestroyBuffer(device, indexBuffer, nullptr); + vkFreeMemory(device, indexBufferMemory, nullptr); + + vertexCapacity *= 2; + indexCapacity *= 2; + + VulkanUtils::createBuffer(device, physicalDevice, vertexCapacity * sizeof(VertexType), + VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vertexBuffer, vertexBufferMemory); + + VulkanUtils::createBuffer(device, physicalDevice, indexCapacity * sizeof(uint16_t), + VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, indexBuffer, indexBufferMemory); } Index: makefile =================================================================== --- makefile (revision cd487fb0c5641b29746b810d236ba7681bd75081) +++ makefile (revision b8777b71951e1e62f58596dcb0b1cab6239cd405) @@ -59,5 +59,5 @@ $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN -vulkangame: main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp game-gui-sdl.cpp graphics-pipeline_vulkan.cpp +vulkangame: main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp game-gui-sdl.cpp $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN Index: vulkan-game.cpp =================================================================== --- vulkan-game.cpp (revision cd487fb0c5641b29746b810d236ba7681bd75081) +++ vulkan-game.cpp (revision b8777b71951e1e62f58596dcb0b1cab6239cd405) @@ -194,14 +194,14 @@ createUniformBuffers(); - vector sceneVertices = { - {{-0.5f, -0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}}, - {{ 0.5f, -0.5f, -0.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, - {{ 0.5f, 0.5f, -0.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, - {{-0.5f, 0.5f, -0.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}, - - {{-0.5f, -0.5f, 0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}}, - {{ 0.5f, -0.5f, 0.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, - {{ 0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, - {{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}} + vector sceneVertices = { + {{-0.5f, -0.5f, -2.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 0.5f, -0.5f, -2.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, + {{ 0.5f, 0.5f, -2.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, + {{-0.5f, 0.5f, -2.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}, + + {{-0.5f, -0.5f, -1.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}}, + {{ 0.5f, -0.5f, -1.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, + {{ 0.5f, 0.5f, -1.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}}, + {{-0.5f, 0.5f, -1.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}} }; vector sceneIndices = { @@ -210,22 +210,22 @@ }; - graphicsPipelines.push_back(GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, - { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(Vertex))); - - graphicsPipelines.back().bindData(sceneVertices, sceneIndices, commandPool, graphicsQueue); - - 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().addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, + modelPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, + { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(ModelVertex)); + + modelPipeline.bindData(sceneVertices, sceneIndices, commandPool, graphicsQueue); + + modelPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::pos)); + modelPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::color)); + modelPipeline.addAttribute(VK_FORMAT_R32G32_SFLOAT, offset_of(&ModelVertex::texCoord)); + + modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList); - graphicsPipelines.back().addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, + modelPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, &floorTextureImageDescriptor); - graphicsPipelines.back().createDescriptorSetLayout(); - graphicsPipelines.back().createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv"); - graphicsPipelines.back().createDescriptorPool(swapChainImages); - graphicsPipelines.back().createDescriptorSets(swapChainImages); + modelPipeline.createDescriptorSetLayout(); + modelPipeline.createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv"); + modelPipeline.createDescriptorPool(swapChainImages); + modelPipeline.createDescriptorSets(swapChainImages); vector overlayVertices = { @@ -239,21 +239,21 @@ }; - graphicsPipelines.push_back(GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, - { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(OverlayVertex))); - - graphicsPipelines.back().bindData(overlayVertices, overlayIndices, commandPool, graphicsQueue); - - graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&OverlayVertex::pos)); - graphicsPipelines.back().addAttribute(VK_FORMAT_R32G32_SFLOAT, offset_of(&OverlayVertex::texCoord)); - - graphicsPipelines.back().addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, + overlayPipeline = GraphicsPipeline_Vulkan(physicalDevice, device, renderPass, + { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(OverlayVertex)); + + overlayPipeline.bindData(overlayVertices, overlayIndices, commandPool, graphicsQueue); + + overlayPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&OverlayVertex::pos)); + overlayPipeline.addAttribute(VK_FORMAT_R32G32_SFLOAT, offset_of(&OverlayVertex::texCoord)); + + overlayPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT, &sdlOverlayImageDescriptor); - graphicsPipelines.back().createDescriptorSetLayout(); - graphicsPipelines.back().createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv"); - graphicsPipelines.back().createDescriptorPool(swapChainImages); - graphicsPipelines.back().createDescriptorSets(swapChainImages); - - cout << "Created " << graphicsPipelines.size() << " graphics pipelines" << endl; + overlayPipeline.createDescriptorSetLayout(); + overlayPipeline.createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv"); + overlayPipeline.createDescriptorPool(swapChainImages); + overlayPipeline.createDescriptorSets(swapChainImages); + + cout << "Created all the graphics pipelines" << endl; numPlanes = 2; @@ -290,6 +290,6 @@ } else if (e.key.keycode == SDL_SCANCODE_SPACE) { cout << "Adding a plane" << endl; - float zOffset = -0.5f + (0.5f * numPlanes); - vector vertices = { + float zOffset = -2.0f + (0.5f * numPlanes); + vector vertices = { {{-0.5f, -0.5f, zOffset}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}}, {{ 0.5f, -0.5f, zOffset}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}}, @@ -301,10 +301,14 @@ }; - if (graphicsPipelines[0].addObject(vertices, indices, commandPool, graphicsQueue)) { - vkFreeCommandBuffers(device, commandPool, static_cast(commandBuffers.size()), commandBuffers.data()); - createCommandBuffers(); - - numPlanes++; - } + // TODO: Encapsulate these lines into an addObject() function in vulkan-game + + vkDeviceWaitIdle(device); + vkFreeCommandBuffers(device, commandPool, static_cast(commandBuffers.size()), commandBuffers.data()); + + modelPipeline.addObject(vertices, indices, commandPool, graphicsQueue); + + createCommandBuffers(); + + numPlanes++; } else { cout << "Key event detected" << endl; @@ -429,7 +433,6 @@ vkDestroySampler(device, textureSampler, nullptr); - for (GraphicsPipeline_Vulkan pipeline : graphicsPipelines) { - pipeline.cleanupBuffers(); - } + modelPipeline.cleanupBuffers(); + overlayPipeline.cleanupBuffers(); for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) { @@ -929,7 +932,6 @@ vkCmdBeginRenderPass(commandBuffers[i], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE); - for (GraphicsPipeline_Vulkan pipeline : graphicsPipelines) { - pipeline.createRenderCommands(commandBuffers[i], i); - } + modelPipeline.createRenderCommands(commandBuffers[i], i); + overlayPipeline.createRenderCommands(commandBuffers[i], i); vkCmdEndRenderPass(commandBuffers[i]); @@ -986,13 +988,13 @@ createUniformBuffers(); - graphicsPipelines[0].updateRenderPass(renderPass); - graphicsPipelines[0].createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv"); - graphicsPipelines[0].createDescriptorPool(swapChainImages); - graphicsPipelines[0].createDescriptorSets(swapChainImages); - - graphicsPipelines[1].updateRenderPass(renderPass); - graphicsPipelines[1].createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv"); - graphicsPipelines[1].createDescriptorPool(swapChainImages); - graphicsPipelines[1].createDescriptorSets(swapChainImages); + modelPipeline.updateRenderPass(renderPass); + modelPipeline.createPipeline("shaders/scene-vert.spv", "shaders/scene-frag.spv"); + modelPipeline.createDescriptorPool(swapChainImages); + modelPipeline.createDescriptorSets(swapChainImages); + + overlayPipeline.updateRenderPass(renderPass); + overlayPipeline.createPipeline("shaders/overlay-vert.spv", "shaders/overlay-frag.spv"); + overlayPipeline.createDescriptorPool(swapChainImages); + overlayPipeline.createDescriptorSets(swapChainImages); createCommandBuffers(); @@ -1026,7 +1028,6 @@ vkFreeCommandBuffers(device, commandPool, static_cast(commandBuffers.size()), commandBuffers.data()); - for (GraphicsPipeline_Vulkan pipeline : graphicsPipelines) { - pipeline.cleanup(); - } + modelPipeline.cleanup(); + overlayPipeline.cleanup(); vkDestroyRenderPass(device, renderPass, nullptr); Index: vulkan-game.hpp =================================================================== --- vulkan-game.hpp (revision cd487fb0c5641b29746b810d236ba7681bd75081) +++ vulkan-game.hpp (revision b8777b71951e1e62f58596dcb0b1cab6239cd405) @@ -15,7 +15,5 @@ #endif -// TODO: Figure out if these structs should be defined in the VulkanGame class - -struct Vertex { +struct ModelVertex { glm::vec3 pos; glm::vec3 color; @@ -40,5 +38,6 @@ GameGui* gui; - vector graphicsPipelines; + GraphicsPipeline_Vulkan modelPipeline; + GraphicsPipeline_Vulkan overlayPipeline; SDL_version sdlVersion;