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

16 files changed, 220 insertions, 189 deletions

diff --git a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
index 70513071..e15e70f2 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
@@ -63,17 +63,17 @@ public:
                     ID3D12Resource*              pd3d12Buffer);
     ~BufferD3D12Impl();
 
-    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;
 
 #ifdef DEVELOPMENT
     void DvpVerifyDynamicAllocation(class DeviceContextD3D12Impl* pCtx) const;
 #endif
 
     /// Implementation of IBufferD3D12::GetD3D12Buffer().
-    virtual ID3D12Resource* GetD3D12Buffer(Uint64& DataStartByteOffset, IDeviceContext* pContext) override final;
+    virtual ID3D12Resource* DILIGENT_CALL_TYPE GetD3D12Buffer(Uint64& DataStartByteOffset, IDeviceContext* pContext) override final;
 
     /// Implementation of IBuffer::GetNativeHandle().
-    virtual void* GetNativeHandle() override final
+    virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final
     {
         VERIFY(GetD3D12Resource() != nullptr, "The buffer is dynamic and has no pointer to D3D12 resource");
         Uint64 DataStartByteOffset = 0;
@@ -83,10 +83,10 @@ public:
     }
 
     /// Implementation of IBufferD3D12::SetD3D12ResourceState().
-    virtual void SetD3D12ResourceState(D3D12_RESOURCE_STATES state) override final;
+    virtual void DILIGENT_CALL_TYPE SetD3D12ResourceState(D3D12_RESOURCE_STATES state) override final;
 
     /// Implementation of IBufferD3D12::GetD3D12ResourceState().
-    virtual D3D12_RESOURCE_STATES GetD3D12ResourceState() const override final;
+    virtual D3D12_RESOURCE_STATES DILIGENT_CALL_TYPE GetD3D12ResourceState() const override final;
 
     __forceinline D3D12_GPU_VIRTUAL_ADDRESS GetGPUAddress(Uint32 ContextId, class DeviceContextD3D12Impl* pCtx)
     {
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
index e88ba682..f7c41fa0 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
@@ -54,10 +54,13 @@ public:
                         DescriptorHeapAllocation&& HandleAlloc,
                         bool                       bIsDefaultView);
 
-    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 IBufferViewD3D12::GetCPUDescriptorHandle().
-    virtual D3D12_CPU_DESCRIPTOR_HANDLE GetCPUDescriptorHandle() override final { return m_DescriptorHandle.GetCpuHandle(); }
+    virtual D3D12_CPU_DESCRIPTOR_HANDLE DILIGENT_CALL_TYPE GetCPUDescriptorHandle() override final
+    {
+        return m_DescriptorHandle.GetCpuHandle();
+    }
 
 protected:
     // Allocation in a CPU-only descriptor heap
diff --git a/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp
index 1f45888b..2026c2b0 100644
--- a/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp
@@ -46,25 +46,25 @@ public:
     CommandQueueD3D12Impl(IReferenceCounters* pRefCounters, ID3D12CommandQueue* pd3d12NativeCmdQueue, ID3D12Fence* pd3d12Fence);
     ~CommandQueueD3D12Impl();
 
-    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 ICommandQueueD3D12::GetNextFenceValue().
-    virtual Uint64 GetNextFenceValue() const override final { return m_NextFenceValue; }
+    virtual Uint64 DILIGENT_CALL_TYPE GetNextFenceValue() const override final { return m_NextFenceValue; }
 
     // Implementation of ICommandQueueD3D12::Submit().
-    virtual Uint64 Submit(ID3D12GraphicsCommandList* commandList) override final;
+    virtual Uint64 DILIGENT_CALL_TYPE Submit(ID3D12GraphicsCommandList* commandList) override final;
 
     // Implementation of ICommandQueueD3D12::GetD3D12CommandQueue().
-    virtual ID3D12CommandQueue* GetD3D12CommandQueue() override final { return m_pd3d12CmdQueue; }
+    virtual ID3D12CommandQueue* DILIGENT_CALL_TYPE GetD3D12CommandQueue() override final { return m_pd3d12CmdQueue; }
 
     // Implementation of ICommandQueueD3D12::WaitForIdle().
-    virtual Uint64 WaitForIdle() override final;
+    virtual Uint64 DILIGENT_CALL_TYPE WaitForIdle() override final;
 
     // Implementation of ICommandQueueD3D12::GetCompletedFenceValue().
-    virtual Uint64 GetCompletedFenceValue() override final;
+    virtual Uint64 DILIGENT_CALL_TYPE GetCompletedFenceValue() override final;
 
     // Implementation of ICommandQueueD3D12::SignalFence().
-    virtual void SignalFence(ID3D12Fence* pFence, Uint64 Value) override final;
+    virtual void DILIGENT_CALL_TYPE SignalFence(ID3D12Fence* pFence, Uint64 Value) override final;
 
 private:
     // A value that will be signaled by the command queue next
diff --git a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
index fb4db98e..5c6912b6 100644
--- a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
@@ -69,165 +69,180 @@ public:
                            Uint32                       CommandQueueId);
     ~DeviceContextD3D12Impl();
 
-    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 IDeviceContext::SetPipelineState() in Direct3D12 backend.
-    virtual void SetPipelineState(IPipelineState* pPipelineState) override final;
+    virtual void DILIGENT_CALL_TYPE SetPipelineState(IPipelineState* pPipelineState) override final;
 
     /// Implementation of IDeviceContext::TransitionShaderResources() in Direct3D12 backend.
-    virtual void TransitionShaderResources(IPipelineState* pPipelineState, IShaderResourceBinding* pShaderResourceBinding) override final;
+    virtual void DILIGENT_CALL_TYPE TransitionShaderResources(IPipelineState*         pPipelineState,
+                                                              IShaderResourceBinding* pShaderResourceBinding) override final;
 
     /// Implementation of IDeviceContext::CommitShaderResources() in Direct3D12 backend.
-    virtual void CommitShaderResources(IShaderResourceBinding* pShaderResourceBinding, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
+    virtual void DILIGENT_CALL_TYPE CommitShaderResources(IShaderResourceBinding*        pShaderResourceBinding,
+                                                          RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
 
     /// Implementation of IDeviceContext::SetStencilRef() in Direct3D12 backend.
-    virtual void SetStencilRef(Uint32 StencilRef) override final;
+    virtual void DILIGENT_CALL_TYPE SetStencilRef(Uint32 StencilRef) override final;
 
     /// Implementation of IDeviceContext::SetBlendFactors() in Direct3D12 backend.
-    virtual void SetBlendFactors(const float* pBlendFactors = nullptr) override final;
+    virtual void DILIGENT_CALL_TYPE SetBlendFactors(const float* pBlendFactors = nullptr) override final;
 
     /// Implementation of IDeviceContext::SetVertexBuffers() in Direct3D12 backend.
-    virtual void SetVertexBuffers(Uint32                         StartSlot,
-                                  Uint32                         NumBuffersSet,
-                                  IBuffer**                      ppBuffers,
-                                  Uint32*                        pOffsets,
-                                  RESOURCE_STATE_TRANSITION_MODE StateTransitionMode,
-                                  SET_VERTEX_BUFFERS_FLAGS       Flags) override final;
+    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 final;
 
     /// Implementation of IDeviceContext::InvalidateState() in Direct3D12 backend.
-    virtual void InvalidateState() override final;
+    virtual void DILIGENT_CALL_TYPE InvalidateState() override final;
 
     /// Implementation of IDeviceContext::SetIndexBuffer() in Direct3D12 backend.
-    virtual void SetIndexBuffer(IBuffer* pIndexBuffer, Uint32 ByteOffset, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
+    virtual void DILIGENT_CALL_TYPE SetIndexBuffer(IBuffer*                       pIndexBuffer,
+                                                   Uint32                         ByteOffset,
+                                                   RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
 
     /// Implementation of IDeviceContext::SetViewports() in Direct3D12 backend.
-    virtual void SetViewports(Uint32 NumViewports, const Viewport* pViewports, Uint32 RTWidth, Uint32 RTHeight) override final;
+    virtual void DILIGENT_CALL_TYPE SetViewports(Uint32          NumViewports,
+                                                 const Viewport* pViewports,
+                                                 Uint32          RTWidth,
+                                                 Uint32          RTHeight) override final;
 
     /// Implementation of IDeviceContext::SetScissorRects() in Direct3D12 backend.
-    virtual void SetScissorRects(Uint32 NumRects, const Rect* pRects, Uint32 RTWidth, Uint32 RTHeight) override final;
+    virtual void DILIGENT_CALL_TYPE SetScissorRects(Uint32      NumRects,
+                                                    const Rect* pRects,
+                                                    Uint32      RTWidth,
+                                                    Uint32      RTHeight) override final;
 
     /// Implementation of IDeviceContext::SetRenderTargets() in Direct3D12 backend.
-    virtual void SetRenderTargets(Uint32                         NumRenderTargets,
-                                  ITextureView*                  ppRenderTargets[],
-                                  ITextureView*                  pDepthStencil,
-                                  RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
+    virtual void DILIGENT_CALL_TYPE SetRenderTargets(Uint32                         NumRenderTargets,
+                                                     ITextureView*                  ppRenderTargets[],
+                                                     ITextureView*                  pDepthStencil,
+                                                     RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
 
     // clang-format off
     /// Implementation of IDeviceContext::Draw() in Direct3D12 backend.
-    virtual void Draw               (const DrawAttribs& Attribs) override final;
+    virtual void DILIGENT_CALL_TYPE Draw               (const DrawAttribs& Attribs) override final;
     /// Implementation of IDeviceContext::DrawIndexed() in Direct3D12 backend.
-    virtual void DrawIndexed        (const DrawIndexedAttribs& Attribs) override final;
+    virtual void DILIGENT_CALL_TYPE DrawIndexed        (const DrawIndexedAttribs& Attribs) override final;
     /// Implementation of IDeviceContext::DrawIndirect() in Direct3D12 backend.
-    virtual void DrawIndirect       (const DrawIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
+    virtual void DILIGENT_CALL_TYPE DrawIndirect       (const DrawIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
     /// Implementation of IDeviceContext::DrawIndexedIndirect() in Direct3D12 backend.
-    virtual void DrawIndexedIndirect(const DrawIndexedIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
+    virtual void DILIGENT_CALL_TYPE DrawIndexedIndirect(const DrawIndexedIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
     
 
     /// Implementation of IDeviceContext::DispatchCompute() in Direct3D12 backend.
-    virtual void DispatchCompute        (const DispatchComputeAttribs& Attribs) override final;
+    virtual void DILIGENT_CALL_TYPE DispatchCompute        (const DispatchComputeAttribs& Attribs) override final;
     /// Implementation of IDeviceContext::DispatchComputeIndirect() in Direct3D12 backend.
-    virtual void DispatchComputeIndirect(const DispatchComputeIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
+    virtual void DILIGENT_CALL_TYPE DispatchComputeIndirect(const DispatchComputeIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final;
     // clang-format on
 
     /// Implementation of IDeviceContext::ClearDepthStencil() in Direct3D12 backend.
-    virtual void ClearDepthStencil(ITextureView*                  pView,
-                                   CLEAR_DEPTH_STENCIL_FLAGS      ClearFlags,
-                                   float                          fDepth,
-                                   Uint8                          Stencil,
-                                   RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
+    virtual void DILIGENT_CALL_TYPE ClearDepthStencil(ITextureView*                  pView,
+                                                      CLEAR_DEPTH_STENCIL_FLAGS      ClearFlags,
+                                                      float                          fDepth,
+                                                      Uint8                          Stencil,
+                                                      RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
 
     /// Implementation of IDeviceContext::ClearRenderTarget() in Direct3D12 backend.
-    virtual void ClearRenderTarget(ITextureView* pView, const float* RGBA, RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
+    virtual void DILIGENT_CALL_TYPE ClearRenderTarget(ITextureView*                  pView,
+                                                      const float*                   RGBA,
+                                                      RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
 
     /// Implementation of IDeviceContext::UpdateBuffer() in Direct3D12 backend.
-    virtual void UpdateBuffer(IBuffer*                       pBuffer,
-                              Uint32                         Offset,
-                              Uint32                         Size,
-                              const void*                    pData,
-                              RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
+    virtual void DILIGENT_CALL_TYPE UpdateBuffer(IBuffer*                       pBuffer,
+                                                 Uint32                         Offset,
+                                                 Uint32                         Size,
+                                                 const void*                    pData,
+                                                 RESOURCE_STATE_TRANSITION_MODE StateTransitionMode) override final;
 
     /// Implementation of IDeviceContext::CopyBuffer() in Direct3D12 backend.
-    virtual void CopyBuffer(IBuffer*                       pSrcBuffer,
-                            Uint32                         SrcOffset,
-                            RESOURCE_STATE_TRANSITION_MODE SrcBufferTransitionMode,
-                            IBuffer*                       pDstBuffer,
-                            Uint32                         DstOffset,
-                            Uint32                         Size,
-                            RESOURCE_STATE_TRANSITION_MODE DstBufferTransitionMode) override final;
+    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 final;
 
     /// Implementation of IDeviceContext::MapBuffer() in Direct3D12 backend.
-    virtual void MapBuffer(IBuffer* pBuffer, MAP_TYPE MapType, MAP_FLAGS MapFlags, PVoid& pMappedData) override final;
+    virtual void DILIGENT_CALL_TYPE MapBuffer(IBuffer*  pBuffer,
+                                              MAP_TYPE  MapType,
+                                              MAP_FLAGS MapFlags,
+                                              PVoid&    pMappedData) override final;
 
     /// Implementation of IDeviceContext::UnmapBuffer() in Direct3D12 backend.
-    virtual void UnmapBuffer(IBuffer* pBuffer, MAP_TYPE MapType) override final;
+    virtual void DILIGENT_CALL_TYPE UnmapBuffer(IBuffer* pBuffer, MAP_TYPE MapType) override final;
 
     /// Implementation of IDeviceContext::UpdateTexture() in Direct3D12 backend.
-    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 final;
+    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 final;
 
     /// Implementation of IDeviceContext::CopyTexture() in Direct3D12 backend.
-    virtual void CopyTexture(const CopyTextureAttribs& CopyAttribs) override final;
+    virtual void DILIGENT_CALL_TYPE CopyTexture(const CopyTextureAttribs& CopyAttribs) override final;
 
     /// Implementation of IDeviceContext::MapTextureSubresource() in Direct3D12 backend.
-    virtual void MapTextureSubresource(ITexture*                 pTexture,
-                                       Uint32                    MipLevel,
-                                       Uint32                    ArraySlice,
-                                       MAP_TYPE                  MapType,
-                                       MAP_FLAGS                 MapFlags,
-                                       const Box*                pMapRegion,
-                                       MappedTextureSubresource& MappedData) override final;
+    virtual void DILIGENT_CALL_TYPE MapTextureSubresource(ITexture*                 pTexture,
+                                                          Uint32                    MipLevel,
+                                                          Uint32                    ArraySlice,
+                                                          MAP_TYPE                  MapType,
+                                                          MAP_FLAGS                 MapFlags,
+                                                          const Box*                pMapRegion,
+                                                          MappedTextureSubresource& MappedData) override final;
 
     /// Implementation of IDeviceContext::UnmapTextureSubresource() in Direct3D12 backend.
-    virtual void UnmapTextureSubresource(ITexture* pTexture, Uint32 MipLevel, Uint32 ArraySlice) override final;
+    virtual void DILIGENT_CALL_TYPE UnmapTextureSubresource(ITexture* pTexture, Uint32 MipLevel, Uint32 ArraySlice) override final;
 
     /// Implementation of IDeviceContext::FinishFrame() in Direct3D12 backend.
-    virtual void FinishFrame() override final;
+    virtual void DILIGENT_CALL_TYPE FinishFrame() override final;
 
     /// Implementation of IDeviceContext::TransitionResourceStates() in Direct3D12 backend.
-    virtual void TransitionResourceStates(Uint32 BarrierCount, StateTransitionDesc* pResourceBarriers) override final;
+    virtual void DILIGENT_CALL_TYPE TransitionResourceStates(Uint32 BarrierCount, StateTransitionDesc* pResourceBarriers) override final;
 
     /// Implementation of IDeviceContext::ResolveTextureSubresource() in Direct3D12 backend.
-    virtual void ResolveTextureSubresource(ITexture*                               pSrcTexture,
-                                           ITexture*                               pDstTexture,
-                                           const ResolveTextureSubresourceAttribs& ResolveAttribs) override final;
+    virtual void DILIGENT_CALL_TYPE ResolveTextureSubresource(ITexture*                               pSrcTexture,
+                                                              ITexture*                               pDstTexture,
+                                                              const ResolveTextureSubresourceAttribs& ResolveAttribs) override final;
 
     /// Implementation of IDeviceContext::FinishCommandList() in Direct3D12 backend.
-    virtual void FinishCommandList(class ICommandList** ppCommandList) override final;
+    virtual void DILIGENT_CALL_TYPE FinishCommandList(class ICommandList** ppCommandList) override final;
 
     /// Implementation of IDeviceContext::ExecuteCommandList() in Direct3D12 backend.
-    virtual void ExecuteCommandList(class ICommandList* pCommandList) override final;
+    virtual void DILIGENT_CALL_TYPE ExecuteCommandList(class ICommandList* pCommandList) override final;
 
     /// Implementation of IDeviceContext::SignalFence() in Direct3D12 backend.
-    virtual void SignalFence(IFence* pFence, Uint64 Value) override final;
+    virtual void DILIGENT_CALL_TYPE SignalFence(IFence* pFence, Uint64 Value) override final;
 
     /// Implementation of IDeviceContext::WaitForFence() in Direct3D12 backend.
-    virtual void WaitForFence(IFence* pFence, Uint64 Value, bool FlushContext) override final;
+    virtual void DILIGENT_CALL_TYPE WaitForFence(IFence* pFence, Uint64 Value, bool FlushContext) override final;
 
     /// Implementation of IDeviceContext::WaitForIdle() in Direct3D12 backend.
-    virtual void WaitForIdle() override final;
+    virtual void DILIGENT_CALL_TYPE WaitForIdle() override final;
 
     /// Implementation of IDeviceContext::BeginQuery() in Direct3D12 backend.
-    virtual void BeginQuery(IQuery* pQuery) override final;
+    virtual void DILIGENT_CALL_TYPE BeginQuery(IQuery* pQuery) override final;
 
     /// Implementation of IDeviceContext::EndQuery() in Direct3D12 backend.
-    virtual void EndQuery(IQuery* pQuery) override final;
+    virtual void DILIGENT_CALL_TYPE EndQuery(IQuery* pQuery) override final;
 
     /// Implementation of IDeviceContext::Flush() in Direct3D12 backend.
-    virtual void Flush() override final;
+    virtual void DILIGENT_CALL_TYPE Flush() override final;
 
     /// Implementation of IDeviceContext::TransitionTextureState() in Direct3D12 backend.
-    virtual void TransitionTextureState(ITexture* pTexture, D3D12_RESOURCE_STATES State) override final;
+    virtual void DILIGENT_CALL_TYPE TransitionTextureState(ITexture* pTexture, D3D12_RESOURCE_STATES State) override final;
 
     /// Implementation of IDeviceContext::TransitionBufferState() in Direct3D12 backend.
-    virtual void TransitionBufferState(IBuffer* pBuffer, D3D12_RESOURCE_STATES State) override final;
+    virtual void DILIGENT_CALL_TYPE TransitionBufferState(IBuffer* pBuffer, D3D12_RESOURCE_STATES State) override final;
 
     /// Implementation of IDeviceContextD3D12::ID3D12GraphicsCommandList() in Direct3D12 backend.
-    virtual ID3D12GraphicsCommandList* GetD3D12CommandList() override final;
+    virtual ID3D12GraphicsCommandList* DILIGENT_CALL_TYPE GetD3D12CommandList() override final;
 
     ///// Number of different shader types (Vertex, Pixel, Geometry, Domain, Hull, Compute)
     //static constexpr int NumShaderTypes = 6;
@@ -276,7 +291,7 @@ public:
                              const Box&                     DstBox,
                              RESOURCE_STATE_TRANSITION_MODE TextureTransitionMode);
 
-    virtual void GenerateMips(ITextureView* pTexView) override final;
+    virtual void DILIGENT_CALL_TYPE GenerateMips(ITextureView* pTexView) override final;
 
     D3D12DynamicAllocation AllocateDynamicSpace(size_t NumBytes, size_t Alignment);
 
diff --git a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
index 1549e584..845eabac 100644
--- a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
@@ -54,16 +54,16 @@ public:
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_FenceD3D12, TFenceBase);
 
     /// Implementation of IFence::GetCompletedValue() in Direct3D12 backend.
-    virtual Uint64 GetCompletedValue() override final;
+    virtual Uint64 DILIGENT_CALL_TYPE GetCompletedValue() override final;
 
     /// Implementation of IFence::GetCompletedValue() in Direct3D12 backend.
-    virtual void Reset(Uint64 Value) override final;
+    virtual void DILIGENT_CALL_TYPE Reset(Uint64 Value) override final;
 
     /// Implementation of IFenceD3D12::GetD3D12Fence().
-    ID3D12Fence* GetD3D12Fence() override final { return m_pd3d12Fence; }
+    virtual ID3D12Fence* DILIGENT_CALL_TYPE GetD3D12Fence() override final { return m_pd3d12Fence; }
 
     /// Implementation of IFenceD3D12::WaitForCompletion().
-    virtual void WaitForCompletion(Uint64 Value) override final;
+    virtual void DILIGENT_CALL_TYPE WaitForCompletion(Uint64 Value) override final;
 
 private:
     CComPtr<ID3D12Fence> m_pd3d12Fence; ///< D3D12 Fence object
diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
index 9431d2f4..48437f92 100644
--- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
@@ -53,31 +53,31 @@ public:
     PipelineStateD3D12Impl(IReferenceCounters* pRefCounters, RenderDeviceD3D12Impl* pDeviceD3D12, const PipelineStateDesc& PipelineDesc);
     ~PipelineStateD3D12Impl();
 
-    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 IPipelineState::BindStaticResources() in Direct3D12 backend.
-    virtual void BindStaticResources(Uint32 ShaderFlags, IResourceMapping* pResourceMapping, Uint32 Flags) override final;
+    virtual void DILIGENT_CALL_TYPE BindStaticResources(Uint32 ShaderFlags, IResourceMapping* pResourceMapping, Uint32 Flags) override final;
 
     /// Implementation of IPipelineState::GetStaticVariableCount() in Direct3D12 backend.
-    virtual Uint32 GetStaticVariableCount(SHADER_TYPE ShaderType) const override final;
+    virtual Uint32 DILIGENT_CALL_TYPE GetStaticVariableCount(SHADER_TYPE ShaderType) const override final;
 
     /// Implementation of IPipelineState::GetStaticVariableByName() in Direct3D12 backend.
-    virtual IShaderResourceVariable* GetStaticVariableByName(SHADER_TYPE ShaderType, const Char* Name) override final;
+    virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByName(SHADER_TYPE ShaderType, const Char* Name) override final;
 
     /// Implementation of IPipelineState::GetStaticVariableByIndex() in Direct3D12 backend.
-    virtual IShaderResourceVariable* GetStaticVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final;
+    virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetStaticVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final;
 
     /// Implementation of IPipelineState::CreateShaderResourceBinding() in Direct3D12 backend.
-    virtual void CreateShaderResourceBinding(IShaderResourceBinding** ppShaderResourceBinding, bool InitStaticResources) override final;
+    virtual void DILIGENT_CALL_TYPE CreateShaderResourceBinding(IShaderResourceBinding** ppShaderResourceBinding, bool InitStaticResources) override final;
 
     /// Implementation of IPipelineState::IsCompatibleWith() in Direct3D12 backend.
-    virtual bool IsCompatibleWith(const IPipelineState* pPSO) const override final;
+    virtual bool DILIGENT_CALL_TYPE IsCompatibleWith(const IPipelineState* pPSO) const override final;
 
     /// Implementation of IPipelineStateD3D12::GetD3D12PipelineState().
-    virtual ID3D12PipelineState* GetD3D12PipelineState() const override final { return m_pd3d12PSO; }
+    virtual ID3D12PipelineState* DILIGENT_CALL_TYPE DILIGENT_CALL_TYPE GetD3D12PipelineState() const override final { return m_pd3d12PSO; }
 
     /// Implementation of IPipelineStateD3D12::GetD3D12RootSignature().
-    virtual ID3D12RootSignature* GetD3D12RootSignature() const override final { return m_RootSig.GetD3D12RootSignature(); }
+    virtual ID3D12RootSignature* DILIGENT_CALL_TYPE GetD3D12RootSignature() const override final { return m_RootSig.GetD3D12RootSignature(); }
 
     struct CommitAndTransitionResourcesAttribs
     {
diff --git a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
index 129e0307..18c01547 100644
--- a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
@@ -55,16 +55,16 @@ public:
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_QueryD3D12, TQueryBase);
 
     /// Implementation of IQuery::GetData().
-    virtual bool GetData(void* pData, Uint32 DataSize, bool AutoInvalidate) override final;
+    virtual bool DILIGENT_CALL_TYPE GetData(void* pData, Uint32 DataSize, bool AutoInvalidate) override final;
 
     /// Implementation of IQueryD3D12::GetD3D12QueryHeap().
-    virtual ID3D12QueryHeap* GetD3D12QueryHeap() override final
+    virtual ID3D12QueryHeap* DILIGENT_CALL_TYPE GetD3D12QueryHeap() override final
     {
         return m_pDevice->GetQueryManager().GetQueryHeap(m_Desc.Type);
     }
 
     /// Implementation of IQueryD3D12::GetQueryHeapIndex().
-    virtual Uint32 GetQueryHeapIndex() const override final
+    virtual Uint32 DILIGENT_CALL_TYPE GetQueryHeapIndex() const override final
     {
         return m_QueryHeapIndex;
     }
diff --git a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
index 75def797..9790aa7c 100644
--- a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
@@ -59,45 +59,58 @@ public:
                           ICommandQueueD3D12**         ppCmdQueues);
     ~RenderDeviceD3D12Impl();
 
-    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 IRenderDevice::CreatePipelineState() in Direct3D12 backend.
-    virtual void CreatePipelineState(const PipelineStateDesc& PipelineDesc, IPipelineState** ppPipelineState) override final;
+    virtual void DILIGENT_CALL_TYPE CreatePipelineState(const PipelineStateDesc& PipelineDesc, IPipelineState** ppPipelineState) override final;
 
     /// Implementation of IRenderDevice::CreateBuffer() in Direct3D12 backend.
-    virtual void CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer) override final;
+    virtual void DILIGENT_CALL_TYPE CreateBuffer(const BufferDesc& BuffDesc,
+                                                 const BufferData* pBuffData,
+                                                 IBuffer**         ppBuffer) override final;
 
     /// Implementation of IRenderDevice::CreateShader() in Direct3D12 backend.
-    virtual void CreateShader(const ShaderCreateInfo& ShaderCreateInfo, IShader** ppShader) override final;
+    virtual void DILIGENT_CALL_TYPE CreateShader(const ShaderCreateInfo& ShaderCreateInfo, IShader** ppShader) override final;
 
     /// Implementation of IRenderDevice::CreateTexture() in Direct3D12 backend.
-    virtual void CreateTexture(const TextureDesc& TexDesc, const TextureData* pData, ITexture** ppTexture) override final;
+    virtual void DILIGENT_CALL_TYPE CreateTexture(const TextureDesc& TexDesc,
+                                                  const TextureData* pData,
+                                                  ITexture**         ppTexture) override final;
 
-    void CreateTexture(const TextureDesc& TexDesc, ID3D12Resource* pd3d12Texture, RESOURCE_STATE InitialState, class TextureD3D12Impl** ppTexture);
+    void CreateTexture(const TextureDesc&       TexDesc,
+                       ID3D12Resource*          pd3d12Texture,
+                       RESOURCE_STATE           InitialState,
+                       class TextureD3D12Impl** ppTexture);
 
     /// Implementation of IRenderDevice::CreateSampler() in Direct3D12 backend.
-    virtual void CreateSampler(const SamplerDesc& SamplerDesc, ISampler** ppSampler) override final;
+    virtual void DILIGENT_CALL_TYPE CreateSampler(const SamplerDesc& SamplerDesc,
+                                                  ISampler**         ppSampler) override final;
 
     /// Implementation of IRenderDevice::CreateFence() in Direct3D12 backend.
-    virtual void CreateFence(const FenceDesc& Desc, IFence** ppFence) override final;
+    virtual void DILIGENT_CALL_TYPE CreateFence(const FenceDesc& Desc, IFence** ppFence) override final;
 
     /// Implementation of IRenderDevice::CreateQuery() in Direct3D12 backend.
-    virtual void CreateQuery(const QueryDesc& Desc, IQuery** ppQuery) override final;
+    virtual void DILIGENT_CALL_TYPE CreateQuery(const QueryDesc& Desc, IQuery** ppQuery) override final;
 
     /// Implementation of IRenderDeviceD3D12::GetD3D12Device().
-    virtual ID3D12Device* GetD3D12Device() override final { return m_pd3d12Device; }
+    virtual ID3D12Device* DILIGENT_CALL_TYPE GetD3D12Device() override final { return m_pd3d12Device; }
 
     /// Implementation of IRenderDeviceD3D12::CreateTextureFromD3DResource().
-    virtual void CreateTextureFromD3DResource(ID3D12Resource* pd3d12Texture, RESOURCE_STATE InitialState, ITexture** ppTexture) override final;
+    virtual void DILIGENT_CALL_TYPE CreateTextureFromD3DResource(ID3D12Resource* pd3d12Texture,
+                                                                 RESOURCE_STATE  InitialState,
+                                                                 ITexture**      ppTexture) override final;
 
     /// Implementation of IRenderDeviceD3D12::CreateBufferFromD3DResource().
-    virtual void CreateBufferFromD3DResource(ID3D12Resource* pd3d12Buffer, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer) override final;
+    virtual void DILIGENT_CALL_TYPE CreateBufferFromD3DResource(ID3D12Resource*   pd3d12Buffer,
+                                                                const BufferDesc& BuffDesc,
+                                                                RESOURCE_STATE    InitialState,
+                                                                IBuffer**         ppBuffer) override final;
 
     DescriptorHeapAllocation AllocateDescriptor(D3D12_DESCRIPTOR_HEAP_TYPE Type, UINT Count = 1);
     DescriptorHeapAllocation AllocateGPUDescriptors(D3D12_DESCRIPTOR_HEAP_TYPE Type, UINT Count = 1);
 
     /// Implementation of IRenderDevice::IdleGPU() in Direct3D12 backend.
-    virtual void IdleGPU() override final;
+    virtual void DILIGENT_CALL_TYPE IdleGPU() override final;
 
     using PooledCommandContext = std::unique_ptr<CommandContext, STDDeleterRawMem<CommandContext>>;
     PooledCommandContext AllocateCommandContext(const Char* ID = "");
@@ -117,7 +130,7 @@ public:
     void FlushStaleResources(Uint32 CmdQueueIndex);
 
     /// Implementation of IRenderDevice::() in Direct3D12 backend.
-    virtual void ReleaseStaleResources(bool ForceRelease = false) override final;
+    virtual void DILIGENT_CALL_TYPE ReleaseStaleResources(bool ForceRelease = false) override final;
 
     D3D12DynamicMemoryManager& GetDynamicMemoryManager() { return m_DynamicMemoryManager; }
 
diff --git a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
index 5633b5dc..b581b474 100644
--- a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
@@ -52,10 +52,10 @@ public:
                      const SamplerDesc&     SamplerDesc);
     ~SamplerD3D12Impl();
 
-    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 ISamplerD3D12::GetCPUDescriptorHandle().
-    virtual D3D12_CPU_DESCRIPTOR_HANDLE GetCPUDescriptorHandle() override { return m_Descriptor.GetCpuHandle(); }
+    virtual D3D12_CPU_DESCRIPTOR_HANDLE DILIGENT_CALL_TYPE GetCPUDescriptorHandle() override { return m_Descriptor.GetCpuHandle(); }
 
 private:
     friend class ShaderD3D12Impl;
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
index 3d38d666..b2143b76 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
@@ -54,22 +54,22 @@ public:
                     const ShaderCreateInfo& ShaderCI);
     ~ShaderD3D12Impl();
 
-    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 IShader::GetResourceCount() in Direct3D12 backend.
-    virtual Uint32 GetResourceCount() const override final
+    virtual Uint32 DILIGENT_CALL_TYPE GetResourceCount() const override final
     {
         return m_pShaderResources->GetTotalResources();
     }
 
     /// Implementation of IShader::GetResource() in Direct3D12 backend.
-    virtual void GetResourceDesc(Uint32 Index, ShaderResourceDesc& ResourceDesc) const override final
+    virtual void DILIGENT_CALL_TYPE GetResourceDesc(Uint32 Index, ShaderResourceDesc& ResourceDesc) const override final
     {
         ResourceDesc = m_pShaderResources->GetHLSLShaderResourceDesc(Index);
     }
 
     /// Implementation of IShaderD3D::GetHLSLResource() in Direct3D12 backend.
-    virtual void GetHLSLResource(Uint32 Index, HLSLShaderResourceDesc& ResourceDesc) const override final
+    virtual void DILIGENT_CALL_TYPE GetHLSLResource(Uint32 Index, HLSLShaderResourceDesc& ResourceDesc) const override final
     {
         ResourceDesc = m_pShaderResources->GetHLSLShaderResourceDesc(Index);
     }
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
index 2fde8ed1..240366c5 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
@@ -53,17 +53,17 @@ public:
                                    bool                          IsPSOInternal);
     ~ShaderResourceBindingD3D12Impl();
 
-    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;
 
-    virtual void BindResources(Uint32 ShaderFlags, IResourceMapping* pResMapping, Uint32 Flags) override;
+    virtual void DILIGENT_CALL_TYPE BindResources(Uint32 ShaderFlags, IResourceMapping* pResMapping, Uint32 Flags) override;
 
-    virtual IShaderResourceVariable* GetVariableByName(SHADER_TYPE ShaderType, const char* Name) override;
+    virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetVariableByName(SHADER_TYPE ShaderType, const char* Name) override;
 
-    virtual Uint32 GetVariableCount(SHADER_TYPE ShaderType) const override final;
+    virtual Uint32 DILIGENT_CALL_TYPE GetVariableCount(SHADER_TYPE ShaderType) const override final;
 
-    virtual IShaderResourceVariable* GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final;
+    virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final;
 
-    virtual void InitializeStaticResources(const IPipelineState* pPipelineState) override final;
+    virtual void DILIGENT_CALL_TYPE InitializeStaticResources(const IPipelineState* pPipelineState) override final;
 
     ShaderResourceCacheD3D12& GetResourceCache() { return m_ShaderResourceCache; }
 
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp
index 749de7f2..deadc6d6 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp
@@ -142,22 +142,22 @@ public:
     ShaderVariableD3D12Impl& operator= (ShaderVariableD3D12Impl&&)      = delete;
     // clang-format on
 
-    virtual IReferenceCounters* GetReferenceCounters() const override final
+    virtual IReferenceCounters* DILIGENT_CALL_TYPE GetReferenceCounters() const override final
     {
         return m_ParentManager.m_Owner.GetReferenceCounters();
     }
 
-    virtual Atomics::Long AddRef() override final
+    virtual Atomics::Long DILIGENT_CALL_TYPE AddRef() override final
     {
         return m_ParentManager.m_Owner.AddRef();
     }
 
-    virtual Atomics::Long Release() override final
+    virtual Atomics::Long DILIGENT_CALL_TYPE Release() override final
     {
         return m_ParentManager.m_Owner.Release();
     }
 
-    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;
@@ -170,39 +170,39 @@ public:
         }
     }
 
-    virtual SHADER_RESOURCE_VARIABLE_TYPE GetType() const override final
+    virtual SHADER_RESOURCE_VARIABLE_TYPE DILIGENT_CALL_TYPE GetType() const override final
     {
         return m_Resource.GetVariableType();
     }
 
-    virtual void Set(IDeviceObject* pObject) override final
+    virtual void DILIGENT_CALL_TYPE Set(IDeviceObject* pObject) override final
     {
         m_Resource.BindResource(pObject, 0, m_ParentManager.m_ResourceCache);
     }
 
-    virtual void SetArray(IDeviceObject* const* ppObjects, Uint32 FirstElement, Uint32 NumElements) override final
+    virtual void DILIGENT_CALL_TYPE SetArray(IDeviceObject* const* ppObjects, Uint32 FirstElement, Uint32 NumElements) override final
     {
         VerifyAndCorrectSetArrayArguments(m_Resource.Attribs.Name, m_Resource.Attribs.BindCount, FirstElement, NumElements);
         for (Uint32 Elem = 0; Elem < NumElements; ++Elem)
             m_Resource.BindResource(ppObjects[Elem], FirstElement + Elem, m_ParentManager.m_ResourceCache);
     }
 
-    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_Resource.Attribs.GetHLSLResourceDesc();
     }
 
-    virtual Uint32 GetIndex() const override final
+    virtual Uint32 DILIGENT_CALL_TYPE GetIndex() const override final
     {
         return m_ParentManager.GetVariableIndex(*this);
     }
 
-    virtual bool IsBound(Uint32 ArrayIndex) const override final
+    virtual bool DILIGENT_CALL_TYPE IsBound(Uint32 ArrayIndex) const override final
     {
         return m_Resource.IsBound(ArrayIndex, m_ParentManager.m_ResourceCache);
     }
diff --git a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp
index 30c6577e..42889126 100644
--- a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp
@@ -51,19 +51,19 @@ public:
                        void*                         pNativeWndHandle);
     ~SwapChainD3D12Impl();
 
-    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 ISwapChain::Present() in Direct3D12 backend.
-    virtual void Present(Uint32 SyncInterval) override final;
+    virtual void DILIGENT_CALL_TYPE Present(Uint32 SyncInterval) override final;
 
     /// Implementation of ISwapChain::Resize() in Direct3D12 backend.
-    virtual void Resize(Uint32 NewWidth, Uint32 NewHeight) override final;
+    virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight) override final;
 
     /// Implementation of ISwapChainD3D12::GetDXGISwapChain().
-    virtual IDXGISwapChain* GetDXGISwapChain() override final { return m_pSwapChain; }
+    virtual IDXGISwapChain* DILIGENT_CALL_TYPE GetDXGISwapChain() override final { return m_pSwapChain; }
 
     /// Implementation of ISwapChain::GetCurrentBackBufferRTV() in Direct3D12 backend.
-    virtual ITextureViewD3D12* GetCurrentBackBufferRTV() override final
+    virtual ITextureViewD3D12* DILIGENT_CALL_TYPE GetCurrentBackBufferRTV() override final
     {
         auto CurrentBackBufferIndex = m_pSwapChain->GetCurrentBackBufferIndex();
         VERIFY_EXPR(CurrentBackBufferIndex >= 0 && CurrentBackBufferIndex < m_SwapChainDesc.BufferCount);
@@ -71,7 +71,7 @@ public:
     }
 
     /// Implementation of ISwapChain::GetDepthBufferDSV() in Direct3D12 backend.
-    virtual ITextureViewD3D12* GetDepthBufferDSV() override final { return m_pDepthBufferDSV; }
+    virtual ITextureViewD3D12* DILIGENT_CALL_TYPE GetDepthBufferDSV() override final { return m_pDepthBufferDSV; }
 
 private:
     virtual void UpdateSwapChain(bool CreateNew) override final;
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
index 7c1c041b..5ba2283e 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
@@ -65,19 +65,19 @@ public:
                      ID3D12Resource*              pTexture);
     ~TextureD3D12Impl();
 
-    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 ITextureD3D12::GetD3D12Texture().
-    virtual ID3D12Resource* GetD3D12Texture() override final { return GetD3D12Resource(); }
+    virtual ID3D12Resource* DILIGENT_CALL_TYPE GetD3D12Texture() override final { return GetD3D12Resource(); }
 
     /// Implementation of ITexture::GetNativeHandle() in Direct3D12 backend.
-    virtual void* GetNativeHandle() override final { return GetD3D12Texture(); }
+    virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final { return GetD3D12Texture(); }
 
     /// Implementation of ITextureD3D12::SetD3D12ResourceState().
-    virtual void SetD3D12ResourceState(D3D12_RESOURCE_STATES state) override final;
+    virtual void DILIGENT_CALL_TYPE SetD3D12ResourceState(D3D12_RESOURCE_STATES state) override final;
 
     /// Implementation of ITextureD3D12::GetD3D12ResourceState().
-    virtual D3D12_RESOURCE_STATES GetD3D12ResourceState() const override final;
+    virtual D3D12_RESOURCE_STATES DILIGENT_CALL_TYPE GetD3D12ResourceState() const override final;
 
     D3D12_RESOURCE_DESC GetD3D12TextureDesc() const;
 
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
index fe69179b..697e0132 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
@@ -57,10 +57,10 @@ public:
                          bool                       bIsDefaultView);
     ~TextureViewD3D12Impl();
 
-    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 ITextureViewD3D12::GetCPUDescriptorHandle().
-    virtual D3D12_CPU_DESCRIPTOR_HANDLE GetCPUDescriptorHandle() override final
+    virtual D3D12_CPU_DESCRIPTOR_HANDLE DILIGENT_CALL_TYPE GetCPUDescriptorHandle() override final
     {
         return m_Descriptor.GetCpuHandle();
     }
diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
index 227dc3c2..b313461d 100644
--- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
@@ -68,36 +68,36 @@ public:
         TBase{IID_EngineFactoryD3D12}
     {}
 
-    bool LoadD3D12(const char* DllName) override final;
-
-    void CreateDeviceAndContextsD3D12(const EngineD3D12CreateInfo& EngineCI,
-                                      IRenderDevice**              ppDevice,
-                                      IDeviceContext**             ppContexts) override final;
-
-    void AttachToD3D12Device(void*                        pd3d12NativeDevice,
-                             size_t                       CommandQueueCount,
-                             ICommandQueueD3D12**         ppCommandQueues,
-                             const EngineD3D12CreateInfo& EngineCI,
-                             IRenderDevice**              ppDevice,
-                             IDeviceContext**             ppContexts) override final;
-
-    void CreateSwapChainD3D12(IRenderDevice*            pDevice,
-                              IDeviceContext*           pImmediateContext,
-                              const SwapChainDesc&      SwapChainDesc,
-                              const FullScreenModeDesc& FSDesc,
-                              void*                     pNativeWndHandle,
-                              ISwapChain**              ppSwapChain) override final;
-
-    virtual void EnumerateAdapters(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
-                                   Uint32&                NumAdapters,
-                                   AdapterAttribs*        Adapters) override final;
-
-    virtual void EnumerateDisplayModes(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
-                                       Uint32                 AdapterId,
-                                       Uint32                 OutputId,
-                                       TEXTURE_FORMAT         Format,
-                                       Uint32&                NumDisplayModes,
-                                       DisplayModeAttribs*    DisplayModes) override final;
+    bool DILIGENT_CALL_TYPE LoadD3D12(const char* DllName) override final;
+
+    virtual void DILIGENT_CALL_TYPE CreateDeviceAndContextsD3D12(const EngineD3D12CreateInfo& EngineCI,
+                                                                 IRenderDevice**              ppDevice,
+                                                                 IDeviceContext**             ppContexts) override final;
+
+    virtual void DILIGENT_CALL_TYPE AttachToD3D12Device(void*                        pd3d12NativeDevice,
+                                                        size_t                       CommandQueueCount,
+                                                        ICommandQueueD3D12**         ppCommandQueues,
+                                                        const EngineD3D12CreateInfo& EngineCI,
+                                                        IRenderDevice**              ppDevice,
+                                                        IDeviceContext**             ppContexts) override final;
+
+    virtual void DILIGENT_CALL_TYPE CreateSwapChainD3D12(IRenderDevice*            pDevice,
+                                                         IDeviceContext*           pImmediateContext,
+                                                         const SwapChainDesc&      SwapChainDesc,
+                                                         const FullScreenModeDesc& FSDesc,
+                                                         void*                     pNativeWndHandle,
+                                                         ISwapChain**              ppSwapChain) override final;
+
+    virtual void DILIGENT_CALL_TYPE EnumerateAdapters(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
+                                                      Uint32&                NumAdapters,
+                                                      AdapterAttribs*        Adapters) override final;
+
+    virtual void DILIGENT_CALL_TYPE EnumerateDisplayModes(DIRECT3D_FEATURE_LEVEL MinFeatureLevel,
+                                                          Uint32                 AdapterId,
+                                                          Uint32                 OutputId,
+                                                          TEXTURE_FORMAT         Format,
+                                                          Uint32&                NumDisplayModes,
+                                                          DisplayModeAttribs*    DisplayModes) override final;
 
 
 private: