Diligent-GraphicsEngine: Replaced char with Char to make the API more consistent (close #394)

Author: MikhailGorobets

Graphics/GraphicsEngine/interface/BottomLevelAS.h

@@ -55,7 +55,7 @@ struct BLASTriangleDesc
 {
     /// Geometry name.
     /// The name is used to map triangle data (BLASBuildTriangleData) to this geometry.
-    const char*               GeometryName          DEFAULT_INITIALIZER(nullptr);
+    const Char*               GeometryName          DEFAULT_INITIALIZER(nullptr);
 
     /// The maximum vertex count in this geometry.
     /// Current number of vertices is defined in BLASBuildTriangleData::VertexCount.
@@ -111,7 +111,7 @@ struct BLASBoundingBoxDesc
 {
     /// Geometry name.
     /// The name is used to map AABB data (BLASBuildBoundingBoxData) to this geometry.
-    const char*               GeometryName  DEFAULT_INITIALIZER(nullptr);
+    const Char*               GeometryName  DEFAULT_INITIALIZER(nullptr);
 
     /// The maximum AABB count.
     /// Current number of AABBs is defined in BLASBuildBoundingBoxData::BoxCount.
@@ -120,7 +120,7 @@ struct BLASBoundingBoxDesc
 #if DILIGENT_CPP_INTERFACE
     constexpr BLASBoundingBoxDesc() noexcept {}
 
-    constexpr BLASBoundingBoxDesc(const char* _GeometryName,
+    constexpr BLASBoundingBoxDesc(const Char* _GeometryName,
                                   Uint32      _MaxBoxCount) noexcept :
         GeometryName{_GeometryName},
         MaxBoxCount {_MaxBoxCount }
@@ -292,7 +292,7 @@ DILIGENT_BEGIN_INTERFACE(IBottomLevelAS, IDeviceObject)
     ///
     /// \note Access to the BLAS must be externally synchronized.
     VIRTUAL Uint32 METHOD(GetGeometryDescIndex)(THIS_
-                                                const char* Name) CONST PURE;
+                                                const Char* Name) CONST PURE;
 
 
     /// Returns the geometry index that can be used in a shader binding table.
@@ -302,7 +302,7 @@ DILIGENT_BEGIN_INTERFACE(IBottomLevelAS, IDeviceObject)
     ///
     /// \note Access to the BLAS must be externally synchronized.
     VIRTUAL Uint32 METHOD(GetGeometryIndex)(THIS_
-                                            const char* Name) CONST PURE;
+                                            const Char* Name) CONST PURE;
 
 
     /// Returns the geometry count that was used to build AS.

Graphics/GraphicsEngine/interface/Dearchiver.h

@@ -49,7 +49,7 @@ struct ShaderUnpackInfo
     struct IRenderDevice* pDevice DEFAULT_INITIALIZER(nullptr);
 
     /// Name of the shader to unpack.
-    const char* Name DEFAULT_INITIALIZER(nullptr);
+    const Char* Name DEFAULT_INITIALIZER(nullptr);
 
     /// An optional function to be called by the dearchiver to let the application modify
     /// the shader description.
@@ -68,7 +68,7 @@ struct ResourceSignatureUnpackInfo
 
     /// Name of the signature to unpack. If there is only
     /// one signature in the archive, the name may be null.
-    const char* Name DEFAULT_INITIALIZER(nullptr);
+    const Char* Name DEFAULT_INITIALIZER(nullptr);
 
     /// Shader resource binding allocation granularity.
 
@@ -127,7 +127,7 @@ struct PipelineStateUnpackInfo
 
     /// Name of the PSO to unpack. If there is only
     /// one PSO in the archive, the name may be null.
-    const char* Name DEFAULT_INITIALIZER(nullptr);
+    const Char* Name DEFAULT_INITIALIZER(nullptr);
 
     /// The type of the pipeline state to unpack, see Diligent::PIPELINE_TYPE.
     PIPELINE_TYPE PipelineType DEFAULT_INITIALIZER(PIPELINE_TYPE_INVALID);
@@ -187,7 +187,7 @@ struct RenderPassUnpackInfo
     struct IRenderDevice* pDevice DEFAULT_INITIALIZER(nullptr);
 
     /// Name of the render pass to unpack.
-    const char* Name DEFAULT_INITIALIZER(nullptr);
+    const Char* Name DEFAULT_INITIALIZER(nullptr);
 
     /// An optional function to be called by the dearchiver to let the application modify
     /// the render pass description.

Graphics/GraphicsEngine/interface/DeviceContext.h

@@ -71,7 +71,7 @@ struct DeviceContextDesc
 {
     /// Device context name. This name is what was specified in
     /// ImmediateContextCreateInfo::Name when the engine was initialized.
-    const char*  Name            DEFAULT_INITIALIZER(nullptr);
+    const Char*  Name            DEFAULT_INITIALIZER(nullptr);
 
     /// Command queue type that this context uses.
 
@@ -120,7 +120,7 @@ struct DeviceContextDesc
     constexpr DeviceContextDesc() noexcept {}
 
     /// Initializes the structure with user-specified values.
-    constexpr DeviceContextDesc(const char*        _Name,
+    constexpr DeviceContextDesc(const Char*        _Name,
                                 COMMAND_QUEUE_TYPE _QueueType,
                                 Bool               _IsDeferred,
                                 Uint32             _ContextId,
@@ -1100,7 +1100,7 @@ struct BLASBuildTriangleData
 {
     /// Geometry name used to map a geometry to a hit group in the shader binding table.
     /// Add geometry data to the geometry that is allocated by BLASTriangleDesc with the same name.
-    const char* GeometryName          DEFAULT_INITIALIZER(nullptr);
+    const Char* GeometryName          DEFAULT_INITIALIZER(nullptr);
 
     /// Triangle vertices data source.
     /// Triangles are considered "inactive" if the x component of each vertex is NaN.
@@ -1168,7 +1168,7 @@ struct BLASBuildBoundingBoxData
 {
     /// Geometry name used to map geometry to hit group in shader binding table.
     /// Put geometry data to geometry that allocated by BLASBoundingBoxDesc with the same name.
-    const char* GeometryName DEFAULT_INITIALIZER(nullptr);
+    const Char* GeometryName DEFAULT_INITIALIZER(nullptr);
 
     /// AABB data source.
     /// Each AABB defined as { float3 Min; float3 Max } structure.
@@ -1321,7 +1321,7 @@ typedef struct InstanceMatrix InstanceMatrix;
 struct TLASBuildInstanceData
 {
     /// Instance name that is used to map an instance to a hit group in shader binding table.
-    const char*               InstanceName    DEFAULT_INITIALIZER(nullptr);
+    const Char*               InstanceName    DEFAULT_INITIALIZER(nullptr);
 
     /// Bottom-level AS that represents instance geometry.
     /// Once built, TLAS will hold strong reference to pBLAS until next build or copy operation.

Graphics/GraphicsEngine/interface/EngineFactory.h

@@ -143,7 +143,7 @@ DILIGENT_BEGIN_INTERFACE(IEngineFactory, IObject)
     /// \remarks See AndroidFileSystem::Init.
     VIRTUAL void METHOD(InitAndroidFileSystem)(THIS_
                                                struct ANativeActivity*  NativeActivity,
-                                               const char*              NativeActivityClassName,
+                                               const Char*              NativeActivityClassName,
                                                struct AAssetManager*    AssetManager) CONST PURE;
 #endif
 };

Graphics/GraphicsEngine/interface/GraphicsTypes.h

@@ -3121,7 +3121,7 @@ typedef struct CommandQueueInfo CommandQueueInfo;
 struct GraphicsAdapterInfo
 {
     /// A string that contains the adapter description.
-    char Description[128]   DEFAULT_INITIALIZER({});
+    Char Description[128]   DEFAULT_INITIALIZER({});
 
     /// Adapter type, see Diligent::ADAPTER_TYPE.
     ADAPTER_TYPE   Type     DEFAULT_INITIALIZER(ADAPTER_TYPE_UNKNOWN);
@@ -3230,7 +3230,7 @@ typedef struct GraphicsAdapterInfo GraphicsAdapterInfo;
 struct ImmediateContextCreateInfo
 {
     /// Context name.
-    const char*    Name         DEFAULT_INITIALIZER(nullptr);
+    const Char*    Name         DEFAULT_INITIALIZER(nullptr);
 
     /// Queue index in GraphicsAdapterInfo::Queues.
 
@@ -3250,7 +3250,7 @@ struct ImmediateContextCreateInfo
 #if DILIGENT_CPP_INTERFACE
     constexpr ImmediateContextCreateInfo() noexcept {}
 
-    constexpr ImmediateContextCreateInfo(const char*    _Name,
+    constexpr ImmediateContextCreateInfo(const Char*    _Name,
                                          Uint8          _QueueId,
                                          QUEUE_PRIORITY _Priority = ImmediateContextCreateInfo{}.Priority) noexcept :
         Name    {_Name},
@@ -3461,7 +3461,7 @@ DEFINE_FLAG_ENUM_OPERATORS(D3D12_VALIDATION_FLAGS)
 struct EngineD3D12CreateInfo DILIGENT_DERIVE(EngineCreateInfo)
 
     /// Name of the D3D12 DLL to load. Ignored on UWP.
-    const char* D3D12DllName       DEFAULT_INITIALIZER("d3d12.dll");
+    const Char* D3D12DllName       DEFAULT_INITIALIZER("d3d12.dll");
     /// Direct3D12-specific validation options, see Diligent::D3D12_VALIDATION_FLAGS.
     D3D12_VALIDATION_FLAGS D3D12ValidationFlags DEFAULT_INITIALIZER(D3D12_VALIDATION_FLAG_BREAK_ON_CORRUPTION);
 
@@ -3565,7 +3565,7 @@ struct EngineD3D12CreateInfo DILIGENT_DERIVE(EngineCreateInfo)
 
     /// Path to DirectX Shader Compiler, which is required to use Shader Model 6.0+ features.
     /// By default, the engine will search for "dxcompiler.dll".
-    const char* pDxCompilerPath DEFAULT_INITIALIZER(nullptr);
+    const Char* pDxCompilerPath DEFAULT_INITIALIZER(nullptr);
 
 #if DILIGENT_CPP_INTERFACE
     EngineD3D12CreateInfo() noexcept :
@@ -3656,19 +3656,19 @@ struct EngineVkCreateInfo DILIGENT_DERIVE(EngineCreateInfo)
     Uint32             InstanceLayerCount       DEFAULT_INITIALIZER(0);
 
     /// A list of additional Vulkan instance layers to enable.
-    const char* const* ppInstanceLayerNames     DEFAULT_INITIALIZER(nullptr);
+    const Char* const* ppInstanceLayerNames     DEFAULT_INITIALIZER(nullptr);
 
     /// The number of Vulkan instance extensions in ppInstanceExtensionNames array.
     Uint32             InstanceExtensionCount   DEFAULT_INITIALIZER(0);
 
     /// A list of additional Vulkan instance extensions to enable.
-    const char* const* ppInstanceExtensionNames DEFAULT_INITIALIZER(nullptr);
+    const Char* const* ppInstanceExtensionNames DEFAULT_INITIALIZER(nullptr);
 
     /// Number of Vulkan device extensions in ppDeviceExtensionNames array.
     Uint32             DeviceExtensionCount     DEFAULT_INITIALIZER(0);
 
     /// A list of additional Vulkan device extensions to enable.
-    const char* const* ppDeviceExtensionNames   DEFAULT_INITIALIZER(nullptr);
+    const Char* const* ppDeviceExtensionNames   DEFAULT_INITIALIZER(nullptr);
 
     /// Pointer to Vulkan device extension features.
     /// Will be added to VkDeviceCreateInfo::pNext.
@@ -3681,7 +3681,7 @@ struct EngineVkCreateInfo DILIGENT_DERIVE(EngineCreateInfo)
     Uint32             IgnoreDebugMessageCount  DEFAULT_INITIALIZER(0);
 
     /// An optional list of IgnoreDebugMessageCount Vulkan validation message names to ignore.
-    const char* const* ppIgnoreDebugMessageNames DEFAULT_INITIALIZER(nullptr);
+    const Char* const* ppIgnoreDebugMessageNames DEFAULT_INITIALIZER(nullptr);
 
     /// Size of the main descriptor pool that is used to allocate descriptor sets
     /// for static and mutable variables. If allocation from the current pool fails,
@@ -3752,7 +3752,7 @@ struct EngineVkCreateInfo DILIGENT_DERIVE(EngineCreateInfo)
 
     /// Path to DirectX Shader Compiler, which is required to use Shader Model 6.0+
     /// features when compiling shaders from HLSL.
-    const char* pDxCompilerPath DEFAULT_INITIALIZER(nullptr);
+    const Char* pDxCompilerPath DEFAULT_INITIALIZER(nullptr);
 
 #if DILIGENT_CPP_INTERFACE
     EngineVkCreateInfo() noexcept :

Graphics/GraphicsEngine/interface/InputLayout.h

@@ -72,7 +72,7 @@ struct LayoutElement
     /// to GLSL and used in OpenGL backend as well as compiled to SPIRV and used
     /// in Vulkan backend.
     /// Any value other than default will only work in Direct3D11 and Direct3D12 backends.
-    const char* HLSLSemantic DEFAULT_INITIALIZER("ATTRIB");
+    const Char* HLSLSemantic DEFAULT_INITIALIZER("ATTRIB");
 
     /// Input index of the element that is specified in the vertex shader.
     /// In Direct3D11 and Direct3D12 backends this is the semantic index.
@@ -139,7 +139,7 @@ struct LayoutElement
     {}
 
     /// Initializes the structure
-    constexpr LayoutElement(const char*               _HLSLSemantic,
+    constexpr LayoutElement(const Char*               _HLSLSemantic,
                             Uint32                    _InputIndex,
                             Uint32                    _BufferSlot,
                             Uint32                    _NumComponents,

Graphics/GraphicsEngine/interface/PipelineResourceSignature.h

@@ -138,7 +138,7 @@ DEFINE_FLAG_ENUM_OPERATORS(PIPELINE_RESOURCE_FLAGS);
 struct PipelineResourceDesc
 {
     /// Resource name in the shader
-    const char*                    Name          DEFAULT_INITIALIZER(nullptr);
+    const Char*                    Name          DEFAULT_INITIALIZER(nullptr);
 
     /// Shader stages that this resource applies to. When multiple shader stages are specified,
     /// all stages will share the same resource.
@@ -163,7 +163,7 @@ struct PipelineResourceDesc
     constexpr PipelineResourceDesc() noexcept {}
 
     constexpr PipelineResourceDesc(SHADER_TYPE                   _ShaderStages,
-                                   const char*                   _Name,
+                                   const Char*                   _Name,
                                    Uint32                        _ArraySize,
                                    SHADER_RESOURCE_TYPE          _ResourceType,
                                    SHADER_RESOURCE_VARIABLE_TYPE _VarType = SHADER_RESOURCE_VARIABLE_TYPE_MUTABLE,

Graphics/GraphicsEngine/interface/PipelineState.h

@@ -373,7 +373,7 @@ typedef struct GraphicsPipelineDesc GraphicsPipelineDesc;
 struct RayTracingGeneralShaderGroup
 {
     /// Unique group name.
-    const char* Name    DEFAULT_INITIALIZER(nullptr);
+    const Char* Name    DEFAULT_INITIALIZER(nullptr);
 
     /// Shader type must be SHADER_TYPE_RAY_GEN, SHADER_TYPE_RAY_MISS or SHADER_TYPE_CALLABLE.
     IShader*    pShader DEFAULT_INITIALIZER(nullptr);
@@ -382,7 +382,7 @@ struct RayTracingGeneralShaderGroup
     constexpr RayTracingGeneralShaderGroup() noexcept
     {}
 
-    constexpr RayTracingGeneralShaderGroup(const char* _Name,
+    constexpr RayTracingGeneralShaderGroup(const Char* _Name,
                                            IShader*    _pShader) noexcept:
         Name   {_Name   },
         pShader{_pShader}
@@ -404,7 +404,7 @@ typedef struct RayTracingGeneralShaderGroup RayTracingGeneralShaderGroup;
 struct RayTracingTriangleHitShaderGroup
 {
     /// Unique group name.
-    const char* Name              DEFAULT_INITIALIZER(nullptr);
+    const Char* Name              DEFAULT_INITIALIZER(nullptr);
 
     /// Closest hit shader.
     /// The shader type must be SHADER_TYPE_RAY_CLOSEST_HIT.
@@ -418,7 +418,7 @@ struct RayTracingTriangleHitShaderGroup
     constexpr RayTracingTriangleHitShaderGroup() noexcept
     {}
 
-    constexpr RayTracingTriangleHitShaderGroup(const char* _Name,
+    constexpr RayTracingTriangleHitShaderGroup(const Char* _Name,
                                                IShader*    _pClosestHitShader,
                                                IShader*    _pAnyHitShader    = nullptr) noexcept:
         Name             {_Name             },
@@ -444,7 +444,7 @@ typedef struct RayTracingTriangleHitShaderGroup RayTracingTriangleHitShaderGroup
 struct RayTracingProceduralHitShaderGroup
 {
     /// Unique group name.
-    const char* Name                DEFAULT_INITIALIZER(nullptr);
+    const Char* Name                DEFAULT_INITIALIZER(nullptr);
 
     /// Intersection shader.
     /// The shader type must be SHADER_TYPE_RAY_INTERSECTION.
@@ -462,7 +462,7 @@ struct RayTracingProceduralHitShaderGroup
     constexpr RayTracingProceduralHitShaderGroup() noexcept
     {}
 
-    constexpr RayTracingProceduralHitShaderGroup(const char* _Name,
+    constexpr RayTracingProceduralHitShaderGroup(const Char* _Name,
                                                  IShader*    _pIntersectionShader,
                                                  IShader*    _pClosestHitShader  = nullptr,
                                                  IShader*    _pAnyHitShader      = nullptr) noexcept:
@@ -822,7 +822,7 @@ struct RayTracingPipelineStateCreateInfo DILIGENT_DERIVE(PipelineStateCreateInfo
     /// Direct3D12 only: the name of the constant buffer that will be used by the local root signature.
     /// Ignored if RayTracingPipelineDesc::ShaderRecordSize is zero.
     /// In Vulkan backend in HLSL add [[vk::shader_record_ext]] attribute to the constant buffer, in GLSL add shaderRecord layout to buffer.
-    const char*                               pShaderRecordName        DEFAULT_INITIALIZER(nullptr);
+    const Char*                               pShaderRecordName        DEFAULT_INITIALIZER(nullptr);
 
     /// Direct3D12 only: the maximum hit shader attribute size in bytes.
     /// If zero then maximum allowed size will be used.

Graphics/GraphicsEngine/interface/Shader.h

@@ -153,7 +153,7 @@ struct ShaderDesc DILIGENT_DERIVE(DeviceObjectAttribs)
     constexpr ShaderDesc(const Char* _Name,
                          SHADER_TYPE _ShaderType,
                          Bool        _UseCombinedTextureSamplers = ShaderDesc{}.UseCombinedTextureSamplers,
-                         const char* _CombinedSamplerSuffix      = ShaderDesc{}.CombinedSamplerSuffix) :
+                         const Char* _CombinedSamplerSuffix      = ShaderDesc{}.CombinedSamplerSuffix) :
         DeviceObjectAttribs{_Name},
         ShaderType                {_ShaderType},
         UseCombinedTextureSamplers{_UseCombinedTextureSamplers},
@@ -511,7 +511,7 @@ struct ShaderResourceDesc
 {
     // clang-format off
     /// Shader resource name
-    const char*          Name      DEFAULT_INITIALIZER(nullptr);
+    const Char*          Name      DEFAULT_INITIALIZER(nullptr);
 
     /// Shader resource type, see Diligent::SHADER_RESOURCE_TYPE.
     SHADER_RESOURCE_TYPE Type      DEFAULT_INITIALIZER(SHADER_RESOURCE_TYPE_UNKNOWN);
@@ -524,7 +524,7 @@ struct ShaderResourceDesc
     constexpr ShaderResourceDesc() noexcept
     {}
 
-    constexpr ShaderResourceDesc(const char*          _Name,
+    constexpr ShaderResourceDesc(const Char*          _Name,
                                  SHADER_RESOURCE_TYPE _Type,
                                  Uint32               _ArraySize) noexcept :
         Name{_Name},