创建descriptor sets
parent
4406e944f4
commit
d71eca3c32
|
|
@ -115,6 +115,7 @@ void HelloTriangleApplication::initVulkan() {
|
|||
createImageView();
|
||||
|
||||
createRenderPass();
|
||||
createDescriptorSetLayout();
|
||||
createGraphicPipeline();
|
||||
|
||||
creatFramebuffers();
|
||||
|
|
@ -123,6 +124,10 @@ void HelloTriangleApplication::initVulkan() {
|
|||
|
||||
createVertexBuffer();
|
||||
createIndexBuffer();
|
||||
createUniformBuffers();
|
||||
|
||||
createDescriptorPool();
|
||||
createDescriptorSets();
|
||||
|
||||
createCommandBuffer();
|
||||
|
||||
|
|
@ -152,6 +157,14 @@ void HelloTriangleApplication::cleanup(GLFWwindow* window) {
|
|||
|
||||
cleanupSwapChain();
|
||||
|
||||
for (size_t i = 0; i < MAX_FRAME_IN_FLIGHT; i++)
|
||||
{
|
||||
vkDestroyBuffer(device, uniformBuffers[i], nullptr);
|
||||
vkFreeMemory(device, uniformBuffersMemory[i], nullptr);
|
||||
}
|
||||
vkDestroyDescriptorPool(device, descriptorPool, nullptr);
|
||||
vkDestroyDescriptorSetLayout(device, descriptorSetLayout, nullptr);
|
||||
|
||||
vkDestroyBuffer(device, indexBuffer, nullptr);
|
||||
vkFreeMemory(device, indexBufferMemory, nullptr);
|
||||
vkDestroyBuffer(device, vertexBuffer, nullptr);
|
||||
|
|
@ -760,6 +773,95 @@ void HelloTriangleApplication::createIndexBuffer()
|
|||
vkFreeMemory(device, stagingBufferMemory, nullptr);
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::createUniformBuffers()
|
||||
{
|
||||
VkDeviceSize bufferSize = sizeof(UniformBufferObject);
|
||||
|
||||
uniformBuffers.resize(MAX_FRAME_IN_FLIGHT);
|
||||
uniformBuffersMemory.resize(MAX_FRAME_IN_FLIGHT);
|
||||
uniformBuffersMapped.resize(MAX_FRAME_IN_FLIGHT);
|
||||
|
||||
for (size_t i = 0; i < MAX_FRAME_IN_FLIGHT; i++)
|
||||
{
|
||||
createBuffer(bufferSize, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, uniformBuffers[i], uniformBuffersMemory[i]);
|
||||
vkMapMemory(device, uniformBuffersMemory[i], 0, bufferSize, 0, &uniformBuffersMapped[i]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::createDescriptorPool()
|
||||
{
|
||||
VkDescriptorPoolSize poolSize{};
|
||||
poolSize.type = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
|
||||
poolSize.descriptorCount = static_cast<uint32_t>(MAX_FRAME_IN_FLIGHT);
|
||||
|
||||
VkDescriptorPoolCreateInfo poolInfo{};
|
||||
poolInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
|
||||
poolInfo.poolSizeCount = 1;
|
||||
poolInfo.pPoolSizes = &poolSize;
|
||||
poolInfo.maxSets = static_cast<uint32_t>(MAX_FRAME_IN_FLIGHT);
|
||||
|
||||
if (vkCreateDescriptorPool(device,&poolInfo,nullptr,&descriptorPool) != VK_SUCCESS)
|
||||
{
|
||||
throw std::runtime_error("failed to create descriptor pool");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::createDescriptorSets()
|
||||
{
|
||||
std::vector<VkDescriptorSetLayout> layouts(MAX_FRAME_IN_FLIGHT,descriptorSetLayout);
|
||||
VkDescriptorSetAllocateInfo allocInfo{};
|
||||
allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
|
||||
allocInfo.descriptorPool = descriptorPool;
|
||||
allocInfo.descriptorSetCount = static_cast<uint32_t>(MAX_FRAME_IN_FLIGHT);
|
||||
allocInfo.pSetLayouts = layouts.data();
|
||||
|
||||
descriptorSets.resize(MAX_FRAME_IN_FLIGHT);
|
||||
if (vkAllocateDescriptorSets(device,&allocInfo,descriptorSets.data()) != VK_SUCCESS)
|
||||
{
|
||||
throw std::runtime_error("failed to allocate descriptor sets in createDescriptoSets");
|
||||
}
|
||||
|
||||
for (size_t i = 0; i < MAX_FRAME_IN_FLIGHT; i++)
|
||||
{
|
||||
VkDescriptorBufferInfo bufferInfo{};
|
||||
bufferInfo.buffer = uniformBuffers[i];
|
||||
bufferInfo.offset = 0;
|
||||
bufferInfo.range = sizeof(UniformBufferObject);
|
||||
VkWriteDescriptorSet descriptorWrite{};
|
||||
descriptorWrite.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
|
||||
descriptorWrite.dstSet = descriptorSets[i];
|
||||
descriptorWrite.dstBinding = 0;
|
||||
descriptorWrite.dstArrayElement = 0;
|
||||
descriptorWrite.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
|
||||
descriptorWrite.descriptorCount = 1;
|
||||
descriptorWrite.pBufferInfo = &bufferInfo;
|
||||
descriptorWrite.pImageInfo = nullptr;
|
||||
descriptorWrite.pTexelBufferView = nullptr;
|
||||
|
||||
vkUpdateDescriptorSets(device, 1, &descriptorWrite, 0, nullptr);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::updateUniformBuffer(uint32_t currentImage)
|
||||
{
|
||||
static auto startTime = std::chrono::high_resolution_clock::now();
|
||||
|
||||
auto currentTime = std::chrono::high_resolution_clock::now();
|
||||
float time = std::chrono::duration<float, std::chrono::seconds::period>(currentTime - startTime).count();
|
||||
|
||||
UniformBufferObject ubo{};
|
||||
ubo.model = glm::rotate(glm::mat4(1.0f), time * glm::radians(90.0f), glm::vec3(0.0f, 0.0f, 1.0f));
|
||||
ubo.view = glm::lookAt(glm::vec3(2.0f, 2.0f, 2.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f,0.0f,0.1f));
|
||||
ubo.proj = glm::perspective(glm::radians(45.0f), swapChainExtent.width / (float)swapChainExtent.height, 0.1f, 10.0f);
|
||||
ubo.proj[1][1] *= -1;
|
||||
|
||||
memcpy(uniformBuffersMapped[currentImage], &ubo, sizeof(ubo));
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::createBuffer(VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags properties, VkBuffer& buffer, VkDeviceMemory& bufferMemory)
|
||||
{
|
||||
VkBufferCreateInfo bufferInfo{};
|
||||
|
|
@ -862,7 +964,7 @@ void HelloTriangleApplication::createCommandBuffer()
|
|||
}
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::recordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex)
|
||||
void HelloTriangleApplication::recordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex,uint32_t currentFrame)
|
||||
{
|
||||
VkCommandBufferBeginInfo beginInfo{};
|
||||
beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
|
||||
|
|
@ -907,6 +1009,8 @@ void HelloTriangleApplication::recordCommandBuffer(VkCommandBuffer commandBuffer
|
|||
// bind indexBuffer
|
||||
vkCmdBindIndexBuffer(commandBuffer, indexBuffer, 0, VK_INDEX_TYPE_UINT16);
|
||||
|
||||
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pipelineLayout, 0, 1, &descriptorSets[currentFrame], 0, nullptr);
|
||||
|
||||
vkCmdDrawIndexed(commandBuffer, static_cast<uint32_t>(indices.size()), 1, 0, 0, 0);
|
||||
|
||||
vkCmdEndRenderPass(commandBuffer);
|
||||
|
|
@ -942,7 +1046,9 @@ void HelloTriangleApplication::drawFrame()
|
|||
//vkAcquireNextImageKHR(device, swapChain, UINT64_MAX, imageAvailableSemaphores[currentFrame], VK_NULL_HANDLE, &imageIndex);
|
||||
|
||||
vkResetCommandBuffer(commandBuffers[currentFrame], 0);
|
||||
recordCommandBuffer(commandBuffers[currentFrame], imageIndex);
|
||||
recordCommandBuffer(commandBuffers[currentFrame], imageIndex,currentFrame);
|
||||
|
||||
updateUniformBuffer(currentFrame);
|
||||
|
||||
VkSubmitInfo submitInfo{};
|
||||
submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
|
||||
|
|
@ -1069,6 +1175,29 @@ void HelloTriangleApplication::createRenderPass()
|
|||
throw std::runtime_error("failed to create render pass in createRenderPass");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::createDescriptorSetLayout()
|
||||
{
|
||||
VkDescriptorSetLayoutBinding uboLayoutBinding{};
|
||||
uboLayoutBinding.binding = 0;
|
||||
uboLayoutBinding.descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
|
||||
uboLayoutBinding.descriptorCount = 1;
|
||||
uboLayoutBinding.stageFlags = VK_SHADER_STAGE_VERTEX_BIT;
|
||||
uboLayoutBinding.pImmutableSamplers = nullptr;
|
||||
|
||||
VkDescriptorSetLayoutCreateInfo layoutInfo{};
|
||||
layoutInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
|
||||
layoutInfo.bindingCount = 1;
|
||||
layoutInfo.pBindings = &uboLayoutBinding;
|
||||
|
||||
if (vkCreateDescriptorSetLayout(device,&layoutInfo,nullptr,&descriptorSetLayout) != VK_SUCCESS)
|
||||
{
|
||||
throw std::runtime_error("failed to create descriptor set layout");
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
void HelloTriangleApplication::createGraphicPipeline()
|
||||
|
|
@ -1156,7 +1285,7 @@ void HelloTriangleApplication::createGraphicPipeline()
|
|||
rasterizer.lineWidth = 1.0f;
|
||||
|
||||
rasterizer.cullMode = VK_CULL_MODE_BACK_BIT;// 背面剔除
|
||||
rasterizer.frontFace = VK_FRONT_FACE_CLOCKWISE;
|
||||
rasterizer.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE;
|
||||
|
||||
// 根据fragment的斜率偏置深度值
|
||||
rasterizer.depthBiasEnable = VK_FALSE;
|
||||
|
|
@ -1213,8 +1342,8 @@ void HelloTriangleApplication::createGraphicPipeline()
|
|||
|
||||
VkPipelineLayoutCreateInfo pipelineLayoutInfo{};
|
||||
pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
|
||||
pipelineLayoutInfo.setLayoutCount = 0;
|
||||
pipelineLayoutInfo.pSetLayouts = nullptr;
|
||||
pipelineLayoutInfo.setLayoutCount = 1;
|
||||
pipelineLayoutInfo.pSetLayouts = &descriptorSetLayout;
|
||||
pipelineLayoutInfo.pushConstantRangeCount = 0;
|
||||
pipelineLayoutInfo.pPushConstantRanges = nullptr;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#define GLM_FORCE_RADIANS
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
|
||||
#define GLFW_INCLUDE_VULKAN
|
||||
#include<GLFW/glfw3.h>
|
||||
|
|
@ -20,7 +23,7 @@
|
|||
#include <limits>
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
|
||||
#include <chrono>
|
||||
#include <fstream>
|
||||
|
||||
|
||||
|
|
@ -68,6 +71,7 @@ private:
|
|||
std::vector<VkImageView> swapChainImageViews;
|
||||
|
||||
VkRenderPass renderPass;
|
||||
VkDescriptorSetLayout descriptorSetLayout;
|
||||
VkPipelineLayout pipelineLayout;
|
||||
|
||||
VkPipeline graphicsPipeline;
|
||||
|
|
@ -122,11 +126,25 @@ private:
|
|||
0,1,2,2,3,0
|
||||
};
|
||||
|
||||
struct UniformBufferObject
|
||||
{
|
||||
alignas(16) glm::mat4 model;
|
||||
alignas(16) glm::mat4 view;
|
||||
alignas(16) glm::mat4 proj;
|
||||
};
|
||||
|
||||
std::vector<VkBuffer> uniformBuffers;
|
||||
std::vector<VkDeviceMemory> uniformBuffersMemory;
|
||||
std::vector<void*> uniformBuffersMapped;
|
||||
|
||||
VkBuffer vertexBuffer;
|
||||
VkDeviceMemory vertexBufferMemory;
|
||||
VkBuffer indexBuffer;
|
||||
VkDeviceMemory indexBufferMemory;
|
||||
|
||||
VkDescriptorPool descriptorPool;
|
||||
std::vector<VkDescriptorSet> descriptorSets;
|
||||
|
||||
void initWindow(int Width, int Height);
|
||||
|
||||
void createInstance();
|
||||
|
|
@ -175,6 +193,7 @@ private:
|
|||
void createImageView();
|
||||
|
||||
void createRenderPass();
|
||||
void createDescriptorSetLayout();
|
||||
void createGraphicPipeline();
|
||||
|
||||
static std::vector<char> readFile(const std::string& filename);
|
||||
|
|
@ -187,6 +206,13 @@ private:
|
|||
|
||||
void createVertexBuffer();
|
||||
void createIndexBuffer();
|
||||
void createUniformBuffers();
|
||||
|
||||
void createDescriptorPool();
|
||||
void createDescriptorSets();
|
||||
|
||||
void updateUniformBuffer(uint32_t currentImage);
|
||||
|
||||
void createBuffer(VkDeviceSize size,VkBufferUsageFlags usage,VkMemoryPropertyFlags properties,VkBuffer& buffer,VkDeviceMemory& bufferMemory);
|
||||
|
||||
void copyBuffer(VkBuffer srcBuffer, VkBuffer dstBuffer, VkDeviceSize size);
|
||||
|
|
@ -195,7 +221,8 @@ private:
|
|||
|
||||
void createCommandBuffer();
|
||||
|
||||
void recordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex);
|
||||
void recordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex,uint32_t currentFrame);
|
||||
|
||||
|
||||
void drawFrame();
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,16 @@ layout(location = 1) in vec3 inColor;
|
|||
|
||||
layout(location = 0) out vec3 fragColor;
|
||||
|
||||
layout(binding = 0) uniform uniformBufferObject{
|
||||
|
||||
mat4 model;
|
||||
mat4 view;
|
||||
mat4 proj;
|
||||
|
||||
}ubo;
|
||||
|
||||
|
||||
void main(){
|
||||
gl_Position = vec4(inPosition, 0.0, 1.0);
|
||||
gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition,0.0,1.0);
|
||||
fragColor = inColor;
|
||||
}
|
||||
Binary file not shown.
Loading…
Reference in New Issue