diff options
| author | Egor <egor.yusov@gmail.com> | 2018-02-04 22:26:23 +0000 |
|---|---|---|
| committer | Egor <egor.yusov@gmail.com> | 2018-02-04 22:26:23 +0000 |
| commit | 7b186135859a5580ef8a9d14bb856521a4cbf467 (patch) | |
| tree | 2eca4092c54cdd008d9b518e6df86415b17c132a /Graphics/GraphicsEngineOpenGL | |
| parent | Updated readme with iOS build info (diff) | |
| download | DiligentCore-7b186135859a5580ef8a9d14bb856521a4cbf467.tar.gz DiligentCore-7b186135859a5580ef8a9d14bb856521a4cbf467.zip | |
Fixed Android build
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/pch.h | 19 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/GLContextAndroid.cpp | 4 |
3 files changed, 6 insertions, 21 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index cf57137d..a024c899 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -172,8 +172,8 @@ if(PLATFORM_WIN32) set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static opengl32.lib) elseif(PLATFORM_ANDROID) set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android) - target_compile_definitions(GraphicsEngineOpenGL-static PRIVATE BUILDING_DLL USE_GL3_STUB=0) - target_compile_definitions(GraphicsEngineOpenGL-shared PRIVATE BUILDING_DLL USE_GL3_STUB=0) + target_compile_definitions(GraphicsEngineOpenGL-static PRIVATE BUILDING_DLL) + target_compile_definitions(GraphicsEngineOpenGL-shared PRIVATE BUILDING_DLL) set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) # -fvisibility=hidden elseif(PLATFORM_LINUX) set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} glew-static) diff --git a/Graphics/GraphicsEngineOpenGL/include/pch.h b/Graphics/GraphicsEngineOpenGL/include/pch.h index 5755e391..01be6247 100644 --- a/Graphics/GraphicsEngineOpenGL/include/pch.h +++ b/Graphics/GraphicsEngineOpenGL/include/pch.h @@ -88,16 +88,10 @@ #elif defined(PLATFORM_ANDROID) -# ifndef USE_GL3_STUB -# define USE_GL3_STUB 0 -# endif -# if USE_GL3_STUB -# include "GLStubsAndroid.h" -# include <GLES2/gl2platform.h> -# else -# include <GLES3/gl3.h> -# include <GLES3/gl3ext.h> -# endif +# include <GLES3/gl3.h> +# include <GLES3/gl3ext.h> + // GLStubs must be included after GLFeatures! +# include "GLStubsAndroid.h" #elif defined(PLATFORM_IOS) @@ -111,11 +105,6 @@ #include "Errors.h" -#ifdef PLATFORM_ANDROID - // GLStubs must be included after GLFeatures! - #include "GLStubs.h" -#endif - #include "PlatformDefinitions.h" #include "RefCntAutoPtr.h" #include "DebugUtilities.h" diff --git a/Graphics/GraphicsEngineOpenGL/src/GLContextAndroid.cpp b/Graphics/GraphicsEngineOpenGL/src/GLContextAndroid.cpp index 685e82cb..09ed4f9f 100644 --- a/Graphics/GraphicsEngineOpenGL/src/GLContextAndroid.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/GLContextAndroid.cpp @@ -185,10 +185,6 @@ namespace Diligent const char* versionStr = (const char*)glGetString( GL_VERSION ); LOG_INFO_MESSAGE( "GL Version: ", versionStr, '\n' ); -#if USE_GL3_STUB - gl3stubInit(); -#endif - LoadGLFunctions(); // When GL_FRAMEBUFFER_SRGB is enabled, and if the destination image is in the sRGB colorspace |