Fixed Android build

Author: TheMostDiligent

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)

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"

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