From 98f46b397b76ead7aaa701ebdadb949ac9ecb7d6 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 1 Oct 2018 19:55:30 -0700 Subject: Removed ForceRelease parameter of IDeviceContext::FinishFrame() --- Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.h | 3 +-- Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp | 4 ++-- Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'Graphics/GraphicsEngineVulkan') diff --git a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.h b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.h index b8860e90..cd598c40 100644 --- a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.h @@ -158,8 +158,7 @@ public: return m_CommandBuffer; } - // TODO: remove ForceRelease - virtual void FinishFrame(bool /*ForceRelease*/)override final; + virtual void FinishFrame()override final; VkDescriptorSet AllocateDynamicDescriptorSet(VkDescriptorSetLayout SetLayout) { diff --git a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp index 84a47bd7..202babab 100644 --- a/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp @@ -111,7 +111,7 @@ namespace Diligent Flush(); } - FinishFrame(false); + FinishFrame(); // There must be no stale resources DEV_CHECK_ERR(m_UploadHeap.GetStalePagesCount() == 0, "All allocated upload heap pages must have been released at this point"); @@ -743,7 +743,7 @@ namespace Diligent ++m_State.NumCommands; } - void DeviceContextVkImpl::FinishFrame(bool /*ForceRelease*/) + void DeviceContextVkImpl::FinishFrame() { if(GetNumCommandsInCtx() != 0) LOG_ERROR_MESSAGE(m_bIsDeferred ? diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp index 2d25b036..1251f5c1 100644 --- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp @@ -462,7 +462,7 @@ void SwapChainVkImpl::Present(Uint32 SyncInterval) ); } - pImmediateCtxVk->FinishFrame(false); + pImmediateCtxVk->FinishFrame(); pDeviceVk->ReleaseStaleResources(); if (!m_IsMinimized) -- cgit v1.2.3