diff options
| -rw-r--r-- | gl/glext.h | 6 | ||||
| -rw-r--r-- | gl/glx.h | 1 | ||||
| -rwxr-xr-x | mesalib/include/GL/glext.h | 6 | ||||
| -rw-r--r-- | mesalib/include/GL/wglext.h | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/glx/gl.xml | 28 | ||||
| -rw-r--r-- | 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 @@ -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; <enum value="0x1504" name="GL_AND_INVERTED"/> <enum value="0x1505" name="GL_NOOP"/> <enum value="0x1506" name="GL_XOR"/> + <enum value="0x1506" name="GL_XOR_NV"/> <enum value="0x1507" name="GL_OR"/> <enum value="0x1508" name="GL_NOR"/> <enum value="0x1509" name="GL_EQUIV"/> @@ -2775,8 +2776,11 @@ typedef unsigned int GLhandleARB; <enum value="0x1902" name="GL_DEPTH_COMPONENT"/> <enum value="0x1903" name="GL_RED"/> <enum value="0x1903" name="GL_RED_EXT"/> + <enum value="0x1903" name="GL_RED_NV"/> <enum value="0x1904" name="GL_GREEN"/> + <enum value="0x1904" name="GL_GREEN_NV"/> <enum value="0x1905" name="GL_BLUE"/> + <enum value="0x1905" name="GL_BLUE_NV"/> <enum value="0x1906" name="GL_ALPHA"/> <enum value="0x1907" name="GL_RGB"/> <enum value="0x1908" name="GL_RGBA"/> @@ -38113,12 +38117,22 @@ typedef unsigned int GLhandleARB; <command name="glIsImageHandleResidentNV"/> </require> </extension> - <extension name="GL_NV_blend_equation_advanced" supported="gl"> + <extension name="GL_NV_blend_equation_advanced" supported="gl|gles2"> + <require api="gles2" comment="Really only required for ES 2.0, not ES 3.0"> + <enum name="GL_BLUE_NV"/> + <enum name="GL_GREEN_NV"/> + <enum name="GL_RED_NV"/> + <enum name="GL_XOR_NV"/> + </require> + <require api="gl" comment="GL has these enums in core"> + <enum name="GL_BLUE"/> + <enum name="GL_GREEN"/> + <enum name="GL_RED"/> + <enum name="GL_XOR"/> + </require> <require> - <enum name="GL_BLEND_ADVANCED_COHERENT_NV"/> <enum name="GL_BLEND_OVERLAP_NV"/> <enum name="GL_BLEND_PREMULTIPLIED_SRC_NV"/> - <enum name="GL_BLUE"/> <enum name="GL_COLORBURN_NV"/> <enum name="GL_COLORDODGE_NV"/> <enum name="GL_CONJOINT_NV"/> @@ -38132,7 +38146,6 @@ typedef unsigned int GLhandleARB; <enum name="GL_DST_OUT_NV"/> <enum name="GL_DST_OVER_NV"/> <enum name="GL_EXCLUSION_NV"/> - <enum name="GL_GREEN"/> <enum name="GL_HARDLIGHT_NV"/> <enum name="GL_HARDMIX_NV"/> <enum name="GL_HSL_COLOR_NV"/> @@ -38155,7 +38168,6 @@ typedef unsigned int GLhandleARB; <enum name="GL_PLUS_CLAMPED_NV"/> <enum name="GL_PLUS_DARKER_NV"/> <enum name="GL_PLUS_NV"/> - <enum name="GL_RED"/> <enum name="GL_SCREEN_NV"/> <enum name="GL_SOFTLIGHT_NV"/> <enum name="GL_SRC_ATOP_NV"/> @@ -38165,14 +38177,14 @@ typedef unsigned int GLhandleARB; <enum name="GL_SRC_OVER_NV"/> <enum name="GL_UNCORRELATED_NV"/> <enum name="GL_VIVIDLIGHT_NV"/> - <enum name="GL_XOR"/> <enum name="GL_ZERO"/> <command name="glBlendParameteriNV"/> <command name="glBlendBarrierNV"/> </require> </extension> - <extension name="GL_NV_blend_equation_advanced_coherent" supported="gl"> - <require comment="Identical to GL_NV_blend_equation_advanced, just different semantic behavior"> + <extension name="GL_NV_blend_equation_advanced_coherent" supported="gl|gles2"> + <require comment="Otherwise identical to GL_NV_blend_equation_advanced, just different semantic behavior"> + <enum name="GL_BLEND_ADVANCED_COHERENT_NV"/> </require> </extension> <extension name="GL_NV_blend_square" supported="gl"> 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__) |