RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-06 06:08:23 +00:00
Code Issues Releases Wiki Activity

Support for auto-selecting the OpenGL backend.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31086 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-04-25 10:53:01 +00:00
parent 3a34dbc927
commit a9ff7793e3
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvo/gl_common.c
View File

@ -1901,6 +1901,14 @@ static void dummy_update_xinerama_info(void) {
} }
int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) { int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) {
if (type == GLTYPE_AUTO) {
int res = init_mpglcontext(ctx, GLTYPE_W32);
if (res) return res;
res = init_mpglcontext(ctx, GLTYPE_X11);
if (res) return res;
res = init_mpglcontext(ctx, GLTYPE_SDL);
return res;
}
memset(ctx, 0, sizeof(*ctx)); memset(ctx, 0, sizeof(*ctx));
ctx->setGlWindow = setGlWindow_dummy; ctx->setGlWindow = setGlWindow_dummy;
ctx->releaseGlContext = releaseGlContext_dummy; ctx->releaseGlContext = releaseGlContext_dummy;

1
libvo/gl_common.h
View File

@ -373,6 +373,7 @@ void glDisableYUVConversion(GLenum target, int type);
/** \} */ /** \} */
enum MPGLType { enum MPGLType {
GLTYPE_AUTO,
GLTYPE_W32, GLTYPE_W32,
GLTYPE_X11, GLTYPE_X11,
GLTYPE_SDL, GLTYPE_SDL,

8
libvo/vo_gl.c
View File

@ -1099,14 +1099,8 @@ static const opt_t subopts[] = {
static int preinit_internal(const char *arg, int allow_sw) static int preinit_internal(const char *arg, int allow_sw)
{ {
enum MPGLType gltype = GLTYPE_SDL;
// set defaults // set defaults
#ifdef CONFIG_GL_X11 enum MPGLType gltype = GLTYPE_AUTO;
gltype = GLTYPE_X11;
#endif
#ifdef CONFIG_GL_WIN32
gltype = GLTYPE_W32;
#endif
many_fmts = 1; many_fmts = 1;
use_osd = -1; use_osd = -1;
scaled_osd = 0; scaled_osd = 0;