From ba7b40284d98e893d4e8119c65d1d89c6a7091cf Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 31 Mar 2018 16:45:18 -0700 Subject: Added sync interval to Present. Fixed https://github.com/DiligentGraphics/DiligentEngine/issues/10 --- DiligentCore | 2 +- DiligentSamples | 2 +- Projects/Asteroids/src/asteroids_DE.cpp | 2 +- Tests/TestApp/src/TestApp.cpp | 2 +- unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp | 2 +- unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp | 2 +- unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DiligentCore b/DiligentCore index b731e5a..a8a3940 160000 --- a/DiligentCore +++ b/DiligentCore @@ -1 +1 @@ -Subproject commit b731e5ae479f53adb2be57fdcef1a253c9edbf40 +Subproject commit a8a3940fa4491963048ade02dcb035eaca4b6eb5 diff --git a/DiligentSamples b/DiligentSamples index 4203a19..ba6b4e0 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit 4203a19484da49a39cc2a101a27a8c43d9d35097 +Subproject commit ba6b4e0da05c40dc1d5c9a7dd02b0db2914bd749 diff --git a/Projects/Asteroids/src/asteroids_DE.cpp b/Projects/Asteroids/src/asteroids_DE.cpp index c27b6a1..4d7501b 100644 --- a/Projects/Asteroids/src/asteroids_DE.cpp +++ b/Projects/Asteroids/src/asteroids_DE.cpp @@ -843,7 +843,7 @@ void Asteroids::Render(float frameTime, const OrbitCamera& camera, const Setting } } - mSwapChain->Present();//settings.vsync ? 1 : 0, 0); + mSwapChain->Present(settings.vsync ? 1 : 0); } void Asteroids::GetPerfCounters(float &UpdateTime, float &RenderTime) diff --git a/Tests/TestApp/src/TestApp.cpp b/Tests/TestApp/src/TestApp.cpp index 4994c69..3b96cf0 100644 --- a/Tests/TestApp/src/TestApp.cpp +++ b/Tests/TestApp/src/TestApp.cpp @@ -543,5 +543,5 @@ void TestApp::Render() void TestApp::Present() { - m_pSwapChain->Present(); + m_pSwapChain->Present(0); } diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp index a030158..c3f0f1c 100644 --- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp +++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp @@ -39,7 +39,7 @@ public: virtual ID3D11DepthStencilView *GetDSV()override final { return m_pDSV; } - virtual void Present()override final + virtual void Present(Uint32 SyncInterval)override final { UNEXPECTED("Present is not expected to be called directly"); } diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp index f52016d..938d5b1 100644 --- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp +++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp @@ -103,7 +103,7 @@ public: return m_DSV; } - virtual void Present()override final + virtual void Present(Uint32 SyncInterval)override final { UNEXPECTED("Present is not expected to be called directly"); } diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp index 0e01130..8be2797 100644 --- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp +++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp @@ -29,7 +29,7 @@ public: m_UnityGraphicsGL(UnityGraphicsGL) {} - virtual void Present()override final + virtual void Present(Uint32 SyncInterval)override final { UNEXPECTED("Present is not expected to be called directly"); } -- cgit v1.2.3