Proposed fix for #103.
Apparently the state tokens BLEND_COLOR and BLEND_EQUATION weren't
included in the GL 1.4 core interfaces, although the corresponding entry
points were promoted from ARB_imaging to core.
diff --git a/api/GL/glcorearb.h b/api/GL/glcorearb.h
index f5d9642..a78bbb6 100755
--- a/api/GL/glcorearb.h
+++ b/api/GL/glcorearb.h
@@ -578,15 +578,17 @@
#define GL_TEXTURE_DEPTH_SIZE 0x884A
#define GL_TEXTURE_COMPARE_MODE 0x884C
#define GL_TEXTURE_COMPARE_FUNC 0x884D
-#define GL_FUNC_ADD 0x8006
-#define GL_FUNC_SUBTRACT 0x800A
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#define GL_MIN 0x8007
-#define GL_MAX 0x8008
+#define GL_BLEND_COLOR 0x8005
+#define GL_BLEND_EQUATION 0x8009
#define GL_CONSTANT_COLOR 0x8001
#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
#define GL_CONSTANT_ALPHA 0x8003
#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_FUNC_ADD 0x8006
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
@@ -3342,8 +3344,6 @@
#ifndef GL_ARB_imaging
#define GL_ARB_imaging 1
-#define GL_BLEND_COLOR 0x8005
-#define GL_BLEND_EQUATION 0x8009
#endif /* GL_ARB_imaging */
#ifndef GL_ARB_indirect_parameters
diff --git a/api/GL/glext.h b/api/GL/glext.h
index 62a52e2..b61a145 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20170910
+#define GL_GLEXT_VERSION 20170924
/* Generated C header for:
* API: gl
@@ -353,15 +353,17 @@
#define GL_TEXTURE_FILTER_CONTROL 0x8500
#define GL_DEPTH_TEXTURE_MODE 0x884B
#define GL_COMPARE_R_TO_TEXTURE 0x884E
-#define GL_FUNC_ADD 0x8006
-#define GL_FUNC_SUBTRACT 0x800A
-#define GL_FUNC_REVERSE_SUBTRACT 0x800B
-#define GL_MIN 0x8007
-#define GL_MAX 0x8008
+#define GL_BLEND_COLOR 0x8005
+#define GL_BLEND_EQUATION 0x8009
#define GL_CONSTANT_COLOR 0x8001
#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002
#define GL_CONSTANT_ALPHA 0x8003
#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004
+#define GL_FUNC_ADD 0x8006
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_FUNC_SUBTRACT 0x800A
+#define GL_MIN 0x8007
+#define GL_MAX 0x8008
typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
@@ -3504,8 +3506,6 @@
#ifndef GL_ARB_imaging
#define GL_ARB_imaging 1
-#define GL_BLEND_COLOR 0x8005
-#define GL_BLEND_EQUATION 0x8009
#define GL_CONVOLUTION_1D 0x8010
#define GL_CONVOLUTION_2D 0x8011
#define GL_SEPARABLE_2D 0x8012
diff --git a/xml/gl.xml b/xml/gl.xml
index b9aaa22..1811916 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -33191,15 +33191,17 @@
<command name="glWindowPos3sv"/>
</require>
<require comment="Promoted from ARB_imaging subset to core">
- <enum name="GL_FUNC_ADD"/>
- <enum name="GL_FUNC_SUBTRACT"/>
- <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
- <enum name="GL_MIN"/>
- <enum name="GL_MAX"/>
+ <enum name="GL_BLEND_COLOR"/>
+ <enum name="GL_BLEND_EQUATION"/>
<enum name="GL_CONSTANT_COLOR"/>
<enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
<enum name="GL_CONSTANT_ALPHA"/>
<enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
+ <enum name="GL_FUNC_ADD"/>
+ <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
+ <enum name="GL_FUNC_SUBTRACT"/>
+ <enum name="GL_MIN"/>
+ <enum name="GL_MAX"/>
<command name="glBlendColor"/>
<command name="glBlendEquation"/>
</require>
@@ -40048,17 +40050,17 @@
</extension>
<extension name="GL_ARB_imaging" supported="gl|glcore" comment="Now treating ARB_imaging as an extension, not a GL API version">
<require>
+ <enum name="GL_BLEND_COLOR"/>
+ <enum name="GL_BLEND_EQUATION"/>
<enum name="GL_CONSTANT_COLOR"/>
<enum name="GL_ONE_MINUS_CONSTANT_COLOR"/>
<enum name="GL_CONSTANT_ALPHA"/>
<enum name="GL_ONE_MINUS_CONSTANT_ALPHA"/>
- <enum name="GL_BLEND_COLOR"/>
<enum name="GL_FUNC_ADD"/>
+ <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
+ <enum name="GL_FUNC_SUBTRACT"/>
<enum name="GL_MIN"/>
<enum name="GL_MAX"/>
- <enum name="GL_BLEND_EQUATION"/>
- <enum name="GL_FUNC_SUBTRACT"/>
- <enum name="GL_FUNC_REVERSE_SUBTRACT"/>
<command name="glBlendColor"/>
<command name="glBlendEquation"/>
</require>
