diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-11-10 05:32:14 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-11-10 05:32:14 +0000 |
| commit | ac6a8dd8fb1ee2b2b20733da7d421fce303d2d70 (patch) | |
| tree | 80fb1ef85b6483edd2a627b2f96c961648e532d3 /Tests/IncludeTest | |
| parent | A bunch of minor updates (diff) | |
| parent | Implemented render pass input attachment test Metal reference (diff) | |
| download | DiligentCore-ac6a8dd8fb1ee2b2b20733da7d421fce303d2d70.tar.gz DiligentCore-ac6a8dd8fb1ee2b2b20733da7d421fce303d2d70.zip | |
Merge branch 'master' into ray_tracing
# Conflicts:
# Graphics/GraphicsEngine/interface/RenderDevice.h
Diffstat (limited to 'Tests/IncludeTest')
4 files changed, 4 insertions, 4 deletions
diff --git a/Tests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.c b/Tests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.c index 12c58064..5cbab2e5 100644 --- a/Tests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.c +++ b/Tests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.c @@ -39,7 +39,7 @@ void TestEngineFactoryD3D11CInterface() { - GetEngineFactoryD3D11Type GetEngineFactoryD3D11 = LoadGraphicsEngineD3D11(); + GetEngineFactoryD3D11Type GetEngineFactoryD3D11 = Diligent_LoadGraphicsEngineD3D11(); struct IEngineFactoryD3D11* pFactory = GetEngineFactoryD3D11(); struct EngineD3D11CreateInfo EngineCI = {0}; IRenderDevice* pDevice = NULL; diff --git a/Tests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.c b/Tests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.c index 6d986fec..01bea75d 100644 --- a/Tests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.c +++ b/Tests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.c @@ -39,7 +39,7 @@ void TestEngineFactoryD3D12CInterface() { - GetEngineFactoryD3D12Type GetEngineFactoryD3D12 = LoadGraphicsEngineD3D12(); + GetEngineFactoryD3D12Type GetEngineFactoryD3D12 = Diligent_LoadGraphicsEngineD3D12(); struct IEngineFactoryD3D12* pFactory = GetEngineFactoryD3D12(); struct EngineD3D12CreateInfo EngineCI = {0}; IRenderDevice* pDevice = NULL; diff --git a/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c b/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c index 06758d24..89c5d847 100644 --- a/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c +++ b/Tests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.c @@ -33,7 +33,7 @@ void TestEngineFactoryGL_CInterface() { #if EXPLICITLY_LOAD_ENGINE_GL_DLL - GetEngineFactoryOpenGLType GetEngineFactoryGL = LoadGraphicsEngineOpenGL(); + GetEngineFactoryOpenGLType GetEngineFactoryGL = Diligent_LoadGraphicsEngineOpenGL(); IEngineFactoryOpenGL* pFactory = GetEngineFactoryGL(); #else IEngineFactoryOpenGL* pFactory = Diligent_GetEngineFactoryOpenGL(); diff --git a/Tests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.c b/Tests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.c index fa888524..72ec2186 100644 --- a/Tests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.c +++ b/Tests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.c @@ -36,7 +36,7 @@ void TestEngineFactoryVk_CInterface() { #if EXPLICITLY_LOAD_ENGINE_VK_DLL - GetEngineFactoryVkType GetEngineFactoryVk = LoadGraphicsEngineVk(); + GetEngineFactoryVkType GetEngineFactoryVk = Diligent_LoadGraphicsEngineVk(); IEngineFactoryVk* pFactory = GetEngineFactoryVk(); #else IEngineFactoryVk* pFactory = Diligent_GetEngineFactoryVk(); |