From cdb7b15cdc3d72b6534d03b91113b01488829daf Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 24 Oct 2013 08:23:37 +0200 Subject: Synchronised opengl files --- gl/glext.h | 6 +++--- gl/glx.h | 1 - mesalib/include/GL/glext.h | 6 +++--- mesalib/include/GL/wglext.h | 2 +- xorg-server/hw/xwin/glx/gl.xml | 28 ++++++++++++++++++++-------- xorg-server/hw/xwin/glx/wglext.h | 2 +- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/gl/glext.h b/gl/glext.h index fea9e1f57..8808d29ef 100644 --- a/gl/glext.h +++ b/gl/glext.h @@ -33,7 +33,7 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 23422 $ on $Date: 2013-10-08 15:40:45 -0700 (Tue, 08 Oct 2013) $ +** Khronos $Revision: 23652 $ on $Date: 2013-10-23 01:18:54 -0700 (Wed, 23 Oct 2013) $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -53,7 +53,7 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20131008 +#define GL_GLEXT_VERSION 20131023 /* Generated C header for: * API: gl @@ -8214,7 +8214,6 @@ GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle); #ifndef GL_NV_blend_equation_advanced #define GL_NV_blend_equation_advanced 1 -#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 #define GL_BLEND_OVERLAP_NV 0x9281 #define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 #define GL_COLORBURN_NV 0x929A @@ -8270,6 +8269,7 @@ GLAPI void APIENTRY glBlendBarrierNV (void); #ifndef GL_NV_blend_equation_advanced_coherent #define GL_NV_blend_equation_advanced_coherent 1 +#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 #endif /* GL_NV_blend_equation_advanced_coherent */ #ifndef GL_NV_blend_square diff --git a/gl/glx.h b/gl/glx.h index 87c31fdcc..fa5a8eda9 100644 --- a/gl/glx.h +++ b/gl/glx.h @@ -168,7 +168,6 @@ typedef XID GLXDrawable; /* GLX 1.3 and later */ typedef struct __GLXFBConfigRec *GLXFBConfig; typedef XID GLXFBConfigID; -typedef XID GLXContextID; typedef XID GLXWindow; typedef XID GLXPbuffer; diff --git a/mesalib/include/GL/glext.h b/mesalib/include/GL/glext.h index fea9e1f57..8808d29ef 100755 --- a/mesalib/include/GL/glext.h +++ b/mesalib/include/GL/glext.h @@ -33,7 +33,7 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 23422 $ on $Date: 2013-10-08 15:40:45 -0700 (Tue, 08 Oct 2013) $ +** Khronos $Revision: 23652 $ on $Date: 2013-10-23 01:18:54 -0700 (Wed, 23 Oct 2013) $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -53,7 +53,7 @@ extern "C" { #define GLAPI extern #endif -#define GL_GLEXT_VERSION 20131008 +#define GL_GLEXT_VERSION 20131023 /* Generated C header for: * API: gl @@ -8214,7 +8214,6 @@ GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle); #ifndef GL_NV_blend_equation_advanced #define GL_NV_blend_equation_advanced 1 -#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 #define GL_BLEND_OVERLAP_NV 0x9281 #define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 #define GL_COLORBURN_NV 0x929A @@ -8270,6 +8269,7 @@ GLAPI void APIENTRY glBlendBarrierNV (void); #ifndef GL_NV_blend_equation_advanced_coherent #define GL_NV_blend_equation_advanced_coherent 1 +#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 #endif /* GL_NV_blend_equation_advanced_coherent */ #ifndef GL_NV_blend_square diff --git a/mesalib/include/GL/wglext.h b/mesalib/include/GL/wglext.h index 20ecad200..dc73a01aa 100644 --- a/mesalib/include/GL/wglext.h +++ b/mesalib/include/GL/wglext.h @@ -33,7 +33,7 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 23328 $ on $Date: 2013-10-02 02:28:28 -0700 (Wed, 02 Oct 2013) $ +** Khronos $Revision: 23649 $ on $Date: 2013-10-23 00:21:49 -0700 (Wed, 23 Oct 2013) $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) diff --git a/xorg-server/hw/xwin/glx/gl.xml b/xorg-server/hw/xwin/glx/gl.xml index ed608eaf9..11c100acb 100644 --- a/xorg-server/hw/xwin/glx/gl.xml +++ b/xorg-server/hw/xwin/glx/gl.xml @@ -2742,6 +2742,7 @@ typedef unsigned int GLhandleARB; + @@ -2775,8 +2776,11 @@ typedef unsigned int GLhandleARB; + + + @@ -38113,12 +38117,22 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + - - @@ -38132,7 +38146,6 @@ typedef unsigned int GLhandleARB; - @@ -38155,7 +38168,6 @@ typedef unsigned int GLhandleARB; - @@ -38165,14 +38177,14 @@ typedef unsigned int GLhandleARB; - - - + + + diff --git a/xorg-server/hw/xwin/glx/wglext.h b/xorg-server/hw/xwin/glx/wglext.h index 20ecad200..dc73a01aa 100644 --- a/xorg-server/hw/xwin/glx/wglext.h +++ b/xorg-server/hw/xwin/glx/wglext.h @@ -33,7 +33,7 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 23328 $ on $Date: 2013-10-02 02:28:28 -0700 (Wed, 02 Oct 2013) $ +** Khronos $Revision: 23649 $ on $Date: 2013-10-23 00:21:49 -0700 (Wed, 23 Oct 2013) $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -- cgit v1.2.3