diff options
| author | wm4 <wm4@nowhere> | 2013-03-03 13:02:10 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-03-03 15:36:56 +0100 |
| commit | 979ce46c6403e70bc90348aba260c825e5189b2c (patch) | |
| tree | 3d8c51cbcac6526369ad12a6cdc06a414a2b6385 /video/out/gl_common.c | |
| parent | ca893689fefdac74338b41aa21fbc601ae102ff6 (diff) | |
| download | mpv-979ce46c6403e70bc90348aba260c825e5189b2c.tar.bz2 mpv-979ce46c6403e70bc90348aba260c825e5189b2c.tar.xz | |
gl_common: get rid of symbol redefinition warnings with recent Mesa
Apparently newer Mesa versions changed their <GL/glx.h> header, and
unconditionally define GLX_CONTEXT_MAJOR_VERSION_ARB and others. This
clashed with gl_header_fixes.h, a header which quarantines bad hacks
to make compilation possible on systems with outdated GL headers.
Specifically, our header was included before glx.h, so the hacks were
always active, and somehow Mesa's glx.h used to deal with this by not
redefining existing identifiers.
Fix the gl_header_fixes.h logic so the hacks are checked after including
glx.h.
Diffstat (limited to 'video/out/gl_common.c')
| -rw-r--r-- | video/out/gl_common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/video/out/gl_common.c b/video/out/gl_common.c index 1f7b51de5b..89ed0cbbd3 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -1060,8 +1060,12 @@ static void swapGlBuffers_w32(MPGLContext *ctx) #ifdef CONFIG_GL_X11 #include <X11/Xlib.h> #include <GL/glx.h> + #include "x11_common.h" +#define MP_GET_GLX_WORKAROUNDS +#include "gl_header_fixes.h" + struct glx_context { XVisualInfo *vinfo; GLXContext context; |