Address failures reported by CI

Author: DominikWitczakAMD

deps/glslang/.gitattributes

@@ -8,10 +8,10 @@
 *.txt text
 
 # source code can be native and normalized, but simpler if lf everywhere; will try that way
-*.h text eof=lf
-*.c text eof=lf
-*.cpp text eof=lf
-*.y text eof=lf
-*.out text eof=lf
-*.conf text eof=lf
-*.err text eof=lf
+*.h text eol=lf
+*.c text eol=lf
+*.cpp text eol=lf
+*.y text eol=lf
+*.out text eol=lf
+*.conf text eol=lf
+*.err text eol=lf

include/misc/descriptor_pool_create_info.h

@@ -133,12 +133,12 @@ namespace Anvil
         DescriptorPoolCreateInfo& operator=(const DescriptorPoolCreateInfo&);
 
         /* Private variables */
-        Anvil::DescriptorPoolCreateFlags                    m_create_flags;
-        const Anvil::BaseDevice*                            m_device_ptr;
-        std::unordered_map<Anvil::DescriptorType, uint32_t> m_descriptor_count;
-        Anvil::MTSafety                                     m_mt_safety;
-        uint32_t                                            m_n_max_inline_uniform_block_bindings;
-        uint32_t                                            m_n_max_sets;
+        Anvil::DescriptorPoolCreateFlags                                                             m_create_flags;
+        const Anvil::BaseDevice*                                                                     m_device_ptr;
+        std::unordered_map<Anvil::DescriptorType, uint32_t, EnumClassHasher<Anvil::DescriptorType> > m_descriptor_count;
+        Anvil::MTSafety                                                                              m_mt_safety;
+        uint32_t                                                                                     m_n_max_inline_uniform_block_bindings;
+        uint32_t                                                                                     m_n_max_sets;
     };
 
 }; /* namespace Anvil */

include/misc/types_struct.h

@@ -32,6 +32,15 @@
 
 namespace Anvil
 {
+    template<typename EnumClass>
+    struct EnumClassHasher
+    {
+        std::size_t operator()(const EnumClass& in_value) const
+        {
+            return static_cast<std::size_t>(static_cast<uint32_t>(in_value) );
+        }
+    };
+
     /* Note: Matches VkSampleLocationEXT in terms of the layout and size.
      */
     typedef struct SampleLocation

include/wrappers/descriptor_set_group.h

@@ -346,7 +346,7 @@ namespace Anvil
         const Anvil::BaseDevice*                                                 m_device_ptr;
         std::vector<const Anvil::DescriptorSetCreateInfo*>                       m_ds_create_info_ptrs;
 
-        std::unordered_map<Anvil::DescriptorType, DescriptorTypeProperties> m_descriptor_type_properties;
+        std::unordered_map<Anvil::DescriptorType, DescriptorTypeProperties, EnumClassHasher<Anvil::DescriptorType> > m_descriptor_type_properties;
 
         uint32_t                               m_n_unique_dses;
         const Anvil::DescriptorSetGroup*       m_parent_dsg_ptr;

src/misc/formats.cpp

@@ -22,6 +22,7 @@
 
 #include "misc/debug.h"
 #include "misc/formats.h"
+#include "misc/types.h"
 #include <algorithm>
 #include <unordered_map>
 
@@ -345,7 +346,7 @@ struct YUVFormatInfo
 };
 
 /* TODO: Component layouts are wrong for YUV formats? */
-static const std::unordered_map<Anvil::Format, YUVFormatInfo> g_yuv_formats =
+static const std::unordered_map<Anvil::Format, YUVFormatInfo, Anvil::EnumClassHasher<Anvil::Format>> g_yuv_formats =
 {
     /* format                                                    | name                                                   | num_planes | subresources[0]                                                                                          | subresources[1]                                                                                 | subresources[2]                                                                  | format_type              | is_multiplanar? | is_packed? */
     {Anvil::Format::G8B8G8R8_422_UNORM,                          {"VK_FORMAT_G8B8G8R8_422_UNORM",                         1,             {Anvil::Format::UNKNOWN,            Anvil::ComponentLayout::GBGR,     8,      8,      8,      8},          {},                                                                                               {},                                                                                Anvil::FormatType::UNORM,  false,            false} },
@@ -431,7 +432,7 @@ typedef struct
     uint32_t plane2_b0_last_bit_index;
 } YUVFormatBitLayoutInfo;
 
-static const std::unordered_map<Anvil::Format, YUVFormatBitLayoutInfo> g_yuv_format_bit_layout_info =
+static const std::unordered_map<Anvil::Format, YUVFormatBitLayoutInfo, Anvil::EnumClassHasher<Anvil::Format> > g_yuv_format_bit_layout_info =
 {
     /*                      Single-planar non-packed YUV formats ==> */
 
@@ -480,7 +481,7 @@ static const std::unordered_map<Anvil::Format, YUVFormatBitLayoutInfo> g_yuv_for
     {Anvil::Format::G12X4_B12X4_R12X4_3PLANE_420_UNORM_3PACK16, {UINT32_MAX,  UINT32_MAX, 4,           15,         UINT32_MAX,  UINT32_MAX, UINT32_MAX,  UINT32_MAX, UINT32_MAX,  UINT32_MAX, UINT32_MAX,  UINT32_MAX, UINT32_MAX,  UINT32_MAX,  4,           15,         4,           15,         UINT32_MAX,  UINT32_MAX, UINT32_MAX,  UINT32_MAX} },
 };
 
-static const std::unordered_map<Anvil::Format, NonYUVFormatBitLayoutInfo> g_nonyuv_format_bit_layout_info =
+static const std::unordered_map<Anvil::Format, NonYUVFormatBitLayoutInfo, Anvil::EnumClassHasher<Anvil::Format> > g_nonyuv_format_bit_layout_info =
 {
     /* format                                   | red start | red end   | green start | green end | blue start | blue end   | alpha start | alpha end | shared_start | shared_end | depth start | depth end | stencil start | stencil end */
     {Anvil::Format::UNKNOWN,                     {UINT32_MAX, UINT32_MAX, UINT32_MAX,   UINT32_MAX, UINT32_MAX,  UINT32_MAX,  UINT32_MAX,   UINT32_MAX, UINT32_MAX,    UINT32_MAX,  UINT32_MAX,   UINT32_MAX, UINT32_MAX,     UINT32_MAX} },

src/wrappers/descriptor_set_group.cpp

@@ -185,11 +185,11 @@ Anvil::DescriptorSetGroup::~DescriptorSetGroup()
 /** Re-creates internally-maintained descriptor pool. **/
 bool Anvil::DescriptorSetGroup::bake_descriptor_pool()
 {
-    Anvil::DescriptorPoolCreateFlags                    flags                    = ((m_releaseable_sets) ? Anvil::DescriptorPoolCreateFlagBits::FREE_DESCRIPTOR_SET_BIT : Anvil::DescriptorPoolCreateFlagBits::NONE);
-    std::unique_lock<std::recursive_mutex>              mutex_lock;
-    auto                                                mutex_ptr                = get_mutex();
-    std::unordered_map<Anvil::DescriptorType, uint32_t> n_descriptors_needed_map;
-    bool                                                result                   = false;
+    Anvil::DescriptorPoolCreateFlags                                                                    flags                    = ((m_releaseable_sets) ? Anvil::DescriptorPoolCreateFlagBits::FREE_DESCRIPTOR_SET_BIT : Anvil::DescriptorPoolCreateFlagBits::NONE);
+    std::unique_lock<std::recursive_mutex>                                                              mutex_lock;
+    auto                                                                                                mutex_ptr                = get_mutex();
+    std::unordered_map<Anvil::DescriptorType, uint32_t, Anvil::EnumClassHasher<Anvil::DescriptorType> > n_descriptors_needed_map;
+    bool                                                                                                result                   = false;
 
     if (mutex_ptr != nullptr)
     {