Changeset 237cbec in opengl-game

Timestamp:

Apr 19, 2020, 2:35:55 AM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

1f81ecc

Parents:

6104594

Message:

Create a pipeline and shaders to render multicolored lasers

Files:

• shaders/laser.frag (added)
• shaders/laser.vert (added)
• textures/laser.png (added)
• vulkan-game.cpp (modified) (13 diffs)
• vulkan-game.hpp (modified) (4 diffs)

vulkan-game.cpp

@@ -27 +27 @@
    this->ship_VP_mats = {};
    this->asteroid_VP_mats = {};
+   this->laser_VP_mats = {};
 }
 
@@ -540 +541 @@
    asteroidPipeline.createDescriptorSets(swapChainImages);
 
+   laserPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&LaserVertex::pos));
+   laserPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&LaserVertex::texCoord));
+   laserPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&LaserVertex::objIndex));
+
+   createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+      uniformBuffers_laserPipeline, uniformBuffersMemory_laserPipeline, uniformBufferInfoList_laserPipeline);
+
+   laserPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+      VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList_laserPipeline);
+   laserPipeline.addStorageDescriptor(VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT);
+   laserPipeline.addDescriptorInfo(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+      VK_SHADER_STAGE_FRAGMENT_BIT, &laserTextureImageDescriptor);
+
+   laserPipeline.createDescriptorSetLayout();
+   laserPipeline.createPipeline("shaders/laser-vert.spv", "shaders/laser-frag.spv");
+   laserPipeline.createDescriptorPool(swapChainImages);
+   laserPipeline.createDescriptorSets(swapChainImages);
+
    cout << "Created all the graphics pipelines" << endl;
 
@@ -564 +583 @@
    asteroidPipeline = GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid>(physicalDevice, device, renderPass,
       { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 24, 36, 10);
+
+   laserPipeline = GraphicsPipeline_Vulkan<LaserVertex, SSBO_Laser>(physicalDevice, device, renderPass,
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 8, 18, 2);
 }
 
@@ -591 +613 @@
    asteroid_VP_mats.view = viewMat;
    asteroid_VP_mats.proj = projMat;
+
+   laser_VP_mats.view = viewMat;
+   laser_VP_mats.proj = projMat;
 }
 
@@ -827 +852 @@
    }
 
+   for (size_t i = 0; i < laserObjects.size(); i++) {
+      if (laserObjects[i].modified) {
+         updateObject(laserObjects, laserPipeline, i);
+      }
+   }
+
    VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_modelPipeline[currentImage], 0, object_VP_mats);
 
@@ -832 +863 @@
 
    VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_asteroidPipeline[currentImage], 0, asteroid_VP_mats);
+
+   VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_laserPipeline[currentImage], 0, laser_VP_mats);
 }
 
@@ -929 +962 @@
    VulkanUtils::destroyVulkanImage(device, sdlOverlayImage);
    VulkanUtils::destroyVulkanImage(device, floorTextureImage);
+   VulkanUtils::destroyVulkanImage(device, laserTextureImage);
 
    vkDestroySampler(device, textureSampler, nullptr);
@@ -936 +970 @@
    shipPipeline.cleanupBuffers();
    asteroidPipeline.cleanupBuffers();
+   laserPipeline.cleanupBuffers();
 
    for (size_t i = 0; i < MAX_FRAMES_IN_FLIGHT; i++) {
@@ -1325 +1360 @@
    floorTextureImageDescriptor.imageView = floorTextureImage.imageView;
    floorTextureImageDescriptor.sampler = textureSampler;
+
+   VulkanUtils::createVulkanImageFromFile(device, physicalDevice, commandPool, "textures/laser.png",
+      laserTextureImage, graphicsQueue);
+
+   laserTextureImageDescriptor = {};
+   laserTextureImageDescriptor.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
+   laserTextureImageDescriptor.imageView = laserTextureImage.imageView;
+   laserTextureImageDescriptor.sampler = textureSampler;
 }
 
@@ -1419 +1462 @@
       shipPipeline.createRenderCommands(commandBuffers[i], i);
       asteroidPipeline.createRenderCommands(commandBuffers[i], i);
+      laserPipeline.createRenderCommands(commandBuffers[i], i);
 
       // Always render this pipeline last
@@ -1523 +1567 @@
    asteroidPipeline.createDescriptorSets(swapChainImages);
 
+   createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+      uniformBuffers_laserPipeline, uniformBuffersMemory_laserPipeline, uniformBufferInfoList_laserPipeline);
+
+   laserPipeline.updateRenderPass(renderPass);
+   laserPipeline.createPipeline("shaders/laser-vert.spv", "shaders/laser-frag.spv");
+   laserPipeline.createDescriptorPool(swapChainImages);
+   laserPipeline.createDescriptorSets(swapChainImages);
+
    createCommandBuffers();
 }
@@ -1539 +1591 @@
    shipPipeline.cleanup();
    asteroidPipeline.cleanup();
+   laserPipeline.cleanup();
 
    for (size_t i = 0; i < uniformBuffers_modelPipeline.size(); i++) {
@@ -1555 +1608 @@
    }
 
+   for (size_t i = 0; i < uniformBuffers_laserPipeline.size(); i++) {
+      vkDestroyBuffer(device, uniformBuffers_laserPipeline[i], nullptr);
+      vkFreeMemory(device, uniformBuffersMemory_laserPipeline[i], nullptr);
+   }
+
    vkDestroyRenderPass(device, renderPass, nullptr);
 

vulkan-game.hpp

@@ -51 +51 @@
 };
 
+struct LaserVertex {
+   vec3 pos;
+   vec2 texCoord;
+   unsigned int objIndex;
+};
+
 struct UBO_VP_mats {
    alignas(16) mat4 view;
@@ -63 +69 @@
    alignas(16) mat4 model;
    alignas(4) float hp;
+   alignas(4) unsigned int deleted;
+};
+
+struct SSBO_Laser {
+   alignas(16) mat4 model;
+   alignas(4) vec3 color;
    alignas(4) unsigned int deleted;
 };
@@ -148 +160 @@
       VkDescriptorImageInfo floorTextureImageDescriptor;
 
+      VulkanImage laserTextureImage;
+      VkDescriptorImageInfo laserTextureImageDescriptor;
+
       TTF_Font* font;
       SDL_Texture* fontSDLTexture;
@@ -200 +215 @@
 
       UBO_VP_mats asteroid_VP_mats;
+
+      GraphicsPipeline_Vulkan<LaserVertex, SSBO_Laser> laserPipeline;
+      vector<SceneObject<LaserVertex, SSBO_Laser>> laserObjects;
+
+      vector<VkBuffer> uniformBuffers_laserPipeline;
+      vector<VkDeviceMemory> uniformBuffersMemory_laserPipeline;
+      vector<VkDescriptorBufferInfo> uniformBufferInfoList_laserPipeline;
+
+      UBO_VP_mats laser_VP_mats;
 
       time_point<steady_clock> startTime;