SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorSetGroup.cpp

@@ -53,7 +53,6 @@ namespace SHADE
     for (uint32_t i = 0; i < layouts.size(); ++i)
     {
       vkLayouts[i] = layouts[i]->GetVkHandle();
-      setIndexing.emplace(layouts[i]->GetSetIndex(), i);
     }
 
     // Check for variable descriptor count
@@ -87,7 +86,7 @@ namespace SHADE
       for (auto& binding : bindings)
       {
         BindingAndSetHash writeHash = binding.BindPoint;
-        writeHash |= static_cast<uint64_t>(layouts[i]->GetSetIndex()) << 32;
+        writeHash |= static_cast<uint64_t>(i) << 32;
 
         // new write for the binding
         updater.writeInfos.emplace_back();
@@ -208,16 +207,13 @@ namespace SHADE
     // Get binding + set hash
     BindingAndSetHash bsHash = SHVkUtil::GenBindingSetHash(set, binding);
 
-    // to index a set
-    uint32_t setIndex = setIndexing[set];
-
     // to index a write for a binding
     uint32_t writeInfoIndex = updater.writeHashMap[bsHash];
 
     // Initialize info for write
-    writeDescSet.descriptorType = layoutsUsed[setIndex]->GetBindings()[binding].Type;
+    writeDescSet.descriptorType = layoutsUsed[set]->GetBindings()[binding].Type;
     writeDescSet.dstArrayElement = 0;
-    writeDescSet.dstSet = descSets[setIndex];
+    writeDescSet.dstSet = descSets[set];
     writeDescSet.dstBinding = binding;
 
     writeDescSet.pImageInfo = updater.writeInfos[writeInfoIndex].descImageInfos.data();
@@ -233,16 +229,13 @@ namespace SHADE
     // Get binding + set hash
     BindingAndSetHash bsHash = SHVkUtil::GenBindingSetHash(set, binding);
 
-    // to index a set
-    uint32_t setIndex = setIndexing[set];
-
     // to index a write for a binding
     uint32_t writeInfoIndex = updater.writeHashMap[bsHash];
 
     // Initialize info for write
-    writeDescSet.descriptorType = layoutsUsed[setIndex]->GetBindings()[binding].Type;
+    writeDescSet.descriptorType = layoutsUsed[set]->GetBindings()[binding].Type;
     writeDescSet.dstArrayElement = 0;
-    writeDescSet.dstSet = descSets[setIndex];
+    writeDescSet.dstSet = descSets[set];
     writeDescSet.dstBinding = binding;
 
     writeDescSet.pBufferInfo = updater.writeInfos[writeInfoIndex].descBufferInfos.data();

SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorSetGroup.h

@@ -21,7 +21,6 @@ namespace SHADE
   class SHVkImageView;
   class SHVkBuffer;
 
-
   /*---------------------------------------------------------------------------------*/
   /* Type Definitions                                                                */
   /*---------------------------------------------------------------------------------*/
@@ -91,10 +90,10 @@ namespace SHADE
     //! Descriptor pool to allocate descriptor sets 
     Handle<SHVkDescriptorPool> descPool;
 
-    //! Sometimes when we pass in a layout, the set of the layout used in the
+    ////! Sometimes when we pass in a layout, the set of the layout used in the
-    //! shader cannot be used to index into descSets. This is to mitigate that issue
+    ////! shader cannot be used to index into descSets. This is to mitigate that issue
-    //! when we update descriptor sets.
+    ////! when we update descriptor sets.
-    std::unordered_map<SetIndex, uint32_t> setIndexing;
+    //std::unordered_map<SetIndex, uint32_t> setIndexing;
 
     //! Descriptor sets
     std::vector<vk::DescriptorSet> descSets;

SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorSetLayout.cpp

@@ -8,10 +8,9 @@ namespace SHADE
   /*---------------------------------------------------------------------------------*/
   /* Constructor/Destructor                                                          */
   /*---------------------------------------------------------------------------------*/
-    SHVkDescriptorSetLayout::SHVkDescriptorSetLayout(Handle<SHVkLogicalDevice> device, SetIndex set, const std::vector<Binding>& bindings, bool genImmutableSamplers/* = false*/)
+  SHVkDescriptorSetLayout::SHVkDescriptorSetLayout(Handle<SHVkLogicalDevice> device, const std::vector<Binding>& bindings, bool genImmutableSamplers/* = false*/)
-    : device     { device }
+    : device{ device }
-    , layoutDesc { bindings }
+    , layoutDesc{ bindings }
-    , setIndex {set}
     , immutableSampler{}
   {
     // Check if auto-binding point calculation configuration is valid
@@ -93,10 +92,9 @@ namespace SHADE
   }
 
   SHVkDescriptorSetLayout::SHVkDescriptorSetLayout(SHVkDescriptorSetLayout&& rhs) noexcept
-      : device {rhs.device}
+    : device{ rhs.device }
-      , setLayout {rhs.setLayout}
+    , setLayout{ rhs.setLayout }
-      , layoutDesc{std::move (rhs.layoutDesc)}
+    , layoutDesc{ std::move(rhs.layoutDesc) }
-      , setIndex{ rhs.setIndex }
     , immutableSampler{ rhs.immutableSampler }
   {
     rhs.setLayout = VK_NULL_HANDLE;
@@ -114,11 +112,6 @@ namespace SHADE
     return layoutDesc;
   }
 
-    SetIndex SHVkDescriptorSetLayout::GetSetIndex(void) const noexcept
-    {
-      return setIndex;
-    }
-
   uint32_t SHVkDescriptorSetLayout::GetNumDynamicOffsetsRequired(void) const noexcept
   {
     uint32_t numDynamicBindings = 0;
@@ -139,7 +132,6 @@ namespace SHADE
     device = rhs.device;
     setLayout = rhs.setLayout;
     layoutDesc = std::move(rhs.layoutDesc);
-      setIndex = rhs.setIndex;
     immutableSampler = rhs.immutableSampler;
 
     rhs.setLayout = VK_NULL_HANDLE;

SHADE_Engine/src/Graphics/Descriptors/SHVkDescriptorSetLayout.h

@@ -75,7 +75,7 @@ namespace SHADE
     /// </summary>
     /// <param name="device"></param>
     /// <param name="bindings"></param>
-        SHVkDescriptorSetLayout(Handle<SHVkLogicalDevice> device, SetIndex setIndex, const std::vector<Binding>& bindings, bool genImmutableSamplers = false);
+    SHVkDescriptorSetLayout(Handle<SHVkLogicalDevice> device, const std::vector<Binding>& bindings, bool genImmutableSamplers = false);
     SHVkDescriptorSetLayout(const SHVkDescriptorSetLayout&) = delete;
     SHVkDescriptorSetLayout(SHVkDescriptorSetLayout&& rhs) noexcept;
     /// <summary>
@@ -97,9 +97,8 @@ namespace SHADE
     /// </summary>
     /// <returns>Handle to the Vulkan Descriptor Set Layout handle.</returns>
     inline const vk::DescriptorSetLayout& GetVkHandle() const { return setLayout; }
-        std::vector<Binding> const&           GetBindings (void) const noexcept;
+    std::vector<Binding> const& GetBindings(void) const noexcept;
-        SetIndex                              GetSetIndex (void) const noexcept;
+    uint32_t                              GetNumDynamicOffsetsRequired(void) const noexcept;
-        uint32_t                              GetNumDynamicOffsetsRequired (void) const noexcept;
 
   private:
     /*-----------------------------------------------------------------------------*/
@@ -108,7 +107,6 @@ namespace SHADE
     Handle<SHVkLogicalDevice> device;
     vk::DescriptorSetLayout   setLayout;
     std::vector<Binding>      layoutDesc; // Stores description of the layout
-        SetIndex                  setIndex;   // Index of the set
     Handle<SHVkSampler>       immutableSampler;
   };
 }

SHADE_Engine/src/Graphics/Devices/SHVkLogicalDevice.cpp

@@ -561,9 +561,9 @@ namespace SHADE
 
   }
 
-  Handle<SHVkDescriptorSetLayout> SHVkLogicalDevice::CreateDescriptorSetLayout(SetIndex setIndex, std::vector<SHVkDescriptorSetLayout::Binding> const& bindings, bool genImmutableSamplers/* = false*/) noexcept
+  Handle<SHVkDescriptorSetLayout> SHVkLogicalDevice::CreateDescriptorSetLayout(std::vector<SHVkDescriptorSetLayout::Binding> const& bindings, bool genImmutableSamplers/* = false*/) noexcept
   {
-    return SHVkInstance::GetResourceManager().Create <SHVkDescriptorSetLayout>(GetHandle(), setIndex,  bindings, genImmutableSamplers);
+    return SHVkInstance::GetResourceManager().Create <SHVkDescriptorSetLayout>(GetHandle(), bindings, genImmutableSamplers);
   }
 
   Handle<SHVkDescriptorPool> SHVkLogicalDevice::CreateDescriptorPools(const SHVkDescriptorPool::Config& config /*= {}*/) noexcept

SHADE_Engine/src/Graphics/Devices/SHVkLogicalDevice.h

@@ -190,7 +190,7 @@ namespace SHADE
     Handle<SHVkRenderpass>          CreateRenderpass          (std::span<vk::AttachmentDescription> const vkDescriptions, std::vector<SHVkSubpassParams> const& subpasses) noexcept;
     Handle<SHVkRenderpass>          CreateRenderpass          (std::span<vk::AttachmentDescription> const vkDescriptions, std::span<vk::SubpassDescription> const spDescs, std::span<vk::SubpassDependency> const spDeps) noexcept;
     Handle<SHVkFramebuffer>         CreateFramebuffer         (Handle<SHVkRenderpass> const& renderpassHdl, std::vector<Handle<SHVkImageView>> const& attachments, uint32_t inWidth, uint32_t inHeight) noexcept;
-    Handle<SHVkDescriptorSetLayout> CreateDescriptorSetLayout (SetIndex setIndex, std::vector<SHVkDescriptorSetLayout::Binding> const& bindings, bool genImmutableSamplers = false) noexcept;
+    Handle<SHVkDescriptorSetLayout> CreateDescriptorSetLayout (std::vector<SHVkDescriptorSetLayout::Binding> const& bindings, bool genImmutableSamplers = false) noexcept;
     Handle<SHVkDescriptorPool>      CreateDescriptorPools     (const SHVkDescriptorPool::Config& config = {}) noexcept;
     Handle<SHVkDescriptorSetGroup>  CreateDescriptorSetGroup(Handle<SHVkDescriptorPool> pool,
       std::vector<Handle<SHVkDescriptorSetLayout>> const& layouts,

SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp

@@ -25,7 +25,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Graphics/Descriptors/SHVkDescriptorSetGroup.h"
 #include "ECS_Base/Managers/SHComponentManager.h"
 #include "Math/Transform/SHTransformComponent.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Graphics/Descriptors/SHVkDescriptorPool.h"
 #include "Scene/SHSceneManager.h"
 #include "UI/SHUIComponent.h"
@@ -607,7 +607,7 @@ namespace SHADE
       {
         matPropsDescSet[frameIndex] = descPool->Allocate
         (
-          { SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::PER_INSTANCE] },
+          { SHPredefinedData::GetPredefinedDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::PER_INSTANCE] },
           { 0 }
         );
 #ifdef _DEBUG

SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHPredefinedData.cpp

@@ -1,30 +1,24 @@
 #include "SHpch.h"
-#include "SHGraphicsGlobalData.h"
+#include "SHPredefinedData.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Pipeline/SHPipelineState.h"
 #include "Graphics/Pipeline/SHVkPipelineLayout.h"
 #include "Graphics/Descriptors/SHVkDescriptorSetLayout.h"
 #include "Graphics/MiddleEnd/Lights/SHLightData.h"
-#include "Tools/Utilities/SHUtilities.h"
 
 namespace SHADE
 {
   /*-----------------------------------------------------------------------------------*/
   /* Static Definitions                                                                */
   /*-----------------------------------------------------------------------------------*/
-  std::vector<Handle<SHVkDescriptorSetLayout>> SHGraphicsGlobalData::globalDescSetLayouts;
+  std::vector<Handle<SHVkDescriptorSetLayout>> SHPredefinedData::predefinedLayouts;
-  SHVertexInputState                           SHGraphicsGlobalData::defaultVertexInputState;
+  SHVertexInputState                           SHPredefinedData::defaultVertexInputState;
-  Handle<SHVkPipelineLayout>                   SHGraphicsGlobalData::dummyPipelineLayout;
+  Handle<SHVkPipelineLayout>                   SHPredefinedData::dummyPipelineLayout;
-
-  void SHGraphicsGlobalData::InitHighFrequencyGlobalData(void) noexcept
-  {
-
-  } 
 
   /*-----------------------------------------------------------------------------------*/
   /* Function Definitions                                                              */
   /*-----------------------------------------------------------------------------------*/
-  void SHGraphicsGlobalData::InitDescSetLayouts(Handle<SHVkLogicalDevice> logicalDevice) noexcept
+  void SHPredefinedData::InitDescSetLayouts(Handle<SHVkLogicalDevice> logicalDevice) noexcept
   {
     SHVkDescriptorSetLayout::Binding genericDataBinding
     {
@@ -44,7 +38,7 @@ namespace SHADE
     };
 
     // For global data (generic data and textures)
-    Handle<SHVkDescriptorSetLayout> staticGlobalLayout = logicalDevice->CreateDescriptorSetLayout(SHGraphicsConstants::DescriptorSetIndex::STATIC_GLOBALS, { genericDataBinding, texturesBinding });
+    Handle<SHVkDescriptorSetLayout> staticGlobalLayout = logicalDevice->CreateDescriptorSetLayout({ genericDataBinding, texturesBinding });
     SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, staticGlobalLayout->GetVkHandle(), "[Descriptor Set Layout] Static Globals");
 
 
@@ -72,8 +66,8 @@ namespace SHADE
     }
 
     // For Dynamic global data (lights)
-    Handle<SHVkDescriptorSetLayout> dynamicGlobalLayout = logicalDevice->CreateDescriptorSetLayout(SHGraphicsConstants::DescriptorSetIndex::DYNAMIC_GLOBALS, lightBindings);
+    Handle<SHVkDescriptorSetLayout> lightDataDescSetLayout = logicalDevice->CreateDescriptorSetLayout(lightBindings);
-    SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, dynamicGlobalLayout->GetVkHandle(), "[Descriptor Set Layout] Dynamic Globals");
+    SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, lightDataDescSetLayout->GetVkHandle(), "[Descriptor Set Layout] Dynamic Globals");
 
     // For High frequency global data (camera)
     SHVkDescriptorSetLayout::Binding cameraDataBinding
@@ -83,7 +77,7 @@ namespace SHADE
       .BindPoint = SHGraphicsConstants::DescriptorSetBindings::CAMERA_DATA,
       .DescriptorCount = 1,
     };
-    Handle<SHVkDescriptorSetLayout> cameraDataGlobalLayout = logicalDevice->CreateDescriptorSetLayout(SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS, { cameraDataBinding });
+    Handle<SHVkDescriptorSetLayout> cameraDataGlobalLayout = logicalDevice->CreateDescriptorSetLayout({ cameraDataBinding });
     SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, cameraDataGlobalLayout->GetVkHandle(), "[Descriptor Set Layout] High Frequency Globals");
 
     // For per instance data (transforms, materials, etc.)
@@ -94,21 +88,41 @@ namespace SHADE
       .BindPoint = SHGraphicsConstants::DescriptorSetBindings::BATCHED_PER_INST_DATA,
       .DescriptorCount = 1,
     };
-    Handle<SHVkDescriptorSetLayout> materialDataPerInstanceLayout = logicalDevice->CreateDescriptorSetLayout(SHGraphicsConstants::DescriptorSetIndex::PER_INSTANCE, { materialDataBinding });
+    Handle<SHVkDescriptorSetLayout> materialDataPerInstanceLayout = logicalDevice->CreateDescriptorSetLayout({ materialDataBinding });
     SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, materialDataPerInstanceLayout->GetVkHandle(), "[Descriptor Set Layout] Material Globals");
 
+    // font bitmap data (texture)
+    SHVkDescriptorSetLayout::Binding fontBitmapBinding
+    {
+      .Type = vk::DescriptorType::eCombinedImageSampler,
+      .Stage = vk::ShaderStageFlagBits::eFragment,
+      .BindPoint = SHGraphicsConstants::DescriptorSetBindings::FONT_BITMAP_DATA,
+      .DescriptorCount = 1,
+    };
+
+    // font data in the form of matrices
+    SHVkDescriptorSetLayout::Binding fontMatrixBinding
+    {
+      .Type = vk::DescriptorType::eStorageBuffer,
+      .Stage = vk::ShaderStageFlagBits::eVertex,
+      .BindPoint = SHGraphicsConstants::DescriptorSetBindings::FONT_MATRIX_DATA,
+      .DescriptorCount = 1,
+    };
+
+    Handle<SHVkDescriptorSetLayout> fontDataDescSetLayout = logicalDevice->CreateDescriptorSetLayout({ fontBitmapBinding, fontMatrixBinding });
+    SET_VK_OBJ_NAME(logicalDevice, vk::ObjectType::eDescriptorSetLayout, fontDataDescSetLayout->GetVkHandle(), "[Descriptor Set Layout] Font Data");
 
 
-    globalDescSetLayouts.push_back(staticGlobalLayout);
+    predefinedLayouts.push_back(staticGlobalLayout);
-    globalDescSetLayouts.push_back(dynamicGlobalLayout);
+    predefinedLayouts.push_back(lightDataDescSetLayout);
-    globalDescSetLayouts.push_back(cameraDataGlobalLayout);
+    predefinedLayouts.push_back(cameraDataGlobalLayout);
-    globalDescSetLayouts.push_back(materialDataPerInstanceLayout);
+    predefinedLayouts.push_back(materialDataPerInstanceLayout);
+    predefinedLayouts.push_back(fontDataDescSetLayout);
 
-
+    dummyPipelineLayout = logicalDevice->CreatePipelineLayoutDummy(SHPipelineLayoutParamsDummy{predefinedLayouts});
-    dummyPipelineLayout = logicalDevice->CreatePipelineLayoutDummy(SHPipelineLayoutParamsDummy{globalDescSetLayouts});
   }
 
-  void SHGraphicsGlobalData::InitDefaultVertexInputState(void) noexcept
+  void SHPredefinedData::InitDefaultVertexInputState(void) noexcept
   {
     defaultVertexInputState.AddBinding(false, false, { SHVertexAttribute(SHAttribFormat::FLOAT_3D) }); // positions at binding 0
     defaultVertexInputState.AddBinding(false, false, { SHVertexAttribute(SHAttribFormat::FLOAT_2D) }); // UVs at binding 1
@@ -118,24 +132,31 @@ namespace SHADE
     defaultVertexInputState.AddBinding(true, true,   { SHVertexAttribute(SHAttribFormat::UINT32_2D) }); // Instanced integer data at index 8
   }
 
-  void SHGraphicsGlobalData::Init(Handle<SHVkLogicalDevice> logicalDevice) noexcept
+  void SHPredefinedData::Init(Handle<SHVkLogicalDevice> logicalDevice) noexcept
   {
     InitDescSetLayouts(logicalDevice);
     InitDefaultVertexInputState();
   }
 
-  std::vector<Handle<SHVkDescriptorSetLayout>> const& SHGraphicsGlobalData::GetDescSetLayouts(void) noexcept
+  std::vector<Handle<SHVkDescriptorSetLayout>> SHPredefinedData::GetPredefinedDescSetLayouts(SHEnumWrapper<SHGraphicsConstants::SHPredefinedDescSetLayoutTypes> types) noexcept
   {
-    return globalDescSetLayouts;
+    std::vector<Handle<SHVkDescriptorSetLayout>> layoutsFound;
+    for (uint8_t i = 0; i < SHGraphicsConstants::numPredefinedDescSetLayoutTypes; ++i)
+    {
+    	if (types & (static_cast<uint64_t>(1) << i))
+        layoutsFound.push_back(predefinedLayouts[i]);
+    }
+
+    return layoutsFound;
   }
 
 
-  SHVertexInputState const& SHGraphicsGlobalData::GetDefaultViState(void) noexcept
+  SHVertexInputState const& SHPredefinedData::GetDefaultViState(void) noexcept
   {
     return defaultVertexInputState;
   }
 
-  Handle<SHVkPipelineLayout> SHGraphicsGlobalData::GetDummyPipelineLayout(void) noexcept
+  Handle<SHVkPipelineLayout> SHPredefinedData::GetDummyPipelineLayout(void) noexcept
   {
     return dummyPipelineLayout;
   }

SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHPredefinedData.h

@@ -3,6 +3,7 @@
 #include "SH_API.h"
 #include "Graphics/Pipeline/SHPipelineState.h"
 #include "Graphics/MiddleEnd/Interface/SHGraphicsConstants.h"
+#include "Tools/Utilities/SHUtilities.h"
 
 namespace SHADE
 {
@@ -11,11 +12,11 @@ namespace SHADE
   class SHVkDescriptorSetGroup;
   class SHVkPipelineLayout;
 
-  class SH_API SHGraphicsGlobalData
+  class SH_API SHPredefinedData
   {
   private:
     //! Global descriptor set layouts. Used to allocate descriptor sets
-    static std::vector<Handle<SHVkDescriptorSetLayout>> globalDescSetLayouts;
+    static std::vector<Handle<SHVkDescriptorSetLayout>> predefinedLayouts;
 
     //! Default vertex input state (used by everything).
     static SHVertexInputState                           defaultVertexInputState;
@@ -24,7 +25,6 @@ namespace SHADE
     //! we create a dummy pipeline layout to use it for binding.
     static Handle<SHVkPipelineLayout>                   dummyPipelineLayout;
 
-    static void InitHighFrequencyGlobalData (void) noexcept;
     static void InitDescSetLayouts          (Handle<SHVkLogicalDevice> logicalDevice) noexcept;
     static void InitDefaultVertexInputState (void) noexcept;
 
@@ -32,7 +32,7 @@ namespace SHADE
     /*-----------------------------------------------------------------------*/
     /* Constructors                                                          */
     /*-----------------------------------------------------------------------*/
-    SHGraphicsGlobalData() = delete;
+    SHPredefinedData() = delete;
 
     /*-----------------------------------------------------------------------*/
     /* PUBLIC MEMBER FUNCTIONS                                               */
@@ -42,7 +42,7 @@ namespace SHADE
     /*-----------------------------------------------------------------------*/
     /* SETTERS AND GETTERS                                                   */
     /*-----------------------------------------------------------------------*/
-    static std::vector<Handle<SHVkDescriptorSetLayout>> const& GetDescSetLayouts (void) noexcept;
+    static std::vector<Handle<SHVkDescriptorSetLayout>> GetPredefinedDescSetLayouts (SHEnumWrapper<SHGraphicsConstants::SHPredefinedDescSetLayoutTypes> types) noexcept;
     static SHVertexInputState const&                    GetDefaultViState (void) noexcept;
     static Handle<SHVkPipelineLayout>                   GetDummyPipelineLayout (void) noexcept;
   };

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h

@@ -25,74 +25,85 @@ namespace SHADE
   struct SHGraphicsConstants
   {
   public:
+    static constexpr uint8_t numPredefinedDescSetLayoutTypes = 64;
+
+    enum class SHPredefinedDescSetLayoutTypes : uint64_t
+    {
+      STATIC_DATA = 0x01,
+      LIGHTS = 0x02,
+      CAMERA = 0x04,
+      MATERIALS = 0x08,
+      FONT = 0x10,
+    };
+
     struct RenderGraphIndices
     {
       static constexpr uint32_t WORLD  = 0;
       static constexpr uint32_t EDITOR = 0;
     };
 
-    struct DescriptorSetIndex
+    //struct DescriptorSetIndex
-    {
+    //{
-      /***************************************************************************/
+    //  /***************************************************************************/
-      /*!
+    //  /*!
-        \brief
+    //    \brief
-          DescriptorSet Index for static global values like generic data, and
+    //      DescriptorSet Index for static global values like generic data, and
-          texture samplers
+    //      texture samplers
-      */
+    //  */
-      /***************************************************************************/
+    //  /***************************************************************************/
-      static constexpr uint32_t STATIC_GLOBALS = 0;
+    //  static constexpr uint32_t STATIC_GLOBALS = 0;
-      /***************************************************************************/
+    //  /***************************************************************************/
-      /*!
+    //  /*!
-        \brief
+    //    \brief
-          DescriptorSet Index for dynamic global values like lights.
+    //      DescriptorSet Index for dynamic global values like lights.
-      */
+    //  */
-      /***************************************************************************/
+    //  /***************************************************************************/
-      static constexpr uint32_t DYNAMIC_GLOBALS = 1;
+    //  static constexpr uint32_t DYNAMIC_GLOBALS = 1;
-      /***************************************************************************/
+    //  /***************************************************************************/
-      /*!
+    //  /*!
-        \brief
+    //    \brief
-          DescriptorSet Index for high frequency changing global values like
+    //      DescriptorSet Index for high frequency changing global values like
-          camera matrices.
+    //      camera matrices.
-      */
+    //  */
-      /***************************************************************************/
+    //  /***************************************************************************/
-      static constexpr uint32_t HIGH_FREQUENCY_GLOBALS = 2;
+    //  static constexpr uint32_t HIGH_FREQUENCY_GLOBALS = 2;
-      /***************************************************************************/
+    //  /***************************************************************************/
-      /*!
+    //  /*!
-        \brief
+    //    \brief
-          DescriptorSet Index for per-instance/material changing values.
+    //      DescriptorSet Index for per-instance/material changing values.
-      */
+    //  */
-      /***************************************************************************/
+    //  /***************************************************************************/
-      static constexpr uint32_t PER_INSTANCE = 3;
+    //  static constexpr uint32_t PER_INSTANCE = 3;
-      /***************************************************************************/
+    //  /***************************************************************************/
-      /*!
+    //  /*!
-        \brief
+    //    \brief
-          DescriptorSet Index for render graph resources.  Unlike the sets from 
+    //      DescriptorSet Index for render graph resources.  Unlike the sets from 
-          1 to 3 and 6, this set index does not have hard coded bindings and is 
+    //      1 to 3 and 6, this set index does not have hard coded bindings and is 
-          NOT part of the layouts included in the global data.
+    //      NOT part of the layouts included in the global data.
-      */
+    //  */
-      /***************************************************************************/
+    //  /***************************************************************************/
-      static constexpr uint32_t RENDERGRAPH_RESOURCE = 4;
+    //  static constexpr uint32_t RENDERGRAPH_RESOURCE = 4;
-      /***************************************************************************/
+    //  /***************************************************************************/
-      /*!
+    //  /*!
-        \brief
+    //    \brief
-          DescriptorSet Index for render graph node compute resources. For data 
+    //      DescriptorSet Index for render graph node compute resources. For data 
-          that we wish to pass to compute shaders in the render graph, this is
+    //      that we wish to pass to compute shaders in the render graph, this is
-          the set to use. Unlike the sets from 1 to 3 and 6, this set index does not have
+    //      the set to use. Unlike the sets from 1 to 3 and 6, this set index does not have
-          hard coded bindings and is NOT part of the layouts included in the global
+    //      hard coded bindings and is NOT part of the layouts included in the global
-          data.
+    //      data.
-      */
+    //  */
-      /***************************************************************************/
+    //  /***************************************************************************/
-      static constexpr uint32_t RENDERGRAPH_NODE_COMPUTE_RESOURCE = 5;
+    //  static constexpr uint32_t RENDERGRAPH_NODE_COMPUTE_RESOURCE = 5;
 
-      /***************************************************************************/
+    //  /***************************************************************************/
-      /*!
+    //  /*!
-        \brief
+    //    \brief
-          To store font data.
+    //      To store font data.
-          
+    //      
-      */
+    //  */
-      /***************************************************************************/
+    //  /***************************************************************************/
-      static constexpr uint32_t FONT_DATA = 4;
+    //  static constexpr uint32_t FONT_DATA = 4;
-    };
+    //};
 
     struct DescriptorSetBindings
     {

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp

@@ -31,7 +31,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Graphics/MiddleEnd/Interface/SHRenderable.h"
 #include "Graphics/MiddleEnd/Batching/SHSuperBatch.h"
 #include "SHGraphicsConstants.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Graphics/Buffers/SHVkBuffer.h"
 #include "Graphics/Images/SHVkSampler.h"
 #include "Assets/Asset Types/SHTextureAsset.h"
@@ -124,6 +124,9 @@ namespace SHADE
 
     SHFreetypeInstance::Init();
 
+    SHAssetManager::CompileAsset("../../Assets/Shaders/DebugDraw_VS.glsl", false);
+    SHAssetManager::CompileAsset("../../Assets/Shaders/DebugDraw_FS.glsl", false);
+
     // Load Built In Shaders
     static constexpr AssetID VS_DEFAULT    = 39210065;  defaultVertShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(VS_DEFAULT);
     static constexpr AssetID FS_DEFAULT    = 46377769;  defaultFragShader       = SHResourceManager::LoadOrGet<SHVkShaderModule>(FS_DEFAULT);
@@ -318,12 +321,12 @@ namespace SHADE
     /* BIND RENDER GRAPH TO RENDERER                                         */
     /*-----------------------------------------------------------------------*/
     // Add world renderer to default viewport
-    worldRenderer = worldViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], worldRenderGraph);
+    worldRenderer = worldViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHPredefinedData::GetPredefinedDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], worldRenderGraph);
     worldRenderer->SetCamera(worldCamera);
     worldRenderer->SetCameraDirector(worldCameraDirector);
 
     // Add screen renderer to default viewport
-    screenRenderer = worldViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], screenRenderGraph);
+    screenRenderer = worldViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHPredefinedData::GetPredefinedDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], screenRenderGraph);
     screenRenderer->SetCamera(screenCamera);
     screenRenderer->SetCameraDirector(worldCameraDirector);
 
@@ -356,7 +359,7 @@ namespace SHADE
 
   void SHGraphicsSystem::InitMiddleEnd(void) noexcept
   {
-    SHGraphicsGlobalData::Init(device);
+    SHPredefinedData::Init(device);
 
     InitSceneRenderGraph();
 
@@ -454,7 +457,7 @@ namespace SHADE
     editorRenderGraph->Generate();
 
     // Add world renderer to default viewport
-    editorRenderer = editorViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], editorRenderGraph);
+    editorRenderer = editorViewport->AddRenderer(resourceManager, swapchain->GetNumImages(), renderContextCmdPools, descPool, SHPredefinedData::GetPredefinedDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS], editorRenderGraph);
     editorRenderer->SetCamera(worldCamera);
   }
 #endif
@@ -567,8 +570,8 @@ namespace SHADE
         currentCmdBuffer->SetViewportScissor (static_cast<float>(w), static_cast<float>(h), w, h);
 
         // Force set the pipeline layout 
-        currentCmdBuffer->ForceSetPipelineLayout(SHGraphicsGlobalData::GetDummyPipelineLayout(), SH_PIPELINE_TYPE::GRAPHICS);
+        currentCmdBuffer->ForceSetPipelineLayout(SHPredefinedData::GetDummyPipelineLayout(), SH_PIPELINE_TYPE::GRAPHICS);
-        currentCmdBuffer->ForceSetPipelineLayout(SHGraphicsGlobalData::GetDummyPipelineLayout(), SH_PIPELINE_TYPE::COMPUTE);
+        currentCmdBuffer->ForceSetPipelineLayout(SHPredefinedData::GetDummyPipelineLayout(), SH_PIPELINE_TYPE::COMPUTE);
 
         // Bind all the buffers required for meshes
         for (auto& [buffer, bindingPoint] : MESH_DATA)
@@ -900,7 +903,7 @@ namespace SHADE
 
   void SHGraphicsSystem::BuildFonts(void) noexcept
   {
-    fontLibrary.BuildFonts(device, graphicsQueue, graphicsCmdPool, descPool, textRenderingSubSystem->GetFontDataDescSetLayout(), resourceManager);
+    fontLibrary.BuildFonts(device, graphicsQueue, graphicsCmdPool, descPool, SHPredefinedData::GetPredefinedDescSetLayouts(SHGraphicsConstants::SHPredefinedDescSetLayoutTypes::FONT)[0], resourceManager);
   }
 
 #pragma endregion ADD_REMOVE
@@ -1044,6 +1047,10 @@ namespace SHADE
     graphSemaphores[0].Free();
     graphSemaphores[1].Free();
 
+    for (auto& semaHandle : graphSemaphores)
+      semaHandle = device->CreateSemaphore();
+
+
     auto windowDims = window->GetWindowSize();
 
     // Resize the swapchain
@@ -1054,6 +1061,12 @@ namespace SHADE
     worldRenderGraph->HandleResize(resizeWidth, resizeHeight);
 
 #ifdef SHEDITOR
+
+    // NOTE: These 2 lines are actually not necessary because the editor viewport is not even used for 
+    // setting dynamic viewport or scissor state. ImGUI takes care of that for us.
+    //editorViewport->SetWidth(windowDims.first);
+    //editorViewport->SetHeight(windowDims.second);
+
     editorRenderGraph->HandleResize(windowDims.first, windowDims.second);
 #endif
 
@@ -1076,8 +1089,6 @@ namespace SHADE
 
 #endif
 
-    for (auto& semaHandle : graphSemaphores)
-      semaHandle = device->CreateSemaphore();
   }
   
   void SHGraphicsSystem::AwaitGraphicsExecution()
@@ -1126,7 +1137,7 @@ namespace SHADE
       device, SHPipelineLayoutParams
       {
         .shaderModules = { (instanced ? debugMeshVertShader : debugVertShader) , debugFragShader },
-        .globalDescSetLayouts = SHGraphicsGlobalData::GetDescSetLayouts()
+        .globalDescSetLayouts = SHPredefinedData::GetPredefinedDescSetLayouts(SHGraphicsConstants::SHPredefinedDescSetLayoutTypes::CAMERA)
       }
     );
     auto pipeline = resourceManager.Create<SHVkPipeline>(device, pipelineLayout, nullptr, renderPass, subpass);

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.cpp

@@ -51,9 +51,12 @@ namespace SHADE
 
    std::array cameraBufferArray{cameraBuffer};
 
-   cameraDescriptorSet->ModifyWriteDescBuffer(SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS, SHGraphicsConstants::DescriptorSetBindings::CAMERA_DATA, std::span<Handle<SHVkBuffer>>{ cameraBufferArray.data(), cameraBufferArray.size()}, 0, sizeof (SHShaderCameraData));
+   // We use index 0 because the descriptor set is standalone created from a single desc set layout. What the driver sees is that this set is at index 0 during updating.
+   static constexpr uint8_t SET_0 = 0;
 
-   cameraDescriptorSet->UpdateDescriptorSetBuffer(SHGraphicsConstants::DescriptorSetIndex::HIGH_FREQUENCY_GLOBALS, SHGraphicsConstants::DescriptorSetBindings::CAMERA_DATA);
+   cameraDescriptorSet->ModifyWriteDescBuffer(SET_0, SHGraphicsConstants::DescriptorSetBindings::CAMERA_DATA, std::span<Handle<SHVkBuffer>>{ cameraBufferArray.data(), cameraBufferArray.size()}, 0, sizeof (SHShaderCameraData));
+
+   cameraDescriptorSet->UpdateDescriptorSetBuffer(SET_0, SHGraphicsConstants::DescriptorSetBindings::CAMERA_DATA);
   }
 
   SHRenderer::~SHRenderer(void)

SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHRenderer.h

@@ -37,7 +37,7 @@ namespace SHADE
     class SHVkCommandBuffer;
     class SHCamera;
     class SHVkDescriptorSetGroup;
-    class SHGraphicsGlobalData;
+    class SHPredefinedData;
     class SHVkDescriptorPool;
     class SHVkBuffer;
     class SHCameraDirector;

SHADE_Engine/src/Graphics/MiddleEnd/Lights/SHLightingSubSystem.cpp

@@ -1,6 +1,6 @@
 #include "SHpch.h"
 #include "SHLightingSubSystem.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Tools/Utilities/SHUtilities.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Buffers/SHVkBuffer.h"
@@ -385,7 +385,7 @@ namespace SHADE
     std::fill (variableSizes.begin(), variableSizes.end(), 1);
 
     // Create the descriptor set
-    lightingDataDescSet = descPool->Allocate({ SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::DYNAMIC_GLOBALS] }, variableSizes);
+    lightingDataDescSet = descPool->Allocate({ SHPredefinedData::GetPredefinedDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::DYNAMIC_GLOBALS] }, variableSizes);
 #ifdef _DEBUG
     const auto& CAM_DESC_SETS = lightingDataDescSet->GetVkHandle();
     for (int i = 0; i < static_cast<int>(CAM_DESC_SETS.size()); ++i)

SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.cpp

@@ -1,7 +1,7 @@
 #include "SHpch.h"
 #include "SHPipelineLibrary.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Graphics/RenderGraph/SHSubpass.h"
 #include "Graphics/SHVkUtil.h"
 
@@ -13,7 +13,7 @@ namespace SHADE
     SHPipelineLayoutParams params
     {
       .shaderModules = {vsFsPair.first, vsFsPair.second},
-      .globalDescSetLayouts = SHGraphicsGlobalData::GetDescSetLayouts()
+      .globalDescSetLayouts = SHPredefinedData::GetPredefinedDescSetLayouts()
     };
 
     // Create the pipeline layout
@@ -21,7 +21,7 @@ namespace SHADE
 
     // Create the pipeline and configure the default vertex input state
     auto newPipeline = logicalDevice->CreateGraphicsPipeline(pipelineLayout, nullptr, renderpass, subpass);
-    newPipeline->GetPipelineState().SetVertexInputState(SHGraphicsGlobalData::GetDefaultViState());
+    newPipeline->GetPipelineState().SetVertexInputState(SHPredefinedData::GetDefaultViState());
 
     SHColorBlendState colorBlendState{};
     colorBlendState.logic_op_enable = VK_FALSE;

SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.h

@@ -10,7 +10,7 @@ namespace SHADE
   class SHVkDescriptorSetLayouts;
   class SHVkPipeline;
   class SHSubpass;
-  class SHGraphicsGlobalData;
+  class SHPredefinedData;
   
   // Pipeline library is a PURELY MIDDLE END SYSTEM. It is responsible for only creating pipelines from shaders and caching
   // them so that they don't need to be recreated again. 

SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHFont.cpp

@@ -1,7 +1,7 @@
 #include "SHpch.h"
 #include "SHFont.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Graphics/Descriptors/SHVkDescriptorSetGroup.h"
 #include "Graphics/Buffers/SHVkBuffer.h"
 #include "Graphics/Images/SHVkSampler.h"

SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.cpp

@@ -6,7 +6,7 @@
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/MiddleEnd/TextRendering/SHFont.h"
 #include "Graphics/Buffers/SHVkBuffer.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Graphics/Pipeline/SHVkPipeline.h"
 #include "Graphics/SHVkUtil.h"
 #include "Graphics/RenderGraph/SHSubpass.h"
@@ -103,7 +103,7 @@ namespace SHADE
     SHPipelineLayoutParams plParams
     {
       .shaderModules = {textVS, textFS},
-      .globalDescSetLayouts = SHGraphicsGlobalData::GetDescSetLayouts()
+      .globalDescSetLayouts = SHPredefinedData::GetPredefinedDescSetLayouts()
     };
 
     pipelineLayout = logicalDevice->CreatePipelineLayout(plParams);
@@ -157,24 +157,6 @@ namespace SHADE
     // Construct pipeline
     pipeline->ConstructPipeline();
 
-    SHVkDescriptorSetLayout::Binding fontBitmapBinding
-    {
-      .Type = vk::DescriptorType::eCombinedImageSampler,
-      .Stage = vk::ShaderStageFlagBits::eFragment,
-      .BindPoint = SHGraphicsConstants::DescriptorSetBindings::FONT_BITMAP_DATA,
-      .DescriptorCount = 1,
-    };
-
-    SHVkDescriptorSetLayout::Binding fontMatrixBinding
-    {
-      .Type = vk::DescriptorType::eStorageBuffer,
-      .Stage = vk::ShaderStageFlagBits::eVertex,
-      .BindPoint = SHGraphicsConstants::DescriptorSetBindings::FONT_MATRIX_DATA,
-      .DescriptorCount = 1,
-    };
-
-    fontDataDescSetLayout = logicalDevice->CreateDescriptorSetLayout(SHGraphicsConstants::DescriptorSetIndex::FONT_DATA, { fontBitmapBinding, fontMatrixBinding });
-
   }
 
   void SHTextRenderingSubSystem::Run(uint32_t frameIndex) noexcept
@@ -209,6 +191,7 @@ namespace SHADE
         cmdBuffer->BindVertexBuffer(SHGraphicsConstants::VertexBufferBindings::CALCULATED_GLYPH_POSITION, comp.charPositionDataBuffer, 0);
         cmdBuffer->BindVertexBuffer(SHGraphicsConstants::VertexBufferBindings::GLYPH_INDEX, comp.indexingDataBuffer, 0);
 
+        // bind camera desc set (again). Necessary because pipeline layout is not compatible.
         cameraDescSetBind(cmdBuffer, frameIndex);
 
         // bind descriptors for font (matrices)
@@ -234,9 +217,9 @@ namespace SHADE
 
   }
 
-  Handle<SHVkDescriptorSetLayout> SHTextRenderingSubSystem::GetFontDataDescSetLayout(void) const noexcept
+  //Handle<SHVkDescriptorSetLayout> SHTextRenderingSubSystem::GetFontDataDescSetLayout(void) const noexcept
-  {
+  //{
-    return fontDataDescSetLayout;
+  //  return fontDataDescSetLayout;
-  }
+  //}
 
 }

SHADE_Engine/src/Graphics/MiddleEnd/TextRendering/SHTextRenderingSubSystem.h

@@ -41,7 +41,7 @@ namespace SHADE
     Handle<SHVkPipelineLayout> pipelineLayout;
 
     //! Descriptor set for font data access in shaders
-    Handle<SHVkDescriptorSetLayout> fontDataDescSetLayout;
+    //Handle<SHVkDescriptorSetLayout> fontDataDescSetLayout;
 
     //! Super temporary. Global descriptor set needs to be revamped along with
     //! entire graphics system.
@@ -58,7 +58,7 @@ namespace SHADE
     void Exit(void) noexcept;
 
 
-    Handle<SHVkDescriptorSetLayout> GetFontDataDescSetLayout (void) const noexcept;
+    //Handle<SHVkDescriptorSetLayout> GetFontDataDescSetLayout (void) const noexcept;
 
 
   };

SHADE_Engine/src/Graphics/MiddleEnd/Textures/SHTextureLibrary.cpp

@@ -24,7 +24,7 @@ of DigiPen Institute of Technology is prohibited.
 #include "Graphics/Descriptors/SHVkDescriptorSetGroup.h"
 #include "Graphics/Images/SHVkImage.h"
 #include "Graphics/Images/SHVkImageView.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Assets/Asset Types/SHTextureAsset.h"
 
 namespace SHADE
@@ -168,7 +168,7 @@ namespace SHADE
             }
             texDescriptors = descPool->Allocate
             (
-                { SHGraphicsGlobalData::GetDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::STATIC_GLOBALS] }, 
+                { SHPredefinedData::GetPredefinedDescSetLayouts()[SHGraphicsConstants::DescriptorSetIndex::STATIC_GLOBALS] }, 
                 { static_cast<uint32_t>(texOrder.size()) }
             );
 #ifdef _DEBUG

SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp

@@ -12,7 +12,7 @@
 #include "SHRenderGraphStorage.h"
 #include "Graphics/RenderGraph/SHRenderGraphNodeCompute.h"
 #include "Tools/Utilities/SHUtilities.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Graphics/RenderGraph/SHRenderToSwapchainImageSystem.h" 
 
 namespace SHADE

SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.h

@@ -29,7 +29,7 @@ namespace SHADE
   class SHVkCommandPool;
   class SHVkCommandBuffer;
   class SHRenderGraphNode;
-  class SHGraphicsGlobalData;
+  class SHPredefinedData;
   class SHVkDescriptorPool;
   class SHRenderGraphStorage;
   class SHRenderToSwapchainImageSystem;

SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNode.h

@@ -19,7 +19,7 @@ namespace SHADE
   class SHVkLogicalDevice;
   class SHVkRenderpass;
   class SHVkDescriptorPool;
-  class SHGraphicsGlobalData;
+  class SHPredefinedData;
   class SHRenderGraphStorage;
   class SHRenderGraphNodeCompute;
 

SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphNodeCompute.cpp

@@ -6,7 +6,7 @@
 #include "Graphics/Descriptors/SHVkDescriptorSetLayout.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
 #include "Graphics/Pipeline/SHVkPipelineLayout.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "SHRenderGraphStorage.h"
 #include "SHRenderGraphResource.h"
 #include "Graphics/Commands/SHVkCommandBuffer.h"
@@ -27,7 +27,7 @@ namespace SHADE
     SHPipelineLayoutParams pipelineLayoutParams
     {
       .shaderModules = {computeShaderModule},
-      .globalDescSetLayouts = SHGraphicsGlobalData::GetDescSetLayouts(),
+      .globalDescSetLayouts = SHPredefinedData::GetPredefinedDescSetLayouts(),
       .dynamicBufferBindings = std::move(dynamicBufferBindings),
     };
 

SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraphStorage.h

@@ -7,7 +7,7 @@ namespace SHADE
 {
   class SHVkLogicalDevice;
   class SHVkSwapchain;
-  class SHGraphicsGlobalData;
+  class SHPredefinedData;
   class SHVkDescriptorPool;
   class SHRenderGraphResource;
 

SHADE_Engine/src/Graphics/RenderGraph/SHRenderToSwapchainImageSystem.cpp

@@ -1,7 +1,7 @@
 #include "SHpch.h"
 #include "SHRenderToSwapchainImageSystem.h"
 #include "Graphics/Devices/SHVkLogicalDevice.h"
-#include "Graphics/MiddleEnd/GlobalData/SHGraphicsGlobalData.h"
+#include "Graphics/MiddleEnd/GlobalData/SHPredefinedData.h"
 #include "Graphics/RenderGraph/SHRenderGraphNode.h"
 #include "Graphics/RenderGraph/SHSubpass.h"
 #include "Graphics/SHVkUtil.h"
@@ -24,7 +24,7 @@ namespace SHADE
     auto pipelineLayout = logicalDevice->CreatePipelineLayout(SHPipelineLayoutParams
       {
         .shaderModules = {shaderModules.first, shaderModules.second},
-        .globalDescSetLayouts = SHGraphicsGlobalData::GetDescSetLayouts(),
+        .globalDescSetLayouts = SHPredefinedData::GetPredefinedDescSetLayouts(),
       });
 
     pipeline = logicalDevice->CreateGraphicsPipeline(pipelineLayout, nullptr, renderGraphNode->GetRenderpass(), subpass);

SHADE_Engine/src/Tools/Utilities/SHUtilities.h

@@ -43,6 +43,73 @@ namespace SHADE
     static constexpr OutputType ConvertEnum(InputType enumClassMember) noexcept;
   };
 
+  template<typename BitType>
+  class SHEnumWrapper
+  {
+  public:
+    using UnderlyingType = typename std::underlying_type_t<BitType>;
+
+  private:
+    UnderlyingType mask;
+
+  public:
+
+    constexpr SHEnumWrapper(void) noexcept
+      : mask{ 0 }
+    {
+
+    };
+
+    constexpr SHEnumWrapper(BitType bit) noexcept
+      : mask{ static_cast<UnderlyingType>(bit) }
+    {
+
+    };
+
+    constexpr SHEnumWrapper(SHEnumWrapper<BitType> const& rhs) noexcept = default;
+    constexpr SHEnumWrapper& operator= (SHEnumWrapper<BitType> const& rhs) noexcept = default;
+
+    constexpr explicit SHEnumWrapper(UnderlyingType flags) noexcept
+      : mask{ flags }
+    {
+
+    };
+
+    constexpr SHEnumWrapper<BitType> operator| (SHEnumWrapper<BitType> const& rhs) const noexcept
+    {
+      return static_cast<SHEnumWrapper<BitType>> (mask | rhs.mask);
+    };
+
+    constexpr SHEnumWrapper<BitType> operator& (SHEnumWrapper<BitType> const& rhs) const noexcept
+    {
+      return static_cast<SHEnumWrapper<BitType>> (mask & rhs.mask);
+    };
+
+    constexpr operator UnderlyingType() const noexcept
+    {
+      return mask;
+    };
+  };
+
+  template<typename BitType, typename = std::enable_if_t<std::is_enum_v<BitType>>>
+  inline BitType operator|(const BitType& left, const BitType& right)
+  {
+    return static_cast<BitType>(static_cast<int>(left) | static_cast<int>(right));
+  }
+
+  template<typename BitType, typename = std::enable_if_t<std::is_enum_v<BitType>>>
+  inline BitType operator&(const BitType& left, const BitType& right)
+  {
+    return static_cast<BitType>(static_cast<int>(left) & static_cast<int>(right));
+  }
+
+  template <typename EnumType>
+  std::ostream& operator<<(std::ostream& os, EnumType const& type)
+  {
+    os << static_cast<EnumType::UnderlyingType>(type);
+    return os;
+  }
+
 } // namespace SHADE
 
 #include "SHUtilities.hpp"