diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-01 17:03:50 +0200 |
| commit | aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa (patch) | |
| tree | 37bc7921f864ead4f6eb357b31a1eb66d46aaef9 /mesalib/include/GL | |
| parent | 2e0adb33e03e3142f1412ed570415c5ce616dcef (diff) | |
| parent | ea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (diff) | |
| download | vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.gz vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.bz2 vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_util.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/include/GL')
| -rw-r--r-- | mesalib/include/GL/gl.h | 17 | ||||
| -rw-r--r-- | mesalib/include/GL/internal/dri_interface.h | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/mesalib/include/GL/gl.h b/mesalib/include/GL/gl.h index 4e2932df7..5b2848028 100644 --- a/mesalib/include/GL/gl.h +++ b/mesalib/include/GL/gl.h @@ -97,10 +97,6 @@ #define GLAPIENTRYP GLAPIENTRY * #endif -#if defined(PRAGMA_EXPORT_SUPPORTED) -#pragma export on -#endif - /* * End system-specific stuff. **********************************************************************/ @@ -2112,19 +2108,6 @@ typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum t **/ - -/********************************************************************** - * Begin system-specific stuff - */ -#if defined(PRAGMA_EXPORT_SUPPORTED) -#pragma export off -#endif - -/* - * End system-specific stuff - **********************************************************************/ - - #ifdef __cplusplus } #endif diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h index 0fb645dd5..2d75acf07 100644 --- a/mesalib/include/GL/internal/dri_interface.h +++ b/mesalib/include/GL/internal/dri_interface.h @@ -233,7 +233,7 @@ struct __DRItexOffsetExtensionRec { #define __DRI_TEXTURE_FORMAT_RGBA 0x20DA #define __DRI_TEX_BUFFER "DRI_TexBuffer" -#define __DRI_TEX_BUFFER_VERSION 2 +#define __DRI_TEX_BUFFER_VERSION 3 struct __DRItexBufferExtensionRec { __DRIextension base; |