summaryrefslogtreecommitdiffstats
path: root/unityplugin/UnityEmulator
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-02-03 20:55:17 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-02-03 20:55:17 +0000
commite7a82e9786c96f4d36cd8cf7d4708e3565aac2c6 (patch)
tree105b653fce5c6a4d96bd8800b206aa172a7dd771 /unityplugin/UnityEmulator
parentEnabled IOS build (diff)
parentUpdated core submodule (diff)
downloadDiligentEngine-e7a82e9786c96f4d36cd8cf7d4708e3565aac2c6.tar.gz
DiligentEngine-e7a82e9786c96f4d36cd8cf7d4708e3565aac2c6.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'unityplugin/UnityEmulator')
-rw-r--r--unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
index b9ab052..9a8a164 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterGL.cpp
@@ -6,17 +6,19 @@
#include "RenderDeviceFactoryOpenGL.h"
#include "SwapChainBase.h"
#include "DefaultRawMemoryAllocator.h"
+
#include "UnityGraphicsGL_Impl.h"
+#include "SwapChainGL.h"
using namespace Diligent;
namespace
{
-class ProxySwapChainGL : public SwapChainBase<ISwapChain>
+class ProxySwapChainGL : public SwapChainBase<ISwapChainGL>
{
public:
- using TBase = SwapChainBase<ISwapChain>;
+ using TBase = SwapChainBase<ISwapChainGL>;
ProxySwapChainGL( IReferenceCounters *pRefCounters,
IRenderDevice *pDevice,
@@ -34,6 +36,11 @@ public:
{
TBase::Resize(NewWidth, NewHeight, 0);
}
+
+ virtual GLuint GetDefaultFBO()const override final
+ {
+ return 0;
+ }
};
}
@@ -44,7 +51,7 @@ DiligentGraphicsAdapterGL::DiligentGraphicsAdapterGL(const UnityGraphicsGLCoreES
auto *UnityGraphicsGLImpl = UnityGraphicsGL.GetGraphicsImpl();
auto *pFactoryGL = GetEngineFactoryOpenGL();
- EngineCreationAttribs Attribs;
+ EngineGLAttribs Attribs;
pFactoryGL->AttachToActiveGLContext(Attribs, &m_pDevice, &m_pDeviceCtx);
auto BackBufferGLFormat = UnityGraphicsGLImpl->GetBackBufferFormat();