diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2017-12-28 23:25:15 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2017-12-28 23:25:15 +0000 |
| commit | 2a17214886064466e8c312212b0ecdae35733c21 (patch) | |
| tree | ba407705cae9bdddd0fb84eb8aae270b9fab120f /Graphics/GraphicsEngineOpenGL | |
| parent | Updated debug macros (diff) | |
| download | DiligentCore-2a17214886064466e8c312212b0ecdae35733c21.tar.gz DiligentCore-2a17214886064466e8c312212b0ecdae35733c21.zip | |
Reworked dependencies between projects
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
9 files changed, 22 insertions, 16 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index c777d97a..524d9d2a 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -100,6 +100,16 @@ else() message(FATAL_ERROR "Unknown platform") endif() +add_library(GraphicsEngineOpenGLInterface INTERFACE) +target_include_directories(GraphicsEngineOpenGLInterface +INTERFACE + interface +) +target_link_libraries(GraphicsEngineOpenGLInterface +INTERFACE + GraphicsEngineInterface +) + add_library(GraphicsEngineOpenGL-static STATIC ${SOURCE} ${INTERFACE} ${INCLUDE} @@ -119,30 +129,26 @@ if(PLATFORM_WIN32) endif() target_include_directories(GraphicsEngineOpenGL-static -PUBLIC - include - interface PRIVATE + include ../HLSL2GLSLConverterLib/include ) target_include_directories(GraphicsEngineOpenGL-shared -PUBLIC - include - interface PRIVATE + include ../HLSL2GLSLConverterLib/include ) set(PRIVATE_DEPENDENCIES BuildSettings Common - GraphicsTools TargetPlatform + GraphicsEngine ) set(PUBLIC_DEPENDENCIES - GraphicsEngine + GraphicsEngineOpenGLInterface HLSL2GLSLConverterLib ) diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp index d9f3a08d..d833cb62 100644 --- a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp @@ -39,7 +39,7 @@ #include "Texture2DArray_OGL.h" #include "Texture3D_OGL.h" #include "SamplerGLImpl.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" #include "BufferViewGLImpl.h" #include "PipelineStateGLImpl.h" #include "ShaderResourceBindingGLImpl.h" diff --git a/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp b/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp index cafb7a3c..79ba5591 100644 --- a/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp @@ -23,7 +23,7 @@ #include "pch.h" #include "GLTypeConversions.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" namespace Diligent { diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp index 44507f58..c7b3ad64 100644 --- a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp @@ -27,7 +27,7 @@ #include "RenderDeviceGLImpl.h" #include "DeviceContextGLImpl.h" #include "GLTypeConversions.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" #include "BufferGLImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp index 387a36c2..ccc28ad9 100644 --- a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp @@ -27,7 +27,7 @@ #include "RenderDeviceGLImpl.h" #include "DeviceContextGLImpl.h" #include "GLTypeConversions.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" #include "BufferGLImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp index a6fb1544..05103736 100644 --- a/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp @@ -27,7 +27,7 @@ #include "RenderDeviceGLImpl.h" #include "DeviceContextGLImpl.h" #include "GLTypeConversions.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" #include "BufferGLImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp index 2ce06837..669f67e9 100644 --- a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp @@ -30,7 +30,7 @@ #include "GLContextState.h" #include "DeviceContextGLImpl.h" #include "EngineMemory.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" namespace Diligent { diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp index 43e8f6e9..33e2ca5e 100644 --- a/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp @@ -27,7 +27,7 @@ #include "RenderDeviceGLImpl.h" #include "DeviceContextGLImpl.h" #include "GLTypeConversions.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" #include "BufferGLImpl.h" namespace Diligent diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp index 46de7e76..cfdd4a7f 100644 --- a/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp @@ -27,7 +27,7 @@ #include "RenderDeviceGLImpl.h" #include "DeviceContextGLImpl.h" #include "GLTypeConversions.h" -#include "GraphicsUtilities.h" +#include "GraphicsAccessories.h" #include "BufferGLImpl.h" namespace Diligent |