DescriptorSetLayouts structure changed.

stripe2933 · May 23, 2024 · a99033c · a99033c
1 parent 2fcc676
commit a99033c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/examples/00-compute-device/pipelines/MultiplyComputer.hpp b/examples/00-compute-device/pipelines/MultiplyComputer.hpp
@@ -16,6 +16,7 @@ class MultiplyComputer {
         explicit DescriptorSetLayouts(
             const vk::raii::Device &device
         ) : vku::DescriptorSetLayouts<1> { device, LayoutBindings {
+                {},
                 vk::DescriptorSetLayoutBinding { 0, vk::DescriptorType::eStorageBuffer, 1, vk::ShaderStageFlagBits::eCompute },
             } } { }
     };

diff --git a/include/vku/DescriptorSetLayouts.hpp b/include/vku/DescriptorSetLayouts.hpp
@@ -3,30 +3,30 @@
 #include <vulkan/vulkan_raii.hpp>
 
 #include "details/concepts.hpp"
+#include "details/nofield.hpp"
 
 namespace vku {
     template <std::size_t... BindingCounts>
     class DescriptorSetLayouts : public std::array<vk::DescriptorSetLayout, sizeof...(BindingCounts)> {
     public:
         template <std::size_t BindingCount, bool HasBindingFlags = false>
         struct LayoutBindings {
-            std::array<vk::DescriptorSetLayoutBinding, BindingCount> bindings;
             vk::DescriptorSetLayoutCreateFlags flags = {};
-        };
-
-        template <std::size_t BindingCount>
-        struct LayoutBindings<BindingCount, true> {
             std::array<vk::DescriptorSetLayoutBinding, BindingCount> bindings;
-            vk::DescriptorSetLayoutCreateFlags flags = {};
-            std::array<vk::DescriptorBindingFlags, BindingCount> bindingFlags;
+#ifndef _MSC_VER
+            [[no_unique_address]]
+#endif
+            std::conditional_t<HasBindingFlags, std::array<vk::DescriptorBindingFlags, BindingCount>, details::nofield> bindingFlags;
         };
 
         // Type deductions.
         // TODO: tricky deduction, might be ill-formed...
         template <typename... Ts>
-        LayoutBindings(Ts...) -> LayoutBindings<
+        LayoutBindings(vk::DescriptorSetLayoutCreateFlags, Ts...) -> LayoutBindings<
             details::leading_n<vk::DescriptorSetLayoutBinding, Ts...>,
-            std::convertible_to<details::last_type<Ts...>, std::array<vk::DescriptorBindingFlags, details::leading_n<vk::DescriptorSetLayoutBinding, Ts...>>>>;
+            std::convertible_to<
+                details::last_type<Ts...>,
+                std::array<vk::DescriptorBindingFlags, details::leading_n<vk::DescriptorSetLayoutBinding, Ts...>>>>;
 
         /// Number of descriptor sets in the descriptor set layouts.
         static constexpr std::size_t setCount = sizeof...(BindingCounts);
@@ -37,10 +37,9 @@ namespace vku {
 
         std::tuple<std::array<vk::DescriptorSetLayoutBinding, BindingCounts>...> setLayouts;
 
-        template <bool... HasBindingFlags>
         explicit DescriptorSetLayouts(
             const vk::raii::Device &device,
-            const LayoutBindings<BindingCounts, HasBindingFlags> &...layoutBindings
+            const auto &...layoutBindings
         ) : setLayouts { layoutBindings.bindings... },
             raiiLayouts { vk::raii::DescriptorSetLayout { device, getDescriptorSetLayoutCreateInfo(layoutBindings).get() }... } {
             static_cast<std::array<vk::DescriptorSetLayout, setCount>&>(*this)

diff --git a/include/vku/Gpu.hpp b/include/vku/Gpu.hpp
@@ -6,13 +6,10 @@
 #include <vulkan/vulkan_raii.hpp>
 
 #include "details/concepts.hpp"
+#include "details/nofield.hpp"
 #include "details/ranges.hpp"
 
 namespace vku {
-namespace details {
-    struct nofield{};
-}
-
     template <typename QueueFamilyIndices, typename Queues> requires
         std::constructible_from<Queues, vk::Device, const QueueFamilyIndices&>
         && requires(const QueueFamilyIndices &queueFamilyIndices) {

diff --git a/include/vku/details/nofield.hpp b/include/vku/details/nofield.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+namespace vku::details {
+    struct nofield{};
+};