diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-03-04 16:22:27 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-03-04 16:22:27 +0000 |
| commit | 3b389f92f943ef8384c52f81569dbb0ff4d90dde (patch) | |
| tree | b486826043a3c24a6884e5dada0014db1b13f543 /Graphics/GraphicsEngineOpenGL | |
| parent | Minor update to BuildUtils.cmake: not copyng GraphicsEngineD3D12.dll when D3D... (diff) | |
| download | DiligentCore-3b389f92f943ef8384c52f81569dbb0ff4d90dde.tar.gz DiligentCore-3b389f92f943ef8384c52f81569dbb0ff4d90dde.zip | |
Fixed https://github.com/DiligentGraphics/DiligentEngine/issues/5
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h | 10 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/RenderDeviceFactoryOpenGL.cpp | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h index 6b85331b..b133b113 100644 --- a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h +++ b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h @@ -73,14 +73,10 @@ public: IDeviceContext **ppImmediateContext ) = 0; }; -} - -extern "C" -{ #if ENGINE_DLL && (PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS) - typedef Diligent::IEngineFactoryOpenGL* (*GetEngineFactoryOpenGLType)(); + typedef IEngineFactoryOpenGL* (*GetEngineFactoryOpenGLType)(); static bool LoadGraphicsEngineOpenGL(GetEngineFactoryOpenGLType &GetFactoryFunc) { @@ -125,6 +121,8 @@ extern "C" // Do not forget to call System.loadLibrary("GraphicsEngineOpenGL") in Java on Android! API_QUALIFIER - Diligent::IEngineFactoryOpenGL* GetEngineFactoryOpenGL(); + IEngineFactoryOpenGL* GetEngineFactoryOpenGL(); + #endif + } diff --git a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceFactoryOpenGL.cpp index 271c9f20..bb455da1 100644 --- a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceFactoryOpenGL.cpp @@ -228,10 +228,7 @@ void EngineFactoryOpenGLImpl::CreateHLSL2GLSLConverter(IHLSL2GLSLConverter **ppC pConverter->QueryInterface( IID_HLSL2GLSLConverter, reinterpret_cast<IObject**>(ppConverter) ); } -} -extern "C" -{ API_QUALIFIER Diligent::IEngineFactoryOpenGL* GetEngineFactoryOpenGL() { |