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 --- .../GraphicsEngineOpenGL/include/BufferGLImpl.hpp | 9 +- .../include/BufferViewGLImpl.hpp | 2 +- .../include/DeviceContextGLImpl.hpp | 167 +++++++++++---------- .../GraphicsEngineOpenGL/include/FenceGLImpl.hpp | 4 +- .../include/GLPipelineResourceLayout.hpp | 38 +++-- .../include/PipelineStateGLImpl.hpp | 17 ++- .../GraphicsEngineOpenGL/include/QueryGLImpl.hpp | 4 +- .../include/RenderDeviceGLImpl.hpp | 64 +++++--- .../GraphicsEngineOpenGL/include/SamplerGLImpl.hpp | 2 +- .../GraphicsEngineOpenGL/include/ShaderGLImpl.hpp | 6 +- .../include/ShaderResourceBindingGLImpl.hpp | 14 +- .../include/SwapChainGLBase.hpp | 4 +- .../include/SwapChainGLImpl.hpp | 12 +- .../GraphicsEngineOpenGL/include/TextureBaseGL.hpp | 8 +- .../include/TextureViewGLImpl.hpp | 2 +- .../src/EngineFactoryOpenGL.cpp | 18 +-- 16 files changed, 213 insertions(+), 158 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp index a5a033c8..46251054 100644 --- a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp @@ -66,7 +66,7 @@ public: ~BufferGLImpl(); /// Queries the specific interface, see IObject::QueryInterface() for details - virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; + virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; void UpdateData(GLContextState& CtxState, Uint32 Offset, Uint32 Size, const void* pData); void CopyData(GLContextState& CtxState, BufferGLImpl& SrcBufferGL, Uint32 SrcOffset, Uint32 DstOffset, Uint32 Size); @@ -79,10 +79,13 @@ public: const GLObjectWrappers::GLBufferObj& GetGLHandle() { return m_GlBuffer; } /// Implementation of IBufferGL::GetGLBufferHandle(). - virtual GLuint GetGLBufferHandle() override final { return GetGLHandle(); } + virtual GLuint DILIGENT_CALL_TYPE GetGLBufferHandle() override final { return GetGLHandle(); } /// Implementation of IBuffer::GetNativeHandle() in OpenGL backend. - virtual void* GetNativeHandle() override final { return reinterpret_cast(static_cast(GetGLBufferHandle())); } + virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final + { + return reinterpret_cast(static_cast(GetGLBufferHandle())); + } private: virtual void CreateViewInternal(const struct BufferViewDesc& ViewDesc, IBufferView** ppView, bool bIsDefaultView) override; diff --git a/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp index 6c92168e..d9613521 100644 --- a/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp @@ -51,7 +51,7 @@ public: bool bIsDefaultView); /// Queries the specific interface, see IObject::QueryInterface() for details - 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; const GLObjectWrappers::GLTextureObj& GetTexBufferHandle() { return m_GLTexBuffer; } diff --git a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp index 7703a019..e80e0d04 100644 --- a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp @@ -58,163 +58,174 @@ public: DeviceContextGLImpl(IReferenceCounters* pRefCounters, RenderDeviceGLImpl* pDeviceGL, bool bIsDeferred); /// Queries the specific interface, see IObject::QueryInterface() for details. - 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 OpenGL backend. - virtual void SetPipelineState(IPipelineState* pPipelineState) override final; + virtual void DILIGENT_CALL_TYPE SetPipelineState(IPipelineState* pPipelineState) override final; /// Implementation of IDeviceContext::TransitionShaderResources() in OpenGL 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 OpenGL 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 OpenGL backend. - virtual void SetStencilRef(Uint32 StencilRef) override final; + virtual void DILIGENT_CALL_TYPE SetStencilRef(Uint32 StencilRef) override final; /// Implementation of IDeviceContext::SetBlendFactors() in OpenGL 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 OpenGL 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 OpenGL backend. - virtual void InvalidateState() override final; + virtual void DILIGENT_CALL_TYPE InvalidateState() override final; /// Implementation of IDeviceContext::SetIndexBuffer() in OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL backend. - virtual void UpdateTexture(ITexture* pTexture, - Uint32 MipLevel, - Uint32 Slice, - const Box& DstBox, - const TextureSubResData& SubresData, - RESOURCE_STATE_TRANSITION_MODE SrcBufferStateTransitionMode, - RESOURCE_STATE_TRANSITION_MODE TextureStateTransitionMode) override final; + virtual void DILIGENT_CALL_TYPE UpdateTexture(ITexture* pTexture, + Uint32 MipLevel, + Uint32 Slice, + const Box& DstBox, + const TextureSubResData& SubresData, + RESOURCE_STATE_TRANSITION_MODE SrcBufferStateTransitionMode, + RESOURCE_STATE_TRANSITION_MODE TextureStateTransitionMode) override final; /// Implementation of IDeviceContext::CopyTexture() in OpenGL 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 OpenGL 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 OpenGL 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 OpenGL backend. - virtual void GenerateMips(ITextureView* pTexView) override; + virtual void DILIGENT_CALL_TYPE GenerateMips(ITextureView* pTexView) override; /// Implementation of IDeviceContext::FinishFrame() in OpenGL backend. - virtual void FinishFrame() override final; + virtual void DILIGENT_CALL_TYPE FinishFrame() override final; /// Implementation of IDeviceContext::TransitionResourceStates() in OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL backend. - virtual void WaitForIdle() override final; + virtual void DILIGENT_CALL_TYPE WaitForIdle() override final; /// Implementation of IDeviceContext::BeginQuery() in OpenGL backend. - virtual void BeginQuery(IQuery* pQuery) override final; + virtual void DILIGENT_CALL_TYPE BeginQuery(IQuery* pQuery) override final; /// Implementation of IDeviceContext::EndQuery() in OpenGL backend. - virtual void EndQuery(IQuery* pQuery) override final; + virtual void DILIGENT_CALL_TYPE EndQuery(IQuery* pQuery) override final; /// Implementation of IDeviceContext::Flush() in OpenGL backend. - virtual void Flush() override final; + virtual void DILIGENT_CALL_TYPE Flush() override final; /// Implementation of IDeviceContextGL::UpdateCurrentGLContext(). - virtual bool UpdateCurrentGLContext() override final; + virtual bool DILIGENT_CALL_TYPE UpdateCurrentGLContext() override final; void BindProgramResources(Uint32& NewMemoryBarriers, IShaderResourceBinding* pResBinding); @@ -222,7 +233,7 @@ public: void CommitRenderTargets(); - virtual void SetSwapChain(ISwapChainGL* pSwapChain) override final; + virtual void DILIGENT_CALL_TYPE SetSwapChain(ISwapChainGL* pSwapChain) override final; virtual void ResetRenderTargets() override final; diff --git a/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp index 6de13da9..8c45e713 100644 --- a/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp @@ -56,10 +56,10 @@ public: IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_FenceGL, TFenceBase); /// Implementation of IFence::GetCompletedValue() in OpenGL backend. - virtual Uint64 GetCompletedValue() override final; + virtual Uint64 DILIGENT_CALL_TYPE GetCompletedValue() override final; /// Implementation of IFence::Reset() in OpenGL backend. - virtual void Reset(Uint64 Value) override final; + virtual void DILIGENT_CALL_TYPE Reset(Uint64 Value) override final; void AddPendingFence(GLObjectWrappers::GLSyncObj&& Fence, Uint64 Value) { diff --git a/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp b/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp index bcaee216..67f1e1ec 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/GLPipelineResourceLayout.hpp @@ -125,17 +125,17 @@ public: VERIFY_EXPR(StaticSamplerIdx < 0 || ResourceAttribs.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_SRV); } - virtual SHADER_RESOURCE_VARIABLE_TYPE GetType() const override final + virtual SHADER_RESOURCE_VARIABLE_TYPE DILIGENT_CALL_TYPE GetType() const override final { return m_VariableType; } - virtual void GetResourceDesc(ShaderResourceDesc& ResourceDesc) const override final + virtual void DILIGENT_CALL_TYPE GetResourceDesc(ShaderResourceDesc& ResourceDesc) const override final { ResourceDesc = m_Attribs.GetResourceDesc(); } - virtual Uint32 GetIndex() const override final + virtual Uint32 DILIGENT_CALL_TYPE GetIndex() const override final { return m_ParentResLayout.GetVariableIndex(*this); } @@ -157,19 +157,21 @@ public: // Non-virtual function void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final + 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.ArraySize, 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.ArraySize); return m_ParentResLayout.m_pResourceCache->IsUBBound(m_Attribs.Binding + ArrayIndex); @@ -189,19 +191,21 @@ public: // Non-virtual function void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final + 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.ArraySize, 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.ArraySize); return m_ParentResLayout.m_pResourceCache->IsSamplerBound(m_Attribs.Binding + ArrayIndex, m_Attribs.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_SRV); @@ -220,19 +224,21 @@ public: // Provide non-virtual function void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final + 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.ArraySize, 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.ArraySize); return m_ParentResLayout.m_pResourceCache->IsImageBound(m_Attribs.Binding + ArrayIndex, m_Attribs.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_UAV); @@ -251,19 +257,21 @@ public: // Non-virtual function void BindResource(IDeviceObject* pObject, Uint32 ArrayIndex); - virtual void Set(IDeviceObject* pObject) override final + 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.ArraySize, 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.ArraySize); return m_ParentResLayout.m_pResourceCache->IsSSBOBound(m_Attribs.Binding + ArrayIndex); diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp index f6ab7b0c..ba07c754 100644 --- a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp @@ -56,25 +56,28 @@ public: ~PipelineStateGLImpl(); /// Queries the specific interface, see IObject::QueryInterface() for details - virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; + virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; /// Implementation of IPipelineState::BindStaticResources() in OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL backend. - virtual bool IsCompatibleWith(const IPipelineState* pPSO) const override final; + virtual bool DILIGENT_CALL_TYPE IsCompatibleWith(const IPipelineState* pPSO) const override final; void CommitProgram(GLContextState& State); diff --git a/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp index ab2170b9..a77b55e1 100644 --- a/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp @@ -55,11 +55,11 @@ public: IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_QueryGL, TQueryBase); /// Implementation of IQuery::GetData() in OpenGL backend. - 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 IQueryGL::GetGlQueryHandle(). - virtual GLuint GetGlQueryHandle() const override final + virtual GLuint DILIGENT_CALL_TYPE GetGlQueryHandle() const override final { return m_GlQuery; } diff --git a/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.hpp index 94e0c87c..78646ecc 100644 --- a/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/RenderDeviceGLImpl.hpp @@ -65,48 +65,76 @@ public: const EngineGLCreateInfo& InitAttribs, const SwapChainDesc* pSCDesc = nullptr); ~RenderDeviceGLImpl(); - virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; + + virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; /// Implementation of IRenderDevice::CreateBuffer() in OpenGL backend. - void CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer, bool bIsDeviceInternal); - virtual void CreateBuffer(const BufferDesc& BuffDesc, const BufferData* BuffData, IBuffer** ppBuffer) override final; + void CreateBuffer(const BufferDesc& BuffDesc, + const BufferData* pBuffData, + IBuffer** ppBuffer, + bool bIsDeviceInternal); + virtual void DILIGENT_CALL_TYPE CreateBuffer(const BufferDesc& BuffDesc, + const BufferData* BuffData, + IBuffer** ppBuffer) override final; /// Implementation of IRenderDevice::CreateShader() in OpenGL backend. - void CreateShader(const ShaderCreateInfo& ShaderCreateInfo, IShader** ppShader, bool bIsDeviceInternal); - virtual void CreateShader(const ShaderCreateInfo& ShaderCreateInfo, IShader** ppShader) override final; + void CreateShader(const ShaderCreateInfo& ShaderCreateInfo, + IShader** ppShader, + bool bIsDeviceInternal); + virtual void DILIGENT_CALL_TYPE CreateShader(const ShaderCreateInfo& ShaderCreateInfo, + IShader** ppShader) override final; /// Implementation of IRenderDevice::CreateTexture() in OpenGL backend. - void CreateTexture(const TextureDesc& TexDesc, const TextureData* pData, ITexture** ppTexture, bool bIsDeviceInternal); - virtual void CreateTexture(const TextureDesc& TexDesc, const TextureData* Data, ITexture** ppTexture) override final; + void CreateTexture(const TextureDesc& TexDesc, + const TextureData* pData, + ITexture** ppTexture, + bool bIsDeviceInternal); + virtual void DILIGENT_CALL_TYPE CreateTexture(const TextureDesc& TexDesc, + const TextureData* Data, + ITexture** ppTexture) override final; /// Implementation of IRenderDevice::CreateSampler() in OpenGL backend. - void CreateSampler(const SamplerDesc& SamplerDesc, ISampler** ppSampler, bool bIsDeviceInternal); - virtual void CreateSampler(const SamplerDesc& SamplerDesc, ISampler** ppSampler) override final; + void CreateSampler(const SamplerDesc& SamplerDesc, + ISampler** ppSampler, + bool bIsDeviceInternal); + virtual void DILIGENT_CALL_TYPE CreateSampler(const SamplerDesc& SamplerDesc, + ISampler** ppSampler) override final; /// Implementation of IRenderDevice::CreatePipelineState() in OpenGL backend. - void CreatePipelineState(const PipelineStateDesc& PipelineDesc, IPipelineState** ppPipelineState, bool bIsDeviceInternal); - virtual void CreatePipelineState(const PipelineStateDesc& PipelineDesc, IPipelineState** ppPipelineState) override final; + void CreatePipelineState(const PipelineStateDesc& PipelineDesc, + IPipelineState** ppPipelineState, + bool bIsDeviceInternal); + virtual void DILIGENT_CALL_TYPE CreatePipelineState(const PipelineStateDesc& PipelineDesc, + IPipelineState** ppPipelineState) override final; /// Implementation of IRenderDevice::CreateFence() in OpenGL 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 OpenGL 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 IRenderDeviceGL::CreateTextureFromGLHandle(). - virtual void CreateTextureFromGLHandle(Uint32 GLHandle, const TextureDesc& TexDesc, RESOURCE_STATE InitialState, ITexture** ppTexture) override final; + virtual void DILIGENT_CALL_TYPE CreateTextureFromGLHandle(Uint32 GLHandle, + const TextureDesc& TexDesc, + RESOURCE_STATE InitialState, + ITexture** ppTexture) override final; /// Implementation of IRenderDeviceGL::CreateBufferFromGLHandle(). - virtual void CreateBufferFromGLHandle(Uint32 GLHandle, const BufferDesc& BuffDesc, RESOURCE_STATE InitialState, IBuffer** ppBuffer) override final; + virtual void DILIGENT_CALL_TYPE CreateBufferFromGLHandle(Uint32 GLHandle, + const BufferDesc& BuffDesc, + RESOURCE_STATE InitialState, + IBuffer** ppBuffer) override final; /// Implementation of IRenderDeviceGL::CreateDummyTexture(). - virtual void CreateDummyTexture(const TextureDesc& TexDesc, RESOURCE_STATE InitialState, ITexture** ppTexture) override final; + virtual void DILIGENT_CALL_TYPE CreateDummyTexture(const TextureDesc& TexDesc, + RESOURCE_STATE InitialState, + ITexture** ppTexture) override final; /// Implementation of IRenderDevice::ReleaseStaleResources() in OpenGL 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 OpenGL backend. - virtual void IdleGPU() override final; + virtual void DILIGENT_CALL_TYPE IdleGPU() override final; const GPUInfo& GetGPUInfo() { return m_GPUInfo; } diff --git a/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp index 4460b975..03cc4545 100644 --- a/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp @@ -48,7 +48,7 @@ public: SamplerGLImpl(IReferenceCounters* pRefCounters, RenderDeviceGLImpl* pDeviceGL, const SamplerDesc& SamplerDesc, bool bIsDeviceInternal = false); ~SamplerGLImpl(); - 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; const GLObjectWrappers::GLSamplerObj& GetHandle() { return m_GlSampler; } diff --git a/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp index 8f9769f7..374fe0c2 100644 --- a/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp @@ -84,13 +84,13 @@ public: bool bIsDeviceInternal = false); ~ShaderGLImpl(); - 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 OpenGL backend. - virtual Uint32 GetResourceCount() const override final; + virtual Uint32 DILIGENT_CALL_TYPE GetResourceCount() const override final; /// Implementation of IShader::GetResource() in OpenGL backend. - virtual void GetResourceDesc(Uint32 Index, ShaderResourceDesc& ResourceDesc) const override final; + virtual void DILIGENT_CALL_TYPE GetResourceDesc(Uint32 Index, ShaderResourceDesc& ResourceDesc) const override final; static GLObjectWrappers::GLProgramObj LinkProgram(IShader** ppShaders, Uint32 NumShaders, bool IsSeparableProgram); diff --git a/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp index 3803a2ff..0958e688 100644 --- a/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp @@ -56,22 +56,24 @@ public: Uint32 NumPrograms); ~ShaderResourceBindingGLImpl(); - 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL 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 OpenGL backend. - virtual void InitializeStaticResources(const IPipelineState* pPipelineState) override final; + virtual void DILIGENT_CALL_TYPE InitializeStaticResources(const IPipelineState* pPipelineState) override final; const GLProgramResourceCache& GetResourceCache(PipelineStateGLImpl* pdbgPSO); diff --git a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.hpp b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.hpp index 2eeb500e..3fbd81e7 100644 --- a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLBase.hpp @@ -49,10 +49,10 @@ public: /// Implementation of ISwapChain::GetCurrentBackBufferRTV() in OpenGL backend. - virtual ITextureView* GetCurrentBackBufferRTV() override final { return m_pRenderTargetView; } + virtual ITextureView* DILIGENT_CALL_TYPE GetCurrentBackBufferRTV() override final { return m_pRenderTargetView; } /// Implementation of ISwapChain::GetDepthBufferDSV() in OpenGL backend. - virtual ITextureView* GetDepthBufferDSV() override final { return m_pDepthStencilView; } + virtual ITextureView* DILIGENT_CALL_TYPE GetDepthBufferDSV() override final { return m_pDepthStencilView; } protected: bool Resize(Uint32 NewWidth, Uint32 NewHeight, Int32 /*To be different from virtual function*/) diff --git a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLImpl.hpp index b3613007..f68079eb 100644 --- a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLImpl.hpp @@ -47,22 +47,22 @@ public: class DeviceContextGLImpl* pImmediateContextGL); ~SwapChainGLImpl(); - 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 OpenGL backend. - virtual void Present(Uint32 SyncInterval) override final; + virtual void DILIGENT_CALL_TYPE Present(Uint32 SyncInterval) override final; /// Implementation of ISwapChain::Resize() in OpenGL backend. - virtual void Resize(Uint32 NewWidth, Uint32 NewHeight) override final; + virtual void DILIGENT_CALL_TYPE Resize(Uint32 NewWidth, Uint32 NewHeight) override final; /// Implementation of ISwapChain::SetFullscreenMode() in OpenGL backend. - virtual void SetFullscreenMode(const DisplayModeAttribs& DisplayMode) override final; + virtual void DILIGENT_CALL_TYPE SetFullscreenMode(const DisplayModeAttribs& DisplayMode) override final; /// Implementation of ISwapChain::SetWindowedMode() in OpenGL backend. - virtual void SetWindowedMode() override final; + virtual void DILIGENT_CALL_TYPE SetWindowedMode() override final; /// Implementation of ISwapChainGL::GetDefaultFBO(). - virtual GLuint GetDefaultFBO() const override final { return 0; } + virtual GLuint DILIGENT_CALL_TYPE GetDefaultFBO() const override final { return 0; } }; } // namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp b/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp index 3ec4a128..81dc8fc0 100644 --- a/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp @@ -75,12 +75,12 @@ public: ~TextureBaseGL(); - virtual void QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; + virtual void DILIGENT_CALL_TYPE QueryInterface(const INTERFACE_ID& IID, IObject** ppInterface) override; const GLObjectWrappers::GLTextureObj& GetGLHandle() const { return m_GlTexture; } /// Implementation of ITextureGL::GetBindTarget(). - virtual GLenum GetBindTarget() const override final { return m_BindTarget; } + virtual GLenum DILIGENT_CALL_TYPE GetBindTarget() const override final { return m_BindTarget; } GLenum GetGLTexFormat() const { return m_GLTexFormat; } @@ -100,10 +100,10 @@ public: Uint32 DstZ); /// Implementation of ITextureGL::GetGLTextureHandle(). - virtual GLuint GetGLTextureHandle() override final { return GetGLHandle(); } + virtual GLuint DILIGENT_CALL_TYPE GetGLTextureHandle() override final { return GetGLHandle(); } /// Implementation of ITexture::GetNativeHandle() in OpenGL backend. - virtual void* GetNativeHandle() override final + virtual void* DILIGENT_CALL_TYPE GetNativeHandle() override final { return reinterpret_cast(static_cast(GetGLTextureHandle())); } diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp index eab94be1..f50cf86e 100644 --- a/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp +++ b/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp @@ -53,7 +53,7 @@ public: bool bIsDefaultView); ~TextureViewGLImpl(); - 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; const GLObjectWrappers::GLTextureObj& GetHandle(); diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp index 85372f5d..5faf3f47 100644 --- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp @@ -78,17 +78,17 @@ public: TBase{IID_EngineFactoryOpenGL} {} - virtual void CreateDeviceAndSwapChainGL(const EngineGLCreateInfo& EngineCI, - IRenderDevice** ppDevice, - IDeviceContext** ppImmediateContext, - const SwapChainDesc& SCDesc, - ISwapChain** ppSwapChain) override final; + virtual void DILIGENT_CALL_TYPE CreateDeviceAndSwapChainGL(const EngineGLCreateInfo& EngineCI, + IRenderDevice** ppDevice, + IDeviceContext** ppImmediateContext, + const SwapChainDesc& SCDesc, + ISwapChain** ppSwapChain) override final; - virtual void CreateHLSL2GLSLConverter(IHLSL2GLSLConverter** ppConverter) override final; + virtual void DILIGENT_CALL_TYPE CreateHLSL2GLSLConverter(IHLSL2GLSLConverter** ppConverter) override final; - virtual void AttachToActiveGLContext(const EngineGLCreateInfo& EngineCI, - IRenderDevice** ppDevice, - IDeviceContext** ppImmediateContext) override final; + virtual void DILIGENT_CALL_TYPE AttachToActiveGLContext(const EngineGLCreateInfo& EngineCI, + IRenderDevice** ppDevice, + IDeviceContext** ppImmediateContext) override final; #if PLATFORM_ANDROID virtual void InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const override final; -- cgit v1.2.3