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/DeviceContextNextGenBase.hpp | 4 ++-- .../GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Graphics/GraphicsEngineNextGenBase') diff --git a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp index 84f8d60a..84ad7a91 100644 --- a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp +++ b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp @@ -68,7 +68,7 @@ public: { } - virtual ICommandQueueType* LockCommandQueue() override final + virtual ICommandQueueType* DILIGENT_CALL_TYPE LockCommandQueue() override final { if (this->m_bIsDeferred) { @@ -78,7 +78,7 @@ public: return this->m_pDevice->LockCommandQueue(m_CommandQueueId); } - virtual void UnlockCommandQueue() override final + virtual void DILIGENT_CALL_TYPE UnlockCommandQueue() override final { if (this->m_bIsDeferred) { diff --git a/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp b/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp index 2ee8a3d1..7f9d19c7 100644 --- a/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp +++ b/Graphics/GraphicsEngineNextGenBase/include/RenderDeviceNextGenBase.hpp @@ -234,23 +234,23 @@ public: return m_CommandQueues[QueueIndex].ReleaseQueue; } - const CommandQueueType& GetCommandQueue(Uint32 QueueIndex) const + const CommandQueueType& DILIGENT_CALL_TYPE GetCommandQueue(Uint32 QueueIndex) const { VERIFY_EXPR(QueueIndex < m_CmdQueueCount); return *m_CommandQueues[QueueIndex].CmdQueue; } - virtual Uint64 GetCompletedFenceValue(Uint32 QueueIndex) override final + virtual Uint64 DILIGENT_CALL_TYPE GetCompletedFenceValue(Uint32 QueueIndex) override final { return m_CommandQueues[QueueIndex].CmdQueue->GetCompletedFenceValue(); } - virtual Uint64 GetNextFenceValue(Uint32 QueueIndex) override final + virtual Uint64 DILIGENT_CALL_TYPE GetNextFenceValue(Uint32 QueueIndex) override final { return m_CommandQueues[QueueIndex].CmdQueue->GetNextFenceValue(); } - virtual Bool IsFenceSignaled(Uint32 QueueIndex, Uint64 FenceValue) override final + virtual Bool DILIGENT_CALL_TYPE IsFenceSignaled(Uint32 QueueIndex, Uint64 FenceValue) override final { return FenceValue <= GetCompletedFenceValue(QueueIndex); } -- cgit v1.2.3