diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-17 19:29:04 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-08-17 19:29:04 +0000 |
| commit | 3a9134095d647d6018b6b11ae87b7bb8b67c39ef (patch) | |
| tree | 699e66b23af78c968bb882ae4a22a44141e77d25 /proto | |
| parent | 6cf46cb1132717ef6fd63a06d2f5bb6996ef4ac1 (diff) | |
Update to glproto 1.4.16
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/glproto/ChangeLog | 26 | ||||
| -rw-r--r-- | proto/glproto/configure.ac | 2 | ||||
| -rw-r--r-- | proto/glproto/glxtokens.h | 4 |
3 files changed, 30 insertions, 2 deletions
diff --git a/proto/glproto/ChangeLog b/proto/glproto/ChangeLog index 1110e3cb6..178dc8426 100644 --- a/proto/glproto/ChangeLog +++ b/proto/glproto/ChangeLog @@ -1,3 +1,29 @@ +commit ec1eec4355ee4a6c5134f2178192f10b6d28a87a +Author: Dave Airlie <airlied@gmail.com> +Date: Thu Jul 12 22:55:53 2012 +1000 + + glproto: bump version to 1.4.16 for release. + + Signed-off-by: Dave Airlie <airlied@redhat.com> + +commit 458a9eb2660b6c9fcc5b63ad55d0529c22803138 +Author: Ian Romanick <ian.d.romanick@intel.com> +Date: Wed May 23 13:49:36 2012 -0700 + + glproto: Add define for GLX_EXT_create_context_es2_profile + + Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> + Reviewed-by: Matt Turner <mattst88@gmail.com> + +commit ec3f3387211f428886dfdee2443e16f45e00e77b +Author: Ian Romanick <ian.d.romanick@intel.com> +Date: Wed May 23 13:47:52 2012 -0700 + + glproto: Fix typo in name of GLX_LOSE_CONTEXT_ON_RESET_ARB + + Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> + Reviewed-by: Matt Turner <mattst88@gmail.com> + commit 29d5b553b30755a25300c30b67d39b37c9a76466 Author: Ian Romanick <ian.d.romanick@intel.com> Date: Mon Nov 28 10:53:17 2011 -0800 diff --git a/proto/glproto/configure.ac b/proto/glproto/configure.ac index 9907db05c..58d60fa34 100644 --- a/proto/glproto/configure.ac +++ b/proto/glproto/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([GLProto], [1.4.15], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([GLProto], [1.4.16], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/proto/glproto/glxtokens.h b/proto/glproto/glxtokens.h index 1ed2fd3e4..5e6bbea11 100644 --- a/proto/glproto/glxtokens.h +++ b/proto/glproto/glxtokens.h @@ -286,6 +286,7 @@ extern "C" { /* * GLX_ARB_create_context * GLX_ARB_create_context_profile + * GLX_EXT_create_context_es2_profile */ #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 @@ -297,6 +298,7 @@ extern "C" { #define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x0001 #define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x0002 +#define GLX_CONTEXT_ES2_PROFILE_BIT_EXT 0x0004 /* * GLX_ARB_create_context_robustness @@ -304,7 +306,7 @@ extern "C" { #define GLX_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x0004 #define GLX_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 #define GLX_NO_RESET_NOTIFICATION_ARB 0x8261 -#define GLX_LOST_CONTEXT_ON_RESET_ARB 0x8252 +#define GLX_LOSE_CONTEXT_ON_RESET_ARB 0x8252 #ifdef __cplusplus } #endif |