X Strike Force X.Org X11 SVN commit: r2381 - vendor/X11R7.1/proto/glproto
Author: dnusinow
Date: 2006-07-01 20:18:11 -0400 (Sat, 01 Jul 2006)
New Revision: 2381
Modified:
vendor/X11R7.1/proto/glproto/ChangeLog
vendor/X11R7.1/proto/glproto/configure
vendor/X11R7.1/proto/glproto/configure.ac
vendor/X11R7.1/proto/glproto/glxtokens.h
Log:
Vendor drop of glproto 1.4.7
Modified: vendor/X11R7.1/proto/glproto/ChangeLog
===================================================================
--- vendor/X11R7.1/proto/glproto/ChangeLog 2006-07-02 00:16:25 UTC (rev 2380)
+++ vendor/X11R7.1/proto/glproto/ChangeLog 2006-07-02 00:18:11 UTC (rev 2381)
@@ -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.
Modified: vendor/X11R7.1/proto/glproto/configure
===================================================================
--- vendor/X11R7.1/proto/glproto/configure 2006-07-02 00:16:25 UTC (rev 2380)
+++ vendor/X11R7.1/proto/glproto/configure 2006-07-02 00:18:11 UTC (rev 2381)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GLProto 1.4.6.
+# Generated by GNU Autoconf 2.59 for GLProto 1.4.7.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='GLProto'
PACKAGE_TARNAME='glproto'
-PACKAGE_VERSION='1.4.6'
-PACKAGE_STRING='GLProto 1.4.6'
+PACKAGE_VERSION='1.4.7'
+PACKAGE_STRING='GLProto 1.4.7'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBOBJS LTLIBOBJS'
@@ -722,7 +722,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GLProto 1.4.6 to adapt to many kinds of systems.
+\`configure' configures GLProto 1.4.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -784,7 +784,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GLProto 1.4.6:";;
+ short | recursive ) echo "Configuration of GLProto 1.4.7:";;
esac
cat <<\_ACEOF
@@ -890,7 +890,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-GLProto configure 1.4.6
+GLProto configure 1.4.7
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -904,7 +904,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GLProto $as_me 1.4.6, which was
+It was created by GLProto $as_me 1.4.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1547,7 +1547,7 @@
# Define the identity of the package.
PACKAGE='glproto'
- VERSION='1.4.6'
+ VERSION='1.4.7'
cat >>confdefs.h <<_ACEOF
@@ -2089,7 +2089,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by GLProto $as_me 1.4.6, which was
+This file was extended by GLProto $as_me 1.4.7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2144,7 +2144,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-GLProto config.status 1.4.6
+GLProto config.status 1.4.7
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: vendor/X11R7.1/proto/glproto/configure.ac
===================================================================
--- vendor/X11R7.1/proto/glproto/configure.ac 2006-07-02 00:16:25 UTC (rev 2380)
+++ vendor/X11R7.1/proto/glproto/configure.ac 2006-07-02 00:18:11 UTC (rev 2381)
@@ -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
Modified: vendor/X11R7.1/proto/glproto/glxtokens.h
===================================================================
--- vendor/X11R7.1/proto/glproto/glxtokens.h 2006-07-02 00:16:25 UTC (rev 2380)
+++ vendor/X11R7.1/proto/glproto/glxtokens.h 2006-07-02 00:18:11 UTC (rev 2381)
@@ -234,8 +234,45 @@
/*
** 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:
*/
Reply to: