diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 23:57:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 23:57:14 +0200 |
| commit | 67b40bd21988fed2f70b1c4f5aea301b28f78298 (patch) | |
| tree | d68ea94ae2d712cb2e991496049bc13f19d9ea60 /libvo/gl_common.c | |
| parent | 9fe4f647824b8067ea4e4f6cf7f699e6c8fa67cb (diff) | |
| parent | f97fd3eff02bd1048750f350230d9e9192ea3dfd (diff) | |
| download | mpv-67b40bd21988fed2f70b1c4f5aea301b28f78298.tar.bz2 mpv-67b40bd21988fed2f70b1c4f5aea301b28f78298.tar.xz | |
Merge svn changes up to r30065
Diffstat (limited to 'libvo/gl_common.c')
| -rw-r--r-- | libvo/gl_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c index 250f2df2da..f9b8359906 100644 --- a/libvo/gl_common.c +++ b/libvo/gl_common.c @@ -1539,7 +1539,7 @@ void glDrawTex(GLfloat x, GLfloat y, GLfloat w, GLfloat h, End(); } -#ifdef GL_WIN32 +#ifdef CONFIG_GL_WIN32 #include "w32_common.h" /** * \brief little helper since wglGetProcAddress definition does not fit our @@ -1635,7 +1635,7 @@ static void swapGlBuffers_w32(MPGLContext *ctx) { vo_w32_release_dc(vo_w32_window, vo_hdc); } #endif -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 #ifdef HAVE_LIBDL #include <dlfcn.h> #endif @@ -1828,7 +1828,7 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) { memset(ctx, 0, sizeof(*ctx)); ctx->type = type; switch (ctx->type) { -#ifdef GL_WIN32 +#ifdef CONFIG_GL_WIN32 case GLTYPE_W32: ctx->setGlWindow = setGlWindow_w32; ctx->releaseGlContext = releaseGlContext_w32; @@ -1840,7 +1840,7 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) { ctx->ontop = vo_w32_ontop; return vo_w32_init(); #endif -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 case GLTYPE_X11: ctx->setGlWindow = setGlWindow_x11; ctx->releaseGlContext = releaseGlContext_x11; @@ -1860,12 +1860,12 @@ int init_mpglcontext(MPGLContext *ctx, enum MPGLType type) { void uninit_mpglcontext(MPGLContext *ctx) { ctx->releaseGlContext(ctx); switch (ctx->type) { -#ifdef GL_WIN32 +#ifdef CONFIG_GL_WIN32 case GLTYPE_W32: vo_w32_uninit(); break; #endif -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 case GLTYPE_X11: vo_x11_uninit(); break; |