Nigel/LearnVulkan
1
0
Fork 0
Code Releases Activity

Added Index Buffer usage

Browse Source
This commit is contained in:
Nigel Barink
2023-11-09 20:03:05 +01:00
parent 8f7aa2ddf7
commit 94d467d897
1 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Hello_triangle/main.cpp
View File

@@ -1,6 +1,6 @@
/* /*
Following the vulkan tutorial on : Following the vulkan tutorial on :
https://vulkan-tutorial.com/Vertex_buffers/Staging_buffer https://vulkan-tutorial.com/en/Vertex_buffers/Index_buffer
*/ */
#define GLFW_INCLUDE_VULKAN #define GLFW_INCLUDE_VULKAN
@@ -69,9 +69,14 @@ const std::vector<const char*> deviceExtensions = {
const std::vector<Vertex> vertices = { const std::vector<Vertex> vertices = {
{{0.0f, -0.5f}, {1.0f,1.0f, 1.0f}}, {{-0.5f, -0.5f}, {1.0f, 0.0f, 0.0f}},
{{0.5f, 0.5f}, {0.0f, 1.0f, 0.0f}}, {{0.5f, -0.5f}, {0.0f,1.0f, 0.0f}},
{{-0.5f, 0.5f}, {0.0f, 0.0f, 1.0f}} {{0.5f, 0.5f}, {0.0f, 0.0f, 1.0f}},
{{-0.5f, 0.5f}, {1.0f, 1.0f, 1.0f}}
};
const std::vector<uint16_t> indices = {
0,1,2,2,3,0
}; };
class HelloTriangleApplication { class HelloTriangleApplication {
@@ -102,14 +107,18 @@ const std::vector<const char*> deviceExtensions = {
VkPipeline graphicsPipeline; VkPipeline graphicsPipeline;
std::vector<VkFramebuffer> swapchainFrameBuffers; std::vector<VkFramebuffer> swapchainFrameBuffers;
VkCommandPool commandPool; VkCommandPool commandPool;
VkBuffer vertexBuffer; VkBuffer vertexBuffer;
VkDeviceMemory vertexBufferMemory; VkDeviceMemory vertexBufferMemory;
VkBuffer indexBuffer;
VkDeviceMemory indexBufferMemory;
std::vector<VkCommandBuffer> commandBuffers; std::vector<VkCommandBuffer> commandBuffers;
std::vector<VkSemaphore> imageAvailableSemaphores; std::vector<VkSemaphore> imageAvailableSemaphores;
std::vector<VkSemaphore> renderFinishedSemaphores; std::vector<VkSemaphore> renderFinishedSemaphores;
std::vector<VkFence> inFlightFences; std::vector<VkFence> inFlightFences;
bool framebufferResized = false; bool framebufferResized = false;
uint32_t currentFrame = 0; uint32_t currentFrame = 0;
struct SwapChainSupportDetails { struct SwapChainSupportDetails {
@@ -149,6 +158,7 @@ const std::vector<const char*> deviceExtensions = {
createFramebuffers(); createFramebuffers();
createCommandPool(); createCommandPool();
createVertexBuffer(); createVertexBuffer();
createIndexBuffer();
createCommandBuffers(); createCommandBuffers();
createSyncObjects(); createSyncObjects();
} }
@@ -252,6 +262,30 @@ const std::vector<const char*> deviceExtensions = {
vkFreeMemory(device, stagingBufferMemory, nullptr); vkFreeMemory(device, stagingBufferMemory, nullptr);
} }
void createIndexBuffer() {
VkDeviceSize buffersize = sizeof(indices[0]) * indices.size();
VkBuffer stagingBuffer;
VkDeviceMemory stagingBufferMemory;
CreateBuffer(buffersize,
VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
stagingBuffer, stagingBufferMemory);
void* data;
vkMapMemory(device, stagingBufferMemory, 0, buffersize, 0, &data);
memcpy(data, indices.data(), (size_t)buffersize);
vkUnmapMemory(device, stagingBufferMemory);
CreateBuffer(buffersize,
VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT,
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, indexBuffer, indexBufferMemory);
copyBuffer(stagingBuffer, indexBuffer, buffersize);
vkDestroyBuffer(device, stagingBuffer, nullptr);
vkFreeMemory(device, stagingBufferMemory, nullptr);
}
void recreateSwapChain() { void recreateSwapChain() {
int width = 0, height = 0; int width = 0, height = 0;
@@ -341,6 +375,8 @@ const std::vector<const char*> deviceExtensions = {
VkDeviceSize offsets[] = { 0 }; VkDeviceSize offsets[] = { 0 };
vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets); vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets);
vkCmdBindIndexBuffer(commandBuffer, indexBuffer, 0, VK_INDEX_TYPE_UINT16);
VkViewport viewport{}; VkViewport viewport{};
viewport.x = 0.0f; viewport.x = 0.0f;
viewport.y = 0.0f; viewport.y = 0.0f;
@@ -355,10 +391,7 @@ const std::vector<const char*> deviceExtensions = {
scissor.extent = swapChainExtent; scissor.extent = swapChainExtent;
vkCmdSetScissor(commandBuffer, 0, 1, &scissor); vkCmdSetScissor(commandBuffer, 0, 1, &scissor);
vkCmdDrawIndexed(commandBuffer, static_cast<uint32_t>(indices.size()), 1, 0, 0, 0);
vkCmdDraw(commandBuffer, static_cast<uint32_t>(vertices.size()), 1, 0, 0);
vkCmdEndRenderPass(commandBuffer); vkCmdEndRenderPass(commandBuffer);
@@ -1126,8 +1159,12 @@ const std::vector<const char*> deviceExtensions = {
void cleanup(){ void cleanup(){
cleanupSwapChain(); cleanupSwapChain();
vkDestroyBuffer(device, indexBuffer, nullptr);
vkFreeMemory(device, vertexBufferMemory, nullptr);
vkDestroyBuffer(device, vertexBuffer, nullptr); vkDestroyBuffer(device, vertexBuffer, nullptr);
vkFreeMemory(device, vertexBufferMemory, nullptr); vkFreeMemory(device, vertexBufferMemory, nullptr);
vkDestroyPipeline(device, graphicsPipeline, nullptr); vkDestroyPipeline(device, graphicsPipeline, nullptr);
vkDestroyPipelineLayout(device, pipelineLayout, nullptr); vkDestroyPipelineLayout(device, pipelineLayout, nullptr);
vkDestroyRenderPass(device, renderPass, nullptr); vkDestroyRenderPass(device, renderPass, nullptr);