Skip to content

Commit 55c7340

Browse files
Rename macros for explicit loading of shared libraries
1 parent f90759b commit 55c7340

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

Graphics/Archiver/interface/ArchiverFactoryLoader.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939

4040
#if DILIGENT_ARCHIVER_SHARED && PLATFORM_WIN32 && defined(_MSC_VER)
4141
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
42-
# define EXPLICITLY_LOAD_ARCHIVER_FACTORY_DLL 1
42+
# define DILIGENT_ARCHIVER_EXPLICIT_LOAD 1
4343
#endif
4444

4545
DILIGENT_BEGIN_NAMESPACE(Diligent)
4646

4747
typedef struct IArchiverFactory* (*GetArchiverFactoryType)();
4848

49-
#if EXPLICITLY_LOAD_ARCHIVER_FACTORY_DLL
49+
#if DILIGENT_ARCHIVER_EXPLICIT_LOAD
5050

5151
inline GetArchiverFactoryType DILIGENT_GLOBAL_FUNCTION(LoadArchiverFactory)()
5252
{
@@ -69,7 +69,7 @@ struct IArchiverFactory* DILIGENT_GLOBAL_FUNCTION(GetArchiverFactory)();
6969
inline struct IArchiverFactory* DILIGENT_GLOBAL_FUNCTION(LoadAndGetArchiverFactory)()
7070
{
7171
GetArchiverFactoryType GetFactoryFunc = NULL;
72-
#if EXPLICITLY_LOAD_ARCHIVER_FACTORY_DLL
72+
#if DILIGENT_ARCHIVER_EXPLICIT_LOAD
7373
GetFactoryFunc = DILIGENT_GLOBAL_FUNCTION(LoadArchiverFactory)();
7474
if (GetFactoryFunc == NULL)
7575
{

Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
#if DILIGENT_OPENGL_SHARED && PLATFORM_WIN32 && defined(_MSC_VER)
5151
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
52-
# define EXPLICITLY_LOAD_ENGINE_GL_DLL 1
52+
# define DILIGENT_OPENGL_EXPLICIT_LOAD 1
5353
#endif
5454

5555
DILIGENT_BEGIN_NAMESPACE(Diligent)
@@ -126,7 +126,7 @@ DILIGENT_END_INTERFACE
126126

127127
typedef struct IEngineFactoryOpenGL* (*GetEngineFactoryOpenGLType)();
128128

129-
#if EXPLICITLY_LOAD_ENGINE_GL_DLL
129+
#if DILIGENT_OPENGL_EXPLICIT_LOAD
130130

131131
inline GetEngineFactoryOpenGLType DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineOpenGL)()
132132
{
@@ -150,7 +150,7 @@ struct IEngineFactoryOpenGL* DILIGENT_GLOBAL_FUNCTION(GetEngineFactoryOpenGL)();
150150
inline struct IEngineFactoryOpenGL* DILIGENT_GLOBAL_FUNCTION(LoadAndGetEngineFactoryOpenGL)()
151151
{
152152
GetEngineFactoryOpenGLType GetFactoryFunc = NULL;
153-
#if EXPLICITLY_LOAD_ENGINE_GL_DLL
153+
#if DILIGENT_OPENGL_EXPLICIT_LOAD
154154
GetFactoryFunc = DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineOpenGL)();
155155
if (GetFactoryFunc == NULL)
156156
{

Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
#if DILIGENT_VK_SHARED && PLATFORM_WIN32 && defined(_MSC_VER)
4848
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
49-
# define EXPLICITLY_LOAD_ENGINE_VK_DLL 1
49+
# define DILIGENT_VK_EXPLICIT_LOAD 1
5050
#endif
5151

5252
DILIGENT_BEGIN_NAMESPACE(Diligent)
@@ -132,7 +132,7 @@ DILIGENT_END_INTERFACE
132132

133133
typedef struct IEngineFactoryVk* (*GetEngineFactoryVkType)();
134134

135-
#if EXPLICITLY_LOAD_ENGINE_VK_DLL
135+
#if DILIGENT_VK_EXPLICIT_LOAD
136136

137137
inline GetEngineFactoryVkType DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineVk)()
138138
{
@@ -155,7 +155,7 @@ struct IEngineFactoryVk* DILIGENT_GLOBAL_FUNCTION(GetEngineFactoryVk)();
155155
inline struct IEngineFactoryVk* DILIGENT_GLOBAL_FUNCTION(LoadAndGetEngineFactoryVk)()
156156
{
157157
GetEngineFactoryVkType GetFactoryFunc = NULL;
158-
#if EXPLICITLY_LOAD_ENGINE_VK_DLL
158+
#if DILIGENT_VK_EXPLICIT_LOAD
159159
GetFactoryFunc = DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineVk)();
160160
if (GetFactoryFunc == NULL)
161161
{

Graphics/GraphicsEngineWebGPU/interface/EngineFactoryWebGPU.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#if DILIGENT_WEBGPU_SHARED && PLATFORM_WIN32 && defined(_MSC_VER)
4747
# include "../../GraphicsEngine/interface/LoadEngineDll.h"
48-
# define EXPLICITLY_LOAD_ENGINE_WEBGPU_DLL 1
48+
# define DILIGENT_WEBGPU_EXPLICIT_LOAD 1
4949
#endif
5050

5151
DILIGENT_BEGIN_NAMESPACE(Diligent)
@@ -141,7 +141,7 @@ DILIGENT_END_INTERFACE
141141

142142
typedef struct IEngineFactoryWebGPU* (*GetEngineFactoryWebGPUType)();
143143

144-
#if EXPLICITLY_LOAD_ENGINE_WEBGPU_DLL
144+
#if DILIGENT_WEBGPU_EXPLICIT_LOAD
145145

146146
inline GetEngineFactoryWebGPUType DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineWebGPU)()
147147
{
@@ -164,7 +164,7 @@ struct IEngineFactoryWebGPU* DILIGENT_GLOBAL_FUNCTION(GetEngineFactoryWebGPU)();
164164
inline struct IEngineFactoryWebGPU* DILIGENT_GLOBAL_FUNCTION(LoadAndGetEngineFactoryWebGPU)()
165165
{
166166
GetEngineFactoryWebGPUType GetFactoryFunc = NULL;
167-
#if EXPLICITLY_LOAD_ENGINE_WEBGPU_DLL
167+
#if DILIGENT_WEBGPU_EXPLICIT_LOAD
168168
GetFactoryFunc = DILIGENT_GLOBAL_FUNCTION(LoadGraphicsEngineWebGPU)();
169169
if (GetFactoryFunc == NULL)
170170
{

Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2025 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,7 @@
3232

3333
void TestEngineFactoryGL_CInterface()
3434
{
35-
#if EXPLICITLY_LOAD_ENGINE_GL_DLL
35+
#if DILIGENT_OPENGL_EXPLICIT_LOAD
3636
GetEngineFactoryOpenGLType GetEngineFactoryGL = Diligent_LoadGraphicsEngineOpenGL();
3737
IEngineFactoryOpenGL* pFactory = GetEngineFactoryGL();
3838
#else

Tests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
void TestEngineFactoryVk_CInterface()
3737
{
38-
#if EXPLICITLY_LOAD_ENGINE_VK_DLL
38+
#if DILIGENT_VK_EXPLICIT_LOAD
3939
GetEngineFactoryVkType GetEngineFactoryVk = Diligent_LoadGraphicsEngineVk();
4040
IEngineFactoryVk* pFactory = GetEngineFactoryVk();
4141
#else

Tests/IncludeTest/GraphicsEngineWebGPU/EngineFactoryWebGPUH_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
void TestEngineFactoryWebGPU_CInterface(void)
3434
{
35-
#if EXPLICITLY_LOAD_ENGINE_WEBGPU_DLL
35+
#if DILIGENT_WEBGPU_EXPLICIT_LOAD
3636
GetEngineFactoryWebGPUType GetEngineFactoryWebGPU = Diligent_LoadGraphicsEngineWebGPU();
3737
IEngineFactoryWebGPU* pFactory = GetEngineFactoryWebGPU();
3838
#else

0 commit comments

Comments
 (0)