summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-03-31 23:45:18 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-03-31 23:45:18 +0000
commitba7b40284d98e893d4e8119c65d1d89c6a7091cf (patch)
tree9593bb5a4a39e7362943aa332016236a6a685c23
parentUpdated samples submodule (implemented switching to fullscreen in sample apps) (diff)
downloadDiligentEngine-ba7b40284d98e893d4e8119c65d1d89c6a7091cf.tar.gz
DiligentEngine-ba7b40284d98e893d4e8119c65d1d89c6a7091cf.zip
Added sync interval to Present.
Fixed https://github.com/DiligentGraphics/DiligentEngine/issues/10
m---------DiligentCore0
m---------DiligentSamples0
-rw-r--r--Projects/Asteroids/src/asteroids_DE.cpp2
-rw-r--r--Tests/TestApp/src/TestApp.cpp2
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp2
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp2
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp2
7 files changed, 5 insertions, 5 deletions
diff --git a/DiligentCore b/DiligentCore
-Subproject b731e5ae479f53adb2be57fdcef1a253c9edbf4
+Subproject a8a3940fa4491963048ade02dcb035eaca4b6eb
diff --git a/DiligentSamples b/DiligentSamples
-Subproject 4203a19484da49a39cc2a101a27a8c43d9d3509
+Subproject ba6b4e0da05c40dc1d5c9a7dd02b0db2914bd74
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");
}