start adding the depth image

rfdickerson · rfdickerson · commit 26ee4f148321 · 2025-07-11T16:10:06.000-05:00
diff --git a/.clang-tidy b/.clang-tidy
@@ -2,21 +2,26 @@ Checks: >
   clang-analyzer-*,
   bugprone-*,
   performance-*,
-  readability-*,
+  hicpp-*,
   modernize-*,
   cppcoreguidelines-*,
-  misc-*,
+  readability-*,
+  
+  # disable overly noisy checks
   -clang-analyzer-alpha.*,
   -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-pro-type-reinterpret-cast,
   -cppcoreguidelines-pro-bounds-pointer-arithmetic,
   -cppcoreguidelines-avoid-magic-numbers,
+  -misc-unused-using-decls,
+  -misc-unused-parameters,
+  -hicpp-vararg,
   -modernize-use-trailing-return-type,
-  -readability-magic-numbers
+  -readability-const-parameter,
+  -readability-const-variable
 
 WarningsAsErrors: ''
-
-HeaderFilterRegex: '.*'
+HeaderFilterRegex: '^(include|src)/'
 FormatStyle: file
 
 CheckOptions:
diff --git a/src/vulkan/Pipeline.cpp b/src/vulkan/Pipeline.cpp
@@ -20,26 +20,31 @@ std::vector<char> Pipeline::readFile(const std::string &filename) const {
 
 Pipeline::Pipeline(vk::Device device, vk::Format colorAttachmentFormat,
                    const std::string &vertShaderPath, const std::string &fragShaderPath,
-                   const std::vector<vk::DescriptorSetLayout> &setLayouts, uint32_t samples)
+                   const std::vector<vk::DescriptorSetLayout> &setLayouts, uint32_t samples,
+                   vk::Format depthAttachmentFormat, bool depthWriteEnable)
     : m_device(device) {
     // 1. Read shader code from files
     auto vertShaderCode = readFile(vertShaderPath);
-    auto fragShaderCode = readFile(fragShaderPath);
-
     auto vertShaderModule = ShaderModule(m_device, vertShaderCode);
-    auto fragShaderModule = ShaderModule(m_device, fragShaderCode);
 
     vk::PipelineShaderStageCreateInfo vertStageInfo{};
     vertStageInfo.stage  = vk::ShaderStageFlagBits::eVertex;
     vertStageInfo.module = vertShaderModule.getHandle();
     vertStageInfo.pName  = "main";
 
-    vk::PipelineShaderStageCreateInfo fragStageInfo{};
-    fragStageInfo.stage  = vk::ShaderStageFlagBits::eFragment;
-    fragStageInfo.module = fragShaderModule.getHandle();
-    fragStageInfo.pName  = "main";
+    std::vector<vk::PipelineShaderStageCreateInfo> shaderStages = {vertStageInfo};
+
+    std::unique_ptr<ShaderModule> fragShaderModule;
+    if (!fragShaderPath.empty()) {
+        auto fragShaderCode = readFile(fragShaderPath);
+        fragShaderModule = std::make_unique<ShaderModule>(m_device, fragShaderCode);
 
-    vk::PipelineShaderStageCreateInfo shaderStages[] = {vertStageInfo, fragStageInfo};
+        vk::PipelineShaderStageCreateInfo fragStageInfo{};
+        fragStageInfo.stage  = vk::ShaderStageFlagBits::eFragment;
+        fragStageInfo.module = fragShaderModule->getHandle();
+        fragStageInfo.pName  = "main";
+        shaderStages.push_back(fragStageInfo);
+    }
 
     // 3. Vertex input (empty, for a basic triangle with no vertex buffer)
     vk::PipelineVertexInputStateCreateInfo vertexInputInfo{};
@@ -67,19 +72,28 @@ Pipeline::Pipeline(vk::Device device, vk::Format colorAttachmentFormat,
     // 7. Multisampling (disabled)
     vk::PipelineMultisampleStateCreateInfo multisampling{};
     multisampling.sampleShadingEnable = VK_FALSE;
-
     multisampling.rasterizationSamples = utils::mapSampleCountFlag(samples);
 
+    vk::PipelineDepthStencilStateCreateInfo depthStencil{};
+    if (depthAttachmentFormat != vk::Format::eUndefined) {
+        depthStencil.depthTestEnable = VK_TRUE;
+        depthStencil.depthWriteEnable = depthWriteEnable ? VK_TRUE : VK_FALSE;
+        depthStencil.depthCompareOp = vk::CompareOp::eLess;
+        depthStencil.depthBoundsTestEnable = VK_FALSE;
+        depthStencil.stencilTestEnable = VK_FALSE;
+    }
+
     // 8. Color blending
     vk::PipelineColorBlendAttachmentState colorBlendAttachment{};
     colorBlendAttachment.colorWriteMask =
         vk::ColorComponentFlagBits::eR | vk::ColorComponentFlagBits::eG |
         vk::ColorComponentFlagBits::eB | vk::ColorComponentFlagBits::eA;
     colorBlendAttachment.blendEnable = VK_FALSE;
+
     vk::PipelineColorBlendStateCreateInfo colorBlending{};
     colorBlending.logicOpEnable   = VK_FALSE;
-    colorBlending.attachmentCount = 1;
-    colorBlending.pAttachments    = &colorBlendAttachment;
+    colorBlending.attachmentCount = (colorAttachmentFormat != vk::Format::eUndefined) ? 1 : 0;
+    colorBlending.pAttachments    = (colorAttachmentFormat != vk::Format::eUndefined) ? &colorBlendAttachment : nullptr;
 
     // 9. Pipeline layout
     vk::PipelineLayoutCreateInfo pipelineLayoutInfo{};
@@ -97,16 +111,16 @@ Pipeline::Pipeline(vk::Device device, vk::Format colorAttachmentFormat,
 
     // 11. Dynamic rendering
     vk::PipelineRenderingCreateInfo renderingInfo{};
-    renderingInfo.colorAttachmentCount    = 1;
-    renderingInfo.pColorAttachmentFormats = &colorAttachmentFormat;
+    renderingInfo.colorAttachmentCount    = (colorAttachmentFormat != vk::Format::eUndefined) ? 1 : 0;
+    renderingInfo.pColorAttachmentFormats = (colorAttachmentFormat != vk::Format::eUndefined) ? &colorAttachmentFormat : nullptr;
     renderingInfo.viewMask                = 0;
-    renderingInfo.depthAttachmentFormat   = vk::Format::eUndefined;
+    renderingInfo.depthAttachmentFormat   = depthAttachmentFormat;
     renderingInfo.stencilAttachmentFormat = vk::Format::eUndefined;
 
     // 11. Create graphics pipeline
     vk::GraphicsPipelineCreateInfo pipelineInfo{};
-    pipelineInfo.stageCount          = 2;
-    pipelineInfo.pStages             = shaderStages;
+    pipelineInfo.stageCount          = static_cast<uint32_t>(shaderStages.size());
+    pipelineInfo.pStages             = shaderStages.data();
     pipelineInfo.pVertexInputState   = &vertexInputInfo;
     pipelineInfo.pInputAssemblyState = &inputAssembly;
     pipelineInfo.pViewportState      = &viewportState;
@@ -129,10 +143,42 @@ Pipeline::Pipeline(vk::Device device, vk::Format colorAttachmentFormat,
 }
 
 Pipeline::~Pipeline() {
-    if (m_pipeline)
+    if (m_pipeline) {
         m_device.destroyPipeline(m_pipeline);
-    if (m_pipelineLayout)
+}
+    if (m_pipelineLayout) {
         m_device.destroyPipelineLayout(m_pipelineLayout);
 }
+}
+
+Pipeline::Pipeline(Pipeline&& other) noexcept
+    : m_device(other.m_device),
+      m_pipelineLayout(other.m_pipelineLayout),
+      m_pipeline(other.m_pipeline)
+{
+    other.m_pipelineLayout = nullptr;
+    other.m_pipeline = nullptr;
+}
+
+Pipeline& Pipeline::operator=(Pipeline&& other) noexcept
+{
+    if (this != &other) {
+        // Destroy our own Vulkan objects first
+        if (m_pipeline) {
+            m_device.destroyPipeline(m_pipeline);
+        }
+        if (m_pipelineLayout) {
+            m_device.destroyPipelineLayout(m_pipelineLayout);
+        }
+        m_device = other.m_device;
+        m_pipelineLayout = other.m_pipelineLayout;
+        m_pipeline = other.m_pipeline;
+
+        other.m_pipelineLayout = nullptr;
+        other.m_pipeline = nullptr;
+    }
+    return *this;
+}
+
 
 } // namespace reactor
diff --git a/src/vulkan/Pipeline.hpp b/src/vulkan/Pipeline.hpp
@@ -10,23 +10,29 @@ namespace reactor {
     public:
         Pipeline(vk::Device device, vk::Format colorAttachmentFormat,
                  const std::string& vertShaderPath, const std::string& fragShaderPath,
-                 const std::vector<vk::DescriptorSetLayout>& setLayouts, uint32_t samples);
+                 const std::vector<vk::DescriptorSetLayout>& setLayouts, uint32_t samples,
+                 vk::Format depthAttachmentFormat = vk::Format::eUndefined, bool depthWriteEnable = true);
         ~Pipeline();
 
-        vk::Pipeline get() const { return m_pipeline; }
-        vk::PipelineLayout getLayout() const { return m_pipelineLayout; }
+        [[nodiscard]] vk::Pipeline get() const { return m_pipeline; }
+        [[nodiscard]] vk::PipelineLayout getLayout() const { return m_pipelineLayout; }
+
+        // Delete copy operations
+        Pipeline(const Pipeline&) = delete;
+        Pipeline& operator=(const Pipeline&) = delete;
+
+        // Move operations
+        Pipeline(Pipeline&& other) noexcept;
+        Pipeline& operator=(Pipeline&& other) noexcept;
 
     private:
         vk::Device m_device;
-        vk::PipelineLayout m_pipelineLayout{};
-        vk::Pipeline m_pipeline{};
+        vk::PipelineLayout m_pipelineLayout;
+        vk::Pipeline m_pipeline;
+
+        [[nodiscard]] std::vector<char> readFile(const std::string& filename) const;
 
-        std::vector<char> readFile(const std::string& filename) const;
-        vk::ShaderModule createShaderModule(const std::vector<char>& code);
 
-        // Prevent copying
-        Pipeline(const Pipeline&) = delete;
-        Pipeline& operator=(const Pipeline&) = delete;
     };
 
 } // namespace reactor
diff --git a/src/vulkan/UniformManager.hpp b/src/vulkan/UniformManager.hpp
@@ -32,7 +32,7 @@ class UniformManager {
 
     // Get the descriptor info need to update a descriptor set.
     template <typename T>
-    vk::DescriptorBufferInfo getDescriptorInfo(size_t frameIndex) const {
+    [[nodiscard]] vk::DescriptorBufferInfo getDescriptorInfo(size_t frameIndex) const {
         const auto& name = m_uboTypeMap.at(std::type_index(typeid(T)));
         const auto& buffer = m_uniformBuffers.at(name)[frameIndex];
 
diff --git a/src/vulkan/VulkanContext.hpp b/src/vulkan/VulkanContext.hpp
@@ -42,7 +42,7 @@ class VulkanContext {
     void createLogicalDevice();
 
     bool isDeviceSuitable(vk::PhysicalDevice device);
-    QueueFamilyIndices findQueueFamilies(vk::PhysicalDevice device) const;
+    [[nodiscard]] QueueFamilyIndices findQueueFamilies(vk::PhysicalDevice device) const;
 
     // Member variables - these are owned by the context
     vk::Instance m_instance;
diff --git a/src/vulkan/VulkanRenderer.cpp b/src/vulkan/VulkanRenderer.cpp
@@ -23,6 +23,7 @@ VulkanRenderer::VulkanRenderer(const RendererConfig& config, Window& window, Cam
     createMSAAImage();
     createResolveImages();
     createSceneViewImages();
+    createDepthImages();
     createSampler();
     createDescriptorSets();
 
@@ -532,8 +533,55 @@ void VulkanRenderer::createDescriptorSets() {
     const auto framesInFlight = m_frameManager->getFramesInFlightCount();
     m_sceneViewImageDescriptorSets.resize(framesInFlight);
     for (int i = 0; i < framesInFlight; ++i) {
-        m_sceneViewImageDescriptorSets[i] = m_imgui->createDescriptorSet(m_sceneViewViews[i], m_sampler->get());
+        m_sceneViewImageDescriptorSets[i] =
+            m_imgui->createDescriptorSet(m_sceneViewViews[i], m_sampler->get());
     }
 }
+void VulkanRenderer::createDepthImages() {
+    vk::Format   format = vk::Format::eD32Sfloat; // Common depth format
+    vk::Extent2D extent = m_swapchain->getExtent();
+    size_t framesInFlight = m_frameManager->getFramesInFlightCount();
+
+    for (size_t i = 0; i < m_depthImages.size(); ++i) {
+        m_context->device().destroyImageView(m_depthViews[i]);
+    }
+    m_depthImages.clear();
+    m_depthViews.clear();
+
+    m_depthImages.resize(framesInFlight);
+    m_depthViews.resize(framesInFlight);
+    for (size_t i = 0; i < framesInFlight; ++i) {
+        vk::ImageCreateInfo imageInfo{};
+        imageInfo.imageType     = vk::ImageType::e2D;
+        imageInfo.extent.width  = extent.width;
+        imageInfo.extent.height = extent.height;
+        imageInfo.extent.depth  = 1;
+        imageInfo.mipLevels     = 1;
+        imageInfo.arrayLayers   = 1;
+        imageInfo.format        = format;
+        imageInfo.tiling        = vk::ImageTiling::eOptimal;
+        imageInfo.initialLayout = vk::ImageLayout::eUndefined;
+        imageInfo.usage         = vk::ImageUsageFlagBits::eDepthStencilAttachment |
+            vk::ImageUsageFlagBits::eSampled;
+        imageInfo.samples     = vk::SampleCountFlagBits::e1;
+        imageInfo.sharingMode = vk::SharingMode::eExclusive;
+
+        m_depthImages[i] = std::make_unique<Image>(*m_allocator, imageInfo, VMA_MEMORY_USAGE_GPU_ONLY);
+        m_imageStateTracker.recordState(m_depthImages[i]->get(), vk::ImageLayout::eUndefined);
+
+        vk::ImageViewCreateInfo viewInfo{};
+        viewInfo.image                           = m_depthImages[i]->get();
+        viewInfo.viewType                        = vk::ImageViewType::e2D;
+        viewInfo.format                          = format;
+        viewInfo.subresourceRange.aspectMask     = vk::ImageAspectFlagBits::eDepth;
+        viewInfo.subresourceRange.baseMipLevel   = 0;
+        viewInfo.subresourceRange.levelCount     = 1;
+        viewInfo.subresourceRange.baseArrayLayer = 0;
+        viewInfo.subresourceRange.layerCount     = 1;
+
+        m_depthViews[i] = m_context->device().createImageView(viewInfo);
+    }
+
+}
 
 } // namespace reactor
diff --git a/src/vulkan/VulkanRenderer.hpp b/src/vulkan/VulkanRenderer.hpp
@@ -63,6 +63,10 @@ class VulkanRenderer {
     std::vector<vk::ImageView> m_sceneViewViews;
     std::vector<vk::DescriptorSet> m_sceneViewImageDescriptorSets;
 
+    std::vector<std::unique_ptr<Image>> m_depthImages;
+    std::vector<vk::ImageView> m_depthViews;
+    std::vector<vk::DescriptorSet> m_depthImageDescriptorSets;
+
     void createCoreVulkanObjects();
     void createSwapchainAndFrameManager();
     void createPipelineAndDescriptors();
@@ -72,6 +76,7 @@ class VulkanRenderer {
     void createSceneViewImages();
     void createSampler();
     void createDescriptorSets();
+    void createDepthImages();
 
     void handleSwapchainResizing();
     void beginCommandBuffer(vk::CommandBuffer cmd);
