RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Use SDL_GL_ProcAddress to work around conflicts between -lGL 

and -framework OpenGL.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31073 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-04-25 07:32:42 +00:00
parent 7fc3b782ea
commit 5cdca55005
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libvo/gl_common.c
View File

@ -1854,6 +1854,15 @@ static void swapGlBuffers_sdl(MPGLContext *ctx) {
SDL_GL_SwapBuffers();
}
static void *sdlgpa(const GLubyte *name) {
return SDL_GL_GetProcAddress(name);
}
static int setGlWindow_sdl(MPGLContext *ctx) {
SDL_GL_LoadLibrary(NULL);
getFunctions(sdlgpa, NULL);
return SET_WINDOW_OK;
}
#endif
static int setGlWindow_dummy(MPGLContext *ctx) {
@ -1902,6 +1911,7 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
#ifdef CONFIG_GL_SDL
case GLTYPE_SDL:
SDL_Init(SDL_INIT_VIDEO);
ctx->setGlWindow = setGlWindow_sdl;
ctx->swapGlBuffers = swapGlBuffers_sdl;
return 1;
#endif