aboutsummaryrefslogtreecommitdiff
path: root/mesalib/include/GL/internal
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-09 09:27:21 +0200
committermarha <marha@users.sourceforge.net>2011-06-09 09:27:21 +0200
commit0de14292c4fac98f91105baf9cc16e58f25d4d77 (patch)
tree1704165c3d7f05bde08dc6d3d52ee33aed0f270f /mesalib/include/GL/internal
parent637bc31135b378ea9521b5a93b14bdce482da209 (diff)
parent0a9d2abef2e6fac5d52556969655a62711df6418 (diff)
downloadvcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.gz
vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.tar.bz2
vcxsrv-0de14292c4fac98f91105baf9cc16e58f25d4d77.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
Diffstat (limited to 'mesalib/include/GL/internal')
-rw-r--r--mesalib/include/GL/internal/dri_interface.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index 1564e4cea..2132277f0 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/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;