diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c index 201330eab..adb07fd5a 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c +++ b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c @@ -130,7 +130,7 @@ int ANDROID_ToggleFullScreen(_THIS, int fullscreen) return 1; } -enum { SDL_NUMMODES = 57 }; +enum { SDL_NUMMODES = 58 }; static SDL_Rect *SDL_modelist[SDL_NUMMODES+1]; //#define SDL_modelist (this->hidden->SDL_modelist) @@ -341,7 +341,8 @@ int ANDROID_VideoInit(_THIS, SDL_PixelFormat *vformat) SDL_modelist[54]->w = 768; SDL_modelist[54]->h = 270; // For UAE4ALL2 SDL_modelist[55]->w = 1280; SDL_modelist[55]->h = 960; // For UQM-HD SDL_modelist[56]->w = 960; SDL_modelist[56]->h = 600; // For ScummVM 3x-mode - SDL_modelist[57] = NULL; + SDL_modelist[57]->w = 960; SDL_modelist[57]->h = 540; // Virtual wide-screen mode + SDL_modelist[58] = NULL; // If you going to add another video mode, increase SDL_NUMMODES constant SDL_VideoInit_1_3(NULL, 0); @@ -1237,12 +1238,12 @@ void SDL_ANDROID_VideoContextRecreated() static void* ANDROID_GL_GetProcAddress(_THIS, const char *proc) { +#ifdef USE_GLSHIM + void * func = glXGetProcAddress(proc); +#else void * func = dlsym(glLibraryHandle, proc); if(!func && gl2LibraryHandle) func = dlsym(gl2LibraryHandle, proc); -#ifdef USE_GLSHIM - if (func==NULL) - func = glXGetProcAddress(proc); #endif __android_log_print(ANDROID_LOG_INFO, "libSDL", "ANDROID_GL_GetProcAddress(\"%s\"): %p", proc, func); return func;