Add NATIVE_TOOLKIT_STATIC_ANGLE switch to allow the angle library to …

…be statically linked
ceramic-engine · Apr 16, 2017 · a78c07d · a78c07d
1 parent 953cc95
commit a78c07d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/files.xml b/files.xml
@@ -105,6 +105,7 @@
 
             <compilerflag value="-DUSING_GENERATED_CONFIG_H" />
             <compilerflag value="-DNATIVE_TOOLKIT_SDL_ANGLE" if="NATIVE_TOOLKIT_SDL_ANGLE" />
+            <compilerflag value="-DNATIVE_TOOLKIT_STATIC_ANGLE" if="NATIVE_TOOLKIT_STATIC_ANGLE" />
 
         </section>
 

diff --git a/include/SDL_egl.h b/include/SDL_egl.h
@@ -132,7 +132,10 @@
 *-------------------------------------------------------------------------
 * This precedes the return type of the function in the function prototype.
 */
-#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
+#if defined(NATIVE_TOOLKIT_STATIC_ANGLE)
+    // not "dllimport" - just extern
+#   define KHRONOS_APICALL
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
 #   define KHRONOS_APICALL __declspec(dllimport)
 #elif defined (__SYMBIAN32__)
 #   define KHRONOS_APICALL IMPORT_C

diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
@@ -68,12 +68,18 @@
 #define DEFAULT_OGL_ES "libGLESv1_CM.so.1"
 #endif /* SDL_VIDEO_DRIVER_RPI */
 
+#ifdef NATIVE_TOOLKIT_STATIC_ANGLE
+// Just resolve the symbol directly
+   #define LOAD_FUNC(NAME) \
+       _this->egl_data->NAME = (void *)NAME;
+#else
 #define LOAD_FUNC(NAME) \
 _this->egl_data->NAME = SDL_LoadFunction(_this->egl_data->dll_handle, #NAME); \
 if (!_this->egl_data->NAME) \
 { \
     return SDL_SetError("Could not retrieve EGL function " #NAME); \
 }
+#endif
 
 /* EGL implementation of SDL OpenGL ES support */
 #ifdef EGL_KHR_create_context        
@@ -189,12 +195,13 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
     }
 #endif
 
+    // Do not need to load dll if we static link ...
+    #ifndef NATIVE_TOOLKIT_STATIC_ANGLE
     /* A funny thing, loading EGL.so first does not work on the Raspberry, so we load libGL* first */
     path = SDL_getenv("SDL_VIDEO_GL_DRIVER");
     if (path != NULL) {
         egl_dll_handle = SDL_LoadObject(path);
     }
-
     if (egl_dll_handle == NULL) {
         if (_this->gl_config.profile_mask == SDL_GL_CONTEXT_PROFILE_ES) {
             if (_this->gl_config.major_version > 1) {
@@ -245,6 +252,8 @@ SDL_EGL_LoadLibrary(_THIS, const char *egl_path, NativeDisplayType native_displa
         SDL_ClearError();
     }
 
+    #endif // NATIVE_TOOLKIT_STATIC_ANGLE
+
     _this->egl_data->dll_handle = dll_handle;
 
     /* Load new function pointers */

diff --git a/src/video/windows/SDL_windowsopengles.c b/src/video/windows/SDL_windowsopengles.c
@@ -129,12 +129,16 @@ WIN_GLES_SetupWindow(_THIS, SDL_Window * window)
 int
 WIN_GLES_SetSwapInterval(_THIS, int interval)
 {
+    #ifndef NATIVE_TOOLKIT_STATIC_ANGLE
     /* FIXME: This should call SDL_EGL_SetSwapInterval, but ANGLE has a bug that prevents this
      * from working if we do (the window contents freeze and don't swap properly). So, we ignore
      * the request for now.
      */
     SDL_Log("WARNING: Ignoring SDL_GL_SetSwapInterval call due to ANGLE bug");
     return 0;
+    #else
+    return SDL_EGL_SetSwapInterval(_this, interval);
+    #endif
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS && SDL_VIDEO_OPENGL_EGL */