ruby-opengl 0.50.0 → 0.60.0

data/ext/common/funcdef.h

@@ -0,0 +1,280 @@
+/*
+ * Copyright (C) 2007 Jan Dvorak <jan.dvorak@kraxnet.cz>
+ *
+ * This program is distributed under the terms of the MIT license.
+ * See the included MIT-LICENSE file for the terms of this license.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* These macros are for simplification of function definition, as passing
+  arguments from/to OpenGL usually follows the same few patterns. It would
+  be probably wise to adapt the whole bindings to C++ (templates, overloaded
+  functions, etc.), but for now supporting ruby extension for Windows means
+  MSVC6, and that in turn means unspeakable horrors and pains for everyone
+  attempting to merely write, much less debug or maintain any template-based
+  code.
+*/
+
+/* Will load function pointer for function _NAME_ on first call to the
+  function, or raise if the OpenGL version is less then required or the
+  required extension is not supported */
+#define LOAD_GL_FUNC(_NAME_,_VEREXT_) \
+if (fptr_##_NAME_==NULL) { \
+	if (CheckVersionExtension(_VEREXT_)==GL_FALSE) { \
+		if (isdigit(_VEREXT_[0])) \
+			rb_raise(rb_eNotImpError,"OpenGL version %s is not available on this system",_VEREXT_); \
+		else \
+			rb_raise(rb_eNotImpError,"Extension %s is not available on this system",_VEREXT_); \
+	} \
+	fptr_##_NAME_ = load_gl_function(#_NAME_, 1); \
+}
+
+/* Macroset for defining simple functions, i.e. functions that take n arguments and
+  pass them to GL API function without any additional processing.
+
+  Some checking is implicit in _conversion_ argument - e.g. NUM2INT makes sure that
+  user is really passing type that can be converted to INT, otherwire raises.
+  
+  *_LOAD version of macros are for defining functions where we load function pointer
+  instead of direct call - that means all functions above OpenGL 1.1 (including all extensions)
+*/
+
+#define ARGLIST0 
+#define ARGLIST1 ,arg1
+#define ARGLIST2 ,arg1,arg2
+#define ARGLIST3 ,arg1,arg2,arg3
+#define ARGLIST4 ,arg1,arg2,arg3,arg4
+#define ARGLIST5 ,arg1,arg2,arg3,arg4,arg5
+#define ARGLIST6 ,arg1,arg2,arg3,arg4,arg5,arg6
+#define ARGLIST7 ,arg1,arg2,arg3,arg4,arg5,arg6,arg7
+#define ARGLIST8 ,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8
+#define ARGLIST9 ,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9
+#define ARGLIST10 ,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10
+
+#define CONV_GLenum (GLenum)NUM2UINT
+#define CONV_GLboolean (GLboolean)NUM2UINT
+#define CONV_GLbitfield (GLbitfield)NUM2UINT
+#define CONV_GLbyte (GLbyte)NUM2INT
+#define CONV_GLshort (GLshort)NUM2INT
+#define CONV_GLint (GLint)NUM2INT
+#define CONV_GLubyte (GLubyte)NUM2UINT
+#define CONV_GLushort (GLushort)NUM2UINT
+#define CONV_GLuint (GLuint)NUM2UINT
+#define CONV_GLsizei (GLsizei)NUM2INT
+#define CONV_GLfloat (GLfloat)NUM2DBL
+#define CONV_GLclampf (GLclampf)NUM2DBL
+#define CONV_GLdouble (GLdouble)NUM2DBL
+#define CONV_GLclampd (GLclampd)NUM2DBL
+
+#define RETDECL_BASE(_t_) _t_ ret = (_t_) 0;
+#define RETDECL_GLvoid
+#define RETDECL_void
+#define RETDECL_GLenum RETDECL_BASE(GLenum)
+#define RETDECL_GLboolean RETDECL_BASE(GLboolean)
+#define RETDECL_GLbitfield RETDECL_BASE(GLbitfield)
+#define RETDECL_GLbyte RETDECL_BASE(GLbyte)
+#define RETDECL_GLshort RETDECL_BASE(GLshort)
+#define RETDECL_GLint RETDECL_BASE(GLint)
+#define RETDECL_GLubyte RETDECL_BASE(GLubyte)
+#define RETDECL_GLushort RETDECL_BASE(GLushort)
+#define RETDECL_GLuint RETDECL_BASE(GLuint)
+#define RETDECL_GLsizei RETDECL_BASE(GLsizei)
+#define RETDECL_GLfloat RETDECL_BASE(GLfloat)
+#define RETDECL_GLclampf RETDECL_BASE(GLclampf)
+#define RETDECL_GLdouble RETDECL_BASE(GLdouble)
+#define RETDECL_GLclampd RETDECL_BASE(GLclampd)
+
+#define RETSTAT_GLvoid
+#define RETSTAT_void
+#define RETSTAT_GLenum ret=
+#define RETSTAT_GLboolean ret=
+#define RETSTAT_GLbitfield ret=
+#define RETSTAT_GLbyte ret=
+#define RETSTAT_GLshort ret=
+#define RETSTAT_GLint ret=
+#define RETSTAT_GLubyte ret=
+#define RETSTAT_GLushort ret=
+#define RETSTAT_GLuint ret=
+#define RETSTAT_GLsizei ret=
+#define RETSTAT_GLfloat ret=
+#define RETSTAT_GLclampf ret=
+#define RETSTAT_GLdouble ret=
+#define RETSTAT_GLclampd ret=
+
+#define RETCONV_GLvoid(x) Qnil
+#define RETCONV_void(x) Qnil
+#define RETCONV_GLenum(x) UINT2NUM(x)
+#define RETCONV_GLboolean(x) GLBOOL2RUBY(x)
+#define RETCONV_GLbitfield(x) UINT2NUM(x)
+#define RETCONV_GLbyte(x) INT2NUM(x)
+#define RETCONV_GLshort(x) INT2NUM(x)
+#define RETCONV_GLint(x) INT2NUM(x)
+#define RETCONV_GLubyte(x) UINT2NUM(x)
+#define RETCONV_GLushort(x) UINT2NUM(x)
+#define RETCONV_GLuint(x) UINT2NUM(x)
+#define RETCONV_GLsizei(x) INT2NUM(x)
+#define RETCONV_GLfloat(x) rb_float_new(x)
+#define RETCONV_GLclampf(x) rb_float_new(x)
+#define RETCONV_GLdouble(x) rb_float_new(x)
+#define RETCONV_GLclampd(x) rb_float_new(x)
+
+#define PROTOPARAM0(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) void
+#define PROTOPARAM1(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1
+#define PROTOPARAM2(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2
+#define PROTOPARAM3(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3
+#define PROTOPARAM4(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3,p4
+#define PROTOPARAM5(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3,p4,p5
+#define PROTOPARAM6(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3,p4,p5,p6
+#define PROTOPARAM7(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3,p4,p5,p6,p7
+#define PROTOPARAM8(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3,p4,p5,p6,p7,p8
+#define PROTOPARAM9(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3,p4,p5,p6,p7,p8,p9
+#define PROTOPARAM10(p1,p2,p3,p4,p5,p6,p7,p8,p9,p10) p1,p2,p3,p4,p5,p6,p7,p8,p9,p10
+
+#define CALLCONV0(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) 
+#define CALLCONV1(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1)
+#define CALLCONV2(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2)
+#define CALLCONV3(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3)
+#define CALLCONV4(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4)
+#define CALLCONV5(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4),CONV_##cv5(arg5)
+#define CALLCONV6(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4),CONV_##cv5(arg5),CONV_##cv6(arg6)
+#define CALLCONV7(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4),CONV_##cv5(arg5),CONV_##cv6(arg6),CONV_##cv7(arg7)
+#define CALLCONV8(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4),CONV_##cv5(arg5),CONV_##cv6(arg6),CONV_##cv7(arg7),CONV_##cv8(arg8)
+#define CALLCONV9(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4),CONV_##cv5(arg5),CONV_##cv6(arg6),CONV_##cv7(arg7),CONV_##cv8(arg8),CONV_##cv9(arg9)
+#define CALLCONV10(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4),CONV_##cv5(arg5),CONV_##cv6(arg6),CONV_##cv7(arg7),CONV_##cv8(arg8),CONV_##cv9(arg9),CONV_##cv10(arg10)
+
+#define GL_FUNC_LOAD(_num_,_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_) \
+static _returntype_ (APIENTRY * fptr_gl##_name_)(PROTOPARAM##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
+static VALUE \
+gl_##_name_(obj ARGLIST##_num_) \
+VALUE obj ARGLIST##_num_; \
+{ \
+	RETDECL_##_returntype_ \
+	LOAD_GL_FUNC(gl##_name_,_ver_) \
+	RETSTAT_##_returntype_ fptr_gl##_name_(CALLCONV##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
+	CHECK_GLERROR \
+	return RETCONV_##_returntype_(ret) ; \
+}
+
+#define GL_FUNC_STATIC(_num_,_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10) \
+static VALUE \
+gl_##_name_(obj ARGLIST##_num_) \
+VALUE obj ARGLIST##_num_; \
+{ \
+	RETDECL_##_returntype_ \
+	RETSTAT_##_returntype_ gl##_name_(CALLCONV##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
+	CHECK_GLERROR \
+	return RETCONV_##_returntype_(ret) ; \
+}
+
+#define GL_FUNC_LOAD_0(_name_,_returntype_,_ver_) GL_FUNC_LOAD(0, _name_,_returntype_,0,0,0,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_1(_name_,_returntype_,targ1,_ver_) GL_FUNC_LOAD(1, _name_,_returntype_,targ1,0,0,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_2(_name_,_returntype_,targ1,targ2,_ver_) GL_FUNC_LOAD(2, _name_,_returntype_,targ1,targ2,0,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_3(_name_,_returntype_,targ1,targ2,targ3,_ver_) GL_FUNC_LOAD(3, _name_,_returntype_,targ1,targ2,targ3,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_4(_name_,_returntype_,targ1,targ2,targ3,targ4,_ver_) GL_FUNC_LOAD(4, _name_,_returntype_,targ1,targ2,targ3,targ4,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_5(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,_ver_) GL_FUNC_LOAD(5, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_6(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,_ver_) GL_FUNC_LOAD(6, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_7(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,_ver_) GL_FUNC_LOAD(7, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,0,0,0,_ver_)
+#define GL_FUNC_LOAD_8(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,_ver_) GL_FUNC_LOAD(8, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,0,0,_ver_)
+#define GL_FUNC_LOAD_9(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,_ver_) GL_FUNC_LOAD(9, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,0,_ver_)
+#define GL_FUNC_LOAD_10(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_) GL_FUNC_LOAD(10, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_)
+
+#define GL_FUNC_STATIC_0(_name_,_returntype_) GL_FUNC_STATIC(0, _name_,_returntype_,0,0,0,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_1(_name_,_returntype_,targ1) GL_FUNC_STATIC(1, _name_,_returntype_,targ1,0,0,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_2(_name_,_returntype_,targ1,targ2) GL_FUNC_STATIC(2, _name_,_returntype_,targ1,targ2,0,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_3(_name_,_returntype_,targ1,targ2,targ3) GL_FUNC_STATIC(3, _name_,_returntype_,targ1,targ2,targ3,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_4(_name_,_returntype_,targ1,targ2,targ3,targ4) GL_FUNC_STATIC(4, _name_,_returntype_,targ1,targ2,targ3,targ4,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_5(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5) GL_FUNC_STATIC(5, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,0,0,0,0,0)
+#define GL_FUNC_STATIC_6(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6) GL_FUNC_STATIC(6, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,0,0,0,0)
+#define GL_FUNC_STATIC_7(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7) GL_FUNC_STATIC(7, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,0,0,0)
+#define GL_FUNC_STATIC_8(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8) GL_FUNC_STATIC(8, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,0,0)
+#define GL_FUNC_STATIC_9(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9) GL_FUNC_STATIC(9, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,0)
+#define GL_FUNC_STATIC_10(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10_ver_) GL_FUNC_STATIC(10, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)
+
+/* Templates for glGen* and glDelete* */
+
+#define GL_FUNC_GENOBJECTS_LOAD(_name_,_ver_) \
+static void (APIENTRY * fptr_gl##_name_)(GLsizei,GLuint *); \
+static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
+{ \
+	GLsizei n; \
+	GLuint *objects; \
+	VALUE ret; \
+	unsigned int i; \
+	LOAD_GL_FUNC(gl##_name_,_ver_) \
+	n = CONV_GLsizei(arg1); \
+	objects = ALLOC_N(GLuint, n); \
+	fptr_gl##_name_(n,objects); \
+	ret = rb_ary_new2(n); \
+	for (i = 0; i < n; i++) \
+		rb_ary_push(ret, RETCONV_GLuint(objects[i])); \
+	xfree(objects); \
+	CHECK_GLERROR \
+	return ret; \
+}
+
+#define GL_FUNC_GENOBJECTS(_name_) \
+static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
+{ \
+	GLsizei n; \
+	GLuint *objects; \
+	VALUE ret; \
+	unsigned int i; \
+	n = CONV_GLsizei(arg1); \
+	objects = ALLOC_N(GLuint, n); \
+	gl##_name_(n,objects); \
+	ret = rb_ary_new2(n); \
+	for (i = 0; i < n; i++) \
+		rb_ary_push(ret, RETCONV_GLuint(objects[i])); \
+	xfree(objects); \
+	CHECK_GLERROR \
+	return ret; \
+}
+
+#define GL_FUNC_DELETEOBJECTS_LOAD(_name_,_ver_) \
+static void (APIENTRY * fptr_gl##_name_)(GLsizei,const GLuint *); \
+static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
+{ \
+	GLsizei n; \
+	LOAD_GL_FUNC(gl##_name_,_ver_) \
+	if (TYPE(arg1)==T_ARRAY) { \
+		GLuint *objects; \
+		n = RARRAY(arg1)->len; \
+		objects = ALLOC_N(GLuint,n); \
+		ary2cuint(arg1,objects,n);  \
+		fptr_gl##_name_(n,objects); \
+		xfree(objects); \
+	} else { \
+		GLuint object; \
+		object = CONV_GLsizei(arg1); \
+		fptr_gl##_name_(1,&object);  \
+	} \
+	CHECK_GLERROR \
+	return Qnil; \
+}
+
+#define GL_FUNC_DELETEOBJECTS(_name_) \
+static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
+{ \
+	GLsizei n; \
+	if (TYPE(arg1)==T_ARRAY) { \
+		GLuint *objects; \
+		n = RARRAY(arg1)->len; \
+		objects = ALLOC_N(GLuint,n); \
+		ary2cuint(arg1,objects,n);  \
+		gl##_name_(n,objects); \
+		xfree(objects); \
+	} else { \
+		GLuint object; \
+		object = CONV_GLsizei(arg1); \
+		gl##_name_(1,&object);  \
+	} \
+	CHECK_GLERROR \
+	return Qnil; \
+}

data/ext/common/gl-error.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2007 Jan Dvorak <jan.dvorak@kraxnet.cz>
+ *
+ * This program is distributed under the terms of the MIT license.
+ * See the included MIT-LICENSE file for the terms of this license.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+void gl_init_error(VALUE);
+
+extern VALUE error_checking;
+extern VALUE inside_begin_end;
+
+void check_for_glerror(void);
+
+#define CHECK_GLERROR if (error_checking==Qtrue && inside_begin_end==Qfalse) check_for_glerror();

data/ext/common/gl-types.h

@@ -16,6 +16,15 @@
 /* GL types - define if system GLheaders are not recent
    Note: must be included before gl-enums.h */
 
+#if defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <inttypes.h> 
+#endif
+
 /* GL base */
 #ifndef GL_VERSION_1_5
 typedef ptrdiff_t GLintptr;
@@ -45,3 +54,8 @@ typedef ptrdiff_t GLsizeiptrARB;
 #ifndef GL_NV_half_float
 typedef unsigned short GLhalfNV;
 #endif
+
+#ifndef GL_EXT_timer_query
+typedef int64_t GLint64EXT;
+typedef uint64_t GLuint64EXT;
+#endif

data/ext/gl/gl-1.0-1.1.c

@@ -23,192 +23,222 @@
 
 /* OpenGL 1.0 + 1.1 functions */
 
-/* simple functions - see common.h */
-GL_SIMPLE_FUNC(ArrayElement,1,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Begin,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(BlendFunc,2,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(CallList,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(Clear,1,GLbitfield,NUM2UINT)
-GL_SIMPLE_FUNC(ClearAccum,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(ClearColor,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(ClearDepth,1,GLclampd,NUM2DBL)
-GL_SIMPLE_FUNC(ClearIndex,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(ClearStencil,1,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Color3b,3,GLbyte,NUM2INT)
-GL_SIMPLE_FUNC(Color3d,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Color3f,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Color3i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Color3s,3,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Color3ub,3,GLubyte,NUM2INT)
-GL_SIMPLE_FUNC(Color3ui,3,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(Color3us,3,GLushort,NUM2INT)
-GL_SIMPLE_FUNC(Color4b,4,GLbyte,NUM2INT)
-GL_SIMPLE_FUNC(Color4d,4,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Color4f,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Color4i,4,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Color4s,4,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Color4ub,4,GLubyte,NUM2INT)
-GL_SIMPLE_FUNC(Color4ui,4,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(Color4us,4,GLushort,NUM2INT)
-GL_SIMPLE_FUNC(ColorMask,4,GLboolean,NUM2INT)
-GL_SIMPLE_FUNC(ColorMaterial,2,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(CullFace,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(DeleteLists,2,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(DepthFunc,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(DepthMask,1,GLboolean,NUM2INT)
-GL_SIMPLE_FUNC(DepthRange,2,GLclampd,NUM2DBL)
-GL_SIMPLE_FUNC(Disable,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(DisableClientState,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(DrawBuffer,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(EdgeFlag,1,GLboolean,NUM2INT)
-GL_SIMPLE_FUNC(Enable,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(EnableClientState,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(End,0,0,0)
-GL_SIMPLE_FUNC(EndList,0,0,0)
-GL_SIMPLE_FUNC(EvalCoord1d,1,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(EvalCoord1f,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(EvalCoord2d,2,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(EvalCoord2f,2,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(EvalPoint1,1,GLint,NUM2INT)
-GL_SIMPLE_FUNC(EvalPoint2,2,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Finish,0,0,0)
-GL_SIMPLE_FUNC(Flush,0,0,0)
-GL_SIMPLE_FUNC(FrontFace,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(Frustum,6,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Hint,2,GLenum,NUM2UINT)
-GL_SIMPLE_FUNC(Indexd,1,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Indexf,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Indexi,1,GLint,NUM2INT)
-GL_SIMPLE_FUNC(IndexMask,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(Indexs,1,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Indexub,1,GLubyte,NUM2INT)
-GL_SIMPLE_FUNC(InitNames,0,0,0)
-GL_SIMPLE_FUNC(LineWidth,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(ListBase,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(LoadIdentity,0,0,0)
-GL_SIMPLE_FUNC(LoadName,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(LogicOp,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(MatrixMode,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(Normal3b,3,GLbyte,NUM2INT)
-GL_SIMPLE_FUNC(Normal3d,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Normal3f,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Normal3i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Normal3s,3,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Ortho,6,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(PassThrough,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(PixelZoom,2,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(PointSize,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(PolygonMode,2,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(PopAttrib,0,0,0)
-GL_SIMPLE_FUNC(PopClientAttrib,0,0,0)
-GL_SIMPLE_FUNC(PopMatrix,0,0,0)
-GL_SIMPLE_FUNC(PopName,0,0,0)
-GL_SIMPLE_FUNC(PushAttrib,1,GLbitfield,NUM2UINT)
-GL_SIMPLE_FUNC(PushClientAttrib,1,GLbitfield,NUM2UINT)
-GL_SIMPLE_FUNC(PushMatrix,0,0,0)
-GL_SIMPLE_FUNC(PushName,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(RasterPos2d,2,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(RasterPos2f,2,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(RasterPos2i,2,GLint,NUM2INT)
-GL_SIMPLE_FUNC(RasterPos2s,2,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(RasterPos3d,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(RasterPos3f,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(RasterPos3i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC(RasterPos3s,3,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(RasterPos4d,4,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(RasterPos4f,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(RasterPos4i,4,GLint,NUM2INT)
-GL_SIMPLE_FUNC(RasterPos4s,4,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(ReadBuffer,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(Rectd,4,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Rectf,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Recti,4,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Rects,4,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Rotated,4,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Rotatef,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Scaled,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Scalef,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Scissor,4,GLint,NUM2UINT)
-GL_SIMPLE_FUNC(ShadeModel,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(StencilMask,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC(StencilOp,3,GLenum,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord1d,1,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord1f,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord1i,1,GLint,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord1s,1,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord2d,2,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord2f,2,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord2i,2,GLint,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord2s,2,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord3d,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord3f,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord3i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord3s,3,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord4d,4,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord4f,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(TexCoord4i,4,GLint,NUM2INT)
-GL_SIMPLE_FUNC(TexCoord4s,4,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Translated,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Translatef,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Vertex2d,2,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Vertex2f,2,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Vertex2i,2,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Vertex2s,2,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Vertex3d,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Vertex3f,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Vertex3i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Vertex3s,3,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Vertex4d,4,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC(Vertex4f,4,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC(Vertex4i,4,GLint,NUM2INT)
-GL_SIMPLE_FUNC(Vertex4s,4,GLshort,NUM2INT)
-GL_SIMPLE_FUNC(Viewport,4,GLuint,NUM2UINT)
-
-static VALUE
-gl_NewList(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
+GL_FUNC_STATIC_2(Accum,GLvoid, GLenum,GLfloat)
+GL_FUNC_STATIC_2(AlphaFunc,GLvoid, GLenum,GLclampf)
+GL_FUNC_STATIC_1(ArrayElement,GLvoid, GLint)
+GL_FUNC_STATIC_2(BindTexture,GLvoid, GLenum,GLuint)
+GL_FUNC_STATIC_2(BlendFunc,GLvoid, GLenum,GLenum)
+GL_FUNC_STATIC_1(CallList,GLvoid, GLuint)
+GL_FUNC_STATIC_1(Clear,GLvoid, GLbitfield)
+GL_FUNC_STATIC_4(ClearAccum,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_4(ClearColor,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_1(ClearDepth,GLvoid, GLclampd)
+GL_FUNC_STATIC_1(ClearIndex,GLvoid, GLfloat)
+GL_FUNC_STATIC_1(ClearStencil,GLvoid, GLint)
+GL_FUNC_STATIC_3(Color3b,GLvoid, GLbyte,GLbyte,GLbyte)
+GL_FUNC_STATIC_3(Color3d,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(Color3f,GLvoid, GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_3(Color3i,GLvoid, GLint,GLint,GLint)
+GL_FUNC_STATIC_3(Color3s,GLvoid, GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_3(Color3ub,GLvoid, GLubyte,GLubyte,GLubyte)
+GL_FUNC_STATIC_3(Color3ui,GLvoid, GLuint,GLuint,GLuint)
+GL_FUNC_STATIC_3(Color3us,GLvoid, GLushort,GLushort,GLushort)
+GL_FUNC_STATIC_4(Color4b,GLvoid, GLbyte,GLbyte,GLbyte,GLbyte)
+GL_FUNC_STATIC_4(Color4d,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_4(Color4f,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_4(Color4i,GLvoid, GLint,GLint,GLint,GLint)
+GL_FUNC_STATIC_4(Color4s,GLvoid, GLshort,GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_4(Color4ub,GLvoid, GLubyte,GLubyte,GLubyte,GLubyte)
+GL_FUNC_STATIC_4(Color4ui,GLvoid, GLuint,GLuint,GLuint,GLuint)
+GL_FUNC_STATIC_4(Color4us,GLvoid, GLushort,GLushort,GLushort,GLushort)
+GL_FUNC_STATIC_4(ColorMask,GLvoid, GLboolean,GLboolean,GLboolean,GLboolean)
+GL_FUNC_STATIC_2(ColorMaterial,GLvoid, GLenum,GLenum)
+GL_FUNC_STATIC_5(CopyPixels,GLvoid, GLint,GLint,GLsizei,GLsizei,GLenum)
+GL_FUNC_STATIC_7(CopyTexImage1D,GLvoid, GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLint)
+GL_FUNC_STATIC_8(CopyTexImage2D,GLvoid, GLenum,GLint,GLenum,GLint,GLint,GLsizei,GLsizei,GLint)
+GL_FUNC_STATIC_6(CopyTexSubImage1D,GLvoid, GLenum,GLint,GLint,GLint,GLint,GLsizei)
+GL_FUNC_STATIC_8(CopyTexSubImage2D,GLvoid, GLenum,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei)
+GL_FUNC_STATIC_1(CullFace,GLvoid, GLenum)
+GL_FUNC_STATIC_2(DeleteLists,GLvoid, GLuint,GLuint)
+GL_FUNC_STATIC_1(DepthFunc,GLvoid, GLenum)
+GL_FUNC_STATIC_1(DepthMask,GLvoid, GLboolean)
+GL_FUNC_STATIC_2(DepthRange,GLvoid, GLclampd,GLclampd)
+GL_FUNC_STATIC_1(Disable,GLvoid, GLenum)
+GL_FUNC_STATIC_1(DisableClientState,GLvoid, GLenum)
+GL_FUNC_STATIC_3(DrawArrays,GLvoid, GLenum,GLint,GLsizei)
+GL_FUNC_STATIC_1(DrawBuffer,GLvoid, GLenum)
+GL_FUNC_STATIC_1(EdgeFlag,GLvoid, GLboolean)
+GL_FUNC_STATIC_1(Enable,GLvoid, GLenum)
+GL_FUNC_STATIC_1(EnableClientState,GLvoid, GLenum)
+GL_FUNC_STATIC_0(EndList,GLvoid)
+GL_FUNC_STATIC_1(EvalCoord1d,GLvoid, GLdouble)
+GL_FUNC_STATIC_1(EvalCoord1f,GLvoid, GLfloat)
+GL_FUNC_STATIC_2(EvalCoord2d,GLvoid, GLdouble,GLdouble)
+GL_FUNC_STATIC_2(EvalCoord2f,GLvoid, GLfloat,GLfloat)
+GL_FUNC_STATIC_3(EvalMesh1,GLvoid, GLenum,GLint,GLint)
+GL_FUNC_STATIC_5(EvalMesh2,GLvoid, GLenum,GLint,GLint,GLint,GLint)
+GL_FUNC_STATIC_1(EvalPoint1,GLvoid, GLint)
+GL_FUNC_STATIC_2(EvalPoint2,GLvoid, GLint,GLint)
+GL_FUNC_STATIC_0(Finish,GLvoid)
+GL_FUNC_STATIC_0(Flush,GLvoid)
+GL_FUNC_STATIC_2(Fogi,GLvoid, GLenum,GLint)
+GL_FUNC_STATIC_2(Fogf,GLvoid, GLenum,GLfloat)
+GL_FUNC_STATIC_1(FrontFace,GLvoid, GLenum)
+GL_FUNC_STATIC_6(Frustum,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_1(GenLists,GLuint, GLsizei)
+GL_FUNC_STATIC_0(GetError,GLenum)
+GL_FUNC_STATIC_2(Hint,GLvoid, GLenum,GLenum)
+GL_FUNC_STATIC_1(Indexd,GLvoid, GLdouble)
+GL_FUNC_STATIC_1(Indexf,GLvoid, GLfloat)
+GL_FUNC_STATIC_1(Indexi,GLvoid, GLint)
+GL_FUNC_STATIC_1(IndexMask,GLvoid, GLuint)
+GL_FUNC_STATIC_1(Indexs,GLvoid, GLshort)
+GL_FUNC_STATIC_1(Indexub,GLvoid, GLubyte)
+GL_FUNC_STATIC_0(InitNames,GLvoid)
+GL_FUNC_STATIC_1(IsEnabled,GLboolean, GLenum)
+GL_FUNC_STATIC_1(IsList,GLboolean, GLuint)
+GL_FUNC_STATIC_1(IsTexture,GLboolean, GLuint)
+GL_FUNC_STATIC_2(LightModelf,GLvoid, GLenum,GLfloat)
+GL_FUNC_STATIC_2(LightModeli,GLvoid, GLenum,GLint)
+GL_FUNC_STATIC_3(Lightf,GLvoid, GLenum,GLenum,GLfloat)
+GL_FUNC_STATIC_3(Lighti,GLvoid, GLenum,GLenum,GLint)
+GL_FUNC_STATIC_2(LineStipple,GLvoid, GLint,GLushort)
+GL_FUNC_STATIC_1(LineWidth,GLvoid, GLfloat)
+GL_FUNC_STATIC_1(ListBase,GLvoid, GLuint)
+GL_FUNC_STATIC_0(LoadIdentity,GLvoid)
+GL_FUNC_STATIC_1(LoadName,GLvoid, GLuint)
+GL_FUNC_STATIC_1(LogicOp,GLvoid, GLenum)
+GL_FUNC_STATIC_3(MapGrid1d,GLvoid, GLint,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(MapGrid1f,GLvoid, GLint,GLfloat,GLfloat)
+GL_FUNC_STATIC_6(MapGrid2d,GLvoid, GLint,GLdouble,GLdouble,GLint,GLdouble,GLdouble)
+GL_FUNC_STATIC_6(MapGrid2f,GLvoid, GLint,GLfloat,GLfloat,GLint,GLfloat,GLfloat)
+GL_FUNC_STATIC_3(Materialf,GLvoid, GLenum,GLenum,GLfloat)
+GL_FUNC_STATIC_3(Materiali,GLvoid, GLenum,GLenum,GLint)
+GL_FUNC_STATIC_1(MatrixMode,GLvoid, GLenum)
+GL_FUNC_STATIC_2(NewList,GLvoid, GLuint,GLenum)
+GL_FUNC_STATIC_3(Normal3b,GLvoid, GLbyte,GLbyte,GLbyte)
+GL_FUNC_STATIC_3(Normal3d,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(Normal3f,GLvoid, GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_3(Normal3i,GLvoid, GLint,GLint,GLint)
+GL_FUNC_STATIC_3(Normal3s,GLvoid, GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_6(Ortho,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_1(PassThrough,GLvoid, GLfloat)
+GL_FUNC_STATIC_2(PixelStoref,GLvoid, GLenum,GLfloat)
+GL_FUNC_STATIC_2(PixelStorei,GLvoid, GLenum,GLint)
+GL_FUNC_STATIC_2(PixelTransferf,GLvoid, GLenum,GLfloat)
+GL_FUNC_STATIC_2(PixelTransferi,GLvoid, GLenum,GLint)
+GL_FUNC_STATIC_2(PixelZoom,GLvoid, GLfloat,GLfloat)
+GL_FUNC_STATIC_1(PointSize,GLvoid, GLfloat)
+GL_FUNC_STATIC_2(PolygonMode,GLvoid, GLenum,GLenum)
+GL_FUNC_STATIC_2(PolygonOffset,GLvoid, GLfloat,GLfloat)
+GL_FUNC_STATIC_0(PopAttrib,GLvoid)
+GL_FUNC_STATIC_0(PopClientAttrib,GLvoid)
+GL_FUNC_STATIC_0(PopMatrix,GLvoid)
+GL_FUNC_STATIC_0(PopName,GLvoid)
+GL_FUNC_STATIC_1(PushAttrib,GLvoid, GLbitfield)
+GL_FUNC_STATIC_1(PushClientAttrib,GLvoid, GLbitfield)
+GL_FUNC_STATIC_0(PushMatrix,GLvoid)
+GL_FUNC_STATIC_1(PushName,GLvoid, GLuint)
+GL_FUNC_STATIC_2(RasterPos2d,GLvoid, GLdouble,GLdouble)
+GL_FUNC_STATIC_2(RasterPos2f,GLvoid, GLfloat,GLfloat)
+GL_FUNC_STATIC_2(RasterPos2i,GLvoid, GLint,GLint)
+GL_FUNC_STATIC_2(RasterPos2s,GLvoid, GLshort,GLshort)
+GL_FUNC_STATIC_3(RasterPos3d,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(RasterPos3f,GLvoid, GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_3(RasterPos3i,GLvoid, GLint,GLint,GLint)
+GL_FUNC_STATIC_3(RasterPos3s,GLvoid, GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_4(RasterPos4d,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_4(RasterPos4f,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_4(RasterPos4i,GLvoid, GLint,GLint,GLint,GLint)
+GL_FUNC_STATIC_4(RasterPos4s,GLvoid, GLshort,GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_1(ReadBuffer,GLvoid, GLenum)
+GL_FUNC_STATIC_4(Rectd,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_4(Rectf,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_4(Recti,GLvoid, GLint,GLint,GLint,GLint)
+GL_FUNC_STATIC_4(Rects,GLvoid, GLshort,GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_1(RenderMode,GLint, GLenum)
+GL_FUNC_STATIC_4(Rotated,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_4(Rotatef,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_3(Scaled,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(Scalef,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_4(Scissor,GLvoid, GLint,GLint,GLint,GLint)
+GL_FUNC_STATIC_1(ShadeModel,GLvoid, GLenum)
+GL_FUNC_STATIC_3(StencilFunc,GLvoid, GLenum,GLint,GLuint)
+GL_FUNC_STATIC_1(StencilMask,GLvoid, GLuint)
+GL_FUNC_STATIC_3(StencilOp,GLvoid, GLenum,GLenum,GLenum)
+GL_FUNC_STATIC_1(TexCoord1d,GLvoid, GLdouble)
+GL_FUNC_STATIC_1(TexCoord1f,GLvoid, GLfloat)
+GL_FUNC_STATIC_1(TexCoord1i,GLvoid, GLint)
+GL_FUNC_STATIC_1(TexCoord1s,GLvoid, GLshort)
+GL_FUNC_STATIC_2(TexCoord2d,GLvoid, GLdouble,GLdouble)
+GL_FUNC_STATIC_2(TexCoord2f,GLvoid, GLfloat,GLfloat)
+GL_FUNC_STATIC_2(TexCoord2i,GLvoid, GLint,GLint)
+GL_FUNC_STATIC_2(TexCoord2s,GLvoid, GLshort,GLshort)
+GL_FUNC_STATIC_3(TexCoord3d,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(TexCoord3f,GLvoid, GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_3(TexCoord3i,GLvoid, GLint,GLint,GLint)
+GL_FUNC_STATIC_3(TexCoord3s,GLvoid, GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_4(TexCoord4d,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_4(TexCoord4f,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_4(TexCoord4i,GLvoid, GLint,GLint,GLint,GLint)
+GL_FUNC_STATIC_4(TexCoord4s,GLvoid, GLshort,GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_3(TexEnvf,GLvoid, GLenum,GLenum,GLfloat)
+GL_FUNC_STATIC_3(TexEnvi,GLvoid, GLenum,GLenum,GLint)
+GL_FUNC_STATIC_3(TexGend,GLvoid, GLenum,GLenum,GLdouble)
+GL_FUNC_STATIC_3(TexGenf,GLvoid, GLenum,GLenum,GLfloat)
+GL_FUNC_STATIC_3(TexGeni,GLvoid, GLenum,GLenum,GLint)
+GL_FUNC_STATIC_3(TexParameterf,GLvoid, GLenum,GLenum,GLfloat)
+GL_FUNC_STATIC_3(TexParameteri,GLvoid, GLenum,GLenum,GLint)
+GL_FUNC_STATIC_3(Translated,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(Translatef,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_2(Vertex2d,GLvoid, GLdouble,GLdouble)
+GL_FUNC_STATIC_2(Vertex2f,GLvoid, GLfloat,GLfloat)
+GL_FUNC_STATIC_2(Vertex2i,GLvoid, GLint,GLint)
+GL_FUNC_STATIC_2(Vertex2s,GLvoid, GLshort,GLshort)
+GL_FUNC_STATIC_3(Vertex3d,GLvoid, GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_3(Vertex3f,GLvoid, GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_3(Vertex3i,GLvoid, GLint,GLint,GLint)
+GL_FUNC_STATIC_3(Vertex3s,GLvoid, GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_4(Vertex4d,GLvoid, GLdouble,GLdouble,GLdouble,GLdouble)
+GL_FUNC_STATIC_4(Vertex4f,GLvoid, GLfloat,GLfloat,GLfloat,GLfloat)
+GL_FUNC_STATIC_4(Vertex4i,GLvoid, GLint,GLint,GLint,GLint)
+GL_FUNC_STATIC_4(Vertex4s,GLvoid, GLshort,GLshort,GLshort,GLshort)
+GL_FUNC_STATIC_4(Viewport,GLvoid, GLuint,GLuint,GLuint,GLuint)
+
+VALUE inside_begin_end = Qfalse;
+
+static VALUE
+gl_Begin(obj,arg1)
+VALUE obj,arg1;
 {
-	GLuint list;
-	GLenum mode;
-	list = (GLuint)NUM2UINT(arg1);
-	mode = (GLenum)NUM2INT(arg2);
-	glNewList(list,mode);
-	return Qnil;
+	glBegin(CONV_GLenum(arg1));
+	inside_begin_end = Qtrue;
+	return Qnil;	
 }
 
 static VALUE
-gl_CallLists(obj,arg1)
-VALUE obj,arg1;
+gl_End(obj)
+VALUE obj;
 {
-	GLsizei n;
-	GLenum type;
-	GLvoid *lists;
-	if (TYPE(arg1) == T_STRING) {
-		type = GL_BYTE;
-		lists = RSTRING(arg1)->ptr;
-		n = RSTRING(arg1)->len;
-	} else if (TYPE(arg1) == T_ARRAY) {
-		type = GL_INT;
-		lists = ALLOC_N(GLint, RARRAY(arg1)->len);
-		n = ary2cint(arg1,lists,0);
-	} else {
-		Check_Type(arg1,T_ARRAY); /* force exception */
-		return Qnil; /* not reached */
-	}
-	glCallLists(n, type, lists);
-	if (type == GL_INT) xfree(lists);
-	return Qnil;
+	inside_begin_end = Qfalse;	
+	glEnd();
+	CHECK_GLERROR
+	return Qnil;	
 }
 
 static VALUE
-gl_GenLists(obj,arg1)
-VALUE obj,arg1;
+gl_CallLists(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLsizei range;
-	GLuint ret;
-	range = (GLsizei)NUM2UINT(arg1);
-	ret = glGenLists(range);
-	return INT2NUM(ret);
+	GLsizei n;
+	GLenum type;
+	VALUE lists;
+	type = CONV_GLenum(arg1);
+	lists = pack_array_or_pass_string(type,arg2);
+	n = RSTRING_LEN(lists) / gltype_glformat_unit_size(type,1);
+	glCallLists(n, type, RSTRING_PTR(lists));
+	CHECK_GLERROR
+	return Qnil;
 }
 
 static VALUE
@@ -230,15 +260,15 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glBitmap(width, height, xorig, yorig, xmove, ymove, (GLvoid *)NUM2INT(arg7));
 	} else {
-		const GLubyte *bitmap;
-		Check_Type(arg7,T_STRING); 
+		VALUE data;
+		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg7);
 
-		if (RSTRING(arg7)->len < (width * height / 8))
-			rb_raise(rb_eArgError, "string length:%d", RSTRING(arg7)->len);
+		if ((RSTRING_LEN(data)*8) < (width * height))
+			rb_raise(rb_eArgError, "string length:%li", RSTRING_LEN(data));
 
-		bitmap = (const GLubyte*)RSTRING(arg7)->ptr;
-		glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
+		glBitmap(width, height, xorig, yorig, xmove, ymove, (const GLubyte *)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -250,6 +280,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cboolean(arg1,flag,1);
 	glEdgeFlagv(flag);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -261,6 +292,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,c,1);
 	glIndexdv(c);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -272,6 +304,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,c,1);
 	glIndexfv(c);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -283,6 +316,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cint(arg1,c,1);
 	glIndexiv(c);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -294,6 +328,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cshort(arg1,c,1);
 	glIndexsv(c);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -307,18 +342,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cdbl(arg2, equation, 4);
 	glClipPlane(plane,equation);
-	return Qnil;
-}
-
-static VALUE
-gl_Fogf(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLfloat)NUM2DBL(arg2);
-	glFogf(pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -332,18 +356,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cflt(arg2,params,4);
 	glFogfv(pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_Fogi(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLint)NUM2INT(arg2);
-	glFogi(pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -357,20 +370,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cint(arg2,params,4);
 	glFogiv(pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_Lightf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum light;
-	GLenum pname;
-	GLfloat param;
-	light = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glLightf(light,pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -386,20 +386,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glLightfv(light,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_Lighti(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum light;
-	GLenum pname;
-	GLint param;
-	light = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glLighti(light,pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -415,18 +402,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glLightiv(light,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_LightModelf(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLfloat)NUM2DBL(arg2);
-	glLightModelf(pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -440,18 +416,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cflt(arg2,params,4);
 	glLightModelfv(pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_LightModeli(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLint)NUM2INT(arg2);
-	glLightModeli(pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -465,34 +430,10 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cint(arg2,params,4);
 	glLightModeliv(pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static VALUE
-gl_LineStipple(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint factor;
-	GLushort pattern;
-	factor = (GLint)NUM2INT(arg1);
-	pattern = (GLushort)(NUM2INT(arg2) & 0xFFFF);
-	glLineStipple(factor,pattern);
-	return Qnil;
-}
-
-static VALUE
-gl_Materialf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum face;
-	GLenum pname;
-	GLfloat param;
-	face = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glMaterialf(face,pname,param);
-	return Qnil;
-}
 
 static VALUE
 gl_Materialfv(obj,arg1,arg2,arg3)
@@ -506,20 +447,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glMaterialfv(face,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_Materiali(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum face;
-	GLenum pname;
-	GLint param;
-	face = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glMateriali(face,pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -535,6 +463,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glMaterialiv(face,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -542,40 +471,20 @@ static VALUE
 gl_PolygonStipple(obj,arg1)
 VALUE obj,arg1;
 {
-	GLubyte mask[128];
-
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glPolygonStipple((GLvoid *)NUM2INT(arg1));
 	} else {
-		memset(mask, 0x0, sizeof(GLubyte)*128);
-		if (TYPE(arg1) == T_ARRAY) {
-			ary2cubyte(arg1,mask,128);
-		}
-		else if (TYPE(arg1) == T_STRING) {
-			if (RSTRING(arg1)->len < 128)
-				rb_raise(rb_eArgError, "string length:%d", RSTRING(arg1)->len);
-			memcpy(mask, RSTRING(arg1)->ptr, 128);
-		}
-		else
-			Check_Type(arg1,T_STRING); /* force exception */
-		glPolygonStipple(mask);
+		VALUE data;
+		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg1);
+		if (RSTRING_LEN(data) < 128)
+			rb_raise(rb_eArgError, "string length:%li", RSTRING_LEN(data));
+		
+		glPolygonStipple((GLubyte *)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static VALUE
-gl_TexParameterf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum pname;
-	GLfloat param;
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glTexParameterf(target,pname,param);
-	return Qnil;
-}
 
 static VALUE
 gl_TexParameterfv(obj,arg1,arg2,arg3)
@@ -589,20 +498,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexParameterfv(target,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_TexParameteri(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum pname;
-	GLint param;
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glTexParameteri(target,pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -618,6 +514,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexParameteriv(target,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -643,17 +540,20 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glTexImage1D(target,level,components,width,border,format,type,(GLvoid *)NUM2INT(arg8));
+		CHECK_GLERROR
 		return Qnil;
 	}
 
 	if (target == GL_PROXY_TEXTURE_1D || NIL_P(arg8)) { /* proxy texture, no data read */
 		pixels = NULL;
 	} else {
-		Check_Type(arg8,T_STRING);
-		CheckDataSize(type,format,width,arg8);
-		pixels = RSTRING(arg8)->ptr;
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg8);
+		CheckDataSize(type,format,width,data);
+		pixels = RSTRING_PTR(data);
 	}
 	glTexImage1D(target,level,components,width,border,format,type,pixels);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -681,31 +581,20 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glTexImage2D(target,level,components,width,height,border,format,type,(GLvoid *)NUM2INT(arg9));
+		CHECK_GLERROR
 		return Qnil;
 	}
 	
 	if (target == GL_PROXY_TEXTURE_2D || target == GL_PROXY_TEXTURE_1D_ARRAY_EXT || target == GL_PROXY_TEXTURE_CUBE_MAP || NIL_P(arg9)) { /* proxy texture, no data read */
 		pixels = NULL;
 	} else {
-		Check_Type(arg9,T_STRING);
-		CheckDataSize(type,format,width*height,arg9);
-		pixels = RSTRING(arg9)->ptr;
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg9);
+		CheckDataSize(type,format,width*height,data);
+		pixels = RSTRING_PTR(data);
 	}
 	glTexImage2D(target,level,components,width,height,border,format,type,pixels);
-	return Qnil;
-}
-
-static VALUE
-gl_TexEnvf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum pname;
-	GLfloat param;
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glTexEnvf(target,pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -721,20 +610,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexEnvfv(target,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_TexEnvi(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum pname;
-	GLint param;
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glTexEnvi(target,pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -750,22 +626,10 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexEnviv(target,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static VALUE
-gl_TexGend(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLdouble param;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLdouble)NUM2DBL(arg3);
-	glTexGend(coord,pname,param);
-	return Qnil;
-}
 
 static VALUE
 gl_TexGendv(obj,arg1,arg2,arg3)
@@ -779,24 +643,11 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cdbl(arg3,params,4);
 	glTexGendv(coord,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
 
-static VALUE
-gl_TexGenf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLfloat param;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glTexGenf(coord,pname,param);
-	return Qnil;
-}
-
 static VALUE
 gl_TexGenfv(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
@@ -809,22 +660,10 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexGenfv(coord,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static VALUE
-gl_TexGeni(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLint param;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glTexGeni(coord,pname,param);
-	return Qnil;
-}
 
 static VALUE
 gl_TexGeniv(obj,arg1,arg2,arg3)
@@ -838,6 +677,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexGeniv(coord,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 static VALUE g_current_feed_buffer;
@@ -851,7 +691,8 @@ VALUE obj,arg1,arg2;
 	type = (GLenum)NUM2INT(arg2);
 	g_current_feed_buffer = allocate_buffer_with_string(sizeof(GLfloat)*size);
 	rb_str_freeze(g_current_feed_buffer);
-	glFeedbackBuffer(size, type, (GLfloat*)RSTRING(g_current_feed_buffer)->ptr);
+	glFeedbackBuffer(size, type, (GLfloat*)RSTRING_PTR(g_current_feed_buffer));
+	CHECK_GLERROR
 	return g_current_feed_buffer;
 }
 
@@ -864,32 +705,11 @@ VALUE obj,arg1;
 	size = (GLsizei)NUM2UINT(arg1);
 	g_current_sel_buffer = allocate_buffer_with_string(sizeof(GLuint)*size);
 	rb_str_freeze(g_current_sel_buffer);
-	glSelectBuffer(size, (GLuint*)RSTRING(g_current_sel_buffer)->ptr);
+	glSelectBuffer(size, (GLuint*)RSTRING_PTR(g_current_sel_buffer));
+	CHECK_GLERROR
 	return g_current_sel_buffer;
 }
 
-static VALUE
-gl_RenderMode(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	GLint ret;
-	mode = (GLenum)NUM2INT(arg1);
-	ret = glRenderMode(mode);
-	return INT2NUM(ret);
-}
-
-static VALUE
-gl_Accum(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum op;
-	GLfloat value;
-	op = (GLenum)NUM2INT(arg1);
-	value = (GLfloat)NUM2DBL(arg2);
-	glAccum(op,value);
-	return Qnil;
-}
 
 static VALUE
 gl_Map1d(obj,arg1,arg2,arg3,arg4,arg5,arg6)
@@ -910,11 +730,11 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	stride = (GLint)NUM2INT(arg4);
 	order = (GLint)NUM2INT(arg5);
 	points = ALLOC_N(GLdouble, order*stride);
-	work_ary = rb_ary_new();
-	mary2ary(arg6, work_ary);
+	work_ary = rb_funcall(arg6,rb_intern("flatten"),0);
 	ary2cdbl(work_ary, points, order*stride);
 	glMap1d(target, u1, u2, stride, order, points);
 	xfree(points);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -937,11 +757,11 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	stride = (GLint)NUM2INT(arg4);
 	order = (GLint)NUM2INT(arg5);
 	points = ALLOC_N(GLfloat, order*stride);
-	work_ary = rb_ary_new();
-	mary2ary(arg6, work_ary);
+	work_ary = rb_funcall(arg6,rb_intern("flatten"),0);
 	ary2cflt(work_ary, points, order*stride);
 	glMap1f(target, u1, u2, stride, order, points);
 	xfree(points);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -972,11 +792,11 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	vstride = (GLint)NUM2INT(arg8);
 	vorder = (GLint)NUM2INT(arg9);
 	points = ALLOC_N(GLdouble, MAX(ustride*uorder, vstride*vorder));
-	work_ary = rb_ary_new();
-	mary2ary(arg10, work_ary);
-	ary2cdbl(arg10, points, MAX(ustride*uorder, vstride*vorder));
+	work_ary = rb_funcall(arg10,rb_intern("flatten"),0);
+	ary2cdbl(work_ary, points, MAX(ustride*uorder, vstride*vorder));
 	glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 	xfree(points);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -1007,79 +827,11 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	vstride = (GLint)NUM2INT(arg8);
 	vorder = (GLint)NUM2INT(arg9);
 	points = ALLOC_N(GLfloat, MAX(ustride*uorder, vstride*vorder));
-	work_ary = rb_ary_new();
-	mary2ary(arg10, work_ary);
-	ary2cflt(arg10, points, MAX(ustride*uorder, vstride*vorder));
+	work_ary = rb_funcall(arg10,rb_intern("flatten"),0);
+	ary2cflt(work_ary, points, MAX(ustride*uorder, vstride*vorder));
 	glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 	xfree(points);
-	return Qnil;
-}
-
-static VALUE
-gl_MapGrid1d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint un;
-	GLdouble u1;
-	GLdouble u2;
-	un = (GLint)NUM2INT(arg1);
-	u1 = (GLdouble)NUM2DBL(arg2);
-	u2 = (GLdouble)NUM2DBL(arg3);
-	glMapGrid1d(un,u1,u2);
-	return Qnil;
-}
-
-static VALUE
-gl_MapGrid1f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint un;
-	GLfloat u1;
-	GLfloat u2;
-	un = (GLint)NUM2INT(arg1);
-	u1 = (GLfloat)NUM2DBL(arg2);
-	u2 = (GLfloat)NUM2DBL(arg3);
-	glMapGrid1f(un,u1,u2);
-	return Qnil;
-}
-
-static VALUE
-gl_MapGrid2d(obj,arg1,arg2,arg3,arg4,arg5,arg6)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
-{
-	GLint un;
-	GLdouble u1;
-	GLdouble u2;
-	GLint vn;
-	GLdouble v1;
-	GLdouble v2;
-	un = (GLint)NUM2INT(arg1);
-	u1 = (GLdouble)NUM2DBL(arg2);
-	u2 = (GLdouble)NUM2DBL(arg3);
-	vn = (GLint)NUM2INT(arg4);
-	v1 = (GLdouble)NUM2DBL(arg5);
-	v2 = (GLdouble)NUM2DBL(arg6);
-	glMapGrid2d(un,u1,u2,vn,v1,v2);
-	return Qnil;
-}
-
-static VALUE
-gl_MapGrid2f(obj,arg1,arg2,arg3,arg4,arg5,arg6)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
-{
-	GLint un;
-	GLfloat u1;
-	GLfloat u2;
-	GLint vn;
-	GLfloat v1;
-	GLfloat v2;
-	un = (GLint)NUM2INT(arg1);
-	u1 = (GLfloat)NUM2DBL(arg2);
-	u2 = (GLfloat)NUM2DBL(arg3);
-	vn = (GLint)NUM2INT(arg4);
-	v1 = (GLfloat)NUM2DBL(arg5);
-	v2 = (GLfloat)NUM2DBL(arg6);
-	glMapGrid2f(un,u1,u2,vn,v1,v2);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -1091,6 +843,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,params,1);
 	glEvalCoord1dv(params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -1102,6 +855,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,params,1);
 	glEvalCoord1fv(params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -1113,6 +867,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,params,2);
 	glEvalCoord2dv(params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -1124,114 +879,10 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,params,2);
 	glEvalCoord2fv(params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static VALUE
-gl_EvalMesh1(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum mode;
-	GLint i1;
-	GLint i2;
-	mode = (GLenum)NUM2INT(arg1);
-	i1 = (GLint)NUM2INT(arg2);
-	i2 = (GLint)NUM2INT(arg3);
-	glEvalMesh1(mode,i1,i2);
-	return Qnil;
-}
-
-static VALUE
-gl_EvalMesh2(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum mode;
-	GLint i1;
-	GLint i2;
-	GLint j1;
-	GLint j2;
-	mode = (GLenum)NUM2INT(arg1);
-	i1 = (GLint)NUM2INT(arg2);
-	i2 = (GLint)NUM2INT(arg3);
-	j1 = (GLint)NUM2INT(arg4);
-	j2 = (GLint)NUM2INT(arg5);
-	glEvalMesh2(mode,i1,i2,j1,j2);
-	return Qnil;
-}
-
-static VALUE
-gl_AlphaFunc(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum func;
-	GLclampf ref;
-	func = (GLenum)NUM2INT(arg1);
-	ref = (GLclampf)NUM2DBL(arg2);
-	glAlphaFunc(func,ref);
-	return Qnil;
-}
-
-static VALUE
-gl_StencilFunc(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum func;
-	GLint ref;
-	GLuint mask;
-	func = (GLenum)NUM2INT(arg1);
-	ref = (GLint)NUM2INT(arg2);
-	mask = (GLuint)NUM2UINT(arg3);
-	glStencilFunc(func,ref,mask);
-	return Qnil;
-}
-
-static VALUE
-gl_PixelTransferf(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLfloat)NUM2DBL(arg2);
-	glPixelTransferf(pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_PixelTransferi(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLint)NUM2INT(arg2);
-	glPixelTransferi(pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_PixelStoref(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLfloat)NUM2DBL(arg2);
-	glPixelStoref(pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_PixelStorei(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLint)NUM2INT(arg2);
-	glPixelStorei(pname,param);
-	return Qnil;
-}
 
 #define GLPIXELMAP_FUNC(_type_,_vartype_,_convert_) \
 static VALUE \
@@ -1265,6 +916,7 @@ VALUE obj; \
 			glPixelMap##_type_##v(map,size,(GLvoid *)NUM2INT(args[2])); \
 			break; \
 	} \
+	CHECK_GLERROR \
 	return Qnil; \
 }
 
@@ -1273,23 +925,6 @@ GLPIXELMAP_FUNC(ui,GLuint,ary2cuint)
 GLPIXELMAP_FUNC(us,GLushort,ary2cushort)
 #undef GLPIXELMAP_FUNC
 
-static VALUE
-gl_CopyPixels(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLsizei height;
-	GLenum type;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	width = (GLsizei)NUM2UINT(arg3);
-	height = (GLsizei)NUM2UINT(arg4);
-	type = (GLenum)NUM2INT(arg5);
-	glCopyPixels(x,y,width,height,type);
-	return Qnil;
-}
 
 static VALUE
 gl_ReadPixels(argc,argv,obj)
@@ -1321,8 +956,9 @@ VALUE obj;
 				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing");
 			pixels = allocate_buffer_with_string(GetDataSize(type,format,width*height));
 			FORCE_PIXEL_STORE_MODE
-			glReadPixels(x,y,width,height,format,type,(GLvoid*)RSTRING(pixels)->ptr);
+			glReadPixels(x,y,width,height,format,type,(GLvoid*)RSTRING_PTR(pixels));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return pixels;
 			break;			
 		case 7:
@@ -1331,6 +967,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			glReadPixels(x,y,width,height,format,type,(GLvoid*)NUM2INT(args[6]));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return Qnil;
 			break;			
 	}
@@ -1352,11 +989,13 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glDrawPixels(width,height,format,type,(GLvoid *)NUM2INT(arg5));
 	} else {
-		Check_Type(arg5,T_STRING);
-		CheckDataSize(type,format,width*height,arg5);
-		pixels = RSTRING(arg5)->ptr;
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg5);
+		CheckDataSize(type,format,width*height,data);
+		pixels = RSTRING_PTR(data);
 		glDrawPixels(width,height,format,type,pixels);
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -1373,6 +1012,7 @@ VALUE obj,arg1;
 	retary = rb_ary_new2(4);
 	for(i=0;i<4;i++)
 		rb_ary_push(retary, rb_float_new(equation[i]));
+	CHECK_GLERROR
 	return retary;
 }
 
@@ -1415,6 +1055,7 @@ VALUE obj,arg1; \
 	case GL_CONSTANT_COLOR1_NV: \
 	case GL_TEXTURE_COLOR_WRITEMASK_SGIS: \
 	case GL_FLOAT_CLEAR_COLOR_VALUE_NV: \
+  case GL_RGBA_SIGNED_COMPONENTS_EXT: \
 		nitems = 4; \
 		break; \
 	case GL_CURRENT_NORMAL: \
@@ -1449,6 +1090,7 @@ VALUE obj,arg1; \
 	case GL_TRANSPOSE_PROJECTION_MATRIX: \
 	case GL_TRANSPOSE_TEXTURE_MATRIX: \
 	case GL_TRANSPOSE_COLOR_MATRIX: \
+	case GL_TRANSPOSE_CURRENT_MATRIX_ARB: \
 	case GL_MODELVIEW0_ARB: \
 	case GL_MODELVIEW1_ARB: \
 	case GL_MODELVIEW2_ARB: \
@@ -1493,41 +1135,38 @@ VALUE obj,arg1; \
 			for (j = 0; j < 4; j++) \
 				rb_ary_push(ary2, _conv_(items[i*4+j])); \
 		} \
+		CHECK_GLERROR \
 		return ary; \
 	case GL_POLYGON_STIPPLE: \
 		glGet##_name_##v(pname, items); \
+		CHECK_GLERROR \
 		return rb_str_new((const char*)items, 32); \
 	case GL_COMPRESSED_TEXTURE_FORMATS: \
 		glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &nitems); \
+		CHECK_GLERROR \
 		if (nitems<=0||nitems>64) \
 			return INT2NUM(0); \
 		break; \
 	default: /* size=1 */ \
 		glGet##_name_##v(pname, items); \
+		CHECK_GLERROR \
 		return _conv_(items[0]); \
 	} \
 	glGet##_name_##v(pname, items); \
 	ary = rb_ary_new2(nitems); \
 	for (i = 0; i < nitems; i++) \
 		rb_ary_push(ary, _conv_(items[i])); \
+	CHECK_GLERROR \
 	return ary; \
 }
 
 GLGET_FUNC(Double,GLdouble,rb_float_new)
 GLGET_FUNC(Float,GLfloat,rb_float_new)
 GLGET_FUNC(Integer,GLint,INT2NUM)
-GLGET_FUNC(Boolean,GLboolean,INT2NUM)
+GLGET_FUNC(Boolean,GLboolean,GLBOOL2RUBY)
 
 #undef GLGET_FUNC
 
-static VALUE
-gl_GetError(obj)
-VALUE obj;
-{
-	GLenum ret;
-	ret = glGetError();
-	return INT2NUM(ret);
-}
 
 static VALUE
 gl_GetLightfv(obj,arg1,arg2)
@@ -1537,8 +1176,6 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLsizei size;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	VALUE retary;
-	int i;
 	light = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -1563,10 +1200,7 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetLightfv(light,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
+	RET_ARRAY_OR_SINGLE(size,rb_float_new,params)
 }
 
 static VALUE
@@ -1577,8 +1211,6 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLsizei size;
 	GLint params[4] = {0,0,0,0};
-	VALUE retary;
-	int i;
 	light = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -1603,194 +1235,71 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetLightiv(light,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(params[i]));
-	return retary;
-}
-
-static VALUE
-gl_GetMapdv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLenum query;
-	int dims;
-	int pointsize;
-	int size=0;
-	int i;
-	GLdouble *points;
-	VALUE retary;
-	GLint order[2] = {0,0}; /* for GL_COEFF, [order] or [uorder,vorder] (MAP1/MAP2) */
-	target = (GLenum)NUM2INT(arg1);
-	query = (GLenum)NUM2INT(arg2);
-	switch(target) {
-		case GL_MAP1_INDEX:
-		case GL_MAP1_TEXTURE_COORD_1: dims=1; pointsize=1; break;
-		case GL_MAP1_TEXTURE_COORD_2: dims=1; pointsize=2; break;
-		case GL_MAP1_VERTEX_3:
-		case GL_MAP1_NORMAL: 
-		case GL_MAP1_TEXTURE_COORD_3: dims=1; pointsize=3; break;
-		case GL_MAP1_COLOR_4: 
-		case GL_MAP1_TEXTURE_COORD_4:
-		case GL_MAP1_VERTEX_4: dims=1; pointsize=4; break;
-		case GL_MAP2_INDEX:
-		case GL_MAP2_TEXTURE_COORD_1: dims=2; pointsize=1; break;
-		case GL_MAP2_TEXTURE_COORD_2: dims=2; pointsize=2; break;
-		case GL_MAP2_VERTEX_3:
-		case GL_MAP2_NORMAL: 
-		case GL_MAP2_TEXTURE_COORD_3: dims=2; pointsize=3; break;
-		case GL_MAP2_COLOR_4: 
-		case GL_MAP2_TEXTURE_COORD_4:
-		case GL_MAP2_VERTEX_4: dims=2; pointsize=4; break;
-		default:
-			rb_raise(rb_eArgError, "unknown target:%d",target);
-			break; /* not reached */
-	}
-	switch(query) {
-		case GL_ORDER: size = dims;	break;
-		case GL_DOMAIN: size = dims*2; break;
-		case GL_COEFF:
-			glGetMapiv(target,GL_ORDER,order);
-			if (dims==1)
-				size = order[0] * pointsize;
-			else
-				size = (order[0]*order[1]) * pointsize;
-			break;
-		default:
-			rb_raise(rb_eArgError, "unknown target:%d",target);
-			break; /* not reached */
-	}
-	points = ALLOC_N(GLdouble,size);
-	glGetMapdv(target,query,points);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(points[i]));
-	xfree(points);
-	return retary;
+	RET_ARRAY_OR_SINGLE(size,INT2NUM,params)
 }
 
-static VALUE
-gl_GetMapfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLenum query;
-	int dims;
-	int pointsize;
-	int size=0;
-	int i;
-	GLfloat *points;
-	VALUE retary;
-	GLint order[2] = {0,0}; /* for GL_COEFF, [order] or [uorder,vorder] (MAP1/MAP2) */
-	target = (GLenum)NUM2INT(arg1);
-	query = (GLenum)NUM2INT(arg2);
-	switch(target) {
-		case GL_MAP1_INDEX:
-		case GL_MAP1_TEXTURE_COORD_1: dims=1; pointsize=1; break;
-		case GL_MAP1_TEXTURE_COORD_2: dims=1; pointsize=2; break;
-		case GL_MAP1_VERTEX_3:
-		case GL_MAP1_NORMAL: 
-		case GL_MAP1_TEXTURE_COORD_3: dims=1; pointsize=3; break;
-		case GL_MAP1_COLOR_4: 
-		case GL_MAP1_TEXTURE_COORD_4:
-		case GL_MAP1_VERTEX_4: dims=1; pointsize=4; break;
-		case GL_MAP2_INDEX:
-		case GL_MAP2_TEXTURE_COORD_1: dims=2; pointsize=1; break;
-		case GL_MAP2_TEXTURE_COORD_2: dims=2; pointsize=2; break;
-		case GL_MAP2_VERTEX_3:
-		case GL_MAP2_NORMAL: 
-		case GL_MAP2_TEXTURE_COORD_3: dims=2; pointsize=3; break;
-		case GL_MAP2_COLOR_4: 
-		case GL_MAP2_TEXTURE_COORD_4:
-		case GL_MAP2_VERTEX_4: dims=2; pointsize=4; break;
-		default:
-			rb_raise(rb_eArgError, "unknown target:%d",target);
-			break; /* not reached */
-	}
-	switch(query) {
-		case GL_ORDER: size = dims;	break;
-		case GL_DOMAIN: size = dims*2; break;
-		case GL_COEFF:
-			glGetMapiv(target,GL_ORDER,order);
-			if (dims==1)
-				size = order[0] * pointsize;
-			else
-				size = (order[0]*order[1]) * pointsize;
-			break;
-		default:
-			rb_raise(rb_eArgError, "unknown target:%d",target);
-			break; /* not reached */
-	}
-	points = ALLOC_N(GLfloat,size);
-	glGetMapfv(target,query,points);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(points[i]));
-	xfree(points);
-	return retary;
+#define GETMAP_FUNC(_name_,_type_) \
+static VALUE \
+gl_##_name_(obj,arg1,arg2) \
+VALUE obj,arg1,arg2; \
+{ \
+	GLenum target; \
+	GLenum query; \
+	int dims; \
+	int pointsize; \
+	int size=0; \
+	_type_ *points; \
+	GLint order[2] = {0,0}; /* for GL_COEFF, [order] or [uorder,vorder] (MAP1/MAP2) */ \
+	target = (GLenum)NUM2INT(arg1); \
+	query = (GLenum)NUM2INT(arg2); \
+	switch(target) { \
+		case GL_MAP1_INDEX: \
+		case GL_MAP1_TEXTURE_COORD_1: dims=1; pointsize=1; break; \
+		case GL_MAP1_TEXTURE_COORD_2: dims=1; pointsize=2; break; \
+		case GL_MAP1_VERTEX_3: \
+		case GL_MAP1_NORMAL: \
+		case GL_MAP1_TEXTURE_COORD_3: dims=1; pointsize=3; break; \
+		case GL_MAP1_COLOR_4: \
+		case GL_MAP1_TEXTURE_COORD_4: \
+		case GL_MAP1_VERTEX_4: dims=1; pointsize=4; break; \
+		case GL_MAP2_INDEX: \
+		case GL_MAP2_TEXTURE_COORD_1: dims=2; pointsize=1; break; \
+		case GL_MAP2_TEXTURE_COORD_2: dims=2; pointsize=2; break; \
+		case GL_MAP2_VERTEX_3: \
+		case GL_MAP2_NORMAL:  \
+		case GL_MAP2_TEXTURE_COORD_3: dims=2; pointsize=3; break; \
+		case GL_MAP2_COLOR_4:  \
+		case GL_MAP2_TEXTURE_COORD_4: \
+		case GL_MAP2_VERTEX_4: dims=2; pointsize=4; break; \
+		default: \
+			rb_raise(rb_eArgError, "unknown target:%d",target); \
+			break; /* not reached */ \
+	} \
+	switch(query) { \
+		case GL_ORDER: size = dims;	break; \
+		case GL_DOMAIN: size = dims*2; break; \
+		case GL_COEFF: \
+			glGetMapiv(target,GL_ORDER,order); \
+			CHECK_GLERROR \
+			if (dims==1) \
+				size = order[0] * pointsize; \
+			else \
+				size = (order[0]*order[1]) * pointsize; \
+			break; \
+		default: \
+			rb_raise(rb_eArgError, "unknown target:%d",target); \
+			break; /* not reached */ \
+	} \
+	points = ALLOC_N(_type_,size); \
+	gl##_name_(target,query,points); \
+\
+	RET_ARRAY_OR_SINGLE_FREE(size,RETCONV_##_type_,points) \
 }
 
-static VALUE
-gl_GetMapiv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLenum query;
-	int dims;
-	int pointsize;
-	int size=0;
-	int i;
-	GLint *points;
-	VALUE retary;
-	GLint order[2] = {0,0}; /* for GL_COEFF, [order] or [uorder,vorder] (MAP1/MAP2) */
-	target = (GLenum)NUM2INT(arg1);
-	query = (GLenum)NUM2INT(arg2);
-	switch(target) {
-		case GL_MAP1_INDEX:
-		case GL_MAP1_TEXTURE_COORD_1: dims=1; pointsize=1; break;
-		case GL_MAP1_TEXTURE_COORD_2: dims=1; pointsize=2; break;
-		case GL_MAP1_VERTEX_3:
-		case GL_MAP1_NORMAL: 
-		case GL_MAP1_TEXTURE_COORD_3: dims=1; pointsize=3; break;
-		case GL_MAP1_COLOR_4: 
-		case GL_MAP1_TEXTURE_COORD_4:
-		case GL_MAP1_VERTEX_4: dims=1; pointsize=4; break;
-		case GL_MAP2_INDEX:
-		case GL_MAP2_TEXTURE_COORD_1: dims=2; pointsize=1; break;
-		case GL_MAP2_TEXTURE_COORD_2: dims=2; pointsize=2; break;
-		case GL_MAP2_VERTEX_3:
-		case GL_MAP2_NORMAL: 
-		case GL_MAP2_TEXTURE_COORD_3: dims=2; pointsize=3; break;
-		case GL_MAP2_COLOR_4: 
-		case GL_MAP2_TEXTURE_COORD_4:
-		case GL_MAP2_VERTEX_4: dims=2; pointsize=4; break;
-		default:
-			rb_raise(rb_eArgError, "unknown target:%d",target);
-			break; /* not reached */
-	}
-	switch(query) {
-		case GL_ORDER: size = dims;	break;
-		case GL_DOMAIN: size = dims*2; break;
-		case GL_COEFF:
-			glGetMapiv(target,GL_ORDER,order);
-			if (dims==1)
-				size = order[0] * pointsize;
-			else
-				size = (order[0]*order[1]) * pointsize;
-			break;
-		default:
-			rb_raise(rb_eArgError, "unknown target:%d",target);
-			break; /* not reached */
-	}
-	points = ALLOC_N(GLint,size);
-	glGetMapiv(target,query,points);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(points[i]));
-	xfree(points);
-	return retary;
-}
+GETMAP_FUNC(GetMapdv,GLdouble)
+GETMAP_FUNC(GetMapfv,GLfloat)
+GETMAP_FUNC(GetMapiv,GLint)
+#undef GETMAP_FUNC
 
 static VALUE
 gl_GetMaterialfv(obj,arg1,arg2)
@@ -1800,8 +1309,6 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	int size;
-	VALUE retary;
-	int i;
 	face = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -1822,10 +1329,7 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetMaterialfv(face,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
+	RET_ARRAY_OR_SINGLE(size,rb_float_new,params)
 }
 
 static VALUE
@@ -1836,8 +1340,6 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	int size;
-	VALUE retary;
-	int i;
 	face = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -1858,10 +1360,7 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetMaterialiv(face,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(params[i]));
-	return retary;
+	RET_ARRAY_OR_SINGLE(size,INT2NUM,params)
 }
 
 #define GLGETPIXELMAP_FUNC(_type_,_vartype_,_convert_) \
@@ -1875,9 +1374,7 @@ VALUE obj; \
 	GLenum map_size; \
 	GLint size = 0; \
 	_vartype_ *values; \
-	VALUE retary; \
 	VALUE args[2]; \
-	int i; \
 	switch (rb_scan_args(argc, argv, "11", &args[0], &args[1])) { \
 		default: \
 		case 1: \
@@ -1901,19 +1398,18 @@ VALUE obj; \
 					break; \
 			} \
 			glGetIntegerv(map_size,&size); \
+			CHECK_GLERROR \
 			values = ALLOC_N(_vartype_,size); \
 			glGetPixelMap##_type_##v(map,values); \
-			retary = rb_ary_new2(size); \
-			for(i=0;i<size;i++) \
-				rb_ary_push(retary, _convert_(values[i])); \
-			xfree(values); \
-			return retary; \
+			RET_ARRAY_OR_SINGLE_FREE(size,_convert_,values) \
+			break; \
 		case 2: \
 			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING)) \
 				rb_raise(rb_eArgError, "Pixel pack buffer not bound"); \
  \
 			map = (GLenum)NUM2INT(args[0]); \
 			glGetPixelMap##_type_##v(map,(GLvoid*)NUM2INT(args[1])); \
+			CHECK_GLERROR \
 			return Qnil; \
 	} \
 }
@@ -1940,11 +1436,13 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			glGetPolygonStipple(mask);
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return rb_str_new((const char*)mask, 128);
 		case 1:
 			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
 				rb_raise(rb_eArgError, "Pixel pack buffer not bound");
 			glGetPolygonStipple((GLvoid *)NUM2INT(args[0]));
+			CHECK_GLERROR
 			return Qnil;
 	}
 }
@@ -1957,158 +1455,71 @@ VALUE obj,arg1;
 	const GLubyte *ret;
 	name = (GLenum)NUM2INT(arg1);
 	ret = glGetString(name);
+	CHECK_GLERROR
 	return rb_str_new2((const char*)ret);
 }
 
-static VALUE
-gl_GetTexEnvfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	int size;
-	VALUE retary;
-	int i;
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	switch(pname) {
-		case GL_TEXTURE_ENV_COLOR:
-		case GL_TEXTURE_ENV_BIAS_SGIX:
-		case GL_CULL_MODES_NV:
-		case GL_OFFSET_TEXTURE_MATRIX_NV:
-			size = 4;
-			break;
-		case GL_CONST_EYE_NV:
-			size = 3;
-			break;
-		default:
-			size = 1;
-			break;
-	}
-	glGetTexEnvfv(target,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
-}
-
-static VALUE
-gl_GetTexEnviv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	int size;
-	VALUE retary;
-	int i;
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	switch(pname) {
-		case GL_TEXTURE_ENV_COLOR:
-		case GL_TEXTURE_ENV_BIAS_SGIX:
-		case GL_CULL_MODES_NV:
-		case GL_OFFSET_TEXTURE_MATRIX_NV:
-			size = 4;
-			break;
-		case GL_CONST_EYE_NV:
-			size = 3;
-			break;
-		default:
-			size = 1;
-			break;
-	}
-	glGetTexEnviv(target,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(params[i]));
-	return retary;
+#define GETTEXENVFUNC(_name_,_type_) \
+static VALUE \
+gl_##_name_(obj,arg1,arg2) \
+VALUE obj,arg1,arg2; \
+{ \
+	GLenum target; \
+	GLenum pname; \
+	_type_ params[4] = {0.0,0.0,0.0,0.0}; \
+	int size; \
+	target = (GLenum)NUM2INT(arg1); \
+	pname = (GLenum)NUM2INT(arg2); \
+	switch(pname) { \
+		case GL_TEXTURE_ENV_COLOR: \
+		case GL_TEXTURE_ENV_BIAS_SGIX: \
+		case GL_CULL_MODES_NV: \
+		case GL_OFFSET_TEXTURE_MATRIX_NV: \
+			size = 4; \
+			break; \
+		case GL_CONST_EYE_NV: \
+			size = 3; \
+			break; \
+		default: \
+			size = 1; \
+			break; \
+	} \
+	gl##_name_(target,pname,params); \
+	RET_ARRAY_OR_SINGLE(size,RETCONV_##_type_,params) \
 }
 
-static VALUE
-gl_GetTexGendv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum coord;
-	GLenum pname;
-	GLdouble params[4] = {0.0,0.0,0.0,0.0};
-	int size;
-	VALUE retary;
-	int i;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	switch(pname) {
-		case GL_OBJECT_PLANE:
-		case GL_EYE_PLANE:
-			size = 4;
-			break;
-		default:
-			size = 1;
-			break;
-	}
-	glGetTexGendv(coord,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
-}
+GETTEXENVFUNC(GetTexEnvfv,GLfloat)
+GETTEXENVFUNC(GetTexEnviv,GLint)
+#undef GETTEXENVFUNC
 
-static VALUE
-gl_GetTexGenfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum coord;
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	int size;
-	VALUE retary;
-	int i;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	switch(pname) {
-		case GL_OBJECT_PLANE:
-		case GL_EYE_PLANE:
-			size = 4;
-			break;
-		default:
-			size = 1;
-			break;
-	}
-	glGetTexGenfv(coord,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
+#define GETTEXGENFUNC(_name_,_type_) \
+static VALUE \
+gl_##_name_(obj,arg1,arg2) \
+VALUE obj,arg1,arg2; \
+{ \
+	GLenum coord; \
+	GLenum pname; \
+	_type_ params[4] = {0.0,0.0,0.0,0.0}; \
+	int size; \
+	coord = (GLenum)NUM2INT(arg1); \
+	pname = (GLenum)NUM2INT(arg2); \
+	switch(pname) { \
+		case GL_OBJECT_PLANE: \
+		case GL_EYE_PLANE: \
+			size = 4; \
+			break; \
+		default: \
+			size = 1; \
+			break; \
+	} \
+	gl##_name_(coord,pname,params); \
+	RET_ARRAY_OR_SINGLE(size,RETCONV_##_type_,params) \
 }
 
-static VALUE
-gl_GetTexGeniv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum coord;
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	int size;
-	VALUE retary;
-	int i;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	switch(pname) {
-		case GL_OBJECT_PLANE:
-		case GL_EYE_PLANE:
-			size = 4;
-			break;
-		default:
-			size = 1;
-			break;
-	}
-	glGetTexGeniv(coord,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(params[i]));
-	return retary;
-}
+GETTEXGENFUNC(GetTexGendv,GLdouble)
+GETTEXGENFUNC(GetTexGenfv,GLfloat)
+GETTEXGENFUNC(GetTexGeniv,GLint)
+#undef GETTEXGENFUNC
 
 static VALUE
 gl_GetTexImage(argc,argv,obj)
@@ -2170,11 +1581,13 @@ VALUE obj;
 				default:
 					rb_raise(rb_eArgError, "Target type not supported");
 			}
+			CHECK_GLERROR
 			pixels = allocate_buffer_with_string(GetDataSize(type,format,size));
 		
 			FORCE_PIXEL_STORE_MODE
-			glGetTexImage(tex,lod,format,type,(GLvoid*)RSTRING(pixels)->ptr);
+			glGetTexImage(tex,lod,format,type,(GLvoid*)RSTRING_PTR(pixels));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return pixels;
 			break;
 		case 5:
@@ -2184,6 +1597,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			glGetTexImage(tex,lod,format,type,(GLvoid*)NUM2INT(args[4]));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 		return Qnil;
 	}
 }
@@ -2196,8 +1610,6 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	int size;
-	VALUE retary;
-	int i;
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -2212,10 +1624,7 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	glGetTexParameterfv(target,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
+	RET_ARRAY_OR_SINGLE(size,RETCONV_GLfloat,params)
 }
 
 static VALUE
@@ -2226,8 +1635,6 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	int size;
-	VALUE retary;
-	int i;
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -2242,10 +1649,7 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	glGetTexParameteriv(target,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(params[i]));
-	return retary;
+	RET_ARRAY_OR_SINGLE_BOOL(size,cond_GLBOOL2RUBY,pname,params)
 }
 
 static VALUE
@@ -2256,14 +1660,12 @@ VALUE obj,arg1,arg2,arg3;
 	GLint level;
 	GLenum pname;
 	GLfloat params = 0.0; 
-	VALUE retary;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	pname = (GLenum)NUM2INT(arg3);
 	glGetTexLevelParameterfv(target,level,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary, rb_float_new(params));
-	return retary;
+	CHECK_GLERROR
+	return RETCONV_GLfloat(params);
 }
 
 static VALUE
@@ -2274,45 +1676,23 @@ VALUE obj,arg1,arg2,arg3;
 	GLint level;
 	GLenum pname;
 	GLint params = 0; 
-	VALUE retary;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	pname = (GLenum)NUM2INT(arg3);
 	glGetTexLevelParameteriv(target,level,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary, INT2NUM(params));
-	return retary;
+	CHECK_GLERROR
+	return cond_GLBOOL2RUBY(pname,params);
 }
 
-static VALUE
-gl_IsEnabled(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum cap;
-	GLboolean ret;
-	cap = (GLenum)NUM2INT(arg1);
-	ret = glIsEnabled(cap);
-	return INT2NUM(ret);
-}
-
-static VALUE
-gl_IsList(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint list;
-	GLboolean ret;
-	list = (GLuint)NUM2UINT(arg1);
-	ret = glIsList(list);
-	return INT2NUM(ret);
-}
 
 static VALUE
 gl_LoadMatrixf(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat m[4*4];
-	ary2cmat4x4flt(arg1, m);
+	ary2cmatfloat(arg1, m, 4, 4);
 	glLoadMatrixf(m);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2321,8 +1701,9 @@ gl_LoadMatrixd(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble m[4*4];
-	ary2cmat4x4dbl(arg1, m);
+	ary2cmatdouble(arg1, m, 4, 4);
 	glLoadMatrixd(m);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2331,8 +1712,9 @@ gl_MultMatrixf(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat m[4*4];
-	ary2cmat4x4flt(arg1, m);
+	ary2cmatfloat(arg1, m, 4, 4);
 	glMultMatrixf(m);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2341,8 +1723,9 @@ gl_MultMatrixd(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble m[4*4];
-	ary2cmat4x4dbl(arg1, m);
+	ary2cmatdouble(arg1, m, 4, 4);
 	glMultMatrixd(m);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2370,11 +1753,13 @@ VALUE obj, arg1, arg2, arg3, arg4; \
 		g_##_func_##_ptr = arg4; \
 		gl##_func_##Pointer(size, type, stride, (const GLvoid*)NUM2INT(arg4)); \
 	} else { \
-		Check_Type(arg4, T_STRING); \
-		rb_str_freeze(arg4); \
-		g_##_func_##_ptr = arg4; \
-		gl##_func_##Pointer(size, type, stride, (const GLvoid*)RSTRING(arg4)->ptr); \
+		VALUE data; \
+		data = pack_array_or_pass_string(type,arg4); \
+		rb_str_freeze(data); \
+		g_##_func_##_ptr = data; \
+		gl##_func_##Pointer(size, type, stride, (const GLvoid*)RSTRING_PTR(data)); \
 	} \
+	CHECK_GLERROR \
 	return Qnil; \
 }
 
@@ -2384,20 +1769,6 @@ POINTER_FUNC(TexCoord)
 
 #undef POINTER_FUNC
 
-static VALUE
-gl_DrawArrays(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum mode;
-	GLint first;
-	GLsizei count;
-	mode = (GLenum)NUM2INT(arg1);
-	first = (GLint)NUM2INT(arg2);
-	count = (GLsizei)NUM2UINT(arg3);
-	glDrawArrays(mode,first,count);
-	return Qnil;
-}
-
 static VALUE
 gl_DrawElements(obj,arg1,arg2,arg3,arg4)
 VALUE obj,arg1,arg2,arg3,arg4;
@@ -2411,9 +1782,11 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	if (CheckBufferBinding(GL_ELEMENT_ARRAY_BUFFER_BINDING)) {
 		glDrawElements(mode, count, type, (const GLvoid*)NUM2INT(arg4));
 	} else {
-		Check_Type(arg4, T_STRING);
-		glDrawElements(mode, count, type, (const GLvoid*)RSTRING(arg4)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg4);
+		glDrawElements(mode, count, type, (const GLvoid*)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2427,11 +1800,13 @@ VALUE obj,arg1,arg2;
 		g_EdgeFlag_ptr = arg2;
 		glEdgeFlagPointer(stride, (const GLboolean*) NUM2INT(arg2));
 	} else {
-		Check_Type(arg2, T_STRING);
-		rb_str_freeze(arg2);
-		g_EdgeFlag_ptr = arg2;
-		glEdgeFlagPointer(stride, (const GLboolean*)RSTRING(arg2)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg2);
+		rb_str_freeze(data);
+		g_EdgeFlag_ptr = data;
+		glEdgeFlagPointer(stride, (const GLboolean*)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2481,11 +1856,12 @@ VALUE obj,arg1,arg2,arg3;
 		g_Index_ptr = arg3;
 		glIndexPointer(type, stride, (const GLvoid*)NUM2INT(arg3));
 	} else {
-		Check_Type(arg3, T_STRING);
-		rb_str_freeze(arg3);
-		g_Index_ptr = arg3;
-		glIndexPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg3);
+		g_Index_ptr = data;
+		glIndexPointer(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2495,11 +1871,14 @@ VALUE obj,arg1,arg2,arg3;
 {
 	GLenum format;
 	GLsizei stride;
+	VALUE data;
 	format = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
-	Check_Type(arg3, T_STRING);
-	rb_str_freeze(arg3);
-	glInterleavedArrays(format, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+	/* FIXME: add support for GL_C4UB_V2F,GL_C4UB_V3F, GL_T2F_C4UB_V3 */
+	data = pack_array_or_pass_string(GL_FLOAT,arg3);
+	rb_str_freeze(data);
+	glInterleavedArrays(format, stride, (const GLvoid*)RSTRING_PTR(data));
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2515,105 +1894,16 @@ VALUE obj,arg1,arg2,arg3;
 		g_Normal_ptr = arg3;
 		glNormalPointer(type, stride, (const GLvoid*)NUM2INT(arg3));
 	} else {
-		Check_Type(arg3, T_STRING);
-		rb_str_freeze(arg3);
-		g_Normal_ptr = arg3;
-		glNormalPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg3);
+		rb_str_freeze(data);
+		g_Normal_ptr = data;
+		glNormalPointer(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
-GL_SIMPLE_FUNC(PolygonOffset,2,GLfloat,NUM2DBL)
-
-static VALUE
-gl_CopyTexImage1D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
-{
-	GLenum target;
-	GLint level;
-	GLenum internalformat;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLint border;
-	target = (GLenum)NUM2INT(arg1);
-	level = (GLint)NUM2INT(arg2);
-	internalformat = (GLenum)NUM2INT(arg3);
-	x = (GLint)NUM2INT(arg4);
-	y = (GLint)NUM2INT(arg5);
-	width = (GLsizei)NUM2UINT(arg6);
-	border = (GLint)NUM2INT(arg7);
-	glCopyTexImage1D(target,level,internalformat,x,y,width,border);
-	return Qnil;
-}
-
-static VALUE
-gl_CopyTexImage2D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
-{
-	GLenum target;
-	GLint level;
-	GLenum internalformat;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLsizei height;
-	GLint border;
-	target = (GLenum)NUM2INT(arg1);
-	level = (GLint)NUM2INT(arg2);
-	internalformat = (GLenum)NUM2INT(arg3);
-	x = (GLint)NUM2INT(arg4);
-	y = (GLint)NUM2INT(arg5);
-	width = (GLsizei)NUM2UINT(arg6);
-	height = (GLsizei)NUM2UINT(arg7);
-	border = (GLint)NUM2INT(arg8);
-	glCopyTexImage2D(target,level,internalformat,x,y,width,height,border);
-	return Qnil;
-}
-
-static VALUE
-gl_CopyTexSubImage1D(obj,arg1,arg2,arg3,arg4,arg5,arg6)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
-{
-	GLenum target;
-	GLint level;
-	GLint xoffset;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	target = (GLenum)NUM2INT(arg1);
-	level = (GLint)NUM2INT(arg2);
-	xoffset = (GLint)NUM2INT(arg3);
-	x = (GLint)NUM2INT(arg4);
-	y = (GLint)NUM2INT(arg5);
-	width = (GLsizei)NUM2UINT(arg6);
-	glCopyTexSubImage1D(target,level,xoffset,x,y,width);
-	return Qnil;
-}
-
-static VALUE
-gl_CopyTexSubImage2D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
-{
-	GLenum target;
-	GLint level;
-	GLint xoffset;
-	GLint yoffset;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLsizei height;
-	target = (GLenum)NUM2INT(arg1);
-	level = (GLint)NUM2INT(arg2);
-	xoffset = (GLint)NUM2INT(arg3);
-	yoffset = (GLint)NUM2INT(arg4);
-	x = (GLint)NUM2INT(arg5);
-	y = (GLint)NUM2INT(arg6);
-	width = (GLsizei)NUM2UINT(arg7);
-	height = (GLsizei)NUM2UINT(arg8);
-	glCopyTexSubImage2D(target,level,xoffset,yoffset,x,y,width,height);
-	return Qnil;
-}
 
 static VALUE
 gl_TexSubImage1D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
@@ -2625,6 +1915,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLsizei width;
 	GLenum format;
 	GLenum type;
+	VALUE data;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -2634,13 +1925,15 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glTexSubImage1D(target,level,xoffset,width,format,type,(GLvoid *)NUM2INT(arg7));
+		CHECK_GLERROR
 		return Qnil;
 	}
-	
-	Check_Type(arg7,T_STRING);
-	CheckDataSize(type,format,width,arg7);
 
-	glTexSubImage1D(target,level,xoffset,width,format,type,RSTRING(arg7)->ptr);
+	data = pack_array_or_pass_string(type,arg7);
+	CheckDataSize(type,format,width,data);
+
+	glTexSubImage1D(target,level,xoffset,width,format,type,RSTRING_PTR(data));
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2656,6 +1949,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLsizei height;
 	GLenum format;
 	GLenum type;
+	VALUE data;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -2667,13 +1961,15 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,(GLvoid *)NUM2INT(arg9));
+		CHECK_GLERROR
 		return Qnil;
 	}
-	
-	Check_Type(arg9,T_STRING);
-	CheckDataSize(type,format,width*height,arg9);
 
-	glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,(RSTRING(arg9)->ptr));
+	data = pack_array_or_pass_string(type,arg9);
+	CheckDataSize(type,format,width*height,data);
+
+	glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,RSTRING_PTR(data));
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2686,86 +1982,30 @@ VALUE obj,arg1;
 	GLsizei size;
 	GLboolean r;
 	VALUE retary;
+	VALUE ary;
 	int i;
-	Check_Type(arg1,T_ARRAY);
-	size = RARRAY(arg1)->len;
+	ary = rb_Array(arg1);
+	size = RARRAY(ary)->len;
 	textures = ALLOC_N(GLuint,size);
 	residences = ALLOC_N(GLboolean,size);
-	ary2cuint(arg1,textures,size);	
+	ary2cuint(ary,textures,size);	
 	r = glAreTexturesResident(size,textures,residences);
 	retary = rb_ary_new2(size);
 	if (r==GL_TRUE) { /* all are resident */
 		for(i=0;i<size;i++)
-			rb_ary_push(retary, INT2NUM(GL_TRUE));
+			rb_ary_push(retary, GLBOOL2RUBY(GL_TRUE));
 	} else {
 		for(i=0;i<size;i++)
-			rb_ary_push(retary, INT2NUM(residences[i]));
+			rb_ary_push(retary, GLBOOL2RUBY(residences[i]));
 	}
 	xfree(textures);
 	xfree(residences);
+	CHECK_GLERROR
 	return retary;
 }
 
-static VALUE
-gl_BindTexture(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLuint texture;
-	target = (GLenum)NUM2INT(arg1);
-	texture = (GLuint)NUM2UINT(arg2);
-	glBindTexture(target,texture);
-	return Qnil;
-}
-
-static VALUE
-gl_DeleteTextures(obj,arg1)
-VALUE obj,arg1;
-{
-	GLsizei n;
-	GLuint *textures;
-	if (TYPE(arg1)==T_ARRAY) {
-		n = RARRAY(arg1)->len;
-		textures = ALLOC_N(GLuint,n);
-		ary2cuint(arg1,textures,n); 
-		glDeleteTextures( n, textures);
-		xfree(textures);
-	} else {
-		GLuint texture;
-		texture = NUM2INT(arg1);
-		glDeleteTextures( 1, &texture);
-	}
-	return Qnil;
-}
-
-static VALUE
-gl_GenTextures(obj,arg1)
-VALUE obj,arg1;
-{
-	GLsizei n;
-	GLuint *textures;
-	RArray *ret;
-	int i;
-	n = (GLsizei)NUM2UINT(arg1);
-	textures = ALLOC_N(GLuint, n);
-	glGenTextures(n, textures);
-	ret = RARRAY(rb_ary_new2(n));
-	for (i = 0; i < n; i++)
-		rb_ary_push((VALUE)ret, INT2NUM(textures[i]));
-	xfree(textures);
-	return (VALUE)ret;
-}
-
-static VALUE
-gl_IsTexture(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint texture;
-	GLboolean ret;
-	texture = (GLuint)NUM2UINT(arg1);
-	ret = glIsTexture(texture);
-	return INT2NUM(ret);
-}
+GL_FUNC_GENOBJECTS(GenTextures)
+GL_FUNC_DELETEOBJECTS(DeleteTextures)
 
 static VALUE
 gl_PrioritizeTextures(obj,arg1,arg2)
@@ -2785,6 +2025,7 @@ VALUE obj,arg1,arg2;
 	glPrioritizeTextures(size,textures,priorities);
 	xfree(textures);
 	xfree(priorities);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2796,6 +2037,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cubyte(arg1,c,1);
 	glIndexubv(c);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -2824,7 +2066,7 @@ VALUE obj; \
 			gl_Color4##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
 			break; \
 			default: \
-			rb_raise(rb_eArgError, "array length:%d", ary->len); \
+			rb_raise(rb_eArgError, "array length:%li", ary->len); \
 		} \
 		} \
 		else \
@@ -2871,7 +2113,7 @@ VALUE obj; \
 			gl_Normal3##_type_(obj,ary->ptr[0], ary->ptr[1],ary->ptr[2]); \
 			break; \
 			default: \
-			rb_raise(rb_eArgError, "array length:%d", ary->len); \
+			rb_raise(rb_eArgError, "array length:%li", ary->len); \
 		} \
 		} \
 		else \
@@ -2965,7 +2207,7 @@ VALUE obj; \
 			gl_Rect##_type_(obj,ary->ptr[0],ary->ptr[1],ary2->ptr[0],ary2->ptr[1]); \
 			break; \
 			default: \
-			rb_raise(rb_eArgError, "array length:%d", ary->len); \
+			rb_raise(rb_eArgError, "array length:%li", ary->len); \
 		} \
 		} \
 		else \
@@ -3066,7 +2308,7 @@ VALUE obj; \
 			gl_Vertex4##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
 			break; \
 			default: \
-			rb_raise(rb_eRuntimeError, "glVertex vertex num error!:%d", ary->len); \
+			rb_raise(rb_eRuntimeError, "glVertex vertex num error!:%li", ary->len); \
 		} \
 		} \
 		else \
@@ -3190,7 +2432,7 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glNewList", gl_NewList, 2);
 	rb_define_module_function(module, "glEndList", gl_EndList, 0);
 	rb_define_module_function(module, "glCallList", gl_CallList, 1);
-	rb_define_module_function(module, "glCallLists", gl_CallLists, 1);
+	rb_define_module_function(module, "glCallLists", gl_CallLists, 2);
 	rb_define_module_function(module, "glDeleteLists", gl_DeleteLists, 2);
 	rb_define_module_function(module, "glGenLists", gl_GenLists, 1);
 	rb_define_module_function(module, "glListBase", gl_ListBase, 1);