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/vo_gl.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/vo_gl.c')
| -rw-r--r-- | libvo/vo_gl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index e3c4571b32..fab076355f 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -44,7 +44,7 @@ static const vo_info_t info = const LIBVO_EXTERN(gl) -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 static int wsGLXAttrib[] = { GLX_RGBA, GLX_RED_SIZE,1, GLX_GREEN_SIZE,1, @@ -424,7 +424,7 @@ static void uninitGl(void) { DeleteBuffers(2, gl_buffer_uv); gl_buffer_uv[0] = gl_buffer_uv[1] = 0; gl_buffersize_uv = 0; gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0; -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 if (mesa_bufferptr) FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); #endif @@ -529,11 +529,11 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin vo_flipped = !!(flags & VOFLAG_FLIPPING); -#ifdef GL_WIN32 +#ifdef CONFIG_GL_WIN32 if (glctx.type == GLTYPE_W32 && !vo_w32_config(d_width, d_height, flags)) return -1; #endif -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 if (glctx.type == GLTYPE_X11) { XVisualInfo *vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib ); if (vinfo == NULL) @@ -762,7 +762,7 @@ static uint32_t get_image(mp_image_t *mpi) { mpi->stride[0] = mpi->width * mpi->bpp / 8; needed_size = mpi->stride[0] * mpi->height; if (mesa_buffer) { -#ifdef CONFIG_X11 +#ifdef CONFIG_GL_X11 if (mesa_bufferptr && needed_size > mesa_buffersize) { FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); mesa_bufferptr = NULL; @@ -990,7 +990,7 @@ static int preinit(const char *arg) { enum MPGLType gltype = GLTYPE_X11; // set defaults -#ifdef GL_WIN32 +#ifdef CONFIG_GL_WIN32 gltype = GLTYPE_W32; #endif many_fmts = 1; |