diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-22 09:17:57 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-22 09:17:57 +0100 |
| commit | 6baac61e6ca9cd314e689dfe7f84771aad08c66e (patch) | |
| tree | 2a8a059fc83d3f7acc1034071ed3a9f7ff3c0027 /mesalib/src/mapi/glapi | |
| parent | 0ae7710db53515dab4a35c33ba9a030bbfc2ac5b (diff) | |
| download | vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.gz vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.tar.bz2 vcxsrv-6baac61e6ca9cd314e689dfe7f84771aad08c66e.zip | |
fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012
Diffstat (limited to 'mesalib/src/mapi/glapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/glapi_priv.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mesalib/src/mapi/glapi/glapi_priv.h b/mesalib/src/mapi/glapi/glapi_priv.h index 3ab553a2b..b6600c5fc 100644 --- a/mesalib/src/mapi/glapi/glapi_priv.h +++ b/mesalib/src/mapi/glapi/glapi_priv.h @@ -38,6 +38,16 @@ #include "GL/gl.h" #include "GL/glext.h" +/* The define of GL_COVERAGE_SAMPLES_NV in gl2ext.h is guarded by a different + * extension (GL_NV_coverage_sample) than in glext.h + * (GL_NV_multisample_coverage). Just undefine it to avoid spurious compiler + * warnings. + */ +#undef GL_COVERAGE_SAMPLES_NV + +#include "GLES2/gl2platform.h" +#include "GLES2/gl2ext.h" + #ifndef GL_OES_fixed_point typedef int GLfixed; typedef int GLclampx; |