Renamed _DEBUG and DEVELOPMENT macros to DILGENT_DEBUG and DILIGENT_DEVELOPMENT

4 files changed, 6 insertions, 6 deletions

diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp b/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp
index 829eae5d..ea3a9f3e 100644
--- a/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp
@@ -127,7 +127,7 @@ void LoadD3DShaderResources(ID3DBlob*           pShaderByteCode,
             Name.erase(OpenBracketPos, Name.length() - OpenBracketPos);
             // Name == "g_tex2DDiffuse"
             VERIFY_EXPR(Name.length() == OpenBracketPos);
-#ifdef _DEBUG
+#ifdef DILIGENT_DEBUG
             for (const auto& ExistingRes : Resources)
             {
                 VERIFY(Name.compare(ExistingRes.Name) != 0, "Resource with the same name has already been enumerated. All array elements are expected to be enumerated one after another");
diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp
index 9dcd44b4..e12d094e 100644
--- a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp
@@ -128,7 +128,7 @@ public:
         SamplerOrTexSRVId  {_SamplerId}
     // clang-format on
     {
-#ifdef _DEBUG
+#ifdef DILIGENT_DEBUG
         // clang-format off
         VERIFY(_BindPoint <= MaxBindPoint || _BindPoint == InvalidBindPoint, "Bind Point is out of allowed range");
         VERIFY(_BindCount <= MaxBindCount, "Bind Count is out of allowed range");
@@ -376,7 +376,7 @@ public:
                                              const SHADER_RESOURCE_VARIABLE_TYPE* AllowedVarTypes,
                                              Uint32                               NumAllowedTypes,
                                              bool                                 CountStaticSamplers) const noexcept;
-#ifdef DEVELOPMENT
+#ifdef DILIGENT_DEVELOPMENT
     static void DvpVerifyResourceLayout(const PipelineResourceLayoutDesc& ResourceLayout,
                                         const ShaderResources* const      pShaderResources[],
                                         Uint32                            NumShaders);
@@ -540,7 +540,7 @@ void ShaderResources::Initialize(ID3DBlob*           pShaderByteCode,
     {
         m_SamplerSuffix = m_ResourceNames.CopyString(CombinedSamplerSuffix);
 
-#ifdef DEVELOPMENT
+#ifdef DILIGENT_DEVELOPMENT
         for (Uint32 n = 0; n < GetNumSamplers(); ++n)
         {
             const auto& Sampler = GetSampler(n);
diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp
index 8e35198d..e880fe0f 100644
--- a/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp
+++ b/Graphics/GraphicsEngineD3DBase/src/ShaderD3DBase.cpp
@@ -92,7 +92,7 @@ static HRESULT CompileShader(const char*                      Source,
                              ID3DBlob**                       ppCompilerOutput)
 {
     DWORD dwShaderFlags = D3DCOMPILE_ENABLE_STRICTNESS;
-#if defined(DEBUG) || defined(_DEBUG)
+#if defined(DILIGENT_DEBUG)
     // Set the D3D10_SHADER_DEBUG flag to embed debug information in the shaders.
     // Setting this flag improves the shader debugging experience, but still allows
     // the shaders to be optimized and to run exactly the way they will run in
diff --git a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp
index 3f166a9b..ae8e5d8a 100644
--- a/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp
+++ b/Graphics/GraphicsEngineD3DBase/src/ShaderResources.cpp
@@ -213,7 +213,7 @@ D3DShaderResourceCounters ShaderResources::CountResources(const PipelineResource
     return Counters;
 }
 
-#ifdef DEVELOPMENT
+#ifdef DILIGENT_DEVELOPMENT
 void ShaderResources::DvpVerifyResourceLayout(const PipelineResourceLayoutDesc& ResourceLayout,
                                               const ShaderResources* const      pShaderResources[],
                                               Uint32                            NumShaders)