Part of Big Cleanup: move data declarations out of header files.

BGL.[ch] work done by Joilnen Leite (pidhash).  Thanks!

updated 0-todo.txt.
No changes to executable code.

2 files changed, 1120 insertions, 1126 deletions

diff --git a/source/blender/python/api2_2x/BGL.c b/source/blender/python/api2_2x/BGL.c
index 32007267d67..41ce58dc634 100644
--- a/source/blender/python/api2_2x/BGL.c
+++ b/source/blender/python/api2_2x/BGL.c
@@ -38,304 +38,379 @@
 #include "BGL.h"
 
 
+static int type_size( int type );
+static Buffer *make_buffer( int type, int ndimensions, int *dimensions );
+static int Buffer_ass_slice( PyObject * self, int begin, int end,
+			     PyObject * seq );
+
+static char Method_Buffer_doc[] =
+	"(type, dimensions, [template]) - Create a new Buffer object\n\n\
+(type) - The format to store data in\n\
+(dimensions) - An int or sequence specifying the dimensions of the buffer\n\
+[template] - A sequence of matching dimensions to the buffer to be created\n\
+  which will be used to initialize the Buffer.\n\n\
+If a template is not passed in all fields will be initialized to 0.\n\n\
+The type should be one of GL_BYTE, GL_SHORT, GL_INT, or GL_FLOAT.\n\
+If the dimensions are specified as an int a linear buffer will be\n\
+created. If a sequence is passed for the dimensions the buffer\n\
+will have len(sequence) dimensions, where the size for each dimension\n\
+is determined by the value in the sequence at that index.\n\n\
+For example, passing [100, 100] will create a 2 dimensional\n\
+square buffer. Passing [16, 16, 32] will create a 3 dimensional\n\
+buffer which is twice as deep as it is wide or high.";
+
+static PyObject *Method_Buffer( PyObject * self, PyObject * args );
+
+/* Buffer sequence methods */
+
+static int Buffer_len( PyObject * self );
+static PyObject *Buffer_item( PyObject * self, int i );
+static PyObject *Buffer_slice( PyObject * self, int begin, int end );
+static int Buffer_ass_item( PyObject * self, int i, PyObject * v );
+static int Buffer_ass_slice( PyObject * self, int begin, int end,
+			     PyObject * seq );
+
+static PySequenceMethods Buffer_SeqMethods = {
+	( inquiry ) Buffer_len,	/*sq_length */
+	( binaryfunc ) 0,	/*sq_concat */
+	( intargfunc ) 0,	/*sq_repeat */
+	( intargfunc ) Buffer_item,	/*sq_item */
+	( intintargfunc ) Buffer_slice,	/*sq_slice */
+	( intobjargproc ) Buffer_ass_item,	/*sq_ass_item */
+	( intintobjargproc ) Buffer_ass_slice,	/*sq_ass_slice */
+};
+
+static void Buffer_dealloc( PyObject * self );
+static PyObject *Buffer_tolist( PyObject * self );
+static PyObject *Buffer_dimensions( PyObject * self );
+static PyObject *Buffer_getattr( PyObject * self, char *name );
+static PyObject *Buffer_repr( PyObject * self );
+
+PyTypeObject buffer_Type = {
+	PyObject_HEAD_INIT( NULL )      /* required python macro */
+	0,	/*ob_size */
+	"buffer",		/*tp_name */
+	sizeof( Buffer ),	/*tp_basicsize */
+	0,			/*tp_itemsize */
+	( destructor ) Buffer_dealloc,	/*tp_dealloc */
+	( printfunc ) 0,	/*tp_print */
+	( getattrfunc ) Buffer_getattr,	/*tp_getattr */
+	( setattrfunc ) 0,	/*tp_setattr */
+	( cmpfunc ) 0,		/*tp_compare */
+	( reprfunc ) Buffer_repr,	/*tp_repr */
+	0,			/*tp_as_number */
+	&Buffer_SeqMethods,	/*tp_as_sequence */
+};
+
+/* #ifndef __APPLE__ */
+
+#define BGL_Wrap(nargs, funcname, ret, arg_list) \
+static PyObject *Method_##funcname (PyObject *self, PyObject *args) {\
+	arg_def##nargs arg_list; \
+	ret_def_##ret; \
+	if(!PyArg_ParseTuple(args, arg_str##nargs arg_list, arg_ref##nargs arg_list)) return NULL;\
+	ret_set_##ret gl##funcname (arg_var##nargs arg_list);\
+	ret_ret_##ret; \
+}
+
+#define BGLU_Wrap(nargs, funcname, ret, arg_list) \
+static PyObject *Method_##funcname (PyObject *self, PyObject *args) {\
+	arg_def##nargs arg_list; \
+	ret_def_##ret; \
+	if(!PyArg_ParseTuple(args, arg_str##nargs arg_list, arg_ref##nargs arg_list)) return NULL;\
+	ret_set_##ret glu##funcname (arg_var##nargs arg_list);\
+	ret_ret_##ret; \
+}
+
+/* #endif */
+
+PyObject *BGL_Init( void );
+
+/********/
 static int type_size(int type)
 {
-  switch (type) {
-  case GL_BYTE: 
-    return sizeof(char);
-  case GL_SHORT: 
-    return sizeof(short);
-  case GL_INT: 
-    return sizeof(int);
-  case GL_FLOAT: 
-    return sizeof(float);
-  }
-  return -1;
+	switch (type) {
+		case GL_BYTE: 
+		  return sizeof(char);
+		case GL_SHORT: 
+		  return sizeof(short);
+		case GL_INT: 
+		  return sizeof(int);
+		case GL_FLOAT: 
+		  return sizeof(float);
+	}
+	return -1;
 }
 
 static Buffer *make_buffer(int type, int ndimensions, int *dimensions)
 {
-  Buffer *buffer;
-  void *buf= NULL;
-  int i, size, length;
+	Buffer *buffer;
+	void *buf= NULL;
+	int i, size, length;
  
-  length= 1;
-  for (i=0; i<ndimensions; i++) length*= dimensions[i];
+	length= 1;
+	for (i=0; i<ndimensions; i++) 
+		length*= dimensions[i];
  
-  size= type_size(type);
+	size= type_size(type);
  
-  buf= MEM_mallocN(length*size, "Buffer buffer");
+	buf= MEM_mallocN(length*size, "Buffer buffer");
  
-  buffer= (Buffer *) PyObject_NEW(Buffer, &buffer_Type);
-  buffer->parent= NULL;
-  buffer->ndimensions= ndimensions;
-  buffer->dimensions= dimensions;
-  buffer->type= type;
-  buffer->buf.asvoid= buf;
+	buffer= (Buffer *) PyObject_NEW(Buffer, &buffer_Type);
+	buffer->parent= NULL;
+	buffer->ndimensions= ndimensions;
+	buffer->dimensions= dimensions;
+	buffer->type= type;
+	buffer->buf.asvoid= buf;
  
-  for (i= 0; i<length; i++) {
-    if (type==GL_BYTE) 
-      buffer->buf.asbyte[i]= 0;
-
-    else if (type==GL_SHORT) 
-      buffer->buf.asshort[i]= 0;
-
-    else if (type==GL_INT) 
-      buffer->buf.asint[i]= 0;
-
-    else if (type==GL_FLOAT) 
-      buffer->buf.asfloat[i]= 0.0;
-  }
- 
-  return buffer;
+	for (i= 0; i<length; i++) {
+		if (type==GL_BYTE) 
+			buffer->buf.asbyte[i]= 0;
+		else if (type==GL_SHORT) 
+			buffer->buf.asshort[i]= 0;
+		else if (type==GL_INT) 
+			buffer->buf.asint[i]= 0;
+		else if (type==GL_FLOAT) 
+		    buffer->buf.asfloat[i]= 0.0;
+	}
+	return buffer;
 }
 
 static PyObject *Method_Buffer (PyObject *self, PyObject *args)
 {
-  PyObject *length_ob= NULL, *template= NULL;
-  Buffer *buffer;
-  
-  int i, type;
-  int *dimensions = 0, ndimensions = 0;
-  
-  if (!PyArg_ParseTuple(args, "iO|O", &type, &length_ob, &template))
-          return EXPP_ReturnPyObjError(PyExc_AttributeError,
-                          "expected an int and one or two PyObjects");
-
-  if (type!=GL_BYTE && type!=GL_SHORT && type!=GL_INT && type!=GL_FLOAT) {
-    PyErr_SetString(PyExc_AttributeError, "type");
-    return NULL;
-  }
-
-  if (PyNumber_Check(length_ob)) {
-    ndimensions= 1;
-    dimensions= MEM_mallocN(ndimensions*sizeof(int), "Buffer dimensions");
-    dimensions[0]= PyInt_AsLong(length_ob);
-
-  } else if (PySequence_Check(length_ob)) {
-    ndimensions= PySequence_Length(length_ob);
-    dimensions= MEM_mallocN(ndimensions*sizeof(int), "Buffer dimensions");
-    
-    for (i=0; i<ndimensions; i++) {
-      PyObject *ob= PySequence_GetItem(length_ob, i);
-      
-      if (!PyNumber_Check(ob)) dimensions[i]= 1;
-      else dimensions[i]= PyInt_AsLong(ob);
-      
-      Py_DECREF(ob);
-    }
-  }
-  
-  buffer= make_buffer(type, ndimensions, dimensions);
-  if (template && ndimensions) {
-    if (Buffer_ass_slice((PyObject *) buffer, 0, dimensions[0], template)) {
-      Py_DECREF(buffer);
-      return NULL;
-    }
-  }
-  
-  return (PyObject *) buffer;
+	PyObject *length_ob= NULL, *template= NULL;
+	Buffer *buffer;
+	
+	int i, type;
+	int *dimensions = 0, ndimensions = 0;
+	
+	if (!PyArg_ParseTuple(args, "iO|O", &type, &length_ob, &template))
+	        return EXPP_ReturnPyObjError(PyExc_AttributeError,
+	                        "expected an int and one or two PyObjects");
+
+	if (type!=GL_BYTE && type!=GL_SHORT && type!=GL_INT && type!=GL_FLOAT) {
+		PyErr_SetString(PyExc_AttributeError, "type");
+		return NULL;
+	}
+
+	if (PyNumber_Check(length_ob)) {
+		ndimensions= 1;
+		dimensions= MEM_mallocN(ndimensions*sizeof(int), "Buffer dimensions");
+		dimensions[0]= PyInt_AsLong(length_ob);
+	} else if (PySequence_Check(length_ob)) {
+		ndimensions= PySequence_Length(length_ob);
+		dimensions= MEM_mallocN(ndimensions*sizeof(int), "Buffer dimensions");
+		for (i=0; i<ndimensions; i++) {
+			PyObject *ob= PySequence_GetItem(length_ob, i);
+
+			if (!PyNumber_Check(ob)) dimensions[i]= 1;
+			else dimensions[i]= PyInt_AsLong(ob);
+			Py_DECREF(ob);
+		}
+	}
+	
+	buffer= make_buffer(type, ndimensions, dimensions);
+	if (template && ndimensions) {
+		if (Buffer_ass_slice((PyObject *) buffer, 0, dimensions[0], template)) {
+			Py_DECREF(buffer);
+			return NULL;
+		}
+	}
+	
+	return (PyObject *) buffer;
 }
 
 /*@ Buffer sequence methods */
 
 static int Buffer_len(PyObject *self)
 {
-  Buffer *buf= (Buffer *) self;
-  
-  return buf->dimensions[0];
+	Buffer *buf= (Buffer *) self;
+	return buf->dimensions[0];
 }
 
 static PyObject *Buffer_item(PyObject *self, int i)
 {
-  Buffer *buf= (Buffer *) self;
+	Buffer *buf= (Buffer *) self;
+
+	if (i >= buf->dimensions[0]) {
+		PyErr_SetString(PyExc_IndexError, "array index out of range");
+		return NULL;
+	}
+
+	if (buf->ndimensions==1) {
+		switch (buf->type) {
+			case GL_BYTE: return Py_BuildValue("b", buf->buf.asbyte[i]);
+			case GL_SHORT: return Py_BuildValue("h", buf->buf.asshort[i]);
+			case GL_INT: return Py_BuildValue("i", buf->buf.asint[i]);
+			case GL_FLOAT: return Py_BuildValue("f", buf->buf.asfloat[i]);
+		}
+	} else {
+		Buffer *newbuf;
+		int j, length, size;
+ 
+		length= 1;
+		for (j=1; j<buf->ndimensions; j++) {
+			length*= buf->dimensions[j];
+		}
+		size= type_size(buf->type);
 
-  if (i >= buf->dimensions[0]) {
-    PyErr_SetString(PyExc_IndexError, "array index out of range");
-    return NULL;
-  }
-  
-  if (buf->ndimensions==1) {
-    switch (buf->type) {
-    case GL_BYTE: return Py_BuildValue("b", buf->buf.asbyte[i]);
-    case GL_SHORT: return Py_BuildValue("h", buf->buf.asshort[i]);
-    case GL_INT: return Py_BuildValue("i", buf->buf.asint[i]);
-    case GL_FLOAT: return Py_BuildValue("f", buf->buf.asfloat[i]);
-    }
-  } else {
-    Buffer *newbuf;
-    int j, length, size;
-    
-    length= 1;
-    for (j=1; j<buf->ndimensions; j++) {
-      length*= buf->dimensions[j];
-    }
-    size= type_size(buf->type);
-    
-    newbuf= (Buffer *) PyObject_NEW(Buffer, &buffer_Type);
-    
-    Py_INCREF(self);
-    newbuf->parent= self;
-    
-    newbuf->ndimensions= buf->ndimensions-1;
-    newbuf->type= buf->type;
-    newbuf->buf.asvoid= buf->buf.asbyte + i*length*size;
-
-    newbuf->dimensions= MEM_mallocN(newbuf->ndimensions*sizeof(int),
-                    "Buffer dimensions");
-    memcpy(newbuf->dimensions, buf->dimensions+1,
-                    newbuf->ndimensions*sizeof(int));
+		newbuf= (Buffer *) PyObject_NEW(Buffer, &buffer_Type);
     
-    return (PyObject *) newbuf;
-  }
+		Py_INCREF(self);
+		newbuf->parent= self;
+
+		newbuf->ndimensions= buf->ndimensions-1;
+		newbuf->type= buf->type;
+		newbuf->buf.asvoid= buf->buf.asbyte + i*length*size;
+		newbuf->dimensions= MEM_mallocN(newbuf->ndimensions*sizeof(int),
+			"Buffer dimensions");
+		memcpy(newbuf->dimensions, buf->dimensions+1,
+			newbuf->ndimensions*sizeof(int));
+
+		return (PyObject *) newbuf;
+	}
   
-  return NULL;
+	return NULL;
 }
 
 static PyObject *Buffer_slice(PyObject *self, int begin, int end)
 {
-  Buffer *buf= (Buffer *) self;
-  PyObject *list;
-  int count;
-  
-  if (begin<0) begin= 0;
-  if (end>buf->dimensions[0]) end= buf->dimensions[0];
-  if (begin>end) begin= end;
-    
-  list= PyList_New(end-begin);
-
-  for (count= begin; count<end; count++)
-    PyList_SetItem(list, count-begin, Buffer_item(self, count));
-  
-  return list;
+	Buffer *buf= (Buffer *) self;
+	PyObject *list;
+	int count;
+	
+	if (begin<0) begin= 0;
+	if (end>buf->dimensions[0]) 
+		end= buf->dimensions[0];
+	if (begin>end) begin= end;
+	  
+	list= PyList_New(end-begin);
+
+	for (count= begin; count<end; count++)
+		PyList_SetItem(list, count-begin, Buffer_item(self, count));
+	
+	return list;
 }
 
 static int Buffer_ass_item(PyObject *self, int i, PyObject *v)
 {
-  Buffer *buf= (Buffer *) self;
-  
-  if (i >= buf->dimensions[0]) {
-    PyErr_SetString(PyExc_IndexError, "array assignment index out of range");
-    return -1;
-  }
-  
-  if (buf->ndimensions!=1) {
-    PyObject *row= Buffer_item(self, i);
-    int ret;
-    
-    if (!row) return -1;
-
-    ret= Buffer_ass_slice(row, 0, buf->dimensions[1], v);
-    Py_DECREF(row);
-    
-    return ret;
-  }
-
-  if (buf->type==GL_BYTE) {
-    if (!PyArg_Parse(v, "b;Coordinates must be ints", &buf->buf.asbyte[i]))
-      return -1;
-    
-  } else if (buf->type==GL_SHORT) {
-    if (!PyArg_Parse(v, "h;Coordinates must be ints", &buf->buf.asshort[i]))
-      return -1;
-    
-  } else if (buf->type==GL_INT) {
-    if (!PyArg_Parse(v, "i;Coordinates must be ints", &buf->buf.asint[i]))
-      return -1;
-    
-  } else if (buf->type==GL_FLOAT) {
-    if (!PyArg_Parse(v, "f;Coordinates must be floats", &buf->buf.asfloat[i]))
-      return -1;
-  }
-  
-  return 0;
+	Buffer *buf= (Buffer *) self;
+	
+	if (i >= buf->dimensions[0]) {
+		PyErr_SetString(PyExc_IndexError, "array assignment index out of range");
+		return -1;
+	}
+	
+	if (buf->ndimensions!=1) {
+		PyObject *row= Buffer_item(self, i);
+		int ret;
+
+		if (!row) return -1;
+		ret= Buffer_ass_slice(row, 0, buf->dimensions[1], v);
+		Py_DECREF(row);
+		return ret;
+	}
+
+	if (buf->type==GL_BYTE) {
+		if (!PyArg_Parse(v, "b;Coordinates must be ints", &buf->buf.asbyte[i]))
+		return -1;
+	} else if (buf->type==GL_SHORT) {
+		if (!PyArg_Parse(v, "h;Coordinates must be ints", &buf->buf.asshort[i]))
+			return -1;
+	  
+	} else if (buf->type==GL_INT) {
+		if (!PyArg_Parse(v, "i;Coordinates must be ints", &buf->buf.asint[i]))
+			return -1;
+	} else if (buf->type==GL_FLOAT) {
+		if (!PyArg_Parse(v, "f;Coordinates must be floats", &buf->buf.asfloat[i]))
+			return -1;
+	}
+	return 0;
 }
 
 static int Buffer_ass_slice(PyObject *self, int begin, int end, PyObject *seq)
 {
-  Buffer *buf= (Buffer *) self;
-  PyObject *item;
-  int count, err=0;
-  
-  if (begin<0) begin= 0;
-  if (end>buf->dimensions[0]) end= buf->dimensions[0];
-  if (begin>end) begin= end;
-  
-  if (!PySequence_Check(seq)) {
-    PyErr_SetString(PyExc_TypeError,
-                    "illegal argument type for built-in operation");
-    return -1;
-  }
-  
-  if (PySequence_Length(seq)!=(end-begin)) {
-    PyErr_SetString(PyExc_TypeError, "size mismatch in assignment");
-    return -1;
-  }
-  
-  for (count= begin; count<end; count++) {
-    item= PySequence_GetItem(seq, count-begin);
-    err= Buffer_ass_item(self, count, item);
-    Py_DECREF(item);
-    
-    if (err) break;
-  }
-
-  return err;
+	Buffer *buf= (Buffer *) self;
+	PyObject *item;
+	int count, err=0;
+	
+	if (begin<0) begin= 0;
+	if (end>buf->dimensions[0]) end= buf->dimensions[0];
+	if (begin>end) begin= end;
+	
+	if (!PySequence_Check(seq)) {
+		PyErr_SetString(PyExc_TypeError,
+			"illegal argument type for built-in operation");
+		return -1;
+	}
+
+	if (PySequence_Length(seq)!=(end-begin)) {
+		PyErr_SetString(PyExc_TypeError, "size mismatch in assignment");
+		return -1;
+	}
+	
+	for (count= begin; count<end; count++) {
+		item= PySequence_GetItem(seq, count-begin);
+		err= Buffer_ass_item(self, count, item);
+		Py_DECREF(item);
+		if (err) break;
+	}
+	return err;
 }
 
 static void Buffer_dealloc(PyObject *self)
 {
-  Buffer *buf = (Buffer *)self;
+	Buffer *buf = (Buffer *)self;
 
-  if (buf->parent) Py_DECREF (buf->parent);
-  else MEM_freeN (buf->buf.asvoid);
+	if (buf->parent) Py_DECREF (buf->parent);
+	else MEM_freeN (buf->buf.asvoid);
 
-  MEM_freeN (buf->dimensions);
-  
-  PyObject_DEL (self);
+	MEM_freeN (buf->dimensions);
+	
+	PyObject_DEL (self);
 }
 
 static PyObject *Buffer_tolist(PyObject *self)
 {
-  int i, len= ((Buffer *)self)->dimensions[0];
-  PyObject *list= PyList_New(len);
-  
-  for (i=0; i<len; i++) {
-    PyList_SetItem(list, i, Buffer_item(self, i));
-  }
-  
-  return list;
+	int i, len= ((Buffer *)self)->dimensions[0];
+	PyObject *list= PyList_New(len);
+	
+	for (i=0; i<len; i++) {
+	  PyList_SetItem(list, i, Buffer_item(self, i));
+	}
+	
+	return list;
 }
 
 static PyObject *Buffer_dimensions(PyObject *self)
 {
-  Buffer *buffer= (Buffer *) self;
-  PyObject *list= PyList_New(buffer->ndimensions);
-  int i;
-    
-  for (i= 0; i<buffer->ndimensions; i++) {
-    PyList_SetItem(list, i, PyInt_FromLong(buffer->dimensions[i]));
-  }
-  
-  return list;
+	Buffer *buffer= (Buffer *) self;
+	PyObject *list= PyList_New(buffer->ndimensions);
+	int i;
+	  
+	for (i= 0; i<buffer->ndimensions; i++) {
+	  PyList_SetItem(list, i, PyInt_FromLong(buffer->dimensions[i]));
+	}
+	
+	return list;
 }
 
 static PyObject *Buffer_getattr(PyObject *self, char *name)
 {
-  if (strcmp(name, "list")==0) return Buffer_tolist(self);
-  else if (strcmp(name, "dimensions")==0) return Buffer_dimensions(self);
-  
-  PyErr_SetString(PyExc_AttributeError, name);
-  return NULL;
+	if (strcmp(name, "list")==0) return Buffer_tolist(self);
+	else if (strcmp(name, "dimensions")==0) return Buffer_dimensions(self);
+	
+	PyErr_SetString(PyExc_AttributeError, name);
+	return NULL;
 }
 
 static PyObject *Buffer_repr(PyObject *self)
 {
-  PyObject *list= Buffer_tolist(self);
-  PyObject *repr= PyObject_Repr(list);
-  Py_DECREF(list);
-  
-  return repr;
+	PyObject *list= Buffer_tolist(self);
+	PyObject *repr= PyObject_Repr(list);
+	Py_DECREF(list);
+	
+	return repr;
 }
 
 /* BGL_Wrap defined in BGL.h */
@@ -686,337 +761,335 @@ static struct PyMethodDef BGL_methods[] = {
   {"Buffer", Method_Buffer, METH_VARARGS, Method_Buffer_doc}, 
 
 /* #ifndef __APPLE__ */
-
 	MethodDef(Accum),
-  MethodDef(AlphaFunc),
-  MethodDef(AreTexturesResident), 
-  MethodDef(Begin),
-  MethodDef(BindTexture), 
-  MethodDef(Bitmap),
-  MethodDef(BlendFunc),
-  MethodDef(CallList),
-  MethodDef(CallLists),
-  MethodDef(Clear),
-  MethodDef(ClearAccum),
-  MethodDef(ClearColor),
-  MethodDef(ClearDepth),
-  MethodDef(ClearIndex),
-  MethodDef(ClearStencil),
-  MethodDef(ClipPlane),
-  MethodDef(Color3b),
-  MethodDef(Color3bv),
-  MethodDef(Color3d),
-  MethodDef(Color3dv),
-  MethodDef(Color3f),
-  MethodDef(Color3fv),
-  MethodDef(Color3i),
-  MethodDef(Color3iv),
-  MethodDef(Color3s),
-  MethodDef(Color3sv),
-  MethodDef(Color3ub),
-  MethodDef(Color3ubv),
-  MethodDef(Color3ui),
-  MethodDef(Color3uiv),
-  MethodDef(Color3us),
-  MethodDef(Color3usv),
-  MethodDef(Color4b),
-  MethodDef(Color4bv),
-  MethodDef(Color4d),
-  MethodDef(Color4dv),
-  MethodDef(Color4f),
-  MethodDef(Color4fv),
-  MethodDef(Color4i),
-  MethodDef(Color4iv),
-  MethodDef(Color4s),
-  MethodDef(Color4sv),
-  MethodDef(Color4ub),
-  MethodDef(Color4ubv),
-  MethodDef(Color4ui),
-  MethodDef(Color4uiv),
-  MethodDef(Color4us),
-  MethodDef(Color4usv),
-  MethodDef(ColorMask),
-  MethodDef(ColorMaterial),
-  MethodDef(CopyPixels),
-  MethodDef(CullFace),
-  MethodDef(DeleteLists),
-  MethodDef(DeleteTextures),
-  MethodDef(DepthFunc),
-  MethodDef(DepthMask),
-  MethodDef(DepthRange),
-  MethodDef(Disable),
-  MethodDef(DrawBuffer),
-  MethodDef(DrawPixels),
-  MethodDef(EdgeFlag),
-  MethodDef(EdgeFlagv),
-  MethodDef(Enable),
-  MethodDef(End),
-  MethodDef(EndList),
-  MethodDef(EvalCoord1d),
-  MethodDef(EvalCoord1dv),
-  MethodDef(EvalCoord1f),
-  MethodDef(EvalCoord1fv),
-  MethodDef(EvalCoord2d),
-  MethodDef(EvalCoord2dv),
-  MethodDef(EvalCoord2f),
-  MethodDef(EvalCoord2fv),
-  MethodDef(EvalMesh1),
-  MethodDef(EvalMesh2),
-  MethodDef(EvalPoint1),
-  MethodDef(EvalPoint2),
-  MethodDef(FeedbackBuffer),
-  MethodDef(Finish),
-  MethodDef(Flush),
-  MethodDef(Fogf),
-  MethodDef(Fogfv),
-  MethodDef(Fogi),
-  MethodDef(Fogiv),
-  MethodDef(FrontFace),
-  MethodDef(Frustum),
-  MethodDef(GenLists),
-  MethodDef(GenTextures), 
-  MethodDef(GetBooleanv),
-  MethodDef(GetClipPlane),
-  MethodDef(GetDoublev),
-  MethodDef(GetError),
-  MethodDef(GetFloatv),
-  MethodDef(GetIntegerv),
-  MethodDef(GetLightfv),
-  MethodDef(GetLightiv),
-  MethodDef(GetMapdv),
-  MethodDef(GetMapfv),
-  MethodDef(GetMapiv),
-  MethodDef(GetMaterialfv),
-  MethodDef(GetMaterialiv),
-  MethodDef(GetPixelMapfv),
-  MethodDef(GetPixelMapuiv),
-  MethodDef(GetPixelMapusv),
-  MethodDef(GetPolygonStipple),
-  MethodDef(GetString),
-  MethodDef(GetTexEnvfv),
-  MethodDef(GetTexEnviv),
-  MethodDef(GetTexGendv),
-  MethodDef(GetTexGenfv),
-  MethodDef(GetTexGeniv),
-  MethodDef(GetTexImage),
-  MethodDef(GetTexLevelParameterfv),
-  MethodDef(GetTexLevelParameteriv),
-  MethodDef(GetTexParameterfv),
-  MethodDef(GetTexParameteriv),
-  MethodDef(Hint),
-  MethodDef(IndexMask),
-  MethodDef(Indexd),
-  MethodDef(Indexdv),
-  MethodDef(Indexf),
-  MethodDef(Indexfv),
-  MethodDef(Indexi),
-  MethodDef(Indexiv),
-  MethodDef(Indexs),
-  MethodDef(Indexsv),
-  MethodDef(InitNames),
-  MethodDef(IsEnabled),
-  MethodDef(IsList),
-  MethodDef(IsTexture), 
-  MethodDef(LightModelf),
-  MethodDef(LightModelfv),
-  MethodDef(LightModeli),
-  MethodDef(LightModeliv),
-  MethodDef(Lightf),
-  MethodDef(Lightfv),
-  MethodDef(Lighti),
-  MethodDef(Lightiv),
-  MethodDef(LineStipple),
-  MethodDef(LineWidth),
-  MethodDef(ListBase),
-  MethodDef(LoadIdentity),
-  MethodDef(LoadMatrixd),
-  MethodDef(LoadMatrixf),
-  MethodDef(LoadName),
-  MethodDef(LogicOp),
-  MethodDef(Map1d),
-  MethodDef(Map1f),
-  MethodDef(Map2d),
-  MethodDef(Map2f),
-  MethodDef(MapGrid1d),
-  MethodDef(MapGrid1f),
-  MethodDef(MapGrid2d),
-  MethodDef(MapGrid2f),
-  MethodDef(Materialf),
-  MethodDef(Materialfv),
-  MethodDef(Materiali),
-  MethodDef(Materialiv),
-  MethodDef(MatrixMode),
-  MethodDef(MultMatrixd),
-  MethodDef(MultMatrixf),
-  MethodDef(NewList),
-  MethodDef(Normal3b),
-  MethodDef(Normal3bv),
-  MethodDef(Normal3d),
-  MethodDef(Normal3dv),
-  MethodDef(Normal3f),
-  MethodDef(Normal3fv),
-  MethodDef(Normal3i),
-  MethodDef(Normal3iv),
-  MethodDef(Normal3s),
-  MethodDef(Normal3sv),
-  MethodDef(Ortho),
-  MethodDef(PassThrough),
-  MethodDef(PixelMapfv),
-  MethodDef(PixelMapuiv),
-  MethodDef(PixelMapusv),
-  MethodDef(PixelStoref),
-  MethodDef(PixelStorei),
-  MethodDef(PixelTransferf),
-  MethodDef(PixelTransferi),
-  MethodDef(PixelZoom),
-  MethodDef(PointSize),
-  MethodDef(PolygonMode),
-  MethodDef(PolygonOffset),
-  MethodDef(PolygonStipple),
-  MethodDef(PopAttrib),
-  MethodDef(PopMatrix),
-  MethodDef(PopName),
-  MethodDef(PrioritizeTextures), 
-  MethodDef(PushAttrib),
-  MethodDef(PushMatrix),
-  MethodDef(PushName),
-  MethodDef(RasterPos2d),
-  MethodDef(RasterPos2dv),
-  MethodDef(RasterPos2f),
-  MethodDef(RasterPos2fv),
-  MethodDef(RasterPos2i),
-  MethodDef(RasterPos2iv),
-  MethodDef(RasterPos2s),
-  MethodDef(RasterPos2sv),
-  MethodDef(RasterPos3d),
-  MethodDef(RasterPos3dv),
-  MethodDef(RasterPos3f),
-  MethodDef(RasterPos3fv),
-  MethodDef(RasterPos3i),
-  MethodDef(RasterPos3iv),
-  MethodDef(RasterPos3s),
-  MethodDef(RasterPos3sv),
-  MethodDef(RasterPos4d),
-  MethodDef(RasterPos4dv),
-  MethodDef(RasterPos4f),
-  MethodDef(RasterPos4fv),
-  MethodDef(RasterPos4i),
-  MethodDef(RasterPos4iv),
-  MethodDef(RasterPos4s),
-  MethodDef(RasterPos4sv),
-  MethodDef(ReadBuffer),
-  MethodDef(ReadPixels),
-  MethodDef(Rectd),
-  MethodDef(Rectdv),
-  MethodDef(Rectf),
-  MethodDef(Rectfv),
-  MethodDef(Recti),
-  MethodDef(Rectiv),
-  MethodDef(Rects),
-  MethodDef(Rectsv),
-  MethodDef(RenderMode),
-  MethodDef(Rotated),
-  MethodDef(Rotatef),
-  MethodDef(Scaled),
-  MethodDef(Scalef),
-  MethodDef(Scissor),
-  MethodDef(SelectBuffer),
-  MethodDef(ShadeModel),
-  MethodDef(StencilFunc),
-  MethodDef(StencilMask),
-  MethodDef(StencilOp),
-  MethodDef(TexCoord1d),
-  MethodDef(TexCoord1dv),
-  MethodDef(TexCoord1f),
-  MethodDef(TexCoord1fv),
-  MethodDef(TexCoord1i),
-  MethodDef(TexCoord1iv),
-  MethodDef(TexCoord1s),
-  MethodDef(TexCoord1sv),
-  MethodDef(TexCoord2d),
-  MethodDef(TexCoord2dv),
-  MethodDef(TexCoord2f),
-  MethodDef(TexCoord2fv),
-  MethodDef(TexCoord2i),
-  MethodDef(TexCoord2iv),
-  MethodDef(TexCoord2s),
-  MethodDef(TexCoord2sv),
-  MethodDef(TexCoord3d),
-  MethodDef(TexCoord3dv),
-  MethodDef(TexCoord3f),
-  MethodDef(TexCoord3fv),
-  MethodDef(TexCoord3i),
-  MethodDef(TexCoord3iv),
-  MethodDef(TexCoord3s),
-  MethodDef(TexCoord3sv),
-  MethodDef(TexCoord4d),
-  MethodDef(TexCoord4dv),
-  MethodDef(TexCoord4f),
-  MethodDef(TexCoord4fv),
-  MethodDef(TexCoord4i),
-  MethodDef(TexCoord4iv),
-  MethodDef(TexCoord4s),
-  MethodDef(TexCoord4sv),
-  MethodDef(TexEnvf),
-  MethodDef(TexEnvfv),
-  MethodDef(TexEnvi),
-  MethodDef(TexEnviv),
-  MethodDef(TexGend),
-  MethodDef(TexGendv),
-  MethodDef(TexGenf),
-  MethodDef(TexGenfv),
-  MethodDef(TexGeni),
-  MethodDef(TexGeniv),
-  MethodDef(TexImage1D),
-  MethodDef(TexImage2D),
-  MethodDef(TexParameterf),
-  MethodDef(TexParameterfv),
-  MethodDef(TexParameteri),
-  MethodDef(TexParameteriv),
-  MethodDef(Translated),
-  MethodDef(Translatef),
-  MethodDef(Vertex2d),
-  MethodDef(Vertex2dv),
-  MethodDef(Vertex2f),
-  MethodDef(Vertex2fv),
-  MethodDef(Vertex2i),
-  MethodDef(Vertex2iv),
-  MethodDef(Vertex2s),
-  MethodDef(Vertex2sv),
-  MethodDef(Vertex3d),
-  MethodDef(Vertex3dv),
-  MethodDef(Vertex3f),
-  MethodDef(Vertex3fv),
-  MethodDef(Vertex3i),
-  MethodDef(Vertex3iv),
-  MethodDef(Vertex3s),
-  MethodDef(Vertex3sv),
-  MethodDef(Vertex4d),
-  MethodDef(Vertex4dv),
-  MethodDef(Vertex4f),
-  MethodDef(Vertex4fv),
-  MethodDef(Vertex4i),
-  MethodDef(Vertex4iv),
-  MethodDef(Vertex4s),
-  MethodDef(Vertex4sv),
-  MethodDef(Viewport),
-  MethodDefu(Perspective),
-  MethodDefu(LookAt),
-  MethodDefu(Ortho2D),
-  MethodDefu(PickMatrix),
-  MethodDefu(Project),
-  MethodDefu(UnProject),
+	MethodDef(AlphaFunc),
+	MethodDef(AreTexturesResident), 
+	MethodDef(Begin),
+	MethodDef(BindTexture), 
+	MethodDef(Bitmap),
+	MethodDef(BlendFunc),
+	MethodDef(CallList),
+	MethodDef(CallLists),
+	MethodDef(Clear),
+	MethodDef(ClearAccum),
+	MethodDef(ClearColor),
+	MethodDef(ClearDepth),
+	MethodDef(ClearIndex),
+	MethodDef(ClearStencil),
+	MethodDef(ClipPlane),
+	MethodDef(Color3b),
+	MethodDef(Color3bv),
+	MethodDef(Color3d),
+	MethodDef(Color3dv),
+	MethodDef(Color3f),
+	MethodDef(Color3fv),
+	MethodDef(Color3i),
+	MethodDef(Color3iv),
+	MethodDef(Color3s),
+	MethodDef(Color3sv),
+	MethodDef(Color3ub),
+	MethodDef(Color3ubv),
+	MethodDef(Color3ui),
+	MethodDef(Color3uiv),
+	MethodDef(Color3us),
+	MethodDef(Color3usv),
+	MethodDef(Color4b),
+	MethodDef(Color4bv),
+	MethodDef(Color4d),
+	MethodDef(Color4dv),
+	MethodDef(Color4f),
+	MethodDef(Color4fv),
+	MethodDef(Color4i),
+	MethodDef(Color4iv),
+	MethodDef(Color4s),
+	MethodDef(Color4sv),
+	MethodDef(Color4ub),
+	MethodDef(Color4ubv),
+	MethodDef(Color4ui),
+	MethodDef(Color4uiv),
+	MethodDef(Color4us),
+	MethodDef(Color4usv),
+	MethodDef(ColorMask),
+	MethodDef(ColorMaterial),
+	MethodDef(CopyPixels),
+	MethodDef(CullFace),
+	MethodDef(DeleteLists),
+	MethodDef(DeleteTextures),
+	MethodDef(DepthFunc),
+	MethodDef(DepthMask),
+	MethodDef(DepthRange),
+	MethodDef(Disable),
+	MethodDef(DrawBuffer),
+	MethodDef(DrawPixels),
+	MethodDef(EdgeFlag),
+	MethodDef(EdgeFlagv),
+	MethodDef(Enable),
+	MethodDef(End),
+	MethodDef(EndList),
+	MethodDef(EvalCoord1d),
+	MethodDef(EvalCoord1dv),
+	MethodDef(EvalCoord1f),
+	MethodDef(EvalCoord1fv),
+	MethodDef(EvalCoord2d),
+	MethodDef(EvalCoord2dv),
+	MethodDef(EvalCoord2f),
+	MethodDef(EvalCoord2fv),
+	MethodDef(EvalMesh1),
+	MethodDef(EvalMesh2),
+	MethodDef(EvalPoint1),
+	MethodDef(EvalPoint2),
+	MethodDef(FeedbackBuffer),
+	MethodDef(Finish),
+	MethodDef(Flush),
+	MethodDef(Fogf),
+	MethodDef(Fogfv),
+	MethodDef(Fogi),
+	MethodDef(Fogiv),
+	MethodDef(FrontFace),
+	MethodDef(Frustum),
+	MethodDef(GenLists),
+	MethodDef(GenTextures), 
+	MethodDef(GetBooleanv),
+	MethodDef(GetClipPlane),
+	MethodDef(GetDoublev),
+	MethodDef(GetError),
+	MethodDef(GetFloatv),
+	MethodDef(GetIntegerv),
+	MethodDef(GetLightfv),
+	MethodDef(GetLightiv),
+	MethodDef(GetMapdv),
+	MethodDef(GetMapfv),
+	MethodDef(GetMapiv),
+	MethodDef(GetMaterialfv),
+	MethodDef(GetMaterialiv),
+	MethodDef(GetPixelMapfv),
+	MethodDef(GetPixelMapuiv),
+	MethodDef(GetPixelMapusv),
+	MethodDef(GetPolygonStipple),
+	MethodDef(GetString),
+	MethodDef(GetTexEnvfv),
+	MethodDef(GetTexEnviv),
+	MethodDef(GetTexGendv),
+	MethodDef(GetTexGenfv),
+	MethodDef(GetTexGeniv),
+	MethodDef(GetTexImage),
+	MethodDef(GetTexLevelParameterfv),
+	MethodDef(GetTexLevelParameteriv),
+	MethodDef(GetTexParameterfv),
+	MethodDef(GetTexParameteriv),
+	MethodDef(Hint),
+	MethodDef(IndexMask),
+	MethodDef(Indexd),
+	MethodDef(Indexdv),
+	MethodDef(Indexf),
+	MethodDef(Indexfv),
+	MethodDef(Indexi),
+	MethodDef(Indexiv),
+	MethodDef(Indexs),
+	MethodDef(Indexsv),
+	MethodDef(InitNames),
+	MethodDef(IsEnabled),
+	MethodDef(IsList),
+	MethodDef(IsTexture), 
+	MethodDef(LightModelf),
+	MethodDef(LightModelfv),
+	MethodDef(LightModeli),
+	MethodDef(LightModeliv),
+	MethodDef(Lightf),
+	MethodDef(Lightfv),
+	MethodDef(Lighti),
+	MethodDef(Lightiv),
+	MethodDef(LineStipple),
+	MethodDef(LineWidth),
+	MethodDef(ListBase),
+	MethodDef(LoadIdentity),
+	MethodDef(LoadMatrixd),
+	MethodDef(LoadMatrixf),
+	MethodDef(LoadName),
+	MethodDef(LogicOp),
+	MethodDef(Map1d),
+	MethodDef(Map1f),
+	MethodDef(Map2d),
+	MethodDef(Map2f),
+	MethodDef(MapGrid1d),
+	MethodDef(MapGrid1f),
+	MethodDef(MapGrid2d),
+	MethodDef(MapGrid2f),
+	MethodDef(Materialf),
+	MethodDef(Materialfv),
+	MethodDef(Materiali),
+	MethodDef(Materialiv),
+	MethodDef(MatrixMode),
+	MethodDef(MultMatrixd),
+	MethodDef(MultMatrixf),
+	MethodDef(NewList),
+	MethodDef(Normal3b),
+	MethodDef(Normal3bv),
+	MethodDef(Normal3d),
+	MethodDef(Normal3dv),
+	MethodDef(Normal3f),
+	MethodDef(Normal3fv),
+	MethodDef(Normal3i),
+	MethodDef(Normal3iv),
+	MethodDef(Normal3s),
+	MethodDef(Normal3sv),
+	MethodDef(Ortho),
+	MethodDef(PassThrough),
+	MethodDef(PixelMapfv),
+	MethodDef(PixelMapuiv),
+	MethodDef(PixelMapusv),
+	MethodDef(PixelStoref),
+	MethodDef(PixelStorei),
+	MethodDef(PixelTransferf),
+	MethodDef(PixelTransferi),
+	MethodDef(PixelZoom),
+	MethodDef(PointSize),
+	MethodDef(PolygonMode),
+	MethodDef(PolygonOffset),
+	MethodDef(PolygonStipple),
+	MethodDef(PopAttrib),
+	MethodDef(PopMatrix),
+	MethodDef(PopName),
+	MethodDef(PrioritizeTextures), 
+	MethodDef(PushAttrib),
+	MethodDef(PushMatrix),
+	MethodDef(PushName),
+	MethodDef(RasterPos2d),
+	MethodDef(RasterPos2dv),
+	MethodDef(RasterPos2f),
+	MethodDef(RasterPos2fv),
+	MethodDef(RasterPos2i),
+	MethodDef(RasterPos2iv),
+	MethodDef(RasterPos2s),
+	MethodDef(RasterPos2sv),
+	MethodDef(RasterPos3d),
+	MethodDef(RasterPos3dv),
+	MethodDef(RasterPos3f),
+	MethodDef(RasterPos3fv),
+	MethodDef(RasterPos3i),
+	MethodDef(RasterPos3iv),
+	MethodDef(RasterPos3s),
+	MethodDef(RasterPos3sv),
+	MethodDef(RasterPos4d),
+	MethodDef(RasterPos4dv),
+	MethodDef(RasterPos4f),
+	MethodDef(RasterPos4fv),
+	MethodDef(RasterPos4i),
+	MethodDef(RasterPos4iv),
+	MethodDef(RasterPos4s),
+	MethodDef(RasterPos4sv),
+	MethodDef(ReadBuffer),
+	MethodDef(ReadPixels),
+	MethodDef(Rectd),
+	MethodDef(Rectdv),
+	MethodDef(Rectf),
+	MethodDef(Rectfv),
+	MethodDef(Recti),
+	MethodDef(Rectiv),
+	MethodDef(Rects),
+	MethodDef(Rectsv),
+	MethodDef(RenderMode),
+	MethodDef(Rotated),
+	MethodDef(Rotatef),
+	MethodDef(Scaled),
+	MethodDef(Scalef),
+	MethodDef(Scissor),
+	MethodDef(SelectBuffer),
+	MethodDef(ShadeModel),
+	MethodDef(StencilFunc),
+	MethodDef(StencilMask),
+	MethodDef(StencilOp),
+	MethodDef(TexCoord1d),
+	MethodDef(TexCoord1dv),
+	MethodDef(TexCoord1f),
+	MethodDef(TexCoord1fv),
+	MethodDef(TexCoord1i),
+	MethodDef(TexCoord1iv),
+	MethodDef(TexCoord1s),
+	MethodDef(TexCoord1sv),
+	MethodDef(TexCoord2d),
+	MethodDef(TexCoord2dv),
+	MethodDef(TexCoord2f),
+	MethodDef(TexCoord2fv),
+	MethodDef(TexCoord2i),
+	MethodDef(TexCoord2iv),
+	MethodDef(TexCoord2s),
+	MethodDef(TexCoord2sv),
+	MethodDef(TexCoord3d),
+	MethodDef(TexCoord3dv),
+	MethodDef(TexCoord3f),
+	MethodDef(TexCoord3fv),
+	MethodDef(TexCoord3i),
+	MethodDef(TexCoord3iv),
+	MethodDef(TexCoord3s),
+	MethodDef(TexCoord3sv),
+	MethodDef(TexCoord4d),
+	MethodDef(TexCoord4dv),
+	MethodDef(TexCoord4f),
+	MethodDef(TexCoord4fv),
+	MethodDef(TexCoord4i),
+	MethodDef(TexCoord4iv),
+	MethodDef(TexCoord4s),
+	MethodDef(TexCoord4sv),
+	MethodDef(TexEnvf),
+	MethodDef(TexEnvfv),
+	MethodDef(TexEnvi),
+	MethodDef(TexEnviv),
+	MethodDef(TexGend),
+	MethodDef(TexGendv),
+	MethodDef(TexGenf),
+	MethodDef(TexGenfv),
+	MethodDef(TexGeni),
+	MethodDef(TexGeniv),
+	MethodDef(TexImage1D),
+	MethodDef(TexImage2D),
+	MethodDef(TexParameterf),
+	MethodDef(TexParameterfv),
+	MethodDef(TexParameteri),
+	MethodDef(TexParameteriv),
+	MethodDef(Translated),
+	MethodDef(Translatef),
+	MethodDef(Vertex2d),
+	MethodDef(Vertex2dv),
+	MethodDef(Vertex2f),
+	MethodDef(Vertex2fv),
+	MethodDef(Vertex2i),
+	MethodDef(Vertex2iv),
+	MethodDef(Vertex2s),
+	MethodDef(Vertex2sv),
+	MethodDef(Vertex3d),
+	MethodDef(Vertex3dv),
+	MethodDef(Vertex3f),
+	MethodDef(Vertex3fv),
+	MethodDef(Vertex3i),
+	MethodDef(Vertex3iv),
+	MethodDef(Vertex3s),
+	MethodDef(Vertex3sv),
+	MethodDef(Vertex4d),
+	MethodDef(Vertex4dv),
+	MethodDef(Vertex4f),
+	MethodDef(Vertex4fv),
+	MethodDef(Vertex4i),
+	MethodDef(Vertex4iv),
+	MethodDef(Vertex4s),
+	MethodDef(Vertex4sv),
+	MethodDef(Viewport),
+	MethodDefu(Perspective),
+	MethodDefu(LookAt),
+	MethodDefu(Ortho2D),
+	MethodDefu(PickMatrix),
+	MethodDefu(Project),
+	MethodDefu(UnProject),
 /* #endif */
-
-  {NULL, NULL, 0, NULL}
+	{NULL, NULL, 0, NULL}
 };
 
 PyObject *BGL_Init(void) 
 {
-  PyObject *mod= Py_InitModule("Blender.BGL", BGL_methods);
-  PyObject *dict= PyModule_GetDict(mod);
+	PyObject *mod= Py_InitModule("Blender.BGL", BGL_methods);
+	PyObject *dict= PyModule_GetDict(mod);
 
-  buffer_Type.ob_type = &PyType_Type;
+	buffer_Type.ob_type = &PyType_Type;
 
 #define EXPP_ADDCONST(x) PyDict_SetItemString(dict, #x, PyInt_FromLong(x))
 
@@ -1024,484 +1097,484 @@ PyObject *BGL_Init(void)
  * EXPP_ADDCONST(GL_CURRENT_BIT) becomes
  * PyDict_SetItemString(dict, "GL_CURRENT_BIT", PyInt_FromLong(GL_CURRENT_BIT)) */
 
-  EXPP_ADDCONST(GL_CURRENT_BIT);
-  EXPP_ADDCONST(GL_POINT_BIT);
-  EXPP_ADDCONST(GL_LINE_BIT);
-  EXPP_ADDCONST(GL_POLYGON_BIT);
-  EXPP_ADDCONST(GL_POLYGON_STIPPLE_BIT);
-  EXPP_ADDCONST(GL_PIXEL_MODE_BIT);
-  EXPP_ADDCONST(GL_LIGHTING_BIT);
-  EXPP_ADDCONST(GL_FOG_BIT);
-  EXPP_ADDCONST(GL_DEPTH_BUFFER_BIT);
-  EXPP_ADDCONST(GL_ACCUM_BUFFER_BIT);
-  EXPP_ADDCONST(GL_STENCIL_BUFFER_BIT);
-  EXPP_ADDCONST(GL_VIEWPORT_BIT);
-  EXPP_ADDCONST(GL_TRANSFORM_BIT);
-  EXPP_ADDCONST(GL_ENABLE_BIT);
-  EXPP_ADDCONST(GL_COLOR_BUFFER_BIT);
-  EXPP_ADDCONST(GL_HINT_BIT);
-  EXPP_ADDCONST(GL_EVAL_BIT);
-  EXPP_ADDCONST(GL_LIST_BIT);
-  EXPP_ADDCONST(GL_TEXTURE_BIT);
-  EXPP_ADDCONST(GL_SCISSOR_BIT);
-  EXPP_ADDCONST(GL_ALL_ATTRIB_BITS);
-
-  EXPP_ADDCONST(GL_FALSE);
-  EXPP_ADDCONST(GL_TRUE);
-
-  EXPP_ADDCONST(GL_POINTS);
-  EXPP_ADDCONST(GL_LINES);
-  EXPP_ADDCONST(GL_LINE_LOOP);
-  EXPP_ADDCONST(GL_LINE_STRIP);
-  EXPP_ADDCONST(GL_TRIANGLES);
-  EXPP_ADDCONST(GL_TRIANGLE_STRIP);
-  EXPP_ADDCONST(GL_TRIANGLE_FAN);
-  EXPP_ADDCONST(GL_QUADS);
-  EXPP_ADDCONST(GL_QUAD_STRIP);
-  EXPP_ADDCONST(GL_POLYGON);
-
-  EXPP_ADDCONST(GL_ACCUM);
-  EXPP_ADDCONST(GL_LOAD);
-  EXPP_ADDCONST(GL_RETURN);
-  EXPP_ADDCONST(GL_MULT);
-  EXPP_ADDCONST(GL_ADD);
-
-  EXPP_ADDCONST(GL_NEVER);
-  EXPP_ADDCONST(GL_LESS);
-  EXPP_ADDCONST(GL_EQUAL);
-  EXPP_ADDCONST(GL_LEQUAL);
-  EXPP_ADDCONST(GL_GREATER);
-  EXPP_ADDCONST(GL_NOTEQUAL);
-  EXPP_ADDCONST(GL_GEQUAL);
-  EXPP_ADDCONST(GL_ALWAYS);
-
-  EXPP_ADDCONST(GL_ZERO);
-  EXPP_ADDCONST(GL_ONE);
-  EXPP_ADDCONST(GL_SRC_COLOR);
-  EXPP_ADDCONST(GL_ONE_MINUS_SRC_COLOR);
-  EXPP_ADDCONST(GL_SRC_ALPHA);
-  EXPP_ADDCONST(GL_ONE_MINUS_SRC_ALPHA);
-  EXPP_ADDCONST(GL_DST_ALPHA);
-  EXPP_ADDCONST(GL_ONE_MINUS_DST_ALPHA);
-
-  EXPP_ADDCONST(GL_DST_COLOR);
-  EXPP_ADDCONST(GL_ONE_MINUS_DST_COLOR);
-  EXPP_ADDCONST(GL_SRC_ALPHA_SATURATE);
-
-  EXPP_ADDCONST(GL_NONE);
-  EXPP_ADDCONST(GL_FRONT_LEFT);
-  EXPP_ADDCONST(GL_FRONT_RIGHT);
-  EXPP_ADDCONST(GL_BACK_LEFT);
-  EXPP_ADDCONST(GL_BACK_RIGHT);
-  EXPP_ADDCONST(GL_FRONT);
-  EXPP_ADDCONST(GL_BACK);
-  EXPP_ADDCONST(GL_LEFT);
-  EXPP_ADDCONST(GL_RIGHT);
-  EXPP_ADDCONST(GL_FRONT_AND_BACK);
-  EXPP_ADDCONST(GL_AUX0);
-  EXPP_ADDCONST(GL_AUX1);
-  EXPP_ADDCONST(GL_AUX2);
-  EXPP_ADDCONST(GL_AUX3);
-
-  EXPP_ADDCONST(GL_NO_ERROR);
-  EXPP_ADDCONST(GL_INVALID_ENUM);
-  EXPP_ADDCONST(GL_INVALID_VALUE);
-  EXPP_ADDCONST(GL_INVALID_OPERATION);
-  EXPP_ADDCONST(GL_STACK_OVERFLOW);
-  EXPP_ADDCONST(GL_STACK_UNDERFLOW);
-  EXPP_ADDCONST(GL_OUT_OF_MEMORY);
-
-  EXPP_ADDCONST(GL_2D);
-  EXPP_ADDCONST(GL_3D);
-  EXPP_ADDCONST(GL_3D_COLOR);
-  EXPP_ADDCONST(GL_3D_COLOR_TEXTURE);
-  EXPP_ADDCONST(GL_4D_COLOR_TEXTURE);
-
-  EXPP_ADDCONST(GL_PASS_THROUGH_TOKEN);
-  EXPP_ADDCONST(GL_POINT_TOKEN);
-  EXPP_ADDCONST(GL_LINE_TOKEN);
-  EXPP_ADDCONST(GL_POLYGON_TOKEN);
-  EXPP_ADDCONST(GL_BITMAP_TOKEN);
-  EXPP_ADDCONST(GL_DRAW_PIXEL_TOKEN);
-  EXPP_ADDCONST(GL_COPY_PIXEL_TOKEN);
-  EXPP_ADDCONST(GL_LINE_RESET_TOKEN);
-
-  EXPP_ADDCONST(GL_EXP);
-  EXPP_ADDCONST(GL_EXP2);
-
-  EXPP_ADDCONST(GL_CW);
-  EXPP_ADDCONST(GL_CCW);
-
-  EXPP_ADDCONST(GL_COEFF);
-  EXPP_ADDCONST(GL_ORDER);
-  EXPP_ADDCONST(GL_DOMAIN);
-
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_I);
-  EXPP_ADDCONST(GL_PIXEL_MAP_S_TO_S);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_R);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_G);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_B);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_A);
-  EXPP_ADDCONST(GL_PIXEL_MAP_R_TO_R);
-  EXPP_ADDCONST(GL_PIXEL_MAP_G_TO_G);
-  EXPP_ADDCONST(GL_PIXEL_MAP_B_TO_B);
-  EXPP_ADDCONST(GL_PIXEL_MAP_A_TO_A);
-
-  EXPP_ADDCONST(GL_CURRENT_COLOR);
-  EXPP_ADDCONST(GL_CURRENT_INDEX);
-  EXPP_ADDCONST(GL_CURRENT_NORMAL);
-  EXPP_ADDCONST(GL_CURRENT_TEXTURE_COORDS);
-  EXPP_ADDCONST(GL_CURRENT_RASTER_COLOR);
-  EXPP_ADDCONST(GL_CURRENT_RASTER_INDEX);
-  EXPP_ADDCONST(GL_CURRENT_RASTER_TEXTURE_COORDS);
-  EXPP_ADDCONST(GL_CURRENT_RASTER_POSITION);
-  EXPP_ADDCONST(GL_CURRENT_RASTER_POSITION_VALID);
-  EXPP_ADDCONST(GL_CURRENT_RASTER_DISTANCE);
-  EXPP_ADDCONST(GL_POINT_SMOOTH);
-  EXPP_ADDCONST(GL_POINT_SIZE);
-  EXPP_ADDCONST(GL_POINT_SIZE_RANGE);
-  EXPP_ADDCONST(GL_POINT_SIZE_GRANULARITY);
-  EXPP_ADDCONST(GL_LINE_SMOOTH);
-  EXPP_ADDCONST(GL_LINE_WIDTH);
-  EXPP_ADDCONST(GL_LINE_WIDTH_RANGE);
-  EXPP_ADDCONST(GL_LINE_WIDTH_GRANULARITY);
-  EXPP_ADDCONST(GL_LINE_STIPPLE);
-  EXPP_ADDCONST(GL_LINE_STIPPLE_PATTERN);
-  EXPP_ADDCONST(GL_LINE_STIPPLE_REPEAT);
-  EXPP_ADDCONST(GL_LIST_MODE);
-  EXPP_ADDCONST(GL_MAX_LIST_NESTING);
-  EXPP_ADDCONST(GL_LIST_BASE);
-  EXPP_ADDCONST(GL_LIST_INDEX);
-  EXPP_ADDCONST(GL_POLYGON_MODE);
-  EXPP_ADDCONST(GL_POLYGON_SMOOTH);
-  EXPP_ADDCONST(GL_POLYGON_STIPPLE);
-  EXPP_ADDCONST(GL_EDGE_FLAG);
-  EXPP_ADDCONST(GL_CULL_FACE);
-  EXPP_ADDCONST(GL_CULL_FACE_MODE);
-  EXPP_ADDCONST(GL_FRONT_FACE);
-  EXPP_ADDCONST(GL_LIGHTING);
-  EXPP_ADDCONST(GL_LIGHT_MODEL_LOCAL_VIEWER);
-  EXPP_ADDCONST(GL_LIGHT_MODEL_TWO_SIDE);
-  EXPP_ADDCONST(GL_LIGHT_MODEL_AMBIENT);
-  EXPP_ADDCONST(GL_SHADE_MODEL);
-  EXPP_ADDCONST(GL_COLOR_MATERIAL_FACE);
-  EXPP_ADDCONST(GL_COLOR_MATERIAL_PARAMETER);
-  EXPP_ADDCONST(GL_COLOR_MATERIAL);
-  EXPP_ADDCONST(GL_FOG);
-  EXPP_ADDCONST(GL_FOG_INDEX);
-  EXPP_ADDCONST(GL_FOG_DENSITY);
-  EXPP_ADDCONST(GL_FOG_START);
-  EXPP_ADDCONST(GL_FOG_END);
-  EXPP_ADDCONST(GL_FOG_MODE);
-  EXPP_ADDCONST(GL_FOG_COLOR);
-  EXPP_ADDCONST(GL_DEPTH_RANGE);
-  EXPP_ADDCONST(GL_DEPTH_TEST);
-  EXPP_ADDCONST(GL_DEPTH_WRITEMASK);
-  EXPP_ADDCONST(GL_DEPTH_CLEAR_VALUE);
-  EXPP_ADDCONST(GL_DEPTH_FUNC);
-  EXPP_ADDCONST(GL_ACCUM_CLEAR_VALUE);
-  EXPP_ADDCONST(GL_STENCIL_TEST);
-  EXPP_ADDCONST(GL_STENCIL_CLEAR_VALUE);
-  EXPP_ADDCONST(GL_STENCIL_FUNC);
-  EXPP_ADDCONST(GL_STENCIL_VALUE_MASK);
-  EXPP_ADDCONST(GL_STENCIL_FAIL);
-  EXPP_ADDCONST(GL_STENCIL_PASS_DEPTH_FAIL);
-  EXPP_ADDCONST(GL_STENCIL_PASS_DEPTH_PASS);
-  EXPP_ADDCONST(GL_STENCIL_REF);
-  EXPP_ADDCONST(GL_STENCIL_WRITEMASK);
-  EXPP_ADDCONST(GL_MATRIX_MODE);
-  EXPP_ADDCONST(GL_NORMALIZE);
-  EXPP_ADDCONST(GL_VIEWPORT);
-  EXPP_ADDCONST(GL_MODELVIEW_STACK_DEPTH);
-  EXPP_ADDCONST(GL_PROJECTION_STACK_DEPTH);
-  EXPP_ADDCONST(GL_TEXTURE_STACK_DEPTH);
-  EXPP_ADDCONST(GL_MODELVIEW_MATRIX);
-  EXPP_ADDCONST(GL_PROJECTION_MATRIX);
-  EXPP_ADDCONST(GL_TEXTURE_MATRIX);
-  EXPP_ADDCONST(GL_ATTRIB_STACK_DEPTH);
-  EXPP_ADDCONST(GL_ALPHA_TEST);
-  EXPP_ADDCONST(GL_ALPHA_TEST_FUNC);
-  EXPP_ADDCONST(GL_ALPHA_TEST_REF);
-  EXPP_ADDCONST(GL_DITHER);
-  EXPP_ADDCONST(GL_BLEND_DST);
-  EXPP_ADDCONST(GL_BLEND_SRC);
-  EXPP_ADDCONST(GL_BLEND);
-  EXPP_ADDCONST(GL_LOGIC_OP_MODE);
-  EXPP_ADDCONST(GL_LOGIC_OP);
-  EXPP_ADDCONST(GL_AUX_BUFFERS);
-  EXPP_ADDCONST(GL_DRAW_BUFFER);
-  EXPP_ADDCONST(GL_READ_BUFFER);
-  EXPP_ADDCONST(GL_SCISSOR_BOX);
-  EXPP_ADDCONST(GL_SCISSOR_TEST);
-  EXPP_ADDCONST(GL_INDEX_CLEAR_VALUE);
-  EXPP_ADDCONST(GL_INDEX_WRITEMASK);
-  EXPP_ADDCONST(GL_COLOR_CLEAR_VALUE);
-  EXPP_ADDCONST(GL_COLOR_WRITEMASK);
-  EXPP_ADDCONST(GL_INDEX_MODE);
-  EXPP_ADDCONST(GL_RGBA_MODE);
-  EXPP_ADDCONST(GL_DOUBLEBUFFER);
-  EXPP_ADDCONST(GL_STEREO);
-  EXPP_ADDCONST(GL_RENDER_MODE);
-  EXPP_ADDCONST(GL_PERSPECTIVE_CORRECTION_HINT);
-  EXPP_ADDCONST(GL_POINT_SMOOTH_HINT);
-  EXPP_ADDCONST(GL_LINE_SMOOTH_HINT);
-  EXPP_ADDCONST(GL_POLYGON_SMOOTH_HINT);
-  EXPP_ADDCONST(GL_FOG_HINT);
-  EXPP_ADDCONST(GL_TEXTURE_GEN_S);
-  EXPP_ADDCONST(GL_TEXTURE_GEN_T);
-  EXPP_ADDCONST(GL_TEXTURE_GEN_R);
-  EXPP_ADDCONST(GL_TEXTURE_GEN_Q);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_I_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_S_TO_S_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_R_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_G_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_B_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_A_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_R_TO_R_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_G_TO_G_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_B_TO_B_SIZE);
-  EXPP_ADDCONST(GL_PIXEL_MAP_A_TO_A_SIZE);
-  EXPP_ADDCONST(GL_UNPACK_SWAP_BYTES);
-  EXPP_ADDCONST(GL_UNPACK_LSB_FIRST);
-  EXPP_ADDCONST(GL_UNPACK_ROW_LENGTH);
-  EXPP_ADDCONST(GL_UNPACK_SKIP_ROWS);
-  EXPP_ADDCONST(GL_UNPACK_SKIP_PIXELS);
-  EXPP_ADDCONST(GL_UNPACK_ALIGNMENT);
-  EXPP_ADDCONST(GL_PACK_SWAP_BYTES);
-  EXPP_ADDCONST(GL_PACK_LSB_FIRST);
-  EXPP_ADDCONST(GL_PACK_ROW_LENGTH);
-  EXPP_ADDCONST(GL_PACK_SKIP_ROWS);
-  EXPP_ADDCONST(GL_PACK_SKIP_PIXELS);
-  EXPP_ADDCONST(GL_PACK_ALIGNMENT);
-  EXPP_ADDCONST(GL_MAP_COLOR);
-  EXPP_ADDCONST(GL_MAP_STENCIL);
-  EXPP_ADDCONST(GL_INDEX_SHIFT);
-  EXPP_ADDCONST(GL_INDEX_OFFSET);
-  EXPP_ADDCONST(GL_RED_SCALE);
-  EXPP_ADDCONST(GL_RED_BIAS);
-  EXPP_ADDCONST(GL_ZOOM_X);
-  EXPP_ADDCONST(GL_ZOOM_Y);
-  EXPP_ADDCONST(GL_GREEN_SCALE);
-  EXPP_ADDCONST(GL_GREEN_BIAS);
-  EXPP_ADDCONST(GL_BLUE_SCALE);
-  EXPP_ADDCONST(GL_BLUE_BIAS);
-  EXPP_ADDCONST(GL_ALPHA_SCALE);
-  EXPP_ADDCONST(GL_ALPHA_BIAS);
-  EXPP_ADDCONST(GL_DEPTH_SCALE);
-  EXPP_ADDCONST(GL_DEPTH_BIAS);
-  EXPP_ADDCONST(GL_MAX_EVAL_ORDER);
-  EXPP_ADDCONST(GL_MAX_LIGHTS);
-  EXPP_ADDCONST(GL_MAX_CLIP_PLANES);
-  EXPP_ADDCONST(GL_MAX_TEXTURE_SIZE);
-  EXPP_ADDCONST(GL_MAX_PIXEL_MAP_TABLE);
-  EXPP_ADDCONST(GL_MAX_ATTRIB_STACK_DEPTH);
-  EXPP_ADDCONST(GL_MAX_MODELVIEW_STACK_DEPTH);
-  EXPP_ADDCONST(GL_MAX_NAME_STACK_DEPTH);
-  EXPP_ADDCONST(GL_MAX_PROJECTION_STACK_DEPTH);
-  EXPP_ADDCONST(GL_MAX_TEXTURE_STACK_DEPTH);
-  EXPP_ADDCONST(GL_MAX_VIEWPORT_DIMS);
-  EXPP_ADDCONST(GL_SUBPIXEL_BITS);
-  EXPP_ADDCONST(GL_INDEX_BITS);
-  EXPP_ADDCONST(GL_RED_BITS);
-  EXPP_ADDCONST(GL_GREEN_BITS);
-  EXPP_ADDCONST(GL_BLUE_BITS);
-  EXPP_ADDCONST(GL_ALPHA_BITS);
-  EXPP_ADDCONST(GL_DEPTH_BITS);
-  EXPP_ADDCONST(GL_STENCIL_BITS);
-  EXPP_ADDCONST(GL_ACCUM_RED_BITS);
-  EXPP_ADDCONST(GL_ACCUM_GREEN_BITS);
-  EXPP_ADDCONST(GL_ACCUM_BLUE_BITS);
-  EXPP_ADDCONST(GL_ACCUM_ALPHA_BITS);
-  EXPP_ADDCONST(GL_NAME_STACK_DEPTH);
-  EXPP_ADDCONST(GL_AUTO_NORMAL);
-  EXPP_ADDCONST(GL_MAP1_COLOR_4);
-  EXPP_ADDCONST(GL_MAP1_INDEX);
-  EXPP_ADDCONST(GL_MAP1_NORMAL);
-  EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_1);
-  EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_2);
-  EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_3);
-  EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_4);
-  EXPP_ADDCONST(GL_MAP1_VERTEX_3);
-  EXPP_ADDCONST(GL_MAP1_VERTEX_4);
-  EXPP_ADDCONST(GL_MAP2_COLOR_4);
-  EXPP_ADDCONST(GL_MAP2_INDEX);
-  EXPP_ADDCONST(GL_MAP2_NORMAL);
-  EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_1);
-  EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_2);
-  EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_3);
-  EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_4);
-  EXPP_ADDCONST(GL_MAP2_VERTEX_3);
-  EXPP_ADDCONST(GL_MAP2_VERTEX_4);
-  EXPP_ADDCONST(GL_MAP1_GRID_DOMAIN);
-  EXPP_ADDCONST(GL_MAP1_GRID_SEGMENTS);
-  EXPP_ADDCONST(GL_MAP2_GRID_DOMAIN);
-  EXPP_ADDCONST(GL_MAP2_GRID_SEGMENTS);
-  EXPP_ADDCONST(GL_TEXTURE_1D);
-  EXPP_ADDCONST(GL_TEXTURE_2D);
-
-  EXPP_ADDCONST(GL_TEXTURE_WIDTH);
-  EXPP_ADDCONST(GL_TEXTURE_HEIGHT);
-  EXPP_ADDCONST(GL_TEXTURE_COMPONENTS);
-  EXPP_ADDCONST(GL_TEXTURE_BORDER_COLOR);
-  EXPP_ADDCONST(GL_TEXTURE_BORDER);
-
-  EXPP_ADDCONST(GL_DONT_CARE);
-  EXPP_ADDCONST(GL_FASTEST);
-  EXPP_ADDCONST(GL_NICEST);
-
-  EXPP_ADDCONST(GL_AMBIENT);
-  EXPP_ADDCONST(GL_DIFFUSE);
-  EXPP_ADDCONST(GL_SPECULAR);
-  EXPP_ADDCONST(GL_POSITION);
-  EXPP_ADDCONST(GL_SPOT_DIRECTION);
-  EXPP_ADDCONST(GL_SPOT_EXPONENT);
-  EXPP_ADDCONST(GL_SPOT_CUTOFF);
-  EXPP_ADDCONST(GL_CONSTANT_ATTENUATION);
-  EXPP_ADDCONST(GL_LINEAR_ATTENUATION);
-  EXPP_ADDCONST(GL_QUADRATIC_ATTENUATION);
-
-  EXPP_ADDCONST(GL_COMPILE);
-  EXPP_ADDCONST(GL_COMPILE_AND_EXECUTE);
-
-  EXPP_ADDCONST(GL_BYTE);
-  EXPP_ADDCONST(GL_UNSIGNED_BYTE);
-  EXPP_ADDCONST(GL_SHORT);
-  EXPP_ADDCONST(GL_UNSIGNED_SHORT);
-  EXPP_ADDCONST(GL_INT);
-  EXPP_ADDCONST(GL_UNSIGNED_INT);
-  EXPP_ADDCONST(GL_FLOAT);
-  EXPP_ADDCONST(GL_2_BYTES);
-  EXPP_ADDCONST(GL_3_BYTES);
-  EXPP_ADDCONST(GL_4_BYTES);
-
-  EXPP_ADDCONST(GL_CLEAR);
-  EXPP_ADDCONST(GL_AND);
-  EXPP_ADDCONST(GL_AND_REVERSE);
-  EXPP_ADDCONST(GL_COPY);
-  EXPP_ADDCONST(GL_AND_INVERTED);
-  EXPP_ADDCONST(GL_NOOP);
-  EXPP_ADDCONST(GL_XOR);
-  EXPP_ADDCONST(GL_OR);
-  EXPP_ADDCONST(GL_NOR);
-  EXPP_ADDCONST(GL_EQUIV);
-  EXPP_ADDCONST(GL_INVERT);
-  EXPP_ADDCONST(GL_OR_REVERSE);
-  EXPP_ADDCONST(GL_COPY_INVERTED);
-  EXPP_ADDCONST(GL_OR_INVERTED);
-  EXPP_ADDCONST(GL_NAND);
-  EXPP_ADDCONST(GL_SET);
-
-  EXPP_ADDCONST(GL_EMISSION);
-  EXPP_ADDCONST(GL_SHININESS);
-  EXPP_ADDCONST(GL_AMBIENT_AND_DIFFUSE);
-  EXPP_ADDCONST(GL_COLOR_INDEXES);
-
-  EXPP_ADDCONST(GL_MODELVIEW);
-  EXPP_ADDCONST(GL_PROJECTION);
-  EXPP_ADDCONST(GL_TEXTURE);
-
-  EXPP_ADDCONST(GL_COLOR);
-  EXPP_ADDCONST(GL_DEPTH);
-  EXPP_ADDCONST(GL_STENCIL);
-
-  EXPP_ADDCONST(GL_COLOR_INDEX);
-  EXPP_ADDCONST(GL_STENCIL_INDEX);
-  EXPP_ADDCONST(GL_DEPTH_COMPONENT);
-  EXPP_ADDCONST(GL_RED);
-  EXPP_ADDCONST(GL_GREEN);
-  EXPP_ADDCONST(GL_BLUE);
-  EXPP_ADDCONST(GL_ALPHA);
-  EXPP_ADDCONST(GL_RGB);
-  EXPP_ADDCONST(GL_RGBA);
-  EXPP_ADDCONST(GL_LUMINANCE);
-  EXPP_ADDCONST(GL_LUMINANCE_ALPHA);
-
-  EXPP_ADDCONST(GL_BITMAP);
-
-  EXPP_ADDCONST(GL_POINT);
-  EXPP_ADDCONST(GL_LINE);
-  EXPP_ADDCONST(GL_FILL);
-
-  EXPP_ADDCONST(GL_RENDER);
-  EXPP_ADDCONST(GL_FEEDBACK);
-  EXPP_ADDCONST(GL_SELECT);
-
-  EXPP_ADDCONST(GL_FLAT);
-  EXPP_ADDCONST(GL_SMOOTH);
-
-  EXPP_ADDCONST(GL_KEEP);
-  EXPP_ADDCONST(GL_REPLACE);
-  EXPP_ADDCONST(GL_INCR);
-  EXPP_ADDCONST(GL_DECR);
-
-  EXPP_ADDCONST(GL_VENDOR);
-  EXPP_ADDCONST(GL_RENDERER);
-  EXPP_ADDCONST(GL_VERSION);
-  EXPP_ADDCONST(GL_EXTENSIONS);
-
-  EXPP_ADDCONST(GL_S);
-  EXPP_ADDCONST(GL_T);
-  EXPP_ADDCONST(GL_R);
-  EXPP_ADDCONST(GL_Q);
-
-  EXPP_ADDCONST(GL_MODULATE);
-  EXPP_ADDCONST(GL_DECAL);
-
-  EXPP_ADDCONST(GL_TEXTURE_ENV_MODE);
-  EXPP_ADDCONST(GL_TEXTURE_ENV_COLOR);
-
-  EXPP_ADDCONST(GL_TEXTURE_ENV);
-
-  EXPP_ADDCONST(GL_EYE_LINEAR);
-  EXPP_ADDCONST(GL_OBJECT_LINEAR);
-  EXPP_ADDCONST(GL_SPHERE_MAP);
-
-  EXPP_ADDCONST(GL_TEXTURE_GEN_MODE);
-  EXPP_ADDCONST(GL_OBJECT_PLANE);
-  EXPP_ADDCONST(GL_EYE_PLANE);
-
-  EXPP_ADDCONST(GL_NEAREST);
-  EXPP_ADDCONST(GL_LINEAR);
-
-  EXPP_ADDCONST(GL_NEAREST_MIPMAP_NEAREST);
-  EXPP_ADDCONST(GL_LINEAR_MIPMAP_NEAREST);
-  EXPP_ADDCONST(GL_NEAREST_MIPMAP_LINEAR);
-  EXPP_ADDCONST(GL_LINEAR_MIPMAP_LINEAR);
-
-  EXPP_ADDCONST(GL_TEXTURE_MAG_FILTER);
-  EXPP_ADDCONST(GL_TEXTURE_MIN_FILTER);
-  EXPP_ADDCONST(GL_TEXTURE_WRAP_S);
-  EXPP_ADDCONST(GL_TEXTURE_WRAP_T);
-
-  EXPP_ADDCONST(GL_CLAMP);
-  EXPP_ADDCONST(GL_REPEAT);
-
-  EXPP_ADDCONST(GL_CLIP_PLANE0);
-  EXPP_ADDCONST(GL_CLIP_PLANE1);
-  EXPP_ADDCONST(GL_CLIP_PLANE2);
-  EXPP_ADDCONST(GL_CLIP_PLANE3);
-  EXPP_ADDCONST(GL_CLIP_PLANE4);
-  EXPP_ADDCONST(GL_CLIP_PLANE5);
-
-  EXPP_ADDCONST(GL_LIGHT0);
-  EXPP_ADDCONST(GL_LIGHT1);
-  EXPP_ADDCONST(GL_LIGHT2);
-  EXPP_ADDCONST(GL_LIGHT3);
-  EXPP_ADDCONST(GL_LIGHT4);
-  EXPP_ADDCONST(GL_LIGHT5);
-  EXPP_ADDCONST(GL_LIGHT6);
-  EXPP_ADDCONST(GL_LIGHT7);
-  
-  EXPP_ADDCONST(GL_POLYGON_OFFSET_UNITS);
-  EXPP_ADDCONST(GL_POLYGON_OFFSET_POINT);
-  EXPP_ADDCONST(GL_POLYGON_OFFSET_LINE);
-  EXPP_ADDCONST(GL_POLYGON_OFFSET_FILL);
-  EXPP_ADDCONST(GL_POLYGON_OFFSET_FACTOR);
-  
-  EXPP_ADDCONST(GL_TEXTURE_PRIORITY);
-  EXPP_ADDCONST(GL_TEXTURE_RESIDENT);
-  EXPP_ADDCONST(GL_TEXTURE_BINDING_1D);
-  EXPP_ADDCONST(GL_TEXTURE_BINDING_2D);
+	EXPP_ADDCONST(GL_CURRENT_BIT);
+	EXPP_ADDCONST(GL_POINT_BIT);
+	EXPP_ADDCONST(GL_LINE_BIT);
+	EXPP_ADDCONST(GL_POLYGON_BIT);
+	EXPP_ADDCONST(GL_POLYGON_STIPPLE_BIT);
+	EXPP_ADDCONST(GL_PIXEL_MODE_BIT);
+	EXPP_ADDCONST(GL_LIGHTING_BIT);
+	EXPP_ADDCONST(GL_FOG_BIT);
+	EXPP_ADDCONST(GL_DEPTH_BUFFER_BIT);
+	EXPP_ADDCONST(GL_ACCUM_BUFFER_BIT);
+	EXPP_ADDCONST(GL_STENCIL_BUFFER_BIT);
+	EXPP_ADDCONST(GL_VIEWPORT_BIT);
+	EXPP_ADDCONST(GL_TRANSFORM_BIT);
+	EXPP_ADDCONST(GL_ENABLE_BIT);
+	EXPP_ADDCONST(GL_COLOR_BUFFER_BIT);
+	EXPP_ADDCONST(GL_HINT_BIT);
+	EXPP_ADDCONST(GL_EVAL_BIT);
+	EXPP_ADDCONST(GL_LIST_BIT);
+	EXPP_ADDCONST(GL_TEXTURE_BIT);
+	EXPP_ADDCONST(GL_SCISSOR_BIT);
+	EXPP_ADDCONST(GL_ALL_ATTRIB_BITS);
+
+	EXPP_ADDCONST(GL_FALSE);
+	EXPP_ADDCONST(GL_TRUE);
+
+	EXPP_ADDCONST(GL_POINTS);
+	EXPP_ADDCONST(GL_LINES);
+	EXPP_ADDCONST(GL_LINE_LOOP);
+	EXPP_ADDCONST(GL_LINE_STRIP);
+	EXPP_ADDCONST(GL_TRIANGLES);
+	EXPP_ADDCONST(GL_TRIANGLE_STRIP);
+	EXPP_ADDCONST(GL_TRIANGLE_FAN);
+	EXPP_ADDCONST(GL_QUADS);
+	EXPP_ADDCONST(GL_QUAD_STRIP);
+	EXPP_ADDCONST(GL_POLYGON);
+
+	EXPP_ADDCONST(GL_ACCUM);
+	EXPP_ADDCONST(GL_LOAD);
+	EXPP_ADDCONST(GL_RETURN);
+	EXPP_ADDCONST(GL_MULT);
+	EXPP_ADDCONST(GL_ADD);
+
+	EXPP_ADDCONST(GL_NEVER);
+	EXPP_ADDCONST(GL_LESS);
+	EXPP_ADDCONST(GL_EQUAL);
+	EXPP_ADDCONST(GL_LEQUAL);
+	EXPP_ADDCONST(GL_GREATER);
+	EXPP_ADDCONST(GL_NOTEQUAL);
+	EXPP_ADDCONST(GL_GEQUAL);
+	EXPP_ADDCONST(GL_ALWAYS);
+
+	EXPP_ADDCONST(GL_ZERO);
+	EXPP_ADDCONST(GL_ONE);
+	EXPP_ADDCONST(GL_SRC_COLOR);
+	EXPP_ADDCONST(GL_ONE_MINUS_SRC_COLOR);
+	EXPP_ADDCONST(GL_SRC_ALPHA);
+	EXPP_ADDCONST(GL_ONE_MINUS_SRC_ALPHA);
+	EXPP_ADDCONST(GL_DST_ALPHA);
+	EXPP_ADDCONST(GL_ONE_MINUS_DST_ALPHA);
+
+	EXPP_ADDCONST(GL_DST_COLOR);
+	EXPP_ADDCONST(GL_ONE_MINUS_DST_COLOR);
+	EXPP_ADDCONST(GL_SRC_ALPHA_SATURATE);
+
+	EXPP_ADDCONST(GL_NONE);
+	EXPP_ADDCONST(GL_FRONT_LEFT);
+	EXPP_ADDCONST(GL_FRONT_RIGHT);
+	EXPP_ADDCONST(GL_BACK_LEFT);
+	EXPP_ADDCONST(GL_BACK_RIGHT);
+	EXPP_ADDCONST(GL_FRONT);
+	EXPP_ADDCONST(GL_BACK);
+	EXPP_ADDCONST(GL_LEFT);
+	EXPP_ADDCONST(GL_RIGHT);
+	EXPP_ADDCONST(GL_FRONT_AND_BACK);
+	EXPP_ADDCONST(GL_AUX0);
+	EXPP_ADDCONST(GL_AUX1);
+	EXPP_ADDCONST(GL_AUX2);
+	EXPP_ADDCONST(GL_AUX3);
+
+	EXPP_ADDCONST(GL_NO_ERROR);
+	EXPP_ADDCONST(GL_INVALID_ENUM);
+	EXPP_ADDCONST(GL_INVALID_VALUE);
+	EXPP_ADDCONST(GL_INVALID_OPERATION);
+	EXPP_ADDCONST(GL_STACK_OVERFLOW);
+	EXPP_ADDCONST(GL_STACK_UNDERFLOW);
+	EXPP_ADDCONST(GL_OUT_OF_MEMORY);
+
+	EXPP_ADDCONST(GL_2D);
+	EXPP_ADDCONST(GL_3D);
+	EXPP_ADDCONST(GL_3D_COLOR);
+	EXPP_ADDCONST(GL_3D_COLOR_TEXTURE);
+	EXPP_ADDCONST(GL_4D_COLOR_TEXTURE);
+
+	EXPP_ADDCONST(GL_PASS_THROUGH_TOKEN);
+	EXPP_ADDCONST(GL_POINT_TOKEN);
+	EXPP_ADDCONST(GL_LINE_TOKEN);
+	EXPP_ADDCONST(GL_POLYGON_TOKEN);
+	EXPP_ADDCONST(GL_BITMAP_TOKEN);
+	EXPP_ADDCONST(GL_DRAW_PIXEL_TOKEN);
+	EXPP_ADDCONST(GL_COPY_PIXEL_TOKEN);
+	EXPP_ADDCONST(GL_LINE_RESET_TOKEN);
+
+	EXPP_ADDCONST(GL_EXP);
+	EXPP_ADDCONST(GL_EXP2);
+
+	EXPP_ADDCONST(GL_CW);
+	EXPP_ADDCONST(GL_CCW);
+
+	EXPP_ADDCONST(GL_COEFF);
+	EXPP_ADDCONST(GL_ORDER);
+	EXPP_ADDCONST(GL_DOMAIN);
+
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_I);
+	EXPP_ADDCONST(GL_PIXEL_MAP_S_TO_S);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_R);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_G);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_B);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_A);
+	EXPP_ADDCONST(GL_PIXEL_MAP_R_TO_R);
+	EXPP_ADDCONST(GL_PIXEL_MAP_G_TO_G);
+	EXPP_ADDCONST(GL_PIXEL_MAP_B_TO_B);
+	EXPP_ADDCONST(GL_PIXEL_MAP_A_TO_A);
+
+	EXPP_ADDCONST(GL_CURRENT_COLOR);
+	EXPP_ADDCONST(GL_CURRENT_INDEX);
+	EXPP_ADDCONST(GL_CURRENT_NORMAL);
+	EXPP_ADDCONST(GL_CURRENT_TEXTURE_COORDS);
+	EXPP_ADDCONST(GL_CURRENT_RASTER_COLOR);
+	EXPP_ADDCONST(GL_CURRENT_RASTER_INDEX);
+	EXPP_ADDCONST(GL_CURRENT_RASTER_TEXTURE_COORDS);
+	EXPP_ADDCONST(GL_CURRENT_RASTER_POSITION);
+	EXPP_ADDCONST(GL_CURRENT_RASTER_POSITION_VALID);
+	EXPP_ADDCONST(GL_CURRENT_RASTER_DISTANCE);
+	EXPP_ADDCONST(GL_POINT_SMOOTH);
+	EXPP_ADDCONST(GL_POINT_SIZE);
+	EXPP_ADDCONST(GL_POINT_SIZE_RANGE);
+	EXPP_ADDCONST(GL_POINT_SIZE_GRANULARITY);
+	EXPP_ADDCONST(GL_LINE_SMOOTH);
+	EXPP_ADDCONST(GL_LINE_WIDTH);
+	EXPP_ADDCONST(GL_LINE_WIDTH_RANGE);
+	EXPP_ADDCONST(GL_LINE_WIDTH_GRANULARITY);
+	EXPP_ADDCONST(GL_LINE_STIPPLE);
+	EXPP_ADDCONST(GL_LINE_STIPPLE_PATTERN);
+	EXPP_ADDCONST(GL_LINE_STIPPLE_REPEAT);
+	EXPP_ADDCONST(GL_LIST_MODE);
+	EXPP_ADDCONST(GL_MAX_LIST_NESTING);
+	EXPP_ADDCONST(GL_LIST_BASE);
+	EXPP_ADDCONST(GL_LIST_INDEX);
+	EXPP_ADDCONST(GL_POLYGON_MODE);
+	EXPP_ADDCONST(GL_POLYGON_SMOOTH);
+	EXPP_ADDCONST(GL_POLYGON_STIPPLE);
+	EXPP_ADDCONST(GL_EDGE_FLAG);
+	EXPP_ADDCONST(GL_CULL_FACE);
+	EXPP_ADDCONST(GL_CULL_FACE_MODE);
+	EXPP_ADDCONST(GL_FRONT_FACE);
+	EXPP_ADDCONST(GL_LIGHTING);
+	EXPP_ADDCONST(GL_LIGHT_MODEL_LOCAL_VIEWER);
+	EXPP_ADDCONST(GL_LIGHT_MODEL_TWO_SIDE);
+	EXPP_ADDCONST(GL_LIGHT_MODEL_AMBIENT);
+	EXPP_ADDCONST(GL_SHADE_MODEL);
+	EXPP_ADDCONST(GL_COLOR_MATERIAL_FACE);
+	EXPP_ADDCONST(GL_COLOR_MATERIAL_PARAMETER);
+	EXPP_ADDCONST(GL_COLOR_MATERIAL);
+	EXPP_ADDCONST(GL_FOG);
+	EXPP_ADDCONST(GL_FOG_INDEX);
+	EXPP_ADDCONST(GL_FOG_DENSITY);
+	EXPP_ADDCONST(GL_FOG_START);
+	EXPP_ADDCONST(GL_FOG_END);
+	EXPP_ADDCONST(GL_FOG_MODE);
+	EXPP_ADDCONST(GL_FOG_COLOR);
+	EXPP_ADDCONST(GL_DEPTH_RANGE);
+	EXPP_ADDCONST(GL_DEPTH_TEST);
+	EXPP_ADDCONST(GL_DEPTH_WRITEMASK);
+	EXPP_ADDCONST(GL_DEPTH_CLEAR_VALUE);
+	EXPP_ADDCONST(GL_DEPTH_FUNC);
+	EXPP_ADDCONST(GL_ACCUM_CLEAR_VALUE);
+	EXPP_ADDCONST(GL_STENCIL_TEST);
+	EXPP_ADDCONST(GL_STENCIL_CLEAR_VALUE);
+	EXPP_ADDCONST(GL_STENCIL_FUNC);
+	EXPP_ADDCONST(GL_STENCIL_VALUE_MASK);
+	EXPP_ADDCONST(GL_STENCIL_FAIL);
+	EXPP_ADDCONST(GL_STENCIL_PASS_DEPTH_FAIL);
+	EXPP_ADDCONST(GL_STENCIL_PASS_DEPTH_PASS);
+	EXPP_ADDCONST(GL_STENCIL_REF);
+	EXPP_ADDCONST(GL_STENCIL_WRITEMASK);
+	EXPP_ADDCONST(GL_MATRIX_MODE);
+	EXPP_ADDCONST(GL_NORMALIZE);
+	EXPP_ADDCONST(GL_VIEWPORT);
+	EXPP_ADDCONST(GL_MODELVIEW_STACK_DEPTH);
+	EXPP_ADDCONST(GL_PROJECTION_STACK_DEPTH);
+	EXPP_ADDCONST(GL_TEXTURE_STACK_DEPTH);
+	EXPP_ADDCONST(GL_MODELVIEW_MATRIX);
+	EXPP_ADDCONST(GL_PROJECTION_MATRIX);
+	EXPP_ADDCONST(GL_TEXTURE_MATRIX);
+	EXPP_ADDCONST(GL_ATTRIB_STACK_DEPTH);
+	EXPP_ADDCONST(GL_ALPHA_TEST);
+	EXPP_ADDCONST(GL_ALPHA_TEST_FUNC);
+	EXPP_ADDCONST(GL_ALPHA_TEST_REF);
+	EXPP_ADDCONST(GL_DITHER);
+	EXPP_ADDCONST(GL_BLEND_DST);
+	EXPP_ADDCONST(GL_BLEND_SRC);
+	EXPP_ADDCONST(GL_BLEND);
+	EXPP_ADDCONST(GL_LOGIC_OP_MODE);
+	EXPP_ADDCONST(GL_LOGIC_OP);
+	EXPP_ADDCONST(GL_AUX_BUFFERS);
+	EXPP_ADDCONST(GL_DRAW_BUFFER);
+	EXPP_ADDCONST(GL_READ_BUFFER);
+	EXPP_ADDCONST(GL_SCISSOR_BOX);
+	EXPP_ADDCONST(GL_SCISSOR_TEST);
+	EXPP_ADDCONST(GL_INDEX_CLEAR_VALUE);
+	EXPP_ADDCONST(GL_INDEX_WRITEMASK);
+	EXPP_ADDCONST(GL_COLOR_CLEAR_VALUE);
+	EXPP_ADDCONST(GL_COLOR_WRITEMASK);
+	EXPP_ADDCONST(GL_INDEX_MODE);
+	EXPP_ADDCONST(GL_RGBA_MODE);
+	EXPP_ADDCONST(GL_DOUBLEBUFFER);
+	EXPP_ADDCONST(GL_STEREO);
+	EXPP_ADDCONST(GL_RENDER_MODE);
+	EXPP_ADDCONST(GL_PERSPECTIVE_CORRECTION_HINT);
+	EXPP_ADDCONST(GL_POINT_SMOOTH_HINT);
+	EXPP_ADDCONST(GL_LINE_SMOOTH_HINT);
+	EXPP_ADDCONST(GL_POLYGON_SMOOTH_HINT);
+	EXPP_ADDCONST(GL_FOG_HINT);
+	EXPP_ADDCONST(GL_TEXTURE_GEN_S);
+	EXPP_ADDCONST(GL_TEXTURE_GEN_T);
+	EXPP_ADDCONST(GL_TEXTURE_GEN_R);
+	EXPP_ADDCONST(GL_TEXTURE_GEN_Q);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_I_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_S_TO_S_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_R_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_G_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_B_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_I_TO_A_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_R_TO_R_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_G_TO_G_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_B_TO_B_SIZE);
+	EXPP_ADDCONST(GL_PIXEL_MAP_A_TO_A_SIZE);
+	EXPP_ADDCONST(GL_UNPACK_SWAP_BYTES);
+	EXPP_ADDCONST(GL_UNPACK_LSB_FIRST);
+	EXPP_ADDCONST(GL_UNPACK_ROW_LENGTH);
+	EXPP_ADDCONST(GL_UNPACK_SKIP_ROWS);
+	EXPP_ADDCONST(GL_UNPACK_SKIP_PIXELS);
+	EXPP_ADDCONST(GL_UNPACK_ALIGNMENT);
+	EXPP_ADDCONST(GL_PACK_SWAP_BYTES);
+	EXPP_ADDCONST(GL_PACK_LSB_FIRST);
+	EXPP_ADDCONST(GL_PACK_ROW_LENGTH);
+	EXPP_ADDCONST(GL_PACK_SKIP_ROWS);
+	EXPP_ADDCONST(GL_PACK_SKIP_PIXELS);
+	EXPP_ADDCONST(GL_PACK_ALIGNMENT);
+	EXPP_ADDCONST(GL_MAP_COLOR);
+	EXPP_ADDCONST(GL_MAP_STENCIL);
+	EXPP_ADDCONST(GL_INDEX_SHIFT);
+	EXPP_ADDCONST(GL_INDEX_OFFSET);
+	EXPP_ADDCONST(GL_RED_SCALE);
+	EXPP_ADDCONST(GL_RED_BIAS);
+	EXPP_ADDCONST(GL_ZOOM_X);
+	EXPP_ADDCONST(GL_ZOOM_Y);
+	EXPP_ADDCONST(GL_GREEN_SCALE);
+	EXPP_ADDCONST(GL_GREEN_BIAS);
+	EXPP_ADDCONST(GL_BLUE_SCALE);
+	EXPP_ADDCONST(GL_BLUE_BIAS);
+	EXPP_ADDCONST(GL_ALPHA_SCALE);
+	EXPP_ADDCONST(GL_ALPHA_BIAS);
+	EXPP_ADDCONST(GL_DEPTH_SCALE);
+	EXPP_ADDCONST(GL_DEPTH_BIAS);
+	EXPP_ADDCONST(GL_MAX_EVAL_ORDER);
+	EXPP_ADDCONST(GL_MAX_LIGHTS);
+	EXPP_ADDCONST(GL_MAX_CLIP_PLANES);
+	EXPP_ADDCONST(GL_MAX_TEXTURE_SIZE);
+	EXPP_ADDCONST(GL_MAX_PIXEL_MAP_TABLE);
+	EXPP_ADDCONST(GL_MAX_ATTRIB_STACK_DEPTH);
+	EXPP_ADDCONST(GL_MAX_MODELVIEW_STACK_DEPTH);
+	EXPP_ADDCONST(GL_MAX_NAME_STACK_DEPTH);
+	EXPP_ADDCONST(GL_MAX_PROJECTION_STACK_DEPTH);
+	EXPP_ADDCONST(GL_MAX_TEXTURE_STACK_DEPTH);
+	EXPP_ADDCONST(GL_MAX_VIEWPORT_DIMS);
+	EXPP_ADDCONST(GL_SUBPIXEL_BITS);
+	EXPP_ADDCONST(GL_INDEX_BITS);
+	EXPP_ADDCONST(GL_RED_BITS);
+	EXPP_ADDCONST(GL_GREEN_BITS);
+	EXPP_ADDCONST(GL_BLUE_BITS);
+	EXPP_ADDCONST(GL_ALPHA_BITS);
+	EXPP_ADDCONST(GL_DEPTH_BITS);
+	EXPP_ADDCONST(GL_STENCIL_BITS);
+	EXPP_ADDCONST(GL_ACCUM_RED_BITS);
+	EXPP_ADDCONST(GL_ACCUM_GREEN_BITS);
+	EXPP_ADDCONST(GL_ACCUM_BLUE_BITS);
+	EXPP_ADDCONST(GL_ACCUM_ALPHA_BITS);
+	EXPP_ADDCONST(GL_NAME_STACK_DEPTH);
+	EXPP_ADDCONST(GL_AUTO_NORMAL);
+	EXPP_ADDCONST(GL_MAP1_COLOR_4);
+	EXPP_ADDCONST(GL_MAP1_INDEX);
+	EXPP_ADDCONST(GL_MAP1_NORMAL);
+	EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_1);
+	EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_2);
+	EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_3);
+	EXPP_ADDCONST(GL_MAP1_TEXTURE_COORD_4);
+	EXPP_ADDCONST(GL_MAP1_VERTEX_3);
+	EXPP_ADDCONST(GL_MAP1_VERTEX_4);
+	EXPP_ADDCONST(GL_MAP2_COLOR_4);
+	EXPP_ADDCONST(GL_MAP2_INDEX);
+	EXPP_ADDCONST(GL_MAP2_NORMAL);
+	EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_1);
+	EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_2);
+	EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_3);
+	EXPP_ADDCONST(GL_MAP2_TEXTURE_COORD_4);
+	EXPP_ADDCONST(GL_MAP2_VERTEX_3);
+	EXPP_ADDCONST(GL_MAP2_VERTEX_4);
+	EXPP_ADDCONST(GL_MAP1_GRID_DOMAIN);
+	EXPP_ADDCONST(GL_MAP1_GRID_SEGMENTS);
+	EXPP_ADDCONST(GL_MAP2_GRID_DOMAIN);
+	EXPP_ADDCONST(GL_MAP2_GRID_SEGMENTS);
+	EXPP_ADDCONST(GL_TEXTURE_1D);
+	EXPP_ADDCONST(GL_TEXTURE_2D);
+
+	EXPP_ADDCONST(GL_TEXTURE_WIDTH);
+	EXPP_ADDCONST(GL_TEXTURE_HEIGHT);
+	EXPP_ADDCONST(GL_TEXTURE_COMPONENTS);
+	EXPP_ADDCONST(GL_TEXTURE_BORDER_COLOR);
+	EXPP_ADDCONST(GL_TEXTURE_BORDER);
+
+	EXPP_ADDCONST(GL_DONT_CARE);
+	EXPP_ADDCONST(GL_FASTEST);
+	EXPP_ADDCONST(GL_NICEST);
+
+	EXPP_ADDCONST(GL_AMBIENT);
+	EXPP_ADDCONST(GL_DIFFUSE);
+	EXPP_ADDCONST(GL_SPECULAR);
+	EXPP_ADDCONST(GL_POSITION);
+	EXPP_ADDCONST(GL_SPOT_DIRECTION);
+	EXPP_ADDCONST(GL_SPOT_EXPONENT);
+	EXPP_ADDCONST(GL_SPOT_CUTOFF);
+	EXPP_ADDCONST(GL_CONSTANT_ATTENUATION);
+	EXPP_ADDCONST(GL_LINEAR_ATTENUATION);
+	EXPP_ADDCONST(GL_QUADRATIC_ATTENUATION);
+
+	EXPP_ADDCONST(GL_COMPILE);
+	EXPP_ADDCONST(GL_COMPILE_AND_EXECUTE);
+
+	EXPP_ADDCONST(GL_BYTE);
+	EXPP_ADDCONST(GL_UNSIGNED_BYTE);
+	EXPP_ADDCONST(GL_SHORT);
+	EXPP_ADDCONST(GL_UNSIGNED_SHORT);
+	EXPP_ADDCONST(GL_INT);
+	EXPP_ADDCONST(GL_UNSIGNED_INT);
+	EXPP_ADDCONST(GL_FLOAT);
+	EXPP_ADDCONST(GL_2_BYTES);
+	EXPP_ADDCONST(GL_3_BYTES);
+	EXPP_ADDCONST(GL_4_BYTES);
+
+	EXPP_ADDCONST(GL_CLEAR);
+	EXPP_ADDCONST(GL_AND);
+	EXPP_ADDCONST(GL_AND_REVERSE);
+	EXPP_ADDCONST(GL_COPY);
+	EXPP_ADDCONST(GL_AND_INVERTED);
+	EXPP_ADDCONST(GL_NOOP);
+	EXPP_ADDCONST(GL_XOR);
+	EXPP_ADDCONST(GL_OR);
+	EXPP_ADDCONST(GL_NOR);
+	EXPP_ADDCONST(GL_EQUIV);
+	EXPP_ADDCONST(GL_INVERT);
+	EXPP_ADDCONST(GL_OR_REVERSE);
+	EXPP_ADDCONST(GL_COPY_INVERTED);
+	EXPP_ADDCONST(GL_OR_INVERTED);
+	EXPP_ADDCONST(GL_NAND);
+	EXPP_ADDCONST(GL_SET);
+
+	EXPP_ADDCONST(GL_EMISSION);
+	EXPP_ADDCONST(GL_SHININESS);
+	EXPP_ADDCONST(GL_AMBIENT_AND_DIFFUSE);
+	EXPP_ADDCONST(GL_COLOR_INDEXES);
+
+	EXPP_ADDCONST(GL_MODELVIEW);
+	EXPP_ADDCONST(GL_PROJECTION);
+	EXPP_ADDCONST(GL_TEXTURE);
+
+	EXPP_ADDCONST(GL_COLOR);
+	EXPP_ADDCONST(GL_DEPTH);
+	EXPP_ADDCONST(GL_STENCIL);
+
+	EXPP_ADDCONST(GL_COLOR_INDEX);
+	EXPP_ADDCONST(GL_STENCIL_INDEX);
+	EXPP_ADDCONST(GL_DEPTH_COMPONENT);
+	EXPP_ADDCONST(GL_RED);
+	EXPP_ADDCONST(GL_GREEN);
+	EXPP_ADDCONST(GL_BLUE);
+	EXPP_ADDCONST(GL_ALPHA);
+	EXPP_ADDCONST(GL_RGB);
+	EXPP_ADDCONST(GL_RGBA);
+	EXPP_ADDCONST(GL_LUMINANCE);
+	EXPP_ADDCONST(GL_LUMINANCE_ALPHA);
+
+	EXPP_ADDCONST(GL_BITMAP);
+
+	EXPP_ADDCONST(GL_POINT);
+	EXPP_ADDCONST(GL_LINE);
+	EXPP_ADDCONST(GL_FILL);
+
+	EXPP_ADDCONST(GL_RENDER);
+	EXPP_ADDCONST(GL_FEEDBACK);
+	EXPP_ADDCONST(GL_SELECT);
+
+	EXPP_ADDCONST(GL_FLAT);
+	EXPP_ADDCONST(GL_SMOOTH);
+
+	EXPP_ADDCONST(GL_KEEP);
+	EXPP_ADDCONST(GL_REPLACE);
+	EXPP_ADDCONST(GL_INCR);
+	EXPP_ADDCONST(GL_DECR);
+
+	EXPP_ADDCONST(GL_VENDOR);
+	EXPP_ADDCONST(GL_RENDERER);
+	EXPP_ADDCONST(GL_VERSION);
+	EXPP_ADDCONST(GL_EXTENSIONS);
+
+	EXPP_ADDCONST(GL_S);
+	EXPP_ADDCONST(GL_T);
+	EXPP_ADDCONST(GL_R);
+	EXPP_ADDCONST(GL_Q);
+
+	EXPP_ADDCONST(GL_MODULATE);
+	EXPP_ADDCONST(GL_DECAL);
+
+	EXPP_ADDCONST(GL_TEXTURE_ENV_MODE);
+	EXPP_ADDCONST(GL_TEXTURE_ENV_COLOR);
+
+	EXPP_ADDCONST(GL_TEXTURE_ENV);
+
+	EXPP_ADDCONST(GL_EYE_LINEAR);
+	EXPP_ADDCONST(GL_OBJECT_LINEAR);
+	EXPP_ADDCONST(GL_SPHERE_MAP);
+
+	EXPP_ADDCONST(GL_TEXTURE_GEN_MODE);
+	EXPP_ADDCONST(GL_OBJECT_PLANE);
+	EXPP_ADDCONST(GL_EYE_PLANE);
+
+	EXPP_ADDCONST(GL_NEAREST);
+	EXPP_ADDCONST(GL_LINEAR);
+
+	EXPP_ADDCONST(GL_NEAREST_MIPMAP_NEAREST);
+	EXPP_ADDCONST(GL_LINEAR_MIPMAP_NEAREST);
+	EXPP_ADDCONST(GL_NEAREST_MIPMAP_LINEAR);
+	EXPP_ADDCONST(GL_LINEAR_MIPMAP_LINEAR);
+
+	EXPP_ADDCONST(GL_TEXTURE_MAG_FILTER);
+	EXPP_ADDCONST(GL_TEXTURE_MIN_FILTER);
+	EXPP_ADDCONST(GL_TEXTURE_WRAP_S);
+	EXPP_ADDCONST(GL_TEXTURE_WRAP_T);
+
+	EXPP_ADDCONST(GL_CLAMP);
+	EXPP_ADDCONST(GL_REPEAT);
+
+	EXPP_ADDCONST(GL_CLIP_PLANE0);
+	EXPP_ADDCONST(GL_CLIP_PLANE1);
+	EXPP_ADDCONST(GL_CLIP_PLANE2);
+	EXPP_ADDCONST(GL_CLIP_PLANE3);
+	EXPP_ADDCONST(GL_CLIP_PLANE4);
+	EXPP_ADDCONST(GL_CLIP_PLANE5);
+
+	EXPP_ADDCONST(GL_LIGHT0);
+	EXPP_ADDCONST(GL_LIGHT1);
+	EXPP_ADDCONST(GL_LIGHT2);
+	EXPP_ADDCONST(GL_LIGHT3);
+	EXPP_ADDCONST(GL_LIGHT4);
+	EXPP_ADDCONST(GL_LIGHT5);
+	EXPP_ADDCONST(GL_LIGHT6);
+	EXPP_ADDCONST(GL_LIGHT7);
+	
+	EXPP_ADDCONST(GL_POLYGON_OFFSET_UNITS);
+	EXPP_ADDCONST(GL_POLYGON_OFFSET_POINT);
+	EXPP_ADDCONST(GL_POLYGON_OFFSET_LINE);
+	EXPP_ADDCONST(GL_POLYGON_OFFSET_FILL);
+	EXPP_ADDCONST(GL_POLYGON_OFFSET_FACTOR);
+	
+	EXPP_ADDCONST(GL_TEXTURE_PRIORITY);
+	EXPP_ADDCONST(GL_TEXTURE_RESIDENT);
+	EXPP_ADDCONST(GL_TEXTURE_BINDING_1D);
+	EXPP_ADDCONST(GL_TEXTURE_BINDING_2D);
       
-  return mod;
+	return mod;
 }
diff --git a/source/blender/python/api2_2x/BGL.h b/source/blender/python/api2_2x/BGL.h
index 7a09925f2b4..e5eef1de37e 100644
--- a/source/blender/python/api2_2x/BGL.h
+++ b/source/blender/python/api2_2x/BGL.h
@@ -36,6 +36,9 @@
  * writers to make OpenGL calls in their Python scripts for Blender.  The
  * more important original comments are marked with an @ symbol. */
 
+#ifndef EXPP_BGL_H
+#define EXPP_BGL_H
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -71,7 +74,8 @@
 /*@ For Python access to OpenGL functions requiring a pointer. */
 
 typedef struct _Buffer {
-	PyObject_VAR_HEAD PyObject * parent;
+	PyObject_VAR_HEAD 
+	PyObject * parent;
 
 	int type;		/* GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT */
 	int ndimensions;
@@ -87,71 +91,6 @@ typedef struct _Buffer {
 	} buf;
 } Buffer;
 
-static int type_size( int type );
-static Buffer *make_buffer( int type, int ndimensions, int *dimensions );
-static int Buffer_ass_slice( PyObject * self, int begin, int end,
-			     PyObject * seq );
-
-static char Method_Buffer_doc[] =
-	"(type, dimensions, [template]) - Create a new Buffer object\n\n\
-(type) - The format to store data in\n\
-(dimensions) - An int or sequence specifying the dimensions of the buffer\n\
-[template] - A sequence of matching dimensions to the buffer to be created\n\
-  which will be used to initialize the Buffer.\n\n\
-If a template is not passed in all fields will be initialized to 0.\n\n\
-The type should be one of GL_BYTE, GL_SHORT, GL_INT, or GL_FLOAT.\n\
-If the dimensions are specified as an int a linear buffer will be\n\
-created. If a sequence is passed for the dimensions the buffer\n\
-will have len(sequence) dimensions, where the size for each dimension\n\
-is determined by the value in the sequence at that index.\n\n\
-For example, passing [100, 100] will create a 2 dimensional\n\
-square buffer. Passing [16, 16, 32] will create a 3 dimensional\n\
-buffer which is twice as deep as it is wide or high.";
-
-static PyObject *Method_Buffer( PyObject * self, PyObject * args );
-
-/* Buffer sequence methods */
-
-static int Buffer_len( PyObject * self );
-static PyObject *Buffer_item( PyObject * self, int i );
-static PyObject *Buffer_slice( PyObject * self, int begin, int end );
-static int Buffer_ass_item( PyObject * self, int i, PyObject * v );
-static int Buffer_ass_slice( PyObject * self, int begin, int end,
-			     PyObject * seq );
-
-static PySequenceMethods Buffer_SeqMethods = {
-	( inquiry ) Buffer_len,	/*sq_length */
-	( binaryfunc ) 0,	/*sq_concat */
-	( intargfunc ) 0,	/*sq_repeat */
-	( intargfunc ) Buffer_item,	/*sq_item */
-	( intintargfunc ) Buffer_slice,	/*sq_slice */
-	( intobjargproc ) Buffer_ass_item,	/*sq_ass_item */
-	( intintobjargproc ) Buffer_ass_slice,	/*sq_ass_slice */
-};
-
-static void Buffer_dealloc( PyObject * self );
-static PyObject *Buffer_tolist( PyObject * self );
-static PyObject *Buffer_dimensions( PyObject * self );
-static PyObject *Buffer_getattr( PyObject * self, char *name );
-static PyObject *Buffer_repr( PyObject * self );
-
-PyTypeObject buffer_Type = {
-	PyObject_HEAD_INIT( NULL )      /* required python macro */
-	0,	/*ob_size */
-	"buffer",		/*tp_name */
-	sizeof( Buffer ),	/*tp_basicsize */
-	0,			/*tp_itemsize */
-	( destructor ) Buffer_dealloc,	/*tp_dealloc */
-	( printfunc ) 0,	/*tp_print */
-	( getattrfunc ) Buffer_getattr,	/*tp_getattr */
-	( setattrfunc ) 0,	/*tp_setattr */
-	( cmpfunc ) 0,		/*tp_compare */
-	( reprfunc ) Buffer_repr,	/*tp_repr */
-	0,			/*tp_as_number */
-	&Buffer_SeqMethods,	/*tp_as_sequence */
-};
-
-/* #ifndef __APPLE__ */
 
 /*@ By golly George! It looks like fancy pants macro time!!! */
 
@@ -411,24 +350,6 @@ PyTypeObject buffer_Type = {
 #define ret_set_GLstring  ret_str=
 #define ret_ret_GLstring  return PyString_FromString(ret_str);
 
-#define BGL_Wrap(nargs, funcname, ret, arg_list) \
-static PyObject *Method_##funcname (PyObject *self, PyObject *args) {\
-  arg_def##nargs arg_list; \
-  ret_def_##ret; \
-  if(!PyArg_ParseTuple(args, arg_str##nargs arg_list, arg_ref##nargs arg_list)) return NULL;\
-  ret_set_##ret gl##funcname (arg_var##nargs arg_list);\
-  ret_ret_##ret; \
-}
-
-#define BGLU_Wrap(nargs, funcname, ret, arg_list) \
-static PyObject *Method_##funcname (PyObject *self, PyObject *args) {\
-  arg_def##nargs arg_list; \
-  ret_def_##ret; \
-  if(!PyArg_ParseTuple(args, arg_str##nargs arg_list, arg_ref##nargs arg_list)) return NULL;\
-  ret_set_##ret glu##funcname (arg_var##nargs arg_list);\
-  ret_ret_##ret; \
-}
-
-/* #endif */
-
-PyObject *BGL_Init( void );
+
+
+#endif  /*  EXPP_BGL_H */