From 3b389f92f943ef8384c52f81569dbb0ff4d90dde Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sun, 4 Mar 2018 08:22:27 -0800
Subject: Fixed https://github.com/DiligentGraphics/DiligentEngine/issues/5

---
 .../GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h  | 10 ++++------
 Graphics/GraphicsEngineD3D12/src/RenderDeviceFactoryD3D12.cpp | 11 +++--------
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'Graphics/GraphicsEngineD3D12')

diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h
index 63acabf7..bdc3d8a0 100644
--- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h
@@ -62,13 +62,10 @@ public:
 
 };
 
-}
 
-extern "C"
-{
 #if ENGINE_DLL
 
-    typedef Diligent::IEngineFactoryD3D12* (*GetEngineFactoryD3D12Type)();
+    typedef IEngineFactoryD3D12* (*GetEngineFactoryD3D12Type)();
 
     static bool LoadGraphicsEngineD3D12(GetEngineFactoryD3D12Type &GetFactoryFunc)
     {
@@ -91,7 +88,7 @@ extern "C"
 #if PLATFORM_WIN32
         auto hModule = LoadLibraryA(LibName.c_str());
 #elif PLATFORM_UNIVERSAL_WINDOWS
-        auto hModule = LoadPackagedLibrary(Diligent::WidenString(LibName).c_str(), 0);
+        auto hModule = LoadPackagedLibrary(WidenString(LibName).c_str(), 0);
 #else
 #   error Unexpected platform
 #endif
@@ -118,7 +115,8 @@ extern "C"
     }
 #else
 
-    Diligent::IEngineFactoryD3D12* GetEngineFactoryD3D12();
+    IEngineFactoryD3D12* GetEngineFactoryD3D12();
 
 #endif
+
 }
diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceFactoryD3D12.cpp
index 9ff5c668..ac3e1992 100644
--- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceFactoryD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceFactoryD3D12.cpp
@@ -398,14 +398,9 @@ void LoadGraphicsEngineD3D12(GetEngineFactoryD3D12Type &GetFactoryFunc)
 #endif
 
 
+IEngineFactoryD3D12* GetEngineFactoryD3D12()
+{
+    return EngineFactoryD3D12Impl::GetInstance();
 }
 
-
-using namespace Diligent;
-extern "C"
-{
-    IEngineFactoryD3D12* GetEngineFactoryD3D12()
-    {
-        return EngineFactoryD3D12Impl::GetInstance();
-    }
 }
-- 
cgit v1.2.3