Put GL errors in a separate enum.

diff --git a/glapi.py b/glapi.py
index 280aa4e3c6c87682eed45e53f722238d3a9410de..a6c81ca17de3fd8ac6212fa979f66d6b030ee0a6 100644 (file)
--- a/glapi.py
+++ b/glapi.py
@@ -140,7 +140,7 @@ glapi.add_functions([
     GlFunction(Void, "glReadPixels", [(GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLsizei, "height"), (GLenum, "format"), (GLenum, "type"), Out(OpaquePointer(GLvoid), "pixels")], sideeffects=False),
     GlFunction(Void, "glGetBooleanv", [(GLenum, "pname"), Out(Array(GLboolean, "__glGetBooleanv_size(pname)"), "params")], sideeffects=False),
     GlFunction(Void, "glGetDoublev", [(GLenum, "pname"), Out(Array(GLdouble, "__glGetDoublev_size(pname)"), "params")], sideeffects=False),
-    GlFunction(GLenum, "glGetError", [], sideeffects=False),
+    GlFunction(GLenum_error, "glGetError", [], sideeffects=False),
     GlFunction(Void, "glGetFloatv", [(GLenum, "pname"), Out(Array(GLfloat, "__glGetFloatv_size(pname)"), "params")], sideeffects=False),
     GlFunction(Void, "glGetIntegerv", [(GLenum, "pname"), Out(Array(GLint, "__glGetIntegerv_size(pname)"), "params")], sideeffects=False),
     GlFunction(Alias("const GLubyte *", CString), "glGetString", [(GLenum, "name")], sideeffects=False),

diff --git a/glenum.py b/glenum.py
index 58d82b17ce5e1819ac2b7b976d39e3f70dd935de..72e85b184bfe4b883c15ac74d315c641083b792d 100644 (file)
--- a/glenum.py
+++ b/glenum.py
@@ -36,7 +36,6 @@ from stdapi import *
 
 
 GLenum = Enum("GLenum", [
-    #"GL_NO_ERROR",                       # 0x0
     #"GL_NONE",                           # 0x0
     "GL_ZERO",                           # 0x0
     "GL_ONE",                            # 0x1
@@ -76,13 +75,6 @@ GLenum = Enum("GLenum", [
     "GL_AUX1",                           # 0x040A
     "GL_AUX2",                           # 0x040B
     "GL_AUX3",                           # 0x040C
-    "GL_INVALID_ENUM",                   # 0x0500
-    "GL_INVALID_VALUE",                  # 0x0501
-    "GL_INVALID_OPERATION",              # 0x0502
-    "GL_STACK_OVERFLOW",                 # 0x0503
-    "GL_STACK_UNDERFLOW",                # 0x0504
-    "GL_OUT_OF_MEMORY",                  # 0x0505
-    "GL_INVALID_FRAMEBUFFER_OPERATION",  # 0x0506
     "GL_2D",                             # 0x0600
     "GL_3D",                             # 0x0601
     "GL_3D_COLOR",                       # 0x0602
@@ -507,7 +499,6 @@ GLenum = Enum("GLenum", [
     "GL_MINMAX",                         # 0x802E
     "GL_MINMAX_FORMAT",                  # 0x802F
     "GL_MINMAX_SINK",                    # 0x8030
-    "GL_TABLE_TOO_LARGE",                # 0x8031
     "GL_UNSIGNED_BYTE_3_3_2",            # 0x8032
     "GL_UNSIGNED_SHORT_4_4_4_4",         # 0x8033
     "GL_UNSIGNED_SHORT_5_5_5_1",         # 0x8034
@@ -2465,6 +2456,18 @@ GLenum_mode = FakeEnum(GLenum, [
     "GL_TRIANGLE_STRIP_ADJACENCY_ARB",   # 0x000D
 ])
 
+GLenum_error = FakeEnum(GLenum, [
+    "GL_NO_ERROR",                       # 0x0
+    "GL_INVALID_ENUM",                   # 0x0500
+    "GL_INVALID_VALUE",                  # 0x0501
+    "GL_INVALID_OPERATION",              # 0x0502
+    "GL_STACK_OVERFLOW",                 # 0x0503
+    "GL_STACK_UNDERFLOW",                # 0x0504
+    "GL_OUT_OF_MEMORY",                  # 0x0505
+    "GL_INVALID_FRAMEBUFFER_OPERATION",  # 0x0506
+    "GL_TABLE_TOO_LARGE",                # 0x8031
+])
+
 GLbitfield = Alias("GLbitfield", UInt)
 
 GLbitfield_attrib = Flags(GLbitfield, [