summaryrefslogtreecommitdiffstats
path: root/unityplugin/UnityEmulator
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-04-01 22:02:39 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-04-01 22:02:39 +0000
commit6badd197cd08a6e83fe907ffb00077aa99ea4e00 (patch)
treea5987e5b8e54a3afed38ca144c43eca1fb896eb4 /unityplugin/UnityEmulator
parentUpdated core (diff)
parentUpdated readme (diff)
downloadDiligentEngine-6badd197cd08a6e83fe907ffb00077aa99ea4e00.tar.gz
DiligentEngine-6badd197cd08a6e83fe907ffb00077aa99ea4e00.zip
Merged master
Diffstat (limited to 'unityplugin/UnityEmulator')
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp12
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp12
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp12
3 files changed, 33 insertions, 3 deletions
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
index e196585..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");
}
@@ -62,6 +62,16 @@ public:
m_pDSV = nullptr;
}
+ virtual void SetFullscreenMode(const DisplayModeAttribs &DisplayMode)override final
+ {
+ UNEXPECTED("Fullscreen mode cannot be set through the proxy swap chain");
+ }
+
+ virtual void SetWindowedMode()override final
+ {
+ UNEXPECTED("Windowed mode cannot be set through the proxy swap chain");
+ }
+
private:
ID3D11RenderTargetView *m_pRTV = nullptr;
ID3D11DepthStencilView *m_pDSV = nullptr;
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
index 11b912e..938d5b1 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
@@ -103,11 +103,21 @@ 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");
}
+ virtual void SetFullscreenMode(const DisplayModeAttribs &DisplayMode)override final
+ {
+ UNEXPECTED("Fullscreen mode cannot be set through the proxy swap chain");
+ }
+
+ virtual void SetWindowedMode()override final
+ {
+ UNEXPECTED("Windowed mode cannot be set through the proxy swap chain");
+ }
+
virtual void Resize(Uint32 NewWidth, Uint32 NewHeight)override final
{
TBase::Resize(NewWidth, NewHeight, 0);
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
index 1d7ac11..8be2797 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
@@ -29,11 +29,21 @@ 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");
}
+ virtual void SetFullscreenMode(const DisplayModeAttribs &DisplayMode)override final
+ {
+ UNEXPECTED("Fullscreen mode cannot be set through the proxy swap chain");
+ }
+
+ virtual void SetWindowedMode()override final
+ {
+ UNEXPECTED("Windowed mode cannot be set through the proxy swap chain");
+ }
+
virtual void Resize(Uint32 NewWidth, Uint32 NewHeight)override final
{
TBase::Resize(NewWidth, NewHeight, 0);