aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-09 09:32:52 +0200
committermarha <marha@users.sourceforge.net>2011-06-09 09:32:52 +0200
commit4cf8ef726ac1678d54aafde0375fc531f065ebb2 (patch)
tree32670f5c43d1b63e7fe7087ae83e5319ce0ec6df
parent0de14292c4fac98f91105baf9cc16e58f25d4d77 (diff)
downloadvcxsrv-4cf8ef726ac1678d54aafde0375fc531f065ebb2.tar.gz
vcxsrv-4cf8ef726ac1678d54aafde0375fc531f065ebb2.tar.bz2
vcxsrv-4cf8ef726ac1678d54aafde0375fc531f065ebb2.zip
Synchronised files
-rw-r--r--gl/internal/dri_interface.h1
-rw-r--r--xorg-server/glx/dispatch.h19
2 files changed, 8 insertions, 12 deletions
diff --git a/gl/internal/dri_interface.h b/gl/internal/dri_interface.h
index 1564e4cea..2132277f0 100644
--- a/gl/internal/dri_interface.h
+++ b/gl/internal/dri_interface.h
@@ -694,6 +694,7 @@ struct __DRIswrastExtensionRec {
#define __DRI_BUFFER_FAKE_FRONT_LEFT 7
#define __DRI_BUFFER_FAKE_FRONT_RIGHT 8
#define __DRI_BUFFER_DEPTH_STENCIL 9 /**< Only available with DRI2 1.1 */
+#define __DRI_BUFFER_HIZ 10
struct __DRIbufferRec {
unsigned int attachment;
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 64b0b7fb1..c3303aed3 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -25,13 +25,13 @@
* SOFTWARE.
*/
-#if !defined( _GLAPI_DISPATCH_H_ )
-# define _GLAPI_DISPATCH_H_
+#if !defined( _DISPATCH_H_ )
+# define _DISPATCH_H_
#include "glapitable.h"
/**
- * \file glapidispatch.h
+ * \file main/dispatch.h
* Macros for handling GL dispatch tables.
*
* For each known GL function, there are 3 macros in this file. The first
@@ -472,7 +472,7 @@
#define _gloffset_MultiTexCoord4sARB 406
#define _gloffset_MultiTexCoord4svARB 407
-#if !defined(_GLAPI_USE_REMAP_TABLE)
+#if !FEATURE_remap_table
#define _gloffset_AttachShader 408
#define _gloffset_CreateProgram 409
@@ -996,16 +996,11 @@
#define _gloffset_EGLImageTargetRenderbufferStorageOES 927
#define _gloffset_EGLImageTargetTexture2DOES 928
-#else /* !_GLAPI_USE_REMAP_TABLE */
+#else /* !FEATURE_remap_table */
#define driDispatchRemapTable_size 521
extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
-#if FEATURE_remap_table
-#define driDispatchRemapTable remap_table
-static int remap_table[driDispatchRemapTable_size];
-#endif
-
#define AttachShader_remap_index 0
#define CreateProgram_remap_index 1
#define CreateShader_remap_index 2
@@ -2050,7 +2045,7 @@ static int remap_table[driDispatchRemapTable_size];
#define _gloffset_EGLImageTargetRenderbufferStorageOES driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index]
#define _gloffset_EGLImageTargetTexture2DOES driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index]
-#endif /* _GLAPI_USE_REMAP_TABLE */
+#endif /* !FEATURE_remap_table */
typedef void (GLAPIENTRYP _glptr_NewList)(GLuint, GLenum);
#define CALL_NewList(disp, parameters) \
@@ -12272,4 +12267,4 @@ static INLINE void SET_EGLImageTargetTexture2DOES(struct _glapi_table *disp, voi
}
-#endif /* !defined( _GLAPI_DISPATCH_H_ ) */
+#endif /* !defined( _DISPATCH_H_ ) */