From c072867aaf9433ea128438db155fc148d3296b10 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Wed, 29 Jan 2020 01:42:59 -0800
Subject: Added API function call type specification to fix c/c++ mismatch on
 x86 MSVC

---
 .../include/EngineFactoryD3DBase.hpp                   | 18 +++++++++---------
 .../include/ShaderVariableD3DBase.hpp                  |  8 ++++----
 .../GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp |  4 ++--
 .../interface/ShaderResourceVariableD3D.h              |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'Graphics/GraphicsEngineD3DBase')

diff --git a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp
index 88680ff5..52948df2 100644
--- a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp
@@ -47,9 +47,9 @@ public:
     {}
 
 
-    virtual void EnumerateAdapters(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
-                                   Uint32&                NumAdapters,
-                                   AdapterAttribs*        Adapters) override
+    virtual void DILIGENT_CALL_TYPE EnumerateAdapters(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
+                                                      Uint32&                NumAdapters,
+                                                      AdapterAttribs*        Adapters) override
     {
         auto DXGIAdapters = FindCompatibleAdapters(MinFeatureLevel);
 
@@ -86,12 +86,12 @@ public:
     }
 
 
-    virtual void EnumerateDisplayModes(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
-                                       Uint32                 AdapterId,
-                                       Uint32                 OutputId,
-                                       TEXTURE_FORMAT         Format,
-                                       Uint32&                NumDisplayModes,
-                                       DisplayModeAttribs*    DisplayModes) override
+    virtual void DILIGENT_CALL_TYPE EnumerateDisplayModes(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
+                                                          Uint32                 AdapterId,
+                                                          Uint32                 OutputId,
+                                                          TEXTURE_FORMAT         Format,
+                                                          Uint32&                NumDisplayModes,
+                                                          DisplayModeAttribs*    DisplayModes) override
     {
         auto DXGIAdapters = FindCompatibleAdapters(MinFeatureLevel);
         if (AdapterId >= DXGIAdapters.size())
diff --git a/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.hpp b/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.hpp
index c89610f9..0ea6e397 100644
--- a/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/ShaderVariableD3DBase.hpp
@@ -60,22 +60,22 @@ struct ShaderVariableD3DBase : public ShaderVariableBase<TShaderResourceLayout,
     {
     }
 
-    virtual SHADER_RESOURCE_VARIABLE_TYPE GetType() const override final
+    virtual SHADER_RESOURCE_VARIABLE_TYPE DILIGENT_CALL_TYPE GetType() const override final
     {
         return m_VariableType;
     }
 
-    virtual void GetResourceDesc(ShaderResourceDesc& ResourceDesc) const override final
+    virtual void DILIGENT_CALL_TYPE GetResourceDesc(ShaderResourceDesc& ResourceDesc) const override final
     {
         ResourceDesc = GetHLSLResourceDesc();
     }
 
-    virtual HLSLShaderResourceDesc GetHLSLResourceDesc() const override final
+    virtual HLSLShaderResourceDesc DILIGENT_CALL_TYPE GetHLSLResourceDesc() const override final
     {
         return m_Attribs.GetHLSLResourceDesc();
     }
 
-    virtual Uint32 GetIndex() const override final
+    virtual Uint32 DILIGENT_CALL_TYPE GetIndex() const override final
     {
         return m_ParentResLayout.GetVariableIndex(*this);
     }
diff --git a/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp b/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp
index 70856a63..b1088b4f 100644
--- a/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/SwapChainD3DBase.hpp
@@ -209,7 +209,7 @@ protected:
         pSwapChain1->QueryInterface(__uuidof(m_pSwapChain), reinterpret_cast<void**>(static_cast<DXGISwapChainType**>(&m_pSwapChain)));
     }
 
-    virtual void SetFullscreenMode(const DisplayModeAttribs& DisplayMode) override final
+    virtual void DILIGENT_CALL_TYPE SetFullscreenMode(const DisplayModeAttribs& DisplayMode) override final
     {
         if (m_pSwapChain)
         {
@@ -231,7 +231,7 @@ protected:
         }
     }
 
-    virtual void SetWindowedMode() override final
+    virtual void DILIGENT_CALL_TYPE SetWindowedMode() override final
     {
         if (m_FSDesc.Fullscreen)
         {
diff --git a/Graphics/GraphicsEngineD3DBase/interface/ShaderResourceVariableD3D.h b/Graphics/GraphicsEngineD3DBase/interface/ShaderResourceVariableD3D.h
index 70790ecf..f89805b9 100644
--- a/Graphics/GraphicsEngineD3DBase/interface/ShaderResourceVariableD3D.h
+++ b/Graphics/GraphicsEngineD3DBase/interface/ShaderResourceVariableD3D.h
@@ -42,7 +42,7 @@ class IShaderResourceVariableD3D : public IShaderResourceVariable
 {
 public:
     /// Returns HLSL ShaderResourceVariable resource description
-    virtual HLSLShaderResourceDesc GetHLSLResourceDesc() const = 0;
+    virtual HLSLShaderResourceDesc DILIGENT_CALL_TYPE GetHLSLResourceDesc() const = 0;
 };
 
 } // namespace Diligent
-- 
cgit v1.2.3