Fixed a few enum names and replaced bool with Bool to make the API more consistent

MikhailGorobets · TheMostDiligent · commit 11105563e42d · 2022-10-25T18:41:11.000-07:00
diff --git a/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp b/Graphics/GraphicsAccessories/src/GraphicsAccessories.cpp
@@ -840,7 +840,7 @@ const Char* GetBindFlagString(Uint32 BindFlag)
 {
     VERIFY(BindFlag == BIND_NONE || IsPowerOfTwo(BindFlag), "More than one bind flag is specified");
 
-    static_assert(BIND_FLAGS_LAST == 0x800L, "Please handle the new bind flag in the switch below");
+    static_assert(BIND_FLAG_LAST == 0x800L, "Please handle the new bind flag in the switch below");
     switch (BindFlag)
     {
 #define BIND_FLAG_STR_CASE(Flag) \
@@ -868,7 +868,7 @@ String GetBindFlagsString(Uint32 BindFlags, const char* Delimiter)
     if (BindFlags == 0)
         return "0";
     String Str;
-    for (Uint32 Flag = 1; BindFlags && Flag <= BIND_FLAGS_LAST; Flag <<= 1)
+    for (Uint32 Flag = 1; BindFlags && Flag <= BIND_FLAG_LAST; Flag <<= 1)
     {
         if (BindFlags & Flag)
         {
diff --git a/Graphics/GraphicsEngine/interface/BottomLevelAS.h b/Graphics/GraphicsEngine/interface/BottomLevelAS.h
@@ -164,7 +164,7 @@ DILIGENT_TYPED_ENUM(RAYTRACING_BUILD_AS_FLAGS, Uint8)
     /// result build, potentially at the expense of build time or trace performance.
     RAYTRACING_BUILD_AS_LOW_MEMORY        = 0x10,
 
-    RAYTRACING_BUILD_AS_FLAGS_LAST        = RAYTRACING_BUILD_AS_LOW_MEMORY
+    RAYTRACING_BUILD_AS_FLAG_LAST         = RAYTRACING_BUILD_AS_LOW_MEMORY
 };
 DEFINE_FLAG_ENUM_OPERATORS(RAYTRACING_BUILD_AS_FLAGS)
 
diff --git a/Graphics/GraphicsEngine/interface/Dearchiver.h b/Graphics/GraphicsEngine/interface/Dearchiver.h
@@ -236,9 +236,9 @@ DILIGENT_BEGIN_INTERFACE(IDearchiver, IObject)
     /// 
     /// \warning    This method is not thread-safe and must not be called simultaneously
     ///             with other methods.
-    VIRTUAL bool METHOD(LoadArchive)(THIS_
+    VIRTUAL Bool METHOD(LoadArchive)(THIS_
                                      const IDataBlob* pArchive,
-                                     bool             MakeCopy DEFAULT_VALUE(false)) PURE;
+                                     Bool             MakeCopy DEFAULT_VALUE(false)) PURE;
 
     /// Unpacks a shader from the device object archive.
 
@@ -303,7 +303,7 @@ DILIGENT_BEGIN_INTERFACE(IDearchiver, IObject)
     ///
     /// \warning    This method is not thread-safe and must not be called simultaneously
     ///             with other methods.
-    VIRTUAL bool METHOD(Store)(THIS_
+    VIRTUAL Bool METHOD(Store)(THIS_
                                IDataBlob** ppArchive) CONST PURE;
 
     /// Resets the dearchiver state and releases all loaded objects.
diff --git a/Graphics/GraphicsEngine/interface/DeviceContext.h b/Graphics/GraphicsEngine/interface/DeviceContext.h
@@ -1054,7 +1054,7 @@ DILIGENT_TYPED_ENUM(RAYTRACING_INSTANCE_FLAGS, Uint8)
     /// geometries referenced by this instance. This behavior can be overridden in the shader with ray flags.
     RAYTRACING_INSTANCE_FORCE_NO_OPAQUE = 0x08,
 
-    RAYTRACING_INSTANCE_FLAGS_LAST = RAYTRACING_INSTANCE_FORCE_NO_OPAQUE
+    RAYTRACING_INSTANCE_FLAG_LAST = RAYTRACING_INSTANCE_FORCE_NO_OPAQUE
 };
 DEFINE_FLAG_ENUM_OPERATORS(RAYTRACING_INSTANCE_FLAGS)
 
@@ -1090,7 +1090,7 @@ DILIGENT_TYPED_ENUM(RAYTRACING_GEOMETRY_FLAGS, Uint8)
     /// If this bit is absent an implementation may invoke the any-hit shader more than once for this geometry.
     RAYTRACING_GEOMETRY_FLAG_NO_DUPLICATE_ANY_HIT_INVOCATION = 0x02,
 
-    RAYTRACING_GEOMETRY_FLAGS_LAST = RAYTRACING_GEOMETRY_FLAG_NO_DUPLICATE_ANY_HIT_INVOCATION
+    RAYTRACING_GEOMETRY_FLAG_LAST = RAYTRACING_GEOMETRY_FLAG_NO_DUPLICATE_ANY_HIT_INVOCATION
 };
 DEFINE_FLAG_ENUM_OPERATORS(RAYTRACING_GEOMETRY_FLAGS)
 
diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
@@ -163,7 +163,7 @@ DILIGENT_TYPED_ENUM(BIND_FLAGS, Uint32)
     ///< A texture can be used as shading rate texture.
     BIND_SHADING_RATE        = 1u << 11u,
 
-    BIND_FLAGS_LAST          = BIND_SHADING_RATE
+    BIND_FLAG_LAST           = BIND_SHADING_RATE
 };
 DEFINE_FLAG_ENUM_OPERATORS(BIND_FLAGS)
 
@@ -1475,7 +1475,7 @@ struct SwapChainDesc
 
     /// Indicates if this is a primary swap chain. When Present() is called
     /// for the primary swap chain, the engine releases stale resources.
-    bool  IsPrimary                     DEFAULT_INITIALIZER(true);
+    Bool  IsPrimary                     DEFAULT_INITIALIZER(true);
 
 #if DILIGENT_CPP_INTERFACE
     constexpr SwapChainDesc() noexcept
@@ -1494,7 +1494,7 @@ struct SwapChainDesc
                             Uint32         _BufferCount         = SwapChainDesc{}.BufferCount,
                             Float32        _DefaultDepthValue   = SwapChainDesc{}.DefaultDepthValue,
                             Uint8          _DefaultStencilValue = SwapChainDesc{}.DefaultStencilValue,
-                            bool           _IsPrimary           = SwapChainDesc{}.IsPrimary) :
+                            Bool           _IsPrimary           = SwapChainDesc{}.IsPrimary) :
         Width               {_Width              },
         Height              {_Height             },
         ColorBufferFormat   {_ColorBufferFormat  },
@@ -3323,7 +3323,7 @@ struct EngineCreateInfo
     /// debug layer, enable Vulkan validation layers, create debug OpenGL context, etc.).
     /// The validation is enabled by default in Debug/Development builds and disabled
     /// in release builds.
-    bool                EnableValidation            DEFAULT_INITIALIZER(false);
+    Bool                EnableValidation            DEFAULT_INITIALIZER(false);
 
     /// Validation options, see Diligent::VALIDATION_FLAGS.
     VALIDATION_FLAGS    ValidationFlags             DEFAULT_INITIALIZER(VALIDATION_FLAG_NONE);
@@ -3363,7 +3363,7 @@ struct EngineGLCreateInfo DILIGENT_DERIVE(EngineCreateInfo)
 
     /// Enable 0..1 normalized-device Z range, if required extension is supported; -1..+1 otherwise.
     /// Use IRenderDevice::GetDeviceInfo().NDC to get current NDC.
-    bool         ZeroToOneNDZ DEFAULT_INITIALIZER(false);
+    Bool         ZeroToOneNDZ DEFAULT_INITIALIZER(false);
 
 #if DILIGENT_CPP_INTERFACE
     EngineGLCreateInfo() noexcept : EngineGLCreateInfo{EngineCreateInfo{}}
@@ -3914,7 +3914,7 @@ struct TextureFormatAttribs
     COMPONENT_TYPE ComponentType DEFAULT_INITIALIZER(COMPONENT_TYPE_UNDEFINED);
 
     /// Bool flag indicating if the format is a typeless format
-    bool IsTypeless              DEFAULT_INITIALIZER(false);
+    Bool IsTypeless              DEFAULT_INITIALIZER(false);
 
     /// For block-compressed formats, compression block width
     Uint8 BlockWidth             DEFAULT_INITIALIZER(0);
@@ -3962,10 +3962,10 @@ typedef struct TextureFormatAttribs TextureFormatAttribs;
 struct TextureFormatInfo DILIGENT_DERIVE(TextureFormatAttribs)
 
     /// Indicates if the format is supported by the device
-    bool Supported  DEFAULT_INITIALIZER(false);
+    Bool Supported  DEFAULT_INITIALIZER(false);
 
     // Explicitly pad the structure to 8-byte boundary
-    bool Padding[7] DEFAULT_INITIALIZER({});
+    Bool Padding[7] DEFAULT_INITIALIZER({});
 };
 typedef struct TextureFormatInfo TextureFormatInfo;
 
diff --git a/Graphics/GraphicsEngine/interface/PipelineResourceSignature.h b/Graphics/GraphicsEngine/interface/PipelineResourceSignature.h
@@ -223,7 +223,7 @@ struct PipelineResourceSignatureDesc DILIGENT_DERIVE(DeviceObjectAttribs)
     /// the sampler assigned to the shader resource view is automatically set when
     /// the view is bound. Otherwise samplers need to be explicitly set similar to other
     /// shader variables.
-    bool UseCombinedTextureSamplers DEFAULT_INITIALIZER(false);
+    Bool UseCombinedTextureSamplers DEFAULT_INITIALIZER(false);
 
     /// If UseCombinedTextureSamplers is true, defines the suffix added to the
     /// texture variable name to get corresponding sampler name.  For example,
@@ -316,7 +316,7 @@ DILIGENT_BEGIN_INTERFACE(IPipelineResourceSignature, IDeviceObject)
     ///                                        IPipelineResourceSignature::InitializeStaticSRBResources().
     VIRTUAL void METHOD(CreateShaderResourceBinding)(THIS_
                                                      IShaderResourceBinding** ppShaderResourceBinding,
-                                                     bool                     InitStaticResources DEFAULT_VALUE(false)) PURE;
+                                                     Bool                     InitStaticResources DEFAULT_VALUE(false)) PURE;
 
 
     /// Binds static resources for the specified shader stages in the pipeline resource signature.
@@ -412,7 +412,7 @@ DILIGENT_BEGIN_INTERFACE(IPipelineResourceSignature, IDeviceObject)
 
     /// \remarks    Two signatures are compatible if they contain identical resources and immutabke samplers,
     ///             defined in the same order disregarding their names.
-    VIRTUAL bool METHOD(IsCompatibleWith)(THIS_
+    VIRTUAL Bool METHOD(IsCompatibleWith)(THIS_
                                           const struct IPipelineResourceSignature* pPRS) CONST PURE;
 };
 DILIGENT_END_INTERFACE
diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h
@@ -1068,7 +1068,7 @@ DILIGENT_BEGIN_INTERFACE(IPipelineState, IDeviceObject)
     ///             IPipelineResourceSignature::CreateShaderResourceBinding() method.
     VIRTUAL void METHOD(CreateShaderResourceBinding)(THIS_
                                                      IShaderResourceBinding** ppShaderResourceBinding,
-                                                     bool                     InitStaticResources DEFAULT_VALUE(false)) PURE;
+                                                     Bool                     InitStaticResources DEFAULT_VALUE(false)) PURE;
 
 
 
diff --git a/Graphics/GraphicsEngine/interface/Query.h b/Graphics/GraphicsEngine/interface/Query.h
@@ -61,7 +61,7 @@ struct QueryDataBinaryOcclusion
 
     /// Indicates if at least one sample passed depth and stencil testing in between
     /// IDeviceContext::BeginQuery and IDeviceContext::EndQuery.
-    bool AnySamplePassed DEFAULT_INITIALIZER(0);
+    Bool AnySamplePassed DEFAULT_INITIALIZER(0);
 };
 typedef struct QueryDataBinaryOcclusion QueryDataBinaryOcclusion;
 
@@ -201,10 +201,10 @@ DILIGENT_BEGIN_INTERFACE(IQuery, IDeviceObject)
     ///
     ///             If AutoInvalidate is set to true, and the data have been retrieved, an application
     ///             must not call GetData() until it begins and ends the query again.
-    VIRTUAL bool METHOD(GetData)(THIS_
+    VIRTUAL Bool METHOD(GetData)(THIS_
                                  void*   pData,
                                  Uint32  DataSize,
-                                 bool    AutoInvalidate DEFAULT_VALUE(true)) PURE;
+                                 Bool    AutoInvalidate DEFAULT_VALUE(true)) PURE;
 
     /// Invalidates the query and releases associated resources.
     VIRTUAL void METHOD(Invalidate)(THIS) PURE;
diff --git a/Graphics/GraphicsEngine/interface/RenderDevice.h b/Graphics/GraphicsEngine/interface/RenderDevice.h
@@ -371,7 +371,7 @@ DILIGENT_BEGIN_INTERFACE(IRenderDevice, IObject)
     ///                             great care only if you are sure the resources are not
     ///                             in use by the GPU (such as when the device has just been idled).
     VIRTUAL void METHOD(ReleaseStaleResources)(THIS_
-                                               bool ForceRelease DEFAULT_VALUE(false)) PURE;
+                                               Bool ForceRelease DEFAULT_VALUE(false)) PURE;
 
 
     /// Waits until all outstanding operations on the GPU are complete.
diff --git a/Graphics/GraphicsEngine/interface/ResourceMapping.h b/Graphics/GraphicsEngine/interface/ResourceMapping.h
@@ -119,7 +119,7 @@ DILIGENT_BEGIN_INTERFACE(IResourceMapping, IObject)
     VIRTUAL void METHOD(AddResource)(THIS_
                                      const Char*    Name,
                                      IDeviceObject* pObject,
-                                     bool           bIsUnique) PURE;
+                                     Bool           bIsUnique) PURE;
 
 
     /// Adds resource array to the mapping.
@@ -139,7 +139,7 @@ DILIGENT_BEGIN_INTERFACE(IResourceMapping, IObject)
                                           Uint32                StartIndex,
                                           IDeviceObject* const* ppObjects,
                                           Uint32                NumElements,
-                                          bool                  bIsUnique) PURE;
+                                          Bool                  bIsUnique) PURE;
 
 
     /// Removes a resource from the mapping using its literal name.
diff --git a/Graphics/GraphicsEngine/interface/Shader.h b/Graphics/GraphicsEngine/interface/Shader.h
@@ -136,7 +136,7 @@ struct ShaderDesc DILIGENT_DERIVE(DeviceObjectAttribs)
     /// shader variables.
     ///
     /// This member has no effect if the shader is used in the PSO that uses pipeline resource signature(s).
-    bool UseCombinedTextureSamplers DEFAULT_INITIALIZER(false);
+    Bool UseCombinedTextureSamplers DEFAULT_INITIALIZER(false);
 
     /// If UseCombinedTextureSamplers is true, defines the suffix added to the
     /// texture variable name to get corresponding sampler name.  For example,
@@ -152,7 +152,7 @@ struct ShaderDesc DILIGENT_DERIVE(DeviceObjectAttribs)
 
     constexpr ShaderDesc(const Char* _Name,
                          SHADER_TYPE _ShaderType,
-                         bool        _UseCombinedTextureSamplers = ShaderDesc{}.UseCombinedTextureSamplers,
+                         Bool        _UseCombinedTextureSamplers = ShaderDesc{}.UseCombinedTextureSamplers,
                          const char* _CombinedSamplerSuffix      = ShaderDesc{}.CombinedSamplerSuffix) :
         DeviceObjectAttribs{_Name},
         ShaderType                {_ShaderType},
diff --git a/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h b/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h
@@ -150,7 +150,7 @@ DILIGENT_BEGIN_INTERFACE(IShaderResourceBinding, IObject)
                                                                 Uint32      Index) PURE;
 
     /// Returns true if static resources have been initialized in this SRB.
-    VIRTUAL bool METHOD(StaticResourcesInitialized)(THIS) CONST PURE;
+    VIRTUAL Bool METHOD(StaticResourcesInitialized)(THIS) CONST PURE;
 };
 DILIGENT_END_INTERFACE
 
diff --git a/Graphics/GraphicsEngine/src/BufferBase.cpp b/Graphics/GraphicsEngine/src/BufferBase.cpp
@@ -48,7 +48,7 @@ void ValidateBufferDesc(const BufferDesc& Desc, const IRenderDevice* pDevice) no
     const auto& MemoryInfo = pDevice->GetAdapterInfo().Memory;
     const auto& Features   = pDevice->GetDeviceInfo().Features;
 
-    static_assert(BIND_FLAGS_LAST == 0x800L, "Please update this function to handle the new bind flags");
+    static_assert(BIND_FLAG_LAST == 0x800L, "Please update this function to handle the new bind flags");
 
     constexpr Uint32 AllowedBindFlags =
         BIND_VERTEX_BUFFER |
diff --git a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp
@@ -38,7 +38,7 @@ namespace Diligent
 
 inline UINT BindFlagsToD3D11BindFlags(BIND_FLAGS BindFlags)
 {
-    static_assert(BIND_FLAGS_LAST == 2048, "Did you add a new bind flag? Please handle it here.");
+    static_assert(BIND_FLAG_LAST == 2048, "Did you add a new bind flag? Please handle it here.");
     // clang-format off
     UINT D3D11BindFlags = 0;
     D3D11BindFlags = D3D11BindFlags | ((BindFlags & BIND_VERTEX_BUFFER)     ? D3D11_BIND_VERTEX_BUFFER    : 0);
@@ -56,7 +56,7 @@ inline UINT BindFlagsToD3D11BindFlags(BIND_FLAGS BindFlags)
 
 inline BIND_FLAGS D3D11BindFlagsToBindFlags(UINT D3D11BindFlags)
 {
-    static_assert(BIND_FLAGS_LAST == 2048, "Did you add a new bind flag? Please handle it here.");
+    static_assert(BIND_FLAG_LAST == 2048, "Did you add a new bind flag? Please handle it here.");
     BIND_FLAGS BindFlags = BIND_NONE;
     // clang-format off
     BindFlags = BindFlags | ((D3D11BindFlags & D3D11_BIND_VERTEX_BUFFER)     ? BIND_VERTEX_BUFFER    : BIND_NONE);
diff --git a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
@@ -69,7 +69,7 @@ DILIGENT_BEGIN_INTERFACE(IEngineFactoryD3D12, IEngineFactory)
     ///          load the DLL if it has not be loaded already.
     ///
     ///          This method has no effect on UWP.
-    VIRTUAL bool METHOD(LoadD3D12)(THIS_
+    VIRTUAL Bool METHOD(LoadD3D12)(THIS_
                                    const char* DllName DEFAULT_VALUE("d3d12.dll")) PURE;
 
     /// Creates a render device and device contexts for Direct3D12-based engine implementation.
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
@@ -670,7 +670,7 @@ DXGI_FORMAT ValueTypeToIndexType(VALUE_TYPE IndexType)
 
 D3D12_RAYTRACING_GEOMETRY_FLAGS GeometryFlagsToD3D12RTGeometryFlags(RAYTRACING_GEOMETRY_FLAGS Flags)
 {
-    static_assert(RAYTRACING_GEOMETRY_FLAGS_LAST == RAYTRACING_GEOMETRY_FLAG_NO_DUPLICATE_ANY_HIT_INVOCATION,
+    static_assert(RAYTRACING_GEOMETRY_FLAG_LAST == RAYTRACING_GEOMETRY_FLAG_NO_DUPLICATE_ANY_HIT_INVOCATION,
                   "Please update the switch below to handle the new ray tracing geometry flag");
 
     D3D12_RAYTRACING_GEOMETRY_FLAGS Result = D3D12_RAYTRACING_GEOMETRY_FLAG_NONE;
@@ -692,7 +692,7 @@ D3D12_RAYTRACING_GEOMETRY_FLAGS GeometryFlagsToD3D12RTGeometryFlags(RAYTRACING_G
 
 D3D12_RAYTRACING_INSTANCE_FLAGS InstanceFlagsToD3D12RTInstanceFlags(RAYTRACING_INSTANCE_FLAGS Flags)
 {
-    static_assert(RAYTRACING_INSTANCE_FLAGS_LAST == RAYTRACING_INSTANCE_FORCE_NO_OPAQUE,
+    static_assert(RAYTRACING_INSTANCE_FLAG_LAST == RAYTRACING_INSTANCE_FORCE_NO_OPAQUE,
                   "Please update the switch below to handle the new ray tracing instance flag");
 
     D3D12_RAYTRACING_INSTANCE_FLAGS Result = D3D12_RAYTRACING_INSTANCE_FLAG_NONE;
@@ -716,7 +716,7 @@ D3D12_RAYTRACING_INSTANCE_FLAGS InstanceFlagsToD3D12RTInstanceFlags(RAYTRACING_I
 
 D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS BuildASFlagsToD3D12ASBuildFlags(RAYTRACING_BUILD_AS_FLAGS Flags)
 {
-    static_assert(RAYTRACING_BUILD_AS_FLAGS_LAST == RAYTRACING_BUILD_AS_LOW_MEMORY,
+    static_assert(RAYTRACING_BUILD_AS_FLAG_LAST == RAYTRACING_BUILD_AS_LOW_MEMORY,
                   "Please update the switch below to handle the new acceleration structure build flag");
 
     D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAGS Result = D3D12_RAYTRACING_ACCELERATION_STRUCTURE_BUILD_FLAG_NONE;
diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceMemoryD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceMemoryD3D12Impl.cpp
@@ -85,7 +85,7 @@ D3D12_HEAP_FLAGS GetD3D12HeapFlags(ID3D12Device*   pd3d12Device,
     Uint32 UsingNVApiCount    = 0;
     Uint32 NotUsingNVApiCount = 0;
 
-    static_assert(BIND_FLAGS_LAST == 1u << 11u, "Did you add a new bind flag? You may need to update the logic below.");
+    static_assert(BIND_FLAG_LAST == 1u << 11u, "Did you add a new bind flag? You may need to update the logic below.");
     for (Uint32 res = 0; res < NumResources; ++res)
     {
         auto* pResource = ppResources[res];
diff --git a/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/BufferVkImpl.cpp
@@ -73,7 +73,7 @@ BufferVkImpl::BufferVkImpl(IReferenceCounters*        pRefCounters,
         VK_BUFFER_USAGE_TRANSFER_SRC_BIT | // The buffer can be used as the source of a transfer command
         VK_BUFFER_USAGE_TRANSFER_DST_BIT;  // The buffer can be used as the destination of a transfer command
 
-    static_assert(BIND_FLAGS_LAST == 0x800, "Please update this function to handle the new bind flags");
+    static_assert(BIND_FLAG_LAST == 0x800, "Please update this function to handle the new bind flags");
 
     for (auto BindFlags = m_Desc.BindFlags; BindFlags != 0;)
     {
diff --git a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp
@@ -3168,7 +3168,7 @@ void DeviceContextVkImpl::AliasingBarrier(IDeviceObject* pResourceBefore, IDevic
         }
         else
         {
-            constexpr auto BindAll = static_cast<BIND_FLAGS>((Uint32{BIND_FLAGS_LAST} << 1) - 1);
+            constexpr auto BindAll = static_cast<BIND_FLAGS>((Uint32{BIND_FLAG_LAST} << 1) - 1);
             return BindAll;
         }
     };
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanTypeConversions.cpp
diff --git a/Primitives/interface/BasicTypes.h b/Primitives/interface/BasicTypes.h
diff --git a/Primitives/interface/DebugOutput.h b/Primitives/interface/DebugOutput.h

Original file line number	Diff line number	Diff line change
`@@ -840,7 +840,7 @@ const Char* GetBindFlagString(Uint32 BindFlag)`
`840`	`840`	`{`
`841`	`841`	`VERIFY(BindFlag == BIND_NONE \|\| IsPowerOfTwo(BindFlag), "More than one bind flag is specified");`
`842`	`842`
`843`		`- static_assert(BIND_FLAGS_LAST == 0x800L, "Please handle the new bind flag in the switch below");`
	`843`	`+ static_assert(BIND_FLAG_LAST == 0x800L, "Please handle the new bind flag in the switch below");`
`844`	`844`	`switch (BindFlag)`
`845`	`845`	`{`
`846`	`846`	`#define BIND_FLAG_STR_CASE(Flag) \`
`@@ -868,7 +868,7 @@ String GetBindFlagsString(Uint32 BindFlags, const char* Delimiter)`
`868`	`868`	`if (BindFlags == 0)`
`869`	`869`	`return "0";`
`870`	`870`	`String Str;`
`871`		`- for (Uint32 Flag = 1; BindFlags && Flag <= BIND_FLAGS_LAST; Flag <<= 1)`
	`871`	`+ for (Uint32 Flag = 1; BindFlags && Flag <= BIND_FLAG_LAST; Flag <<= 1)`
`872`	`872`	`{`
`873`	`873`	`if (BindFlags & Flag)`
`874`	`874`	`{`