configure.ac | 2 - glxproto.h | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- glxtokens.h | 27 +++++++++++++++++++ 3 files changed, 106 insertions(+), 3 deletions(-)
New commits: commit 6d7e398150dde1c15b7f62f485cb33bad8f4d5c6 Author: Jesse Barnes <[email protected]> Date: Thu May 5 13:10:39 2011 -0700 glproto: add a new GLXBufferSwapComplete struct that matches the spec Just add a new struct to remain compatible with existing code. Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Jeremy Huddleston <[email protected]> Signed-off-by: Jesse Barnes <[email protected]> diff --git a/configure.ac b/configure.ac index a3047e4..a6c301c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([GLProto], [1.4.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([GLProto], [1.4.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/glxproto.h b/glxproto.h index 0ff44e3..0446217 100644 --- a/glxproto.h +++ b/glxproto.h @@ -1384,6 +1384,20 @@ typedef struct { CARD32 sbc_lo B32; } xGLXBufferSwapComplete; +typedef struct { + BYTE type; + BYTE pad; + CARD16 sequenceNumber B16; + CARD16 event_type B16; + CARD16 pad2; + CARD32 drawable; + CARD32 ust_hi B32; + CARD32 ust_lo B32; + CARD32 msc_hi B32; + CARD32 msc_lo B32; + CARD32 sbc B32; +} xGLXBufferSwapComplete2; + /************************************************************************/ /* commit 7196c9441af941be74180f8e8d4e10a08659b80f Author: Jesse Barnes <[email protected]> Date: Thu May 5 09:21:19 2011 -0700 Revert "glxproto: make GLX swap event struct match spec" This reverts commit f5403828c68af0f12c79c0504df0a4781ca84b2b. This broke compatibility with existing code, so revert in favor of a new struct definition instead. diff --git a/glxproto.h b/glxproto.h index dfa0647..0ff44e3 100644 --- a/glxproto.h +++ b/glxproto.h @@ -1375,13 +1375,13 @@ typedef struct { BYTE pad; CARD16 sequenceNumber B16; CARD16 event_type B16; - CARD16 pad2; CARD32 drawable; CARD32 ust_hi B32; CARD32 ust_lo B32; CARD32 msc_hi B32; CARD32 msc_lo B32; - CARD32 sbc B32; + CARD32 sbc_hi B32; + CARD32 sbc_lo B32; } xGLXBufferSwapComplete; /************************************************************************/ commit f5403828c68af0f12c79c0504df0a4781ca84b2b Author: Jesse Barnes <[email protected]> Date: Tue May 3 12:14:10 2011 -0700 glxproto: make GLX swap event struct match spec We only spec a 32 bit swap count, so drop the high sbc field. Also make the padding explicit (most compilers would have already done this since it's not a packed structure, but making it explicit should prevent surprises in the future). Signed-off-by: Jesse Barnes <[email protected]> diff --git a/configure.ac b/configure.ac index d88e6df..a3047e4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([GLProto], [1.4.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([GLProto], [1.4.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/glxproto.h b/glxproto.h index 0ff44e3..dfa0647 100644 --- a/glxproto.h +++ b/glxproto.h @@ -1375,13 +1375,13 @@ typedef struct { BYTE pad; CARD16 sequenceNumber B16; CARD16 event_type B16; + CARD16 pad2; CARD32 drawable; CARD32 ust_hi B32; CARD32 ust_lo B32; CARD32 msc_hi B32; CARD32 msc_lo B32; - CARD32 sbc_hi B32; - CARD32 sbc_lo B32; + CARD32 sbc B32; } xGLXBufferSwapComplete; /************************************************************************/ commit 0cc3162cd29e63f915dc2b66c8dbd7a1a3dcdddc Author: Dave Airlie <[email protected]> Date: Sun Mar 6 17:48:05 2011 +1000 glproto: add GLX_ARB_context_create + GLX_ARB_context_create_profile Add glproto support for these two extensions also add tokens for GLX_ARB_create_context_robustness diff --git a/glxproto.h b/glxproto.h index d0ba2ad..0ff44e3 100644 --- a/glxproto.h +++ b/glxproto.h @@ -51,8 +51,9 @@ #define GLXBadPbuffer 10 #define GLXBadCurrentDrawable 11 #define GLXBadWindow 12 +#define GLXBadProfileARB 13 -#define __GLX_NUMBER_ERRORS 13 +#define __GLX_NUMBER_ERRORS 14 /* ** Events. @@ -1287,6 +1288,65 @@ typedef struct { } xGLXHyperpipeConfigSGIXReply; #define sz_xGLXHyperpipeConfigSGIXReply 32 +/* + * GLX_ARB_create_context + * GLX_ARB_create_context_profile + */ + +/* + * glXSetClientInfoARB + */ +typedef struct { + CARD8 reqType; + CARD8 glxCode; + CARD16 length B16; + CARD32 major B32; + CARD32 minor B32; + CARD32 n0 B32; + CARD32 n1 B32; + CARD32 n2 B32; + /* + ** More data may follow; this is just the header. + */ +} xGLXSetClientInfoARB; +#define sz_xGLXSetClientInfoARB 24 + +/* +** glXCreateContextAttribsARB +*/ +typedef struct { + CARD8 reqType; + CARD8 glxCode; + CARD16 length B16; + GLXContextID context B32; + GLXFBConfigID fbconfig B32; + CARD32 screen; + GLXContextID shareList B32; + BOOL isDirect; + CARD8 reserved1; + CARD16 reserved2 B16; + CARD32 numAttribs B32; + /* followed by attribute list */ +} xGLXCreateContextAttribsARB; +#define sz_xGLXCreateContextAttribsARB 28 + +/* + * glXSetClientInfo2ARB + */ +typedef struct { + CARD8 reqType; + CARD8 glxCode; + CARD16 length B16; + CARD32 major B32; + CARD32 minor B32; + CARD32 n0 B32; + CARD32 n1 B32; + CARD32 n2 B32; + /* + ** More data may follow; this is just the header. + */ +} xGLXSetClientInfo2ARB; +#define sz_xGLXSetClientInfo2ARB 24 /************************************************************************/ /* @@ -2049,7 +2109,9 @@ typedef struct { #define X_GLXChangeDrawableAttributes 30 #define X_GLXCreateWindow 31 #define X_GLXDestroyWindow 32 - +#define X_GLXSetClientInfoARB 33 +#define X_GLXCreateContextAtrribsARB 34 +#define X_GLXSetConfigInfo2ARB 35 /* Opcodes for single commands (part of GLX command space) */ diff --git a/glxtokens.h b/glxtokens.h index 9cb5652..1ed2fd3 100644 --- a/glxtokens.h +++ b/glxtokens.h @@ -282,6 +282,29 @@ extern "C" { * GLX_EXT_framebuffer_SRGB */ #define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 + +/* + * GLX_ARB_create_context + * GLX_ARB_create_context_profile + */ +#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define GLX_CONTEXT_FLAGS_ARB 0x2094 +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 + +#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 +#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 + +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x0001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x0002 + +/* + * GLX_ARB_create_context_robustness + */ +#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 #ifdef __cplusplus } #endif commit a50bd646df530b4ce84a8aef3d40c74766dfb60c Author: Dave Airlie <[email protected]> Date: Mon Jan 3 19:40:30 2011 +1000 glxtokens.h: add GLX_EXT_framebuffer_sRGB support. this is needed to glxcmds.c to emit this info. diff --git a/glxtokens.h b/glxtokens.h index 949935b..9cb5652 100644 --- a/glxtokens.h +++ b/glxtokens.h @@ -278,6 +278,10 @@ extern "C" { #define GLX_SAMPLE_BUFFERS_SGIS 100000 #define GLX_SAMPLES_SGIS 100001 +/* + * GLX_EXT_framebuffer_SRGB + */ +#define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 #ifdef __cplusplus } #endif -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
