summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-05-01 22:23:33 +0000
committerAdam Jackson <ajax@nwnk.net>2006-05-01 22:23:33 +0000
commitaa8b3bb05bf390feb6389a4ef94b26fc394c9fe1 (patch)
tree81cfa952a80dad4e0fc98fbcc7c5974481e19d14
parent2864cebfcbf8e52e1245590724894a6167179b2f (diff)
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--glxtokens.h39
3 files changed, 44 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cf00c1..4d3930f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-30 Adam Jackson <ajax@freedesktop.org>
+
+ * glxtokens.h:
+ Bump to 1.4.7 for final EXT_tfp tokens.
+
2006-03-16 Kristian Høgsberg <krh@redhat.com>
* configure.ac: Bump to 1.4.6 for FBO opcodes.
diff --git a/configure.ac b/configure.ac
index 08020b4..6aba115 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([GLProto], [1.4.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([GLProto], [1.4.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
diff --git a/glxtokens.h b/glxtokens.h
index 18cf046..9e1601a 100644
--- a/glxtokens.h
+++ b/glxtokens.h
@@ -234,7 +234,44 @@ extern "C" {
/*
** GLX_EXT_texture_from_pixmap
*/
-#define GLX_FRONT_LEFT_EXT 0x6005
+#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0
+#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1
+#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2
+#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3
+#define GLX_Y_INVERTED_EXT 0x20D4
+
+#define GLX_TEXTURE_FORMAT_EXT 0x20D5
+#define GLX_TEXTURE_TARGET_EXT 0x20D6
+#define GLX_MIPMAP_TEXTURE_EXT 0x20D7
+
+#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8
+#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9
+#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA
+
+#define GLX_TEXTURE_1D_BIT_EXT 0x00000001
+#define GLX_TEXTURE_2D_BIT_EXT 0x00000002
+#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004
+
+#define GLX_TEXTURE_1D_EXT 0x20DB
+#define GLX_TEXTURE_2D_EXT 0x20DC
+#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD
+
+#define GLX_FRONT_LEFT_EXT 0x20DE
+#define GLX_FRONT_RIGHT_EXT 0x20DF
+#define GLX_BACK_LEFT_EXT 0x20E0
+#define GLX_BACK_RIGHT_EXT 0x20E1
+#define GLX_FRONT_EXT GLX_FRONT_LEFT_EXT
+#define GLX_BACK_EXT GLX_BACK_LEFT_EXT
+#define GLX_AUX0_EXT 0x20E2
+#define GLX_AUX1_EXT 0x20E3
+#define GLX_AUX2_EXT 0x20E4
+#define GLX_AUX3_EXT 0x20E5
+#define GLX_AUX4_EXT 0x20E6
+#define GLX_AUX5_EXT 0x20E7
+#define GLX_AUX6_EXT 0x20E8
+#define GLX_AUX7_EXT 0x20E9
+#define GLX_AUX8_EXT 0x20EA
+#define GLX_AUX9_EXT 0x20EB
/*
* GLX 1.4 and later: