From 1af26305f8fa895eef08a04c3dc325c1a3f93ea3 Mon Sep 17 00:00:00 2001 From: assiduous Date: Thu, 19 Nov 2020 15:41:34 -0800 Subject: Updated submodules: enabled Metal mode support --- unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp | 14 +++++++------- unityplugin/UnityEmulator/src/UnityAppBase.cpp | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'unityplugin/UnityEmulator') diff --git a/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp b/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp index 4968530..7d96d83 100644 --- a/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp +++ b/unityplugin/UnityEmulator/src/MacOS/UnityAppMacOS.cpp @@ -34,12 +34,10 @@ public: m_DeviceType = Diligent::RENDER_DEVICE_TYPE_GL; } - virtual void Initialize(void* view)override final + virtual void Initialize(void* view, RenderMode Mode)override final { - if (view != nullptr) - { - UNSUPPORTED("This app does not support Vulkan"); - } + if (Mode != RenderMode::OpenGL) + LOG_ERROR_AND_THROW("This app only supports OpenGL mode"); InitGraphics(nullptr, 0/*Unused*/, 0/*Unused*/); InitScene(); } @@ -80,7 +78,9 @@ bool UnityAppBase::LoadPlugin() void UnityAppBase::UnloadPlugin() { - m_GraphicsEmulator->InvokeDeviceEventCallback(kUnityGfxDeviceEventShutdown); - UnityPluginUnload(); + if (m_GraphicsEmulator) + m_GraphicsEmulator->InvokeDeviceEventCallback(kUnityGfxDeviceEventShutdown); + if (UnityPluginUnload) + UnityPluginUnload(); } diff --git a/unityplugin/UnityEmulator/src/UnityAppBase.cpp b/unityplugin/UnityEmulator/src/UnityAppBase.cpp index f497bee..15cecdd 100644 --- a/unityplugin/UnityEmulator/src/UnityAppBase.cpp +++ b/unityplugin/UnityEmulator/src/UnityAppBase.cpp @@ -62,7 +62,8 @@ UnityAppBase::~UnityAppBase() UnloadPlugin(); m_DiligentGraphics.reset(); - m_GraphicsEmulator->Release(); + if (m_GraphicsEmulator) + m_GraphicsEmulator->Release(); } -- cgit v1.2.3