Fixed a few remaining MSVC conformance mode issues

DiligentGraphics · Oct 9, 2023 · 961ec5b · 961ec5b
1 parent 59b2c51
commit 961ec5b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourcesD3D11.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2023 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +38,8 @@
 namespace Diligent
 {
 
-static constexpr Uint32 GetRegisterSpace(const D3D11_SHADER_INPUT_BIND_DESC&)
+template <>
+Uint32 GetRegisterSpace<>(const D3D11_SHADER_INPUT_BIND_DESC&)
 {
     return 0;
 }

diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2023 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,7 +40,8 @@
 namespace Diligent
 {
 
-static Uint32 GetRegisterSpace(const D3D12_SHADER_INPUT_BIND_DESC& BindingDesc)
+template <>
+Uint32 GetRegisterSpace<>(const D3D12_SHADER_INPUT_BIND_DESC& BindingDesc)
 {
     return BindingDesc.Space;
 }

diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp b/Graphics/GraphicsEngineD3DBase/include/D3DShaderResourceLoader.hpp
@@ -35,6 +35,7 @@
 #include "StringTools.hpp"
 #include "ShaderToolsCommon.hpp"
 #include "D3DCommonTypeConversions.hpp"
+#include "EngineMemory.h"
 
 /// \file
 /// D3D shader resource loading
@@ -134,8 +135,11 @@ void LoadD3DShaderConstantBufferReflection(TShaderReflection* pBuffReflection, S
     }
 }
 
+template <typename D3D_SHADER_INPUT_BIND_DESC>
+Uint32 GetRegisterSpace(const D3D_SHADER_INPUT_BIND_DESC&);
 
-template <typename TReflectionTraits,
+template <typename D3DShaderResourceAttribs,
+          typename TReflectionTraits,
           typename TShaderReflection,
           typename THandleShaderDesc,
           typename TOnResourcesCounted,

diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp b/Graphics/GraphicsEngineD3DBase/include/ShaderResources.hpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2023 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -510,7 +510,7 @@ void ShaderResources::Initialize(TShaderReflection*  pShaderReflection,
                                  const Char*         CombinedSamplerSuffix,
                                  bool                LoadConstantBufferReflection)
 {
-    using D3D_SHADER_DESC = TD3DReflectionTraits::D3D_SHADER_DESC;
+    using D3D_SHADER_DESC = typename TD3DReflectionTraits::D3D_SHADER_DESC;
 
     Uint32 CurrCB = 0, CurrTexSRV = 0, CurrTexUAV = 0, CurrBufSRV = 0, CurrBufUAV = 0, CurrSampler = 0, CurrAS = 0;
 
@@ -520,7 +520,7 @@ void ShaderResources::Initialize(TShaderReflection*  pShaderReflection,
     // Constant buffer reflections
     std::vector<ShaderCodeBufferDescX> CBReflections;
 
-    LoadD3DShaderResources<TD3DReflectionTraits>(
+    LoadD3DShaderResources<D3DShaderResourceAttribs, TD3DReflectionTraits>(
         pShaderReflection, LoadConstantBufferReflection,
 
         [&](const D3D_SHADER_DESC& d3dShaderDesc) //