src/video/android/SDL_androidvideo.c
changeset 7659 ac4ce59c40e7
parent 7253 eee81780005e
child 7786 cfc1285375e1
     1.1 --- a/src/video/android/SDL_androidvideo.c	Mon Aug 19 11:02:44 2013 -0400
     1.2 +++ b/src/video/android/SDL_androidvideo.c	Mon Aug 19 16:29:46 2013 -0300
     1.3 @@ -44,17 +44,17 @@
     1.4  static int Android_VideoInit(_THIS);
     1.5  static void Android_VideoQuit(_THIS);
     1.6  
     1.7 +#include "../SDL_egl.h"
     1.8  /* GL functions (SDL_androidgl.c) */
     1.9 -extern int Android_GL_LoadLibrary(_THIS, const char *path);
    1.10 -extern void *Android_GL_GetProcAddress(_THIS, const char *proc);
    1.11 -extern void Android_GL_UnloadLibrary(_THIS);
    1.12 -extern SDL_GLContext Android_GL_CreateContext(_THIS, SDL_Window * window);
    1.13 -extern int Android_GL_MakeCurrent(_THIS, SDL_Window * window,
    1.14 -                              SDL_GLContext context);
    1.15 -extern int Android_GL_SetSwapInterval(_THIS, int interval);
    1.16 -extern int Android_GL_GetSwapInterval(_THIS);
    1.17 -extern void Android_GL_SwapWindow(_THIS, SDL_Window * window);
    1.18 -extern void Android_GL_DeleteContext(_THIS, SDL_GLContext context);
    1.19 +extern SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
    1.20 +extern int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
    1.21 +extern void Android_GLES_SwapWindow(_THIS, SDL_Window * window);
    1.22 +extern int Android_GLES_LoadLibrary(_THIS, const char *path);
    1.23 +#define Android_GLES_GetProcAddress SDL_EGL_GetProcAddress
    1.24 +#define Android_GLES_UnloadLibrary SDL_EGL_UnloadLibrary
    1.25 +#define Android_GLES_SetSwapInterval SDL_EGL_SetSwapInterval
    1.26 +#define Android_GLES_GetSwapInterval SDL_EGL_GetSwapInterval
    1.27 +#define Android_GLES_DeleteContext SDL_EGL_DeleteContext
    1.28  
    1.29  /* Android driver bootstrap functions */
    1.30  
    1.31 @@ -114,15 +114,15 @@
    1.32      device->free = Android_DeleteDevice;
    1.33  
    1.34      /* GL pointers */
    1.35 -    device->GL_LoadLibrary = Android_GL_LoadLibrary;
    1.36 -    device->GL_GetProcAddress = Android_GL_GetProcAddress;
    1.37 -    device->GL_UnloadLibrary = Android_GL_UnloadLibrary;
    1.38 -    device->GL_CreateContext = Android_GL_CreateContext;
    1.39 -    device->GL_MakeCurrent = Android_GL_MakeCurrent;
    1.40 -    device->GL_SetSwapInterval = Android_GL_SetSwapInterval;
    1.41 -    device->GL_GetSwapInterval = Android_GL_GetSwapInterval;
    1.42 -    device->GL_SwapWindow = Android_GL_SwapWindow;
    1.43 -    device->GL_DeleteContext = Android_GL_DeleteContext;
    1.44 +    device->GL_LoadLibrary = Android_GLES_LoadLibrary;
    1.45 +    device->GL_GetProcAddress = Android_GLES_GetProcAddress;
    1.46 +    device->GL_UnloadLibrary = Android_GLES_UnloadLibrary;
    1.47 +    device->GL_CreateContext = Android_GLES_CreateContext;
    1.48 +    device->GL_MakeCurrent = Android_GLES_MakeCurrent;
    1.49 +    device->GL_SetSwapInterval = Android_GLES_SetSwapInterval;
    1.50 +    device->GL_GetSwapInterval = Android_GLES_GetSwapInterval;
    1.51 +    device->GL_SwapWindow = Android_GLES_SwapWindow;
    1.52 +    device->GL_DeleteContext = Android_GLES_DeleteContext;
    1.53  
    1.54      /* Text input */
    1.55      device->StartTextInput = Android_StartTextInput;