From 01df5d59e56a1b060568f8cad2e89f7eea22fc70 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 29 Aug 2011 08:51:20 +0200 Subject: xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29 aug 2011 --- mesalib/include/GL/internal/dri_interface.h | 3 +++ mesalib/include/GL/osmesa.h | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'mesalib/include/GL') diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h index 4fe9e943b..eed159e11 100644 --- a/mesalib/include/GL/internal/dri_interface.h +++ b/mesalib/include/GL/internal/dri_interface.h @@ -694,6 +694,9 @@ struct __DRIswrastExtensionRec { #define __DRI_BUFFER_DEPTH_STENCIL 9 /**< Only available with DRI2 1.1 */ #define __DRI_BUFFER_HIZ 10 +/* Inofficial and for internal use. Increase when adding a new buffer token. */ +#define __DRI_BUFFER_COUNT 11 + struct __DRIbufferRec { unsigned int attachment; unsigned int name; diff --git a/mesalib/include/GL/osmesa.h b/mesalib/include/GL/osmesa.h index 56fa23ce8..304655e7c 100644 --- a/mesalib/include/GL/osmesa.h +++ b/mesalib/include/GL/osmesa.h @@ -101,7 +101,7 @@ extern "C" { typedef struct osmesa_context *OSMesaContext; -#if defined(__BEOS__) || defined(__QUICKDRAW__) +#if defined(__QUICKDRAW__) #pragma export on #endif @@ -275,12 +275,6 @@ OSMesaGetProcAddress( const char *funcName ); GLAPI void GLAPIENTRY OSMesaColorClamp(GLboolean enable); - -#if defined(__BEOS__) || defined(__QUICKDRAW__) -#pragma export off -#endif - - #ifdef __cplusplus } #endif -- cgit v1.2.3