Fixed MacOS build issues

8 files changed, 17 insertions, 23 deletions

diff --git a/Tests/IncludeTest/CMakeLists.txt b/Tests/IncludeTest/CMakeLists.txt
index 1ecf6427..ee330698 100644
--- a/Tests/IncludeTest/CMakeLists.txt
+++ b/Tests/IncludeTest/CMakeLists.txt
@@ -5,27 +5,27 @@ project(DiligentCore-IncludeTest)
 file(GLOB_RECURSE SOURCE LIST_DIRECTORIES false *.cpp *.c)
 
 if(NOT D3D11_SUPPORTED)
-    file(GLOB GRAPHICS_ENGINE_D3D11_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3D11/*.cpp)
+    file(GLOB GRAPHICS_ENGINE_D3D11_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3D11/*.cpp GraphicsEngineD3D11/*.c)
     list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_D3D11_INC_TEST})
 endif()
 
 if(NOT D3D12_SUPPORTED)
-    file(GLOB GRAPHICS_ENGINE_D3D12_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3D12/*.cpp)
+    file(GLOB GRAPHICS_ENGINE_D3D12_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3D12/*.cpp GraphicsEngineD3D12/*.c)
     list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_D3D12_INC_TEST})
 endif()
 
 if(NOT D3D11_SUPPORTED AND NOT D3D12_SUPPORTED)
-    file(GLOB GRAPHICS_ENGINE_D3DBASE_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3DBase/*.cpp)
+    file(GLOB GRAPHICS_ENGINE_D3DBASE_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3DBase/*.cpp GraphicsEngineD3DBase/*.c)
     list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_D3DBASE_INC_TEST})
 endif()
 
 if(NOT GL_SUPPORTED AND NOT GLES_SUPPORTED)
-    file(GLOB GRAPHICS_ENGINE_GL_INC_TEST LIST_DIRECTORIES false GraphicsEngineOpenGL/*.cpp)
+    file(GLOB GRAPHICS_ENGINE_GL_INC_TEST LIST_DIRECTORIES false GraphicsEngineOpenGL/*.cpp GraphicsEngineOpenGL/*.c)
     list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_GL_INC_TEST})
 endif()
 
 if(NOT VULKAN_SUPPORTED)
-    file(GLOB GRAPHICS_ENGINE_VK_INC_TEST LIST_DIRECTORIES false GraphicsEngineVk/*.cpp)
+    file(GLOB GRAPHICS_ENGINE_VK_INC_TEST LIST_DIRECTORIES false GraphicsEngineVk/*.cpp GraphicsEngineVk/*.c)
     list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_VK_INC_TEST})
 endif()
 
diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.c
index 2162639d..fad51930 100644
--- a/Tests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.c
+++ b/Tests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.c
@@ -28,7 +28,7 @@
 typedef unsigned int GLuint;
 #include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h"
 
-void TestBufferGLCInterface(IBufferGL* pBuffer)
+void TestBufferGL_CInterface(IBufferGL* pBuffer)
 {
     GLuint Handle = IBufferGL_GetGLBufferHandle(pBuffer);
     (void)Handle;
diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.c
index bd8eb3f1..7060caa4 100644
--- a/Tests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.c
+++ b/Tests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.c
@@ -27,7 +27,7 @@
 
 #include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
 
-void TestDeviceContextGLCInterface(IDeviceContextGL* pCtxGL)
+void TestDeviceContextGL_CInterface(IDeviceContextGL* pCtxGL)
 {
     bool res = IDeviceContextGL_UpdateCurrentGLContext(pCtxGL);
     (void)res;
diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c
index 6d1ec56a..71b99115 100644
--- a/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c
+++ b/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c
@@ -25,24 +25,18 @@
  *  of the possibility of such damages.
  */
 
-#if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
-#    ifndef NOMINMAX
-#        define NOMINMAX
-#    endif
-#    include <Windows.h>
-#endif
-
-#ifndef ENGINE_DLL
-#    define ENGINE_DLL 1
-#endif
-
 #include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h"
 
 
-void TestEngineFactoryGLCInterface()
+void TestEngineFactoryGL_CInterface()
 {
+#if EXPLICITLY_LOAD_ENGINE_GL_DLL
     GetEngineFactoryOpenGLType GetEngineFactoryGL = LoadGraphicsEngineOpenGL();
     IEngineFactoryOpenGL*      pFactory           = GetEngineFactoryGL();
+#else
+    IEngineFactoryOpenGL* pFactory = Diligent_GetEngineFactoryOpenGL();
+#endif
+    
     struct EngineGLCreateInfo  EngineCI           = {0};
     IEngineFactoryOpenGL_CreateDeviceAndSwapChainGL(pFactory, &EngineCI, (IRenderDevice**)NULL, (IDeviceContext**)NULL, (SwapChainDesc*)NULL, (ISwapChain**)NULL);
 
diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/QueryGLH_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/QueryGLH_test.c
index 3245b8f3..7cbb1250 100644
--- a/Tests/IncludeTest/GraphicsEngineOpenGL/QueryGLH_test.c
+++ b/Tests/IncludeTest/GraphicsEngineOpenGL/QueryGLH_test.c
@@ -28,7 +28,7 @@
 typedef unsigned int GLuint;
 #include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/QueryGL.h"
 
-void TestQueryGLCInterface(IQueryGL* pQuery)
+void TestQueryGL_CInterface(IQueryGL* pQuery)
 {
     GLuint Handle = IQueryGL_GetGlQueryHandle(pQuery);
     (void)Handle;
diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.c
index 1a1128ec..8218b927 100644
--- a/Tests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.c
+++ b/Tests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.c
@@ -27,7 +27,7 @@
 
 #include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h"
 
-void TestRenderDeviceGLCInterface(IRenderDeviceGL* pDevice)
+void TestRenderDeviceGL_CInterface(IRenderDeviceGL* pDevice)
 {
     IRenderDeviceGL_CreateTextureFromGLHandle(pDevice, (Uint32)0, (TextureDesc*)NULL, RESOURCE_STATE_SHADER_RESOURCE, (ITexture**)NULL);
     IRenderDeviceGL_CreateBufferFromGLHandle(pDevice, (Uint32)0, (BufferDesc*)NULL, RESOURCE_STATE_CONSTANT_BUFFER, (IBuffer**)NULL);
diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.c
index 509c73d2..e86830c3 100644
--- a/Tests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.c
+++ b/Tests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.c
@@ -27,7 +27,7 @@
 typedef unsigned int GLuint;
 #include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h"
 
-void TestSwapChainCInterface(ISwapChainGL* pSwapChain)
+void TestSwapChain_CInterface(ISwapChainGL* pSwapChain)
 {
     GLuint fbo = ISwapChainGL_GetDefaultFBO(pSwapChain);
     (void)fbo;
diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.c
index 3b4afcf3..5416be09 100644
--- a/Tests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.c
+++ b/Tests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.c
@@ -28,7 +28,7 @@ typedef unsigned int GLuint;
 typedef unsigned int GLenum;
 #include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h"
 
-void TestTextureGLCInterface(ITextureGL* pTex)
+void TestTextureGL_CInterface(ITextureGL* pTex)
 {
     GLuint handle = ITextureGL_GetGLTextureHandle(pTex);
     GLenum target = ITextureGL_GetBindTarget(pTex);