From c072867aaf9433ea128438db155fc148d3296b10 Mon Sep 17 00:00:00 2001 From: assiduous 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/BufferD3D11Impl.hpp | 6 +- .../include/BufferViewD3D11Impl.hpp | 4 +- .../include/DeviceContextD3D11Impl.hpp | 164 +++++++++++---------- .../GraphicsEngineD3D11/include/FenceD3D11Impl.hpp | 4 +- .../include/PipelineStateD3D11Impl.hpp | 39 ++--- .../GraphicsEngineD3D11/include/QueryD3D11Impl.hpp | 6 +- .../include/RenderDeviceD3D11Impl.hpp | 45 ++++-- .../include/SamplerD3D11Impl.hpp | 4 +- .../include/ShaderD3D11Impl.hpp | 10 +- .../include/ShaderResourceBindingD3D11Impl.hpp | 14 +- .../include/ShaderResourceLayoutD3D11.hpp | 48 +++--- .../include/SwapChainD3D11Impl.hpp | 12 +- .../include/TextureBaseD3D11.hpp | 6 +- .../include/TextureViewD3D11Impl.hpp | 4 +- .../GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp | 32 ++-- 15 files changed, 221 insertions(+), 177 deletions(-) (limited to 'Graphics/GraphicsEngineD3D11') diff --git a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp index 1deb3f91..d7273159 100644 --- a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp @@ -62,13 +62,13 @@ public: ~BufferD3D11Impl(); - 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 IBufferD3D11::GetD3D11Buffer(). - virtual ID3D11Buffer* GetD3D11Buffer() override final { return m_pd3d11Buffer; } + virtual ID3D11Buffer* DILIGENT_CALL_TYPE GetD3D11Buffer() override final { return m_pd3d11Buffer; } /// Implementation of IBuffer::GetNativeHandle(). - virtual void* GetNativeHandle() override final { return GetD3D11Buffer(); } + virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final { return GetD3D11Buffer(); } void AddState(RESOURCE_STATE State) { diff --git a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp index 0b0ab051..02b5ba9e 100644 --- a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp @@ -53,10 +53,10 @@ public: ID3D11View* pD3D11View, bool bIsDefaultView); - virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) final; + virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) final; /// Implementation of IBufferViewD3D11::GetD3D11View(). - virtual ID3D11View* GetD3D11View() override final + virtual ID3D11View* DILIGENT_CALL_TYPE GetD3D11View() override final { return m_pD3D11View; } diff --git a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp index f1105509..987faccc 100644 --- a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp @@ -69,159 +69,169 @@ public: ID3D11DeviceContext* pd3d11DeviceContext, const struct EngineD3D11CreateInfo& EngineAttribs, bool bIsDeferred); - 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 Direct3D11 backend. - virtual void SetPipelineState(IPipelineState* pPipelineState) override final; + virtual void DILIGENT_CALL_TYPE SetPipelineState(IPipelineState* pPipelineState) override final; /// Implementation of IDeviceContext::TransitionShaderResources() in Direct3D11 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 Direct3D11 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 Direct3D11 backend. - virtual void SetStencilRef(Uint32 StencilRef) override final; + virtual void DILIGENT_CALL_TYPE SetStencilRef(Uint32 StencilRef) override final; /// Implementation of IDeviceContext::SetBlendFactors() in Direct3D11 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 Direct3D11 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 Direct3D11 backend. - virtual void InvalidateState() override final; + virtual void DILIGENT_CALL_TYPE InvalidateState() override final; /// Implementation of IDeviceContext::SetIndexBuffer() in Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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; /// Implementation of IDeviceContext::Draw() in Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 backend. - virtual void DispatchComputeIndirect(const DispatchComputeIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final; + virtual void DILIGENT_CALL_TYPE DispatchComputeIndirect(const DispatchComputeIndirectAttribs& Attribs, IBuffer* pAttribsBuffer) override final; /// Implementation of IDeviceContext::ClearDepthStencil() in Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 StateTransitionMode) 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 StateTransitionMode) override final; /// Implementation of IDeviceContext::CopyTexture() in Direct3D11 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 Direct3D11 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 Direct3D11 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::GenerateMips() in Direct3D11 backend. - virtual void GenerateMips(ITextureView* pTextureView) override final; + virtual void DILIGENT_CALL_TYPE GenerateMips(ITextureView* pTextureView) override final; /// Implementation of IDeviceContext::FinishFrame() in Direct3D11 backend. - virtual void FinishFrame() override final; + virtual void DILIGENT_CALL_TYPE FinishFrame() override final; /// Implementation of IDeviceContext::TransitionResourceStates() in Direct3D11 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 Direct3D11 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 Direct3D11 backend. - void FinishCommandList(class ICommandList** ppCommandList) override final; + void DILIGENT_CALL_TYPE FinishCommandList(class ICommandList** ppCommandList) override final; /// Implementation of IDeviceContext::ExecuteCommandList() in Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 backend. - virtual void WaitForIdle() override final; + virtual void DILIGENT_CALL_TYPE WaitForIdle() override final; /// Implementation of IDeviceContext::BeginQuery() in Direct3D11 backend. - virtual void BeginQuery(IQuery* pQuery) override final; + virtual void DILIGENT_CALL_TYPE BeginQuery(IQuery* pQuery) override final; /// Implementation of IDeviceContext::EndQuery() in Direct3D11 backend. - virtual void EndQuery(IQuery* pQuery) override final; + virtual void DILIGENT_CALL_TYPE EndQuery(IQuery* pQuery) override final; /// Implementation of IDeviceContext::Flush() in Direct3D11 backend. - virtual void Flush() override final; + virtual void DILIGENT_CALL_TYPE Flush() override final; /// Implementation of IDeviceContextD3D11::GetD3D11DeviceContext(). - virtual ID3D11DeviceContext* GetD3D11DeviceContext() override final { return m_pd3d11DeviceContext; } + virtual ID3D11DeviceContext* DILIGENT_CALL_TYPE GetD3D11DeviceContext() override final { return m_pd3d11DeviceContext; } void CommitRenderTargets(); diff --git a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp index 3b08400a..055fd19e 100644 --- a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp @@ -55,10 +55,10 @@ public: IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_FenceD3D11, TFenceBase); /// Implementation of IFence::GetCompletedValue() in Direct3D11 backend. - virtual Uint64 GetCompletedValue() override final; + virtual Uint64 DILIGENT_CALL_TYPE GetCompletedValue() override final; /// Implementation of IFence::Reset() in Direct3D11 backend. - virtual void Reset(Uint64 Value) override final; + virtual void DILIGENT_CALL_TYPE Reset(Uint64 Value) override final; void AddPendingQuery(CComPtr pCtx, CComPtr pQuery, Uint64 Value) { diff --git a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp index 59c7b0e8..d6d3a51b 100644 --- a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp @@ -53,56 +53,61 @@ public: const PipelineStateDesc& PipelineDesc); ~PipelineStateD3D11Impl(); - 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 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 Direct3D11 backend. - virtual bool IsCompatibleWith(const IPipelineState* pPSO) const override final; + virtual bool DILIGENT_CALL_TYPE IsCompatibleWith(const IPipelineState* pPSO) const override final; /// Implementation of IPipelineStateD3D11::GetD3D11BlendState() method. - virtual ID3D11BlendState* GetD3D11BlendState() override final; + virtual ID3D11BlendState* DILIGENT_CALL_TYPE GetD3D11BlendState() override final; /// Implementation of IPipelineStateD3D11::GetD3D11RasterizerState() method. - virtual ID3D11RasterizerState* GetD3D11RasterizerState() override final; + virtual ID3D11RasterizerState* DILIGENT_CALL_TYPE GetD3D11RasterizerState() override final; /// Implementation of IPipelineStateD3D11::GetD3D11DepthStencilState() method. - virtual ID3D11DepthStencilState* GetD3D11DepthStencilState() override final; + virtual ID3D11DepthStencilState* DILIGENT_CALL_TYPE GetD3D11DepthStencilState() override final; /// Implementation of IPipelineStateD3D11::GetD3D11InputLayout() method. - virtual ID3D11InputLayout* GetD3D11InputLayout() override final; + virtual ID3D11InputLayout* DILIGENT_CALL_TYPE GetD3D11InputLayout() override final; /// Implementation of IPipelineStateD3D11::GetD3D11VertexShader() method. - virtual ID3D11VertexShader* GetD3D11VertexShader() override final; + virtual ID3D11VertexShader* DILIGENT_CALL_TYPE GetD3D11VertexShader() override final; /// Implementation of IPipelineStateD3D11::GetD3D11PixelShader() method. - virtual ID3D11PixelShader* GetD3D11PixelShader() override final; + virtual ID3D11PixelShader* DILIGENT_CALL_TYPE GetD3D11PixelShader() override final; /// Implementation of IPipelineStateD3D11::GetD3D11GeometryShader() method. - virtual ID3D11GeometryShader* GetD3D11GeometryShader() override final; + virtual ID3D11GeometryShader* DILIGENT_CALL_TYPE GetD3D11GeometryShader() override final; /// Implementation of IPipelineStateD3D11::GetD3D11DomainShader() method. - virtual ID3D11DomainShader* GetD3D11DomainShader() override final; + virtual ID3D11DomainShader* DILIGENT_CALL_TYPE GetD3D11DomainShader() override final; /// Implementation of IPipelineStateD3D11::GetD3D11HullShader() method. - virtual ID3D11HullShader* GetD3D11HullShader() override final; + virtual ID3D11HullShader* DILIGENT_CALL_TYPE GetD3D11HullShader() override final; /// Implementation of IPipelineStateD3D11::GetD3D11ComputeShader() method. - virtual ID3D11ComputeShader* GetD3D11ComputeShader() override final; + virtual ID3D11ComputeShader* DILIGENT_CALL_TYPE GetD3D11ComputeShader() override final; SRBMemoryAllocator& GetSRBMemoryAllocator() diff --git a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp index c95ddcd9..6cea3240 100644 --- a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp @@ -56,17 +56,17 @@ public: IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_QueryD3D11, 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 IQuery::Invalidate(). - virtual void Invalidate() override final + virtual void DILIGENT_CALL_TYPE Invalidate() override final { m_DisjointQuery.reset(); TQueryBase::Invalidate(); } /// Implementation of IQueryD3D11::GetD3D11Query(). - virtual ID3D11Query* GetD3D11Query() override final + virtual ID3D11Query* DILIGENT_CALL_TYPE GetD3D11Query() override final { return m_pd3d11Query; } diff --git a/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.hpp index e3c3bf3d..3d8a8e8c 100644 --- a/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/RenderDeviceD3D11Impl.hpp @@ -49,49 +49,64 @@ public: const EngineD3D11CreateInfo& EngineAttribs, ID3D11Device* pd3d11Device, Uint32 NumDeferredContexts); - 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::CreateBuffer() in Direct3D11 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 Direct3D11 backend. - virtual void CreateShader(const ShaderCreateInfo& ShaderCI, IShader** ppShader) override final; + virtual void DILIGENT_CALL_TYPE CreateShader(const ShaderCreateInfo& ShaderCI, + IShader** ppShader) override final; /// Implementation of IRenderDevice::CreateTexture() in Direct3D11 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; /// Implementation of IRenderDevice::CreateSampler() in Direct3D11 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::CreatePipelineState() in Direct3D11 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::CreateFence() in Direct3D11 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 Direct3D11 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 IRenderDeviceD3D11::GetD3D11Device() in Direct3D11 backend. - ID3D11Device* GetD3D11Device() override final { return m_pd3d11Device; } + ID3D11Device* DILIGENT_CALL_TYPE GetD3D11Device() override final { return m_pd3d11Device; } /// Implementation of IRenderDeviceD3D11::CreateBufferFromD3DResource() in Direct3D11 backend. - virtual void CreateBufferFromD3DResource(ID3D11Buffer* pd3d11Buffer, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer) override final; + virtual void DILIGENT_CALL_TYPE CreateBufferFromD3DResource(ID3D11Buffer* pd3d11Buffer, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer) override final; /// Implementation of IRenderDeviceD3D11::CreateTextureFromD3DResource() for 1D textures in Direct3D11 backend. - virtual void CreateTexture1DFromD3DResource(ID3D11Texture1D* pd3d11Texture, RESOURCE_STATE InitialState, ITexture** ppTexture) override final; + virtual void DILIGENT_CALL_TYPE CreateTexture1DFromD3DResource(ID3D11Texture1D* pd3d11Texture, + RESOURCE_STATE InitialState, + ITexture** ppTexture) override final; /// Implementation of IRenderDeviceD3D11::CreateTextureFromD3DResource() for 2D textures in Direct3D11 backend. - virtual void CreateTexture2DFromD3DResource(ID3D11Texture2D* pd3d11Texture, RESOURCE_STATE InitialState, ITexture** ppTexture) override final; + virtual void DILIGENT_CALL_TYPE CreateTexture2DFromD3DResource(ID3D11Texture2D* pd3d11Texture, + RESOURCE_STATE InitialState, + ITexture** ppTexture) override final; /// Implementation of IRenderDeviceD3D11::CreateTextureFromD3DResource() for 3D textures in Direct3D11 backend. - virtual void CreateTexture3DFromD3DResource(ID3D11Texture3D* pd3d11Texture, RESOURCE_STATE InitialState, ITexture** ppTexture) override final; + virtual void DILIGENT_CALL_TYPE CreateTexture3DFromD3DResource(ID3D11Texture3D* pd3d11Texture, + RESOURCE_STATE InitialState, + ITexture** ppTexture) override final; /// Implementation of IRenderDevice::ReleaseStaleResources() in Direct3D11 backend. - virtual void ReleaseStaleResources(bool ForceRelease = false) override final {} + virtual void DILIGENT_CALL_TYPE ReleaseStaleResources(bool ForceRelease = false) override final {} /// Implementation of IRenderDevice::IdleGPU() in Direct3D11 backend. - virtual void IdleGPU() override final; + virtual void DILIGENT_CALL_TYPE IdleGPU() override final; size_t GetCommandQueueCount() const { return 1; } Uint64 GetCommandQueueMask() const { return Uint64{1}; } diff --git a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp index 6ad866f0..2f68d389 100644 --- a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp @@ -51,10 +51,10 @@ public: const SamplerDesc& SamplerDesc); ~SamplerD3D11Impl(); - 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 ISamplerD3D11::ISamplerD3D11() method. - virtual ID3D11SamplerState* GetD3D11SamplerState() override final { return m_pd3dSampler; } + virtual ID3D11SamplerState* DILIGENT_CALL_TYPE GetD3D11SamplerState() override final { return m_pd3dSampler; } private: /// D3D11 sampler diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp index 34f6d48a..48d6e591 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp @@ -57,28 +57,28 @@ public: const ShaderCreateInfo& ShaderCI); ~ShaderD3D11Impl(); - 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 Direct3D11 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 Direct3D11 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() method. - 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); } /// Implementation of IShaderD3D11::GetD3D11Shader() method. - virtual ID3D11DeviceChild* GetD3D11Shader() override final + virtual ID3D11DeviceChild* DILIGENT_CALL_TYPE GetD3D11Shader() override final { return m_pShader; } diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp index b892db0b..b5704f96 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp @@ -53,22 +53,24 @@ public: bool IsInternal); ~ShaderResourceBindingD3D11Impl(); - 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 IShaderResourceBinding::BindResources() in Direct3D11 backend. - virtual void BindResources(Uint32 ShaderFlags, IResourceMapping* pResMapping, Uint32 Flags) override final; + virtual void DILIGENT_CALL_TYPE BindResources(Uint32 ShaderFlags, + IResourceMapping* pResMapping, + Uint32 Flags) override final; /// Implementation of IShaderResourceBinding::GetVariableByName() in Direct3D11 backend. - virtual IShaderResourceVariable* GetVariableByName(SHADER_TYPE ShaderType, const char* Name) override final; + virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetVariableByName(SHADER_TYPE ShaderType, const char* Name) override final; /// Implementation of IShaderResourceBinding::GetVariableCount() in Direct3D11 backend. - virtual Uint32 GetVariableCount(SHADER_TYPE ShaderType) const override final; + virtual Uint32 DILIGENT_CALL_TYPE GetVariableCount(SHADER_TYPE ShaderType) const override final; /// Implementation of IShaderResourceBinding::GetVariableByIndex() in Direct3D11 backend. - virtual IShaderResourceVariable* GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final; + virtual IShaderResourceVariable* DILIGENT_CALL_TYPE GetVariableByIndex(SHADER_TYPE ShaderType, Uint32 Index) override final; /// Implementation of IShaderResourceBinding::InitializeStaticResources() in Direct3D11 backend. - virtual void InitializeStaticResources(const IPipelineState* pPipelineState) override final; + virtual void DILIGENT_CALL_TYPE InitializeStaticResources(const IPipelineState* pPipelineState) override final; ShaderResourceCacheD3D11& GetResourceCache(Uint32 Ind) { diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp index a5534f3f..6325d3c6 100644 --- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp +++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceLayoutD3D11.hpp @@ -84,16 +84,18 @@ public: // Non-virtual function __forceinline void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } + virtual void DILIGENT_CALL_TYPE Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } - 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_Attribs.Name, m_Attribs.BindCount, FirstElement, NumElements); for (Uint32 elem = 0; elem < NumElements; ++elem) BindResource(ppObjects[elem], FirstElement + elem); } - virtual bool IsBound(Uint32 ArrayIndex) const override final + virtual bool DILIGENT_CALL_TYPE IsBound(Uint32 ArrayIndex) const override final { VERIFY_EXPR(ArrayIndex < m_Attribs.BindCount); return m_ParentResLayout.m_ResourceCache.IsCBBound(m_Attribs.BindPoint + ArrayIndex); @@ -113,16 +115,18 @@ public: // Non-virtual function __forceinline void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } + virtual void DILIGENT_CALL_TYPE Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } - 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_Attribs.Name, m_Attribs.BindCount, FirstElement, NumElements); for (Uint32 elem = 0; elem < NumElements; ++elem) BindResource(ppObjects[elem], FirstElement + elem); } - virtual bool IsBound(Uint32 ArrayIndex) const override final + virtual bool DILIGENT_CALL_TYPE IsBound(Uint32 ArrayIndex) const override final { VERIFY_EXPR(ArrayIndex < m_Attribs.BindCount); return m_ParentResLayout.m_ResourceCache.IsSRVBound(m_Attribs.BindPoint + ArrayIndex, true); @@ -146,16 +150,18 @@ public: // Provide non-virtual function __forceinline void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } + virtual void DILIGENT_CALL_TYPE Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } - 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_Attribs.Name, m_Attribs.BindCount, FirstElement, NumElements); for (Uint32 elem = 0; elem < NumElements; ++elem) BindResource(ppObjects[elem], FirstElement + elem); } - __forceinline virtual bool IsBound(Uint32 ArrayIndex) const override final + __forceinline virtual bool DILIGENT_CALL_TYPE IsBound(Uint32 ArrayIndex) const override final { VERIFY_EXPR(ArrayIndex < m_Attribs.BindCount); return m_ParentResLayout.m_ResourceCache.IsUAVBound(m_Attribs.BindPoint + ArrayIndex, true); @@ -173,16 +179,18 @@ public: // Non-virtual function __forceinline void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } + virtual void DILIGENT_CALL_TYPE Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } - 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_Attribs.Name, m_Attribs.BindCount, FirstElement, NumElements); for (Uint32 elem = 0; elem < NumElements; ++elem) BindResource(ppObjects[elem], FirstElement + elem); } - virtual bool IsBound(Uint32 ArrayIndex) const override final + virtual bool DILIGENT_CALL_TYPE IsBound(Uint32 ArrayIndex) const override final { VERIFY_EXPR(ArrayIndex < m_Attribs.BindCount); return m_ParentResLayout.m_ResourceCache.IsUAVBound(m_Attribs.BindPoint + ArrayIndex, false); @@ -200,16 +208,18 @@ public: // Non-virtual function __forceinline void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } + virtual void DILIGENT_CALL_TYPE Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } - 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_Attribs.Name, m_Attribs.BindCount, FirstElement, NumElements); for (Uint32 elem = 0; elem < NumElements; ++elem) BindResource(ppObjects[elem], FirstElement + elem); } - virtual bool IsBound(Uint32 ArrayIndex) const override final + virtual bool DILIGENT_CALL_TYPE IsBound(Uint32 ArrayIndex) const override final { VERIFY_EXPR(ArrayIndex < m_Attribs.BindCount); return m_ParentResLayout.m_ResourceCache.IsSRVBound(m_Attribs.BindPoint + ArrayIndex, false); @@ -227,16 +237,18 @@ public: // Non-virtual function __forceinline void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } + virtual void DILIGENT_CALL_TYPE Set(IDeviceObject* pObject) override final { BindResource(pObject, 0); } - 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_Attribs.Name, m_Attribs.BindCount, FirstElement, NumElements); for (Uint32 elem = 0; elem < NumElements; ++elem) BindResource(ppObjects[elem], FirstElement + elem); } - virtual bool IsBound(Uint32 ArrayIndex) const override final + virtual bool DILIGENT_CALL_TYPE IsBound(Uint32 ArrayIndex) const override final { VERIFY_EXPR(ArrayIndex < m_Attribs.BindCount); return m_ParentResLayout.m_ResourceCache.IsSamplerBound(m_Attribs.BindPoint + ArrayIndex); diff --git a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp index 34c372fc..945a57f2 100644 --- a/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/SwapChainD3D11Impl.hpp @@ -50,22 +50,22 @@ public: void* pNativeWndHandle); ~SwapChainD3D11Impl(); - 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 Direct3D11 backend. - virtual void Present(Uint32 SyncInterval) override final; + virtual void DILIGENT_CALL_TYPE Present(Uint32 SyncInterval) override final; /// Implementation of ISwapChain::Resize() in Direct3D11 backend. - virtual void Resize(Uint32 NewWidth, Uint32 NewHeight) override final; + virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight) override final; /// Implementation of ISwapChainD3D11::GetDXGISwapChain() in Direct3D11 backend. - virtual IDXGISwapChain* GetDXGISwapChain() override final { return m_pSwapChain; } + virtual IDXGISwapChain* DILIGENT_CALL_TYPE GetDXGISwapChain() override final { return m_pSwapChain; } /// Implementation of ISwapChainD3D11::GetCurrentBackBufferRTV() in Direct3D11 backend. - virtual ITextureViewD3D11* GetCurrentBackBufferRTV() override final { return m_pRenderTargetView; } + virtual ITextureViewD3D11* DILIGENT_CALL_TYPE GetCurrentBackBufferRTV() override final { return m_pRenderTargetView; } /// Implementation of ISwapChainD3D11::GetDepthBufferDSV() in Direct3D11 backend. - virtual ITextureViewD3D11* GetDepthBufferDSV() override final { return m_pDepthStencilView; } + virtual ITextureViewD3D11* DILIGENT_CALL_TYPE GetDepthBufferDSV() override final { return m_pDepthStencilView; } private: virtual void UpdateSwapChain(bool CreateNew) override final; diff --git a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp index c954f844..22babbfe 100644 --- a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp +++ b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp @@ -55,13 +55,13 @@ public: const TextureData* pInitData = nullptr); ~TextureBaseD3D11(); - 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 ITextureD3D11::GetD3D11Texture(). - virtual ID3D11Resource* GetD3D11Texture() override final { return m_pd3d11Texture; } + virtual ID3D11Resource* DILIGENT_CALL_TYPE GetD3D11Texture() override final { return m_pd3d11Texture; } /// Implementation of ITexture::GetNativeHandle(). - virtual void* GetNativeHandle() override final { return GetD3D11Texture(); } + virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final { return GetD3D11Texture(); } void AddState(RESOURCE_STATE State) { diff --git a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp index dffbb87f..288ec0bc 100644 --- a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp +++ b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp @@ -53,10 +53,10 @@ public: ID3D11View* pD3D11View, 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 ITextureViewD3D11::GetD3D11View(). - virtual ID3D11View* GetD3D11View() override final + virtual ID3D11View* DILIGENT_CALL_TYPE GetD3D11View() override final { return m_pD3D11View; } diff --git a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp index 51d5f15d..4cddbf6f 100644 --- a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp +++ b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp @@ -58,22 +58,22 @@ public: TBase{IID_EngineFactoryD3D11} {} - void CreateDeviceAndContextsD3D11(const EngineD3D11CreateInfo& EngineCI, - IRenderDevice** ppDevice, - IDeviceContext** ppContexts) override final; - - void CreateSwapChainD3D11(IRenderDevice* pDevice, - IDeviceContext* pImmediateContext, - const SwapChainDesc& SCDesc, - const FullScreenModeDesc& FSDesc, - void* pNativeWndHandle, - ISwapChain** ppSwapChain) override final; - - void AttachToD3D11Device(void* pd3d11NativeDevice, - void* pd3d11ImmediateContext, - const EngineD3D11CreateInfo& EngineCI, - IRenderDevice** ppDevice, - IDeviceContext** ppContexts) override final; + virtual void DILIGENT_CALL_TYPE CreateDeviceAndContextsD3D11(const EngineD3D11CreateInfo& EngineCI, + IRenderDevice** ppDevice, + IDeviceContext** ppContexts) override final; + + virtual void DILIGENT_CALL_TYPE CreateSwapChainD3D11(IRenderDevice* pDevice, + IDeviceContext* pImmediateContext, + const SwapChainDesc& SCDesc, + const FullScreenModeDesc& FSDesc, + void* pNativeWndHandle, + ISwapChain** ppSwapChain) override final; + + virtual void DILIGENT_CALL_TYPE AttachToD3D11Device(void* pd3d11NativeDevice, + void* pd3d11ImmediateContext, + const EngineD3D11CreateInfo& EngineCI, + IRenderDevice** ppDevice, + IDeviceContext** ppContexts) override final; }; -- cgit v1.2.3