Added API function call type specification to fix c/c++ mismatch on x86 MSVC

23 files changed, 107 insertions, 90 deletions

diff --git a/Graphics/GraphicsEngine/include/BufferBase.hpp b/Graphics/GraphicsEngine/include/BufferBase.hpp
index 616ef72d..17d09c91 100644
--- a/Graphics/GraphicsEngine/include/BufferBase.hpp
+++ b/Graphics/GraphicsEngine/include/BufferBase.hpp
@@ -121,10 +121,10 @@ public:
 
     /// Implementation of IBuffer::CreateView(); calls CreateViewInternal() virtual function
     /// that creates buffer view for the specific engine implementation.
-    virtual void CreateView(const struct BufferViewDesc& ViewDesc, IBufferView** ppView) override;
+    virtual void DILIGENT_CALL_TYPE CreateView(const struct BufferViewDesc& ViewDesc, IBufferView** ppView) override;
 
     /// Implementation of IBuffer::GetDefaultView().
-    virtual IBufferView* GetDefaultView(BUFFER_VIEW_TYPE ViewType) override;
+    virtual IBufferView* DILIGENT_CALL_TYPE GetDefaultView(BUFFER_VIEW_TYPE ViewType) override;
 
     /// Creates default buffer views.
 
@@ -135,12 +135,12 @@ public:
     /// The function calls CreateViewInternal().
     void CreateDefaultViews();
 
-    virtual void SetState(RESOURCE_STATE State) override final
+    virtual void DILIGENT_CALL_TYPE SetState(RESOURCE_STATE State) override final
     {
         this->m_State = State;
     }
 
-    virtual RESOURCE_STATE GetState() const override final
+    virtual RESOURCE_STATE DILIGENT_CALL_TYPE GetState() const override final
     {
         return this->m_State;
     }
diff --git a/Graphics/GraphicsEngine/include/BufferViewBase.hpp b/Graphics/GraphicsEngine/include/BufferViewBase.hpp
index 313fcf21..a48d6ed7 100644
--- a/Graphics/GraphicsEngine/include/BufferViewBase.hpp
+++ b/Graphics/GraphicsEngine/include/BufferViewBase.hpp
@@ -76,7 +76,7 @@ public:
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_BufferView, TDeviceObjectBase)
 
     /// Implementation of IBufferView::GetBuffer()
-    virtual IBuffer* GetBuffer() override final
+    virtual IBuffer* DILIGENT_CALL_TYPE GetBuffer() override final
     {
         return m_pBuffer;
     }
diff --git a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp
index 6e6ded8f..87b209b8 100644
--- a/Graphics/GraphicsEngine/include/DeviceContextBase.hpp
+++ b/Graphics/GraphicsEngine/include/DeviceContextBase.hpp
@@ -97,14 +97,14 @@ public:
 
     /// Base implementation of IDeviceContext::SetVertexBuffers(); validates parameters and
     /// caches references to the buffers.
-    inline virtual void SetVertexBuffers(Uint32                         StartSlot,
-                                         Uint32                         NumBuffersSet,
-                                         IBuffer**                      ppBuffers,
-                                         Uint32*                        pOffsets,
-                                         RESOURCE_STATE_TRANSITION_MODE StateTransitionMode,
-                                         SET_VERTEX_BUFFERS_FLAGS       Flags) override = 0;
+    inline virtual void DILIGENT_CALL_TYPE SetVertexBuffers(Uint32                         StartSlot,
+                                                            Uint32                         NumBuffersSet,
+                                                            IBuffer**                      ppBuffers,
+                                                            Uint32*                        pOffsets,
+                                                            RESOURCE_STATE_TRANSITION_MODE StateTransitionMode,
+                                                            SET_VERTEX_BUFFERS_FLAGS       Flags) override = 0;
 
-    inline virtual void InvalidateState() override = 0;
+    inline virtual void DILIGENT_CALL_TYPE InvalidateState() override = 0;
 
     /// Base implementation of IDeviceContext::CommitShaderResources(); validates parameters.
     inline bool CommitShaderResources(IShaderResourceBinding*        pShaderResourceBinding,
@@ -112,7 +112,7 @@ public:
                                       int);
 
     /// Base implementation of IDeviceContext::SetIndexBuffer(); caches the strong reference to the index buffer
-    inline virtual void SetIndexBuffer(IBuffer* pIndexBuffer, Uint32 ByteOffset, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override = 0;
+    inline virtual void DILIGENT_CALL_TYPE SetIndexBuffer(IBuffer* pIndexBuffer, Uint32 ByteOffset, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override = 0;
 
     /// Caches the viewports
     inline void SetViewports(Uint32 NumViewports, const Viewport* pViewports, Uint32& RTWidth, Uint32& RTHeight);
@@ -125,52 +125,61 @@ public:
     inline bool SetRenderTargets(Uint32 NumRenderTargets, ITextureView* ppRenderTargets[], ITextureView* pDepthStencil);
 
     /// Base implementation of IDeviceContext::UpdateBuffer(); validates input parameters.
-    virtual void UpdateBuffer(IBuffer* pBuffer, Uint32 Offset, Uint32 Size, const void* pData, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override = 0;
+    virtual void DILIGENT_CALL_TYPE UpdateBuffer(IBuffer*                       pBuffer,
+                                                 Uint32                         Offset,
+                                                 Uint32                         Size,
+                                                 const void*                    pData,
+                                                 RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override = 0;
 
     /// Base implementation of IDeviceContext::CopyBuffer(); validates input parameters.
-    virtual void CopyBuffer(IBuffer*                       pSrcBuffer,
-                            Uint32                         SrcOffset,
-                            RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode,
-                            IBuffer*                       pDstBuffer,
-                            Uint32                         DstOffset,
-                            Uint32                         Size,
-                            RESOURCE_STATE_TRANSITION_MODE DstBufferTransitionMode) override = 0;
+    virtual void DILIGENT_CALL_TYPE CopyBuffer(IBuffer*                       pSrcBuffer,
+                                               Uint32                         SrcOffset,
+                                               RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode,
+                                               IBuffer*                       pDstBuffer,
+                                               Uint32                         DstOffset,
+                                               Uint32                         Size,
+                                               RESOURCE_STATE_TRANSITION_MODE DstBufferTransitionMode) override = 0;
 
     /// Base implementation of IDeviceContext::MapBuffer(); validates input parameters.
-    virtual void MapBuffer(IBuffer* pBuffer, MAP_TYPE MapType, MAP_FLAGS MapFlags, PVoid& pMappedData) override = 0;
+    virtual void DILIGENT_CALL_TYPE MapBuffer(IBuffer*  pBuffer,
+                                              MAP_TYPE  MapType,
+                                              MAP_FLAGS MapFlags,
+                                              PVoid&    pMappedData) override = 0;
 
     /// Base implementation of IDeviceContext::UnmapBuffer()
-    virtual void UnmapBuffer(IBuffer* pBuffer, MAP_TYPE MapType) override = 0;
+    virtual void DILIGENT_CALL_TYPE UnmapBuffer(IBuffer* pBuffer, MAP_TYPE MapType) override = 0;
 
     /// Base implementaiton of IDeviceContext::UpdateData(); validates input parameters
-    virtual void UpdateTexture(ITexture*                      pTexture,
-                               Uint32                         MipLevel,
-                               Uint32                         Slice,
-                               const Box&                     DstBox,
-                               const TextureSubResData&       SubresData,
-                               RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode,
-                               RESOURCE_STATE_TRANSITION_MODE TextureTransitionMode) override = 0;
+    virtual void DILIGENT_CALL_TYPE UpdateTexture(ITexture*                      pTexture,
+                                                  Uint32                         MipLevel,
+                                                  Uint32                         Slice,
+                                                  const Box&                     DstBox,
+                                                  const TextureSubResData&       SubresData,
+                                                  RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode,
+                                                  RESOURCE_STATE_TRANSITION_MODE TextureTransitionMode) override = 0;
 
     /// Base implementaiton of IDeviceContext::CopyTexture(); validates input parameters
-    virtual void CopyTexture(const CopyTextureAttribs& CopyAttribs) override = 0;
+    virtual void DILIGENT_CALL_TYPE CopyTexture(const CopyTextureAttribs& CopyAttribs) override = 0;
 
     /// Base implementaiton of IDeviceContext::MapTextureSubresource()
-    virtual void MapTextureSubresource(ITexture*                 pTexture,
-                                       Uint32                    MipLevel,
-                                       Uint32                    ArraySlice,
-                                       MAP_TYPE                  MapType,
-                                       MAP_FLAGS                 MapFlags,
-                                       const Box*                pMapRegion,
-                                       MappedTextureSubresource& MappedData) override = 0;
+    virtual void DILIGENT_CALL_TYPE MapTextureSubresource(ITexture*                 pTexture,
+                                                          Uint32                    MipLevel,
+                                                          Uint32                    ArraySlice,
+                                                          MAP_TYPE                  MapType,
+                                                          MAP_FLAGS                 MapFlags,
+                                                          const Box*                pMapRegion,
+                                                          MappedTextureSubresource& MappedData) override = 0;
 
     /// Base implementaiton of IDeviceContext::UnmapTextureSubresource()
-    virtual void UnmapTextureSubresource(ITexture* pTexture, Uint32 MipLevel, Uint32 ArraySlice) override = 0;
+    virtual void DILIGENT_CALL_TYPE UnmapTextureSubresource(ITexture* pTexture,
+                                                            Uint32    MipLevel,
+                                                            Uint32    ArraySlice) override = 0;
 
-    virtual void GenerateMips(ITextureView* pTexView) override = 0;
+    virtual void DILIGENT_CALL_TYPE GenerateMips(ITextureView* pTexView) override = 0;
 
-    virtual void ResolveTextureSubresource(ITexture*                               pSrcTexture,
-                                           ITexture*                               pDstTexture,
-                                           const ResolveTextureSubresourceAttribs& ResolveAttribs) override = 0;
+    virtual void DILIGENT_CALL_TYPE ResolveTextureSubresource(ITexture*                               pSrcTexture,
+                                                              ITexture*                               pDstTexture,
+                                                              const ResolveTextureSubresourceAttribs& ResolveAttribs) override = 0;
 
     /// Returns currently bound pipeline state and blend factors
     inline void GetPipelineState(IPipelineState** ppPSO, float* BlendFactors, Uint32& StencilRef);
diff --git a/Graphics/GraphicsEngine/include/DeviceObjectBase.hpp b/Graphics/GraphicsEngine/include/DeviceObjectBase.hpp
index 5b875ade..59720c10 100644
--- a/Graphics/GraphicsEngine/include/DeviceObjectBase.hpp
+++ b/Graphics/GraphicsEngine/include/DeviceObjectBase.hpp
@@ -108,7 +108,7 @@ public:
         }
     }
 
-    inline virtual Atomics::Long Release() override final
+    inline virtual Atomics::Long DILIGENT_CALL_TYPE Release() override final
     {
         // Render device owns allocators for all types of device objects,
         // so it must be destroyed after all device objects are released.
@@ -137,13 +137,13 @@ public:
 
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_DeviceObject, TBase)
 
-    virtual const ObjectDescType& GetDesc() const override final
+    virtual const ObjectDescType& DILIGENT_CALL_TYPE GetDesc() const override final
     {
         return m_Desc;
     }
 
     /// Returns unique identifier
-    virtual Int32 GetUniqueID() const override final
+    virtual Int32 DILIGENT_CALL_TYPE GetUniqueID() const override final
     {
         /// \note
         /// This unique ID is used to unambiguously identify device object for
diff --git a/Graphics/GraphicsEngine/include/EngineFactoryBase.hpp b/Graphics/GraphicsEngine/include/EngineFactoryBase.hpp
index 2e0b954c..4faf72c0 100644
--- a/Graphics/GraphicsEngine/include/EngineFactoryBase.hpp
+++ b/Graphics/GraphicsEngine/include/EngineFactoryBase.hpp
@@ -56,7 +56,7 @@ public:
     {
     }
 
-    virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final
+    virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final
     {
         if (ppInterface == nullptr)
             return;
@@ -69,28 +69,28 @@ public:
         }
     }
 
-    virtual ReferenceCounterValueType AddRef() override final
+    virtual ReferenceCounterValueType DILIGENT_CALL_TYPE AddRef() override final
     {
         return m_RefCounters.AddStrongRef();
     }
 
-    virtual ReferenceCounterValueType Release() override final
+    virtual ReferenceCounterValueType DILIGENT_CALL_TYPE Release() override final
     {
         return m_RefCounters.ReleaseStrongRef();
     }
 
-    virtual IReferenceCounters* GetReferenceCounters() const override final
+    virtual IReferenceCounters* DILIGENT_CALL_TYPE GetReferenceCounters() const override final
     {
         return const_cast<IReferenceCounters*>(static_cast<const IReferenceCounters*>(&m_RefCounters));
     }
 
-    virtual const APIInfo& GetAPIInfo() const override final
+    virtual const APIInfo& DILIGENT_CALL_TYPE GetAPIInfo() const override final
     {
         return Diligent::GetAPIInfo();
     }
 
-    virtual void CreateDefaultShaderSourceStreamFactory(const Char*                       SearchDirectories,
-                                                        IShaderSourceInputStreamFactory** ppShaderSourceFactory) const override final
+    virtual void DILIGENT_CALL_TYPE CreateDefaultShaderSourceStreamFactory(const Char*                       SearchDirectories,
+                                                                           IShaderSourceInputStreamFactory** ppShaderSourceFactory) const override final
     {
         Diligent::CreateDefaultShaderSourceStreamFactory(SearchDirectories, ppShaderSourceFactory);
     }
diff --git a/Graphics/GraphicsEngine/include/QueryBase.hpp b/Graphics/GraphicsEngine/include/QueryBase.hpp
index cd58380b..322fbf54 100644
--- a/Graphics/GraphicsEngine/include/QueryBase.hpp
+++ b/Graphics/GraphicsEngine/include/QueryBase.hpp
@@ -107,7 +107,7 @@ public:
 
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_Query, TDeviceObjectBase)
 
-    virtual void Invalidate() override
+    virtual void DILIGENT_CALL_TYPE Invalidate() override
     {
         m_State = QueryState::Inactive;
     }
diff --git a/Graphics/GraphicsEngine/include/RenderDeviceBase.hpp b/Graphics/GraphicsEngine/include/RenderDeviceBase.hpp
index d4d4aedb..d3ed96e7 100644
--- a/Graphics/GraphicsEngine/include/RenderDeviceBase.hpp
+++ b/Graphics/GraphicsEngine/include/RenderDeviceBase.hpp
@@ -313,22 +313,22 @@ public:
 
     // It is important to have final implementation of Release() method to avoid
     // virtual calls
-    inline virtual ReferenceCounterValueType Release() override final
+    inline virtual ReferenceCounterValueType DILIGENT_CALL_TYPE Release() override final
     {
         return TObjectBase::Release();
     }
 
     /// Implementation of IRenderDevice::CreateResourceMapping().
-    virtual void CreateResourceMapping(const ResourceMappingDesc& MappingDesc, IResourceMapping** ppMapping) override final;
+    virtual void DILIGENT_CALL_TYPE CreateResourceMapping(const ResourceMappingDesc& MappingDesc, IResourceMapping** ppMapping) override final;
 
     /// Implementation of IRenderDevice::GetDeviceCaps().
-    virtual const DeviceCaps& GetDeviceCaps() const override final
+    virtual const DeviceCaps& DILIGENT_CALL_TYPE GetDeviceCaps() const override final
     {
         return m_DeviceCaps;
     }
 
     /// Implementation of IRenderDevice::GetTextureFormatInfo().
-    virtual const TextureFormatInfo& GetTextureFormatInfo(TEXTURE_FORMAT TexFormat) override final
+    virtual const TextureFormatInfo& DILIGENT_CALL_TYPE GetTextureFormatInfo(TEXTURE_FORMAT TexFormat) override final
     {
         VERIFY(TexFormat >= TEX_FORMAT_UNKNOWN && TexFormat < TEX_FORMAT_NUM_FORMATS, "Texture format out of range");
         const auto& TexFmtInfo = m_TextureFormatsInfo[TexFormat];
@@ -337,7 +337,7 @@ public:
     }
 
     /// Implementation of IRenderDevice::GetTextureFormatInfoExt().
-    virtual const TextureFormatInfoExt& GetTextureFormatInfoExt(TEXTURE_FORMAT TexFormat) override final
+    virtual const TextureFormatInfoExt& DILIGENT_CALL_TYPE GetTextureFormatInfoExt(TEXTURE_FORMAT TexFormat) override final
     {
         VERIFY(TexFormat >= TEX_FORMAT_UNKNOWN && TexFormat < TEX_FORMAT_NUM_FORMATS, "Texture format out of range");
         const auto& TexFmtInfo = m_TextureFormatsInfo[TexFormat];
@@ -351,7 +351,7 @@ public:
         return TexFmtInfo;
     }
 
-    virtual IEngineFactory* GetEngineFactory() const override final
+    virtual IEngineFactory* DILIGENT_CALL_TYPE GetEngineFactory() const override final
     {
         return m_pEngineFactory.RawPtr<IEngineFactory>();
     }
diff --git a/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp b/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp
index 57719898..144ecdd5 100644
--- a/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp
+++ b/Graphics/GraphicsEngine/include/ResourceMappingImpl.hpp
@@ -109,22 +109,30 @@ public:
 
     ~ResourceMappingImpl();
 
-    virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final;
+    virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final;
 
     /// Implementation of IResourceMapping::AddResource()
-    virtual void AddResource(const Char* Name, IDeviceObject* pObject, bool bIsUnique) override final;
+    virtual void DILIGENT_CALL_TYPE AddResource(const Char*    Name,
+                                                IDeviceObject* pObject,
+                                                bool           bIsUnique) override final;
 
     /// Implementation of IResourceMapping::AddResourceArray()
-    virtual void AddResourceArray(const Char* Name, Uint32 StartIndex, IDeviceObject* const* ppObjects, Uint32 NumElements, bool bIsUnique) override final;
+    virtual void DILIGENT_CALL_TYPE AddResourceArray(const Char*           Name,
+                                                     Uint32                StartIndex,
+                                                     IDeviceObject* const* ppObjects,
+                                                     Uint32                NumElements,
+                                                     bool                  bIsUnique) override final;
 
     /// Implementation of IResourceMapping::RemoveResourceByName()
-    virtual void RemoveResourceByName(const Char* Name, Uint32 ArrayIndex) override final;
+    virtual void DILIGENT_CALL_TYPE RemoveResourceByName(const Char* Name, Uint32 ArrayIndex) override final;
 
     /// Implementation of IResourceMapping::GetResource()
-    virtual void GetResource(const Char* Name, IDeviceObject** ppResource, Uint32 ArrayIndex) override final;
+    virtual void DILIGENT_CALL_TYPE GetResource(const Char*     Name,
+                                                IDeviceObject** ppResource,
+                                                Uint32          ArrayIndex) override final;
 
     /// Returns number of resources in the resource mapping.
-    virtual size_t GetSize() override final;
+    virtual size_t DILIGENT_CALL_TYPE GetSize() override final;
 
 private:
     ThreadingTools::LockHelper Lock();
diff --git a/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.hpp b/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.hpp
index cf5dfea3..60992189 100644
--- a/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.hpp
+++ b/Graphics/GraphicsEngine/include/ShaderResourceBindingBase.hpp
@@ -62,7 +62,7 @@ public:
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_ShaderResourceBinding, TObjectBase)
 
     /// Implementation of IShaderResourceBinding::GetPipelineState().
-    virtual IPipelineState* GetPipelineState() override final
+    virtual IPipelineState* DILIGENT_CALL_TYPE GetPipelineState() override final
     {
         return m_pPSO;
     }
diff --git a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp
index 819520df..5648e39d 100644
--- a/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp
+++ b/Graphics/GraphicsEngine/include/ShaderResourceVariableBase.hpp
@@ -344,7 +344,7 @@ struct ShaderVariableBase : public ResourceVariableBaseInterface
     {
     }
 
-    void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final
+    virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override final
     {
         if (ppInterface == nullptr)
             return;
@@ -357,17 +357,17 @@ struct ShaderVariableBase : public ResourceVariableBaseInterface
         }
     }
 
-    virtual Atomics::Long AddRef() override final
+    virtual Atomics::Long DILIGENT_CALL_TYPE AddRef() override final
     {
         return m_ParentResLayout.GetOwner().AddRef();
     }
 
-    virtual Atomics::Long Release() override final
+    virtual Atomics::Long DILIGENT_CALL_TYPE Release() override final
     {
         return m_ParentResLayout.GetOwner().Release();
     }
 
-    virtual IReferenceCounters* GetReferenceCounters() const override final
+    virtual IReferenceCounters* DILIGENT_CALL_TYPE GetReferenceCounters() const override final
     {
         return m_ParentResLayout.GetOwner().GetReferenceCounters();
     }
diff --git a/Graphics/GraphicsEngine/include/SwapChainBase.hpp b/Graphics/GraphicsEngine/include/SwapChainBase.hpp
index a121f519..8610f0de 100644
--- a/Graphics/GraphicsEngine/include/SwapChainBase.hpp
+++ b/Graphics/GraphicsEngine/include/SwapChainBase.hpp
@@ -84,7 +84,7 @@ public:
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_SwapChain, TObjectBase)
 
     /// Implementation of ISwapChain::GetDesc()
-    virtual const SwapChainDesc& GetDesc() const override final
+    virtual const SwapChainDesc& DILIGENT_CALL_TYPE GetDesc() const override final
     {
         return m_SwapChainDesc;
     }
diff --git a/Graphics/GraphicsEngine/include/TextureBase.hpp b/Graphics/GraphicsEngine/include/TextureBase.hpp
index 399acd65..1cd9fd18 100644
--- a/Graphics/GraphicsEngine/include/TextureBase.hpp
+++ b/Graphics/GraphicsEngine/include/TextureBase.hpp
@@ -131,7 +131,7 @@ public:
 
     /// Implementaiton of ITexture::CreateView(); calls CreateViewInternal() virtual function that
     /// creates texture view for the specific engine implementation.
-    virtual void CreateView(const struct TextureViewDesc& ViewDesc, ITextureView** ppView) override
+    virtual void DILIGENT_CALL_TYPE CreateView(const struct TextureViewDesc& ViewDesc, ITextureView** ppView) override
     {
         DEV_CHECK_ERR(ViewDesc.ViewType != TEXTURE_VIEW_UNDEFINED, "Texture view type is not specified");
         if (ViewDesc.ViewType == TEXTURE_VIEW_SHADER_RESOURCE)
@@ -159,12 +159,12 @@ public:
     /// The function calls CreateViewInternal().
     void CreateDefaultViews();
 
-    virtual void SetState(RESOURCE_STATE State) override final
+    virtual void DILIGENT_CALL_TYPE SetState(RESOURCE_STATE State) override final
     {
         this->m_State = State;
     }
 
-    virtual RESOURCE_STATE GetState() const override final
+    virtual RESOURCE_STATE DILIGENT_CALL_TYPE GetState() const override final
     {
         return this->m_State;
     }
@@ -182,7 +182,7 @@ public:
     }
 
     /// Implementation of ITexture::GetDefaultView().
-    virtual ITextureView* GetDefaultView(TEXTURE_VIEW_TYPE ViewType) override
+    virtual ITextureView* DILIGENT_CALL_TYPE GetDefaultView(TEXTURE_VIEW_TYPE ViewType) override
     {
         switch (ViewType)
         {
diff --git a/Graphics/GraphicsEngine/include/TextureViewBase.hpp b/Graphics/GraphicsEngine/include/TextureViewBase.hpp
index 905c9201..f416796f 100644
--- a/Graphics/GraphicsEngine/include/TextureViewBase.hpp
+++ b/Graphics/GraphicsEngine/include/TextureViewBase.hpp
@@ -77,7 +77,7 @@ public:
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_TextureView, TDeviceObjectBase)
 
     /// Implementation of ITextureView::SetSampler()
-    virtual void SetSampler(ISampler* pSampler) override final
+    virtual void DILIGENT_CALL_TYPE SetSampler(ISampler* pSampler) override final
     {
 #ifdef DEVELOPMENT
         if (this->m_Desc.ViewType != TEXTURE_VIEW_SHADER_RESOURCE)
@@ -87,7 +87,7 @@ public:
     }
 
     /// Implementation of ITextureView::GetSampler()
-    virtual ISampler* GetSampler() override final
+    virtual ISampler* DILIGENT_CALL_TYPE GetSampler() override final
     {
         return m_pSampler;
     }
@@ -98,12 +98,12 @@ public:
     }
 
     /// Implementation of ITextureView::GetTexture()
-    virtual ITexture* GetTexture() override final
+    virtual ITexture* DILIGENT_CALL_TYPE GetTexture() override final
     {
         return m_pTexture;
     }
 
-    const ITexture* GetTexture() const
+    const ITexture* DILIGENT_CALL_TYPE GetTexture() const
     {
         return m_pTexture;
     }
diff --git a/Graphics/GraphicsEngine/interface/Buffer.h b/Graphics/GraphicsEngine/interface/Buffer.h
index 4023233b..015d6637 100644
--- a/Graphics/GraphicsEngine/interface/Buffer.h
+++ b/Graphics/GraphicsEngine/interface/Buffer.h
@@ -187,7 +187,7 @@ DILIGENT_BEGIN_INTERFACE(IBuffer, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the buffer description used to create the object
-    virtual const BufferDesc& GetDesc() const override = 0;
+    virtual const BufferDesc& METHOD(GetDesc)() const override = 0;
 #endif
 
     /// Creates a new buffer view
diff --git a/Graphics/GraphicsEngine/interface/BufferView.h b/Graphics/GraphicsEngine/interface/BufferView.h
index 2b1066ea..034c508c 100644
--- a/Graphics/GraphicsEngine/interface/BufferView.h
+++ b/Graphics/GraphicsEngine/interface/BufferView.h
@@ -156,7 +156,7 @@ DILIGENT_BEGIN_INTERFACE(IBufferView, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the buffer view description used to create the object
-    virtual const BufferViewDesc& GetDesc() const override = 0;
+    virtual const BufferViewDesc& METHOD(GetDesc)() const override = 0;
 #endif
 
     /// Returns pointer to the referenced buffer object.
diff --git a/Graphics/GraphicsEngine/interface/Fence.h b/Graphics/GraphicsEngine/interface/Fence.h
index 754d066e..37db8410 100644
--- a/Graphics/GraphicsEngine/interface/Fence.h
+++ b/Graphics/GraphicsEngine/interface/Fence.h
@@ -63,7 +63,7 @@ DILIGENT_BEGIN_INTERFACE(IFence, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the fence description used to create the object
-    virtual const FenceDesc& GetDesc() const override = 0;
+    virtual const FenceDesc& METHOD(GetDesc)() const override = 0;
 #endif
 
     /// Returns the last completed value signaled by the GPU
diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h
index f572523c..12e5e5ff 100644
--- a/Graphics/GraphicsEngine/interface/PipelineState.h
+++ b/Graphics/GraphicsEngine/interface/PipelineState.h
@@ -268,7 +268,7 @@ DILIGENT_BEGIN_INTERFACE(IPipelineState, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the blend state description used to create the object
-    virtual const PipelineStateDesc& GetDesc()const override = 0;
+    virtual const PipelineStateDesc& METHOD(GetDesc)()const override = 0;
 #endif
 
 
diff --git a/Graphics/GraphicsEngine/interface/Query.h b/Graphics/GraphicsEngine/interface/Query.h
index 4abd6e1b..b30b070b 100644
--- a/Graphics/GraphicsEngine/interface/Query.h
+++ b/Graphics/GraphicsEngine/interface/Query.h
@@ -188,7 +188,7 @@ DILIGENT_BEGIN_INTERFACE(IQuery, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the Query description used to create the object.
-    virtual const QueryDesc& GetDesc() const override = 0;
+    virtual const QueryDesc& METHOD(GetDesc)() const override = 0;
 #endif
 
     /// Gets the query data.
diff --git a/Graphics/GraphicsEngine/interface/Sampler.h b/Graphics/GraphicsEngine/interface/Sampler.h
index 7d782cee..1b50f7e7 100644
--- a/Graphics/GraphicsEngine/interface/Sampler.h
+++ b/Graphics/GraphicsEngine/interface/Sampler.h
@@ -193,7 +193,7 @@ DILIGENT_BEGIN_INTERFACE(ISampler, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the sampler description used to create the object
-    virtual const SamplerDesc& GetDesc() const override = 0;
+    virtual const SamplerDesc& METHOD(GetDesc)() const override = 0;
 #endif
 };
 DILIGENT_END_INTERFACE
diff --git a/Graphics/GraphicsEngine/interface/Shader.h b/Graphics/GraphicsEngine/interface/Shader.h
index 73e948dc..20508a9d 100644
--- a/Graphics/GraphicsEngine/interface/Shader.h
+++ b/Graphics/GraphicsEngine/interface/Shader.h
@@ -322,7 +322,7 @@ DILIGENT_BEGIN_INTERFACE(IShader, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the shader description
-    virtual const ShaderDesc& GetDesc() const override = 0;
+    virtual const ShaderDesc& METHOD(GetDesc)() const override = 0;
 #endif
 
     /// Returns the total number of shader resources
diff --git a/Graphics/GraphicsEngine/interface/Texture.h b/Graphics/GraphicsEngine/interface/Texture.h
index e4059740..294bb875 100644
--- a/Graphics/GraphicsEngine/interface/Texture.h
+++ b/Graphics/GraphicsEngine/interface/Texture.h
@@ -320,7 +320,7 @@ DILIGENT_BEGIN_INTERFACE(ITexture, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the texture description used to create the object
-    virtual const TextureDesc& GetDesc()const override = 0;
+    virtual const TextureDesc& METHOD(GetDesc)()const override = 0;
 #endif
 
     /// Creates a new texture view
diff --git a/Graphics/GraphicsEngine/interface/TextureView.h b/Graphics/GraphicsEngine/interface/TextureView.h
index 28af771d..3271a0fa 100644
--- a/Graphics/GraphicsEngine/interface/TextureView.h
+++ b/Graphics/GraphicsEngine/interface/TextureView.h
@@ -203,7 +203,7 @@ DILIGENT_BEGIN_INTERFACE(ITextureView, IDeviceObject)
 {
 #if DILIGENT_CPP_INTERFACE
     /// Returns the texture view description used to create the object
-    virtual const TextureViewDesc& GetDesc() const override = 0;
+    virtual const TextureViewDesc& METHOD(GetDesc)() const override = 0;
 #endif
 
     /// Sets the texture sampler to use for filtering operations
diff --git a/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp b/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp
index 2611d0b3..9c2e1d15 100644
--- a/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp
+++ b/Graphics/GraphicsEngine/src/DefaultShaderSourceStreamFactory.cpp
@@ -40,7 +40,7 @@ class DefaultShaderSourceStreamFactory final : public ObjectBase<IShaderSourceIn
 public:
     DefaultShaderSourceStreamFactory(IReferenceCounters* pRefCounters, const Char* SearchDirectories);
 
-    virtual void CreateInputStream(const Char* Name, IFileStream** ppStream) override final;
+    virtual void DILIGENT_CALL_TYPE CreateInputStream(const Char* Name, IFileStream** ppStream) override final;
 
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_IShaderSourceInputStreamFactory, ObjectBase<IShaderSourceInputStreamFactory>);