opengl 0.7.0.pre1-x86-mingw32 → 0.7.0.pre2-x86-mingw32

data/ext/{gl → opengl}/gl-1.0-1.1.c

@@ -15,7 +15,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 #ifndef MAX
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
@@ -63,14 +63,9 @@ 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)
@@ -115,7 +110,6 @@ 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)
@@ -133,11 +127,9 @@ 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)
@@ -208,21 +200,300 @@ GL_FUNC_STATIC_4(Viewport,GLvoid, GLuint,GLuint,GLuint,GLuint)
 VALUE inside_begin_end = Qfalse;
 
 static VALUE
-gl_Begin(obj,arg1)
-VALUE obj,arg1;
+gl_Enable1(VALUE caps)
 {
-	glBegin(CONV_GLenum(arg1));
-	inside_begin_end = Qtrue;
-	return Qnil;	
+  long i;
+
+  for (i = 0; i < RARRAY_LEN(caps); i++) {
+    glEnable(CONV_GLenum(rb_ary_entry(caps, i)));
+
+    CHECK_GLERROR_FROM("glEnable");
+  }
+
+  return Qnil;
 }
 
 static VALUE
-gl_End(obj)
-VALUE obj;
+gl_Enable0(VALUE caps)
+{
+  gl_Enable1(caps);
+
+  if (rb_block_given_p())
+    rb_yield(Qundef);
+
+  return Qnil;
+}
+
+static VALUE
+gl_Disable1(VALUE caps)
+{
+  long i;
+  for (i = 0; i < RARRAY_LEN(caps); i++) {
+    glDisable(CONV_GLenum(rb_ary_entry(caps, i)));
+
+    CHECK_GLERROR_FROM("glDisable");
+  }
+
+  return Qnil;
+}
+
+static VALUE
+gl_Disable0(VALUE caps)
+{
+  gl_Disable1(caps);
+
+  if (rb_block_given_p())
+    rb_yield(Qundef);
+
+  return Qnil;
+}
+
+static VALUE
+gl_Enable(int argc, VALUE *argv, VALUE self)
+{
+  int i;
+  VALUE caps, rev;
+
+  rb_scan_args(argc, argv, "1*", NULL, NULL);
+
+  caps = rb_ary_new2(argc);
+
+  for (i = 0; i < argc; i++)
+    rb_ary_push(caps, argv[i]);
+
+  rev = rb_ary_reverse(caps);
+
+  if (rb_block_given_p())
+    return rb_ensure(gl_Enable0, caps, gl_Disable1, rev);
+  else
+    gl_Enable0(caps);
+
+  return Qnil;	
+}
+
+static VALUE
+gl_Disable(int argc, VALUE *argv, VALUE self)
+{
+  int i;
+  VALUE caps, rev;
+
+  rb_scan_args(argc, argv, "1*", NULL, NULL);
+
+  caps = rb_ary_new2(argc);
+
+  for (i = 0; i < argc; i++)
+    rb_ary_push(caps, argv[i]);
+
+  rev = rb_ary_reverse(caps);
+
+  if (rb_block_given_p())
+    return rb_ensure(gl_Disable0, caps, gl_Enable1, rev);
+  else
+    gl_Disable0(caps);
+
+  return Qnil;	
+}
+
+static VALUE
+gl_EnableClientState1(VALUE ary)
+{
+  long i;
+  for (i = 0; i < RARRAY_LEN(ary); i++) {
+    glEnableClientState(CONV_GLenum(rb_ary_entry(ary, i)));
+
+    CHECK_GLERROR_FROM("glEnableClientState");
+  }
+
+  return Qnil;
+}
+
+static VALUE
+gl_EnableClientState0(VALUE ary)
+{
+  gl_EnableClientState1(ary);
+
+  if (rb_block_given_p())
+    rb_yield(Qundef);
+
+  return Qnil;
+}
+
+static VALUE
+gl_DisableClientState1(VALUE ary)
+{
+  long i;
+  for (i = 0; i < RARRAY_LEN(ary); i++) {
+    glDisableClientState(CONV_GLenum(rb_ary_entry(ary, i)));
+
+    CHECK_GLERROR_FROM("glDisableClientState");
+  }
+
+  return Qnil;
+}
+
+static VALUE
+gl_DisableClientState0(VALUE ary)
+{
+  gl_DisableClientState1(ary);
+
+  if (rb_block_given_p())
+    rb_yield(Qundef);
+
+  return Qnil;
+}
+
+static VALUE
+gl_EnableClientState(int argc, VALUE *argv, VALUE self)
+{
+  int i;
+  VALUE ary, rev;
+
+  rb_scan_args(argc, argv, "1*", NULL, NULL);
+
+  ary = rb_ary_new2(argc);
+
+  for (i = 0; i < argc; i++)
+    rb_ary_push(ary, argv[i]);
+
+  rev = rb_ary_reverse(ary);
+
+  if (rb_block_given_p())
+    return rb_ensure(gl_EnableClientState0, ary, gl_DisableClientState1, rev);
+  else
+    gl_EnableClientState0(ary);
+
+  return Qnil;	
+}
+
+static VALUE
+gl_DisableClientState(int argc, VALUE *argv, VALUE self)
+{
+  int i;
+  VALUE ary, rev;
+
+  rb_scan_args(argc, argv, "1*", NULL, NULL);
+
+  ary = rb_ary_new2(argc);
+
+  for (i = 0; i < argc; i++)
+    rb_ary_push(ary, argv[i]);
+
+  rev = rb_ary_reverse(ary);
+
+  if (rb_block_given_p())
+    return rb_ensure(gl_DisableClientState0, ary, gl_EnableClientState1, rev);
+  else
+    gl_DisableClientState0(ary);
+
+  return Qnil;	
+}
+
+static VALUE
+gl_Begin0(GLenum mode)
+{
+	glBegin(mode);
+
+  if (rb_block_given_p())
+    rb_yield(Qundef);
+
+  return Qnil;
+}
+
+static VALUE
+gl_End(VALUE self)
 {
 	inside_begin_end = Qfalse;	
+
 	glEnd();
-	CHECK_GLERROR
+
+	CHECK_GLERROR_FROM("glEnd");
+
+	return Qnil;	
+}
+
+static VALUE
+gl_Begin(VALUE self, VALUE mode)
+{
+  GLenum begin_mode = CONV_GLenum(mode);
+	inside_begin_end = Qtrue;
+
+  if (rb_block_given_p())
+    return rb_ensure(gl_Begin0, (VALUE)begin_mode, gl_End, self);
+  else
+	  gl_Begin0(begin_mode);
+
+	return Qnil;	
+}
+
+static VALUE
+gl_PopMatrix(VALUE self)
+{
+  glPopMatrix();
+
+  CHECK_GLERROR_FROM("glPopMatrix");
+
+  return Qnil;
+}
+
+static VALUE
+gl_PushMatrix0(void)
+{
+  glPushMatrix();
+
+  if (rb_block_given_p())
+    rb_yield(Qnil);
+
+  return Qnil;
+}
+
+static VALUE
+gl_PushMatrix(VALUE self)
+{
+  if (rb_block_given_p())
+    return rb_ensure(gl_PushMatrix0, (VALUE)NULL, gl_PopMatrix, self);
+  else
+    glPushMatrix();
+
+  return Qnil;
+}
+
+static VALUE
+gl_NewList0(VALUE args)
+{
+  GLuint list;
+  GLenum mode;
+
+  list = (GLuint)NUM2UINT(rb_ary_entry(args, 0));
+  mode = RUBY2GLENUM(rb_ary_entry(args, 1));
+
+  glNewList(list, mode);
+
+  if (rb_block_given_p())
+    rb_yield(Qundef);
+
+  return Qnil;
+}
+
+static VALUE
+gl_EndList(VALUE self)
+{
+  glEndList();
+
+  return Qnil;
+}
+
+static VALUE
+gl_NewList(VALUE self, VALUE list, VALUE mode)
+{
+  VALUE args = rb_ary_new2(2);
+  rb_ary_push(args, list);
+  rb_ary_push(args, mode);
+
+  if (rb_block_given_p())
+    return rb_ensure(gl_NewList0, args, gl_EndList, self);
+  else
+	  gl_NewList0(args);
+
 	return Qnil;	
 }
 
@@ -237,7 +508,7 @@ VALUE obj,arg1,arg2;
 	lists = pack_array_or_pass_string(type,arg2);
 	n = (GLsizei)RSTRING_LENINT(lists) / gltype_glformat_unit_size(type,1);
 	glCallLists(n, type, RSTRING_PTR(lists));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glCallLists");
 	return Qnil;
 }
 
@@ -268,7 +539,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 
 		glBitmap(width, height, xorig, yorig, xmove, ymove, (const GLubyte *)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glBitmap");
 	return Qnil;
 }
 
@@ -280,7 +551,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cboolean(arg1,flag,1);
 	glEdgeFlagv(flag);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glEdgeFlagv");
 	return Qnil;
 }
 
@@ -292,7 +563,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,c,1);
 	glIndexdv(c);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glIndexdv");
 	return Qnil;
 }
 
@@ -304,7 +575,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,c,1);
 	glIndexfv(c);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glIndexfv");
 	return Qnil;
 }
 
@@ -316,7 +587,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cint(arg1,c,1);
 	glIndexiv(c);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glIndexiv");
 	return Qnil;
 }
 
@@ -328,7 +599,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cshort(arg1,c,1);
 	glIndexsv(c);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glIndexsv");
 	return Qnil;
 }
 
@@ -342,7 +613,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cdbl(arg2, equation, 4);
 	glClipPlane(plane,equation);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glClipPlane");
 	return Qnil;
 }
 
@@ -356,7 +627,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cflt(arg2,params,4);
 	glFogfv(pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glFogfv");
 	return Qnil;
 }
 
@@ -370,7 +641,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cint(arg2,params,4);
 	glFogiv(pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glFogiv");
 	return Qnil;
 }
 
@@ -386,7 +657,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glLightfv(light,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glLightfv");
 	return Qnil;
 }
 
@@ -402,7 +673,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glLightiv(light,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glLightiv");
 	return Qnil;
 }
 
@@ -416,7 +687,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cflt(arg2,params,4);
 	glLightModelfv(pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glLightModelfv");
 	return Qnil;
 }
 
@@ -430,7 +701,7 @@ VALUE obj,arg1,arg2;
 	Check_Type(arg2,T_ARRAY);
 	ary2cint(arg2,params,4);
 	glLightModeliv(pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glLightModeliv");
 	return Qnil;
 }
 
@@ -447,7 +718,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glMaterialfv(face,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMaterialfv");
 	return Qnil;
 }
 
@@ -463,7 +734,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glMaterialiv(face,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMaterialiv");
 	return Qnil;
 }
 
@@ -481,7 +752,7 @@ VALUE obj,arg1;
 		
 		glPolygonStipple((GLubyte *)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glPolygonStipple");
 	return Qnil;
 }
 
@@ -498,7 +769,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexParameterfv(target,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexParameterfv");
 	return Qnil;
 }
 
@@ -514,7 +785,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexParameteriv(target,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexParameteriv");
 	return Qnil;
 }
 
@@ -540,7 +811,7 @@ 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 *)NUM2LONG(arg8));
-		CHECK_GLERROR
+		CHECK_GLERROR_FROM("glTexImage1D");
 		return Qnil;
 	}
 
@@ -553,7 +824,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 		pixels = RSTRING_PTR(data);
 	}
 	glTexImage1D(target,level,components,width,border,format,type,pixels);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexImage1D");
 	return Qnil;
 }
 
@@ -581,7 +852,7 @@ 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 *)NUM2LONG(arg9));
-		CHECK_GLERROR
+		CHECK_GLERROR_FROM("glTexImage2D");
 		return Qnil;
 	}
 	
@@ -594,7 +865,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 		pixels = RSTRING_PTR(data);
 	}
 	glTexImage2D(target,level,components,width,height,border,format,type,pixels);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexImage2D");
 	return Qnil;
 }
 
@@ -610,7 +881,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexEnvfv(target,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexEnvfv");
 	return Qnil;
 }
 
@@ -626,7 +897,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexEnviv(target,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexEnviv");
 	return Qnil;
 }
 
@@ -643,7 +914,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cdbl(arg3,params,4);
 	glTexGendv(coord,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexGendv");
 	return Qnil;
 }
 
@@ -660,7 +931,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexGenfv(coord,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexGenfv");
 	return Qnil;
 }
 
@@ -677,7 +948,7 @@ VALUE obj,arg1,arg2,arg3;
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexGeniv(coord,pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexGeniv");
 	return Qnil;
 }
 static VALUE g_current_feed_buffer;
@@ -692,7 +963,7 @@ VALUE obj,arg1,arg2;
 	g_current_feed_buffer = allocate_buffer_with_string(sizeof(GLfloat)*size);
 	rb_str_freeze(g_current_feed_buffer);
 	glFeedbackBuffer(size, type, (GLfloat*)RSTRING_PTR(g_current_feed_buffer));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glFeedbackBuffer");
 	return g_current_feed_buffer;
 }
 
@@ -706,7 +977,7 @@ VALUE obj,arg1;
 	g_current_sel_buffer = allocate_buffer_with_string(sizeof(GLuint)*size);
 	rb_str_freeze(g_current_sel_buffer);
 	glSelectBuffer(size, (GLuint*)RSTRING_PTR(g_current_sel_buffer));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glSelectBuffer");
 	return g_current_sel_buffer;
 }
 
@@ -734,7 +1005,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	ary2cdbl(work_ary, points, order*stride);
 	glMap1d(target, u1, u2, stride, order, points);
 	xfree(points);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMap1d");
 	return Qnil;
 }
 
@@ -761,7 +1032,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	ary2cflt(work_ary, points, order*stride);
 	glMap1f(target, u1, u2, stride, order, points);
 	xfree(points);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMap1f");
 	return Qnil;
 }
 
@@ -796,7 +1067,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	ary2cdbl(work_ary, points, MAX(ustride*uorder, vstride*vorder));
 	glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 	xfree(points);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMap2d");
 	return Qnil;
 }
 
@@ -831,7 +1102,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	ary2cflt(work_ary, points, MAX(ustride*uorder, vstride*vorder));
 	glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points);
 	xfree(points);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMap2f");
 	return Qnil;
 }
 
@@ -843,7 +1114,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,params,1);
 	glEvalCoord1dv(params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glEvalCoord1dv");
 	return Qnil;
 }
 
@@ -855,7 +1126,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,params,1);
 	glEvalCoord1fv(params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glEvalCoord1fv");
 	return Qnil;
 }
 
@@ -867,7 +1138,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,params,2);
 	glEvalCoord2dv(params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glEvalCoord2fv");
 	return Qnil;
 }
 
@@ -879,7 +1150,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,params,2);
 	glEvalCoord2fv(params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glEvalCoord2fv");
 	return Qnil;
 }
 
@@ -916,7 +1187,7 @@ VALUE obj; \
 			glPixelMap##_type_##v(map,size,(GLvoid *)NUM2LONG(args[2])); \
 			break; \
 	} \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("glPixelMap" #_type_ "v"); \
 	return Qnil; \
 }
 
@@ -958,7 +1229,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			glReadPixels(x,y,width,height,format,type,(GLvoid*)RSTRING_PTR(pixels));
 			RESTORE_PIXEL_STORE_MODE
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glReadPixels");
 			return pixels;
 			break;			
 		case 7:
@@ -967,7 +1238,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			glReadPixels(x,y,width,height,format,type,(GLvoid*)NUM2LONG(args[6]));
 			RESTORE_PIXEL_STORE_MODE
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glReadPixels");
 			return Qnil;
 			break;			
 	}
@@ -995,7 +1266,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 		pixels = RSTRING_PTR(data);
 		glDrawPixels(width,height,format,type,pixels);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glDrawPixels");
 	return Qnil;
 }
 
@@ -1012,7 +1283,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
+	CHECK_GLERROR_FROM("glGetClipPlane");
 	return retary;
 }
 
@@ -1135,28 +1406,28 @@ VALUE obj,arg1; \
 			for (j = 0; j < 4; j++) \
 				rb_ary_push(ary2, _conv_(items[i*4+j])); \
 		} \
-		CHECK_GLERROR \
+		CHECK_GLERROR_FROM("glGet" #_name_ "v"); \
 		return ary; \
 	case GL_POLYGON_STIPPLE: \
 		glGet##_name_##v(pname, items); \
-		CHECK_GLERROR \
+		CHECK_GLERROR_FROM("glGet" #_name_ "v"); \
 		return rb_str_new((const char*)items, 32); \
 	case GL_COMPRESSED_TEXTURE_FORMATS: \
 		glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &nitems); \
-		CHECK_GLERROR \
+		CHECK_GLERROR_FROM("glGetIntegerv"); \
 		if (nitems<=0||nitems>64) \
 			return INT2NUM(0); \
 		break; \
 	default: /* size=1 */ \
 		glGet##_name_##v(pname, items); \
-		CHECK_GLERROR \
+		CHECK_GLERROR_FROM("glGet" #_name_ "v"); \
 		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 \
+	CHECK_GLERROR_FROM("glGet" #_name_ "v"); \
 	return ary; \
 }
 
@@ -1200,7 +1471,7 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetLightfv(light,pname,params);
-	RET_ARRAY_OR_SINGLE(size,rb_float_new,params)
+	RET_ARRAY_OR_SINGLE("glGetLightfv", size, rb_float_new, params);
 }
 
 static VALUE
@@ -1235,7 +1506,7 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetLightiv(light,pname,params);
-	RET_ARRAY_OR_SINGLE(size,INT2NUM,params)
+	RET_ARRAY_OR_SINGLE("glGetLightiv", size, INT2NUM, params);
 }
 
 #define GETMAP_FUNC(_name_,_type_) \
@@ -1280,7 +1551,7 @@ VALUE obj,arg1,arg2; \
 		case GL_DOMAIN: size = dims*2; break; \
 		case GL_COEFF: \
 			glGetMapiv(target,GL_ORDER,order); \
-			CHECK_GLERROR \
+			CHECK_GLERROR_FROM("glGetMapiv"); \
 			if (dims==1) \
 				size = order[0] * pointsize; \
 			else \
@@ -1293,7 +1564,7 @@ VALUE obj,arg1,arg2; \
 	points = ALLOC_N(_type_,size); \
 	gl##_name_(target,query,points); \
 \
-	RET_ARRAY_OR_SINGLE_FREE(size,RETCONV_##_type_,points) \
+	RET_ARRAY_OR_SINGLE_FREE("gl" #_name_, size, RETCONV_##_type_, points); \
 }
 
 GETMAP_FUNC(GetMapdv,GLdouble)
@@ -1329,7 +1600,7 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetMaterialfv(face,pname,params);
-	RET_ARRAY_OR_SINGLE(size,rb_float_new,params)
+	RET_ARRAY_OR_SINGLE("glGetMaterialfv", size, rb_float_new, params);
 }
 
 static VALUE
@@ -1360,7 +1631,7 @@ VALUE obj,arg1,arg2;
 			break; /* not reached */
 	}
 	glGetMaterialiv(face,pname,params);
-	RET_ARRAY_OR_SINGLE(size,INT2NUM,params)
+	RET_ARRAY_OR_SINGLE("glGetMaterialiv", size, INT2NUM, params);
 }
 
 #define GLGETPIXELMAP_FUNC(_type_,_vartype_,_convert_) \
@@ -1379,7 +1650,8 @@ VALUE obj; \
 		default: \
 		case 1: \
 			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING)) \
-				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing"); \
+				rb_raise(rb_eArgError, \
+            "Pixel pack buffer bound, but offset argument missing"); \
 \
 			map = (GLenum)NUM2INT(args[0]); \
 			switch(map) { \
@@ -1398,10 +1670,11 @@ VALUE obj; \
 					break; \
 			} \
 			glGetIntegerv(map_size,&size); \
-			CHECK_GLERROR \
+			CHECK_GLERROR_FROM("glGetIntegerv"); \
 			values = ALLOC_N(_vartype_,size); \
 			glGetPixelMap##_type_##v(map,values); \
-			RET_ARRAY_OR_SINGLE_FREE(size,_convert_,values) \
+      RET_ARRAY_OR_SINGLE_FREE("glGetPixelMap" #_type_ "v", size, _convert_, \
+          values); \
 			break; \
 		case 2: \
 			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING)) \
@@ -1409,7 +1682,7 @@ VALUE obj; \
  \
 			map = (GLenum)NUM2INT(args[0]); \
 			glGetPixelMap##_type_##v(map,(GLvoid*)NUM2LONG(args[1])); \
-			CHECK_GLERROR \
+			CHECK_GLERROR_FROM("glGetPixelMap" #_type_ "v"); \
 			return Qnil; \
 	} \
 }
@@ -1436,13 +1709,13 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			glGetPolygonStipple(mask);
 			RESTORE_PIXEL_STORE_MODE
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetPolygonStipple");
 			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 *)NUM2LONG(args[0]));
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetPolygonStipple");
 			return Qnil;
 	}
 }
@@ -1455,7 +1728,7 @@ VALUE obj,arg1;
 	const GLubyte *ret;
 	name = (GLenum)NUM2INT(arg1);
 	ret = glGetString(name);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetString");
 	return rb_str_new2((const char*)ret);
 }
 
@@ -1485,7 +1758,7 @@ VALUE obj,arg1,arg2; \
 			break; \
 	} \
 	gl##_name_(target,pname,params); \
-	RET_ARRAY_OR_SINGLE(size,RETCONV_##_type_,params) \
+	RET_ARRAY_OR_SINGLE("gl" #_name_, size, RETCONV_##_type_, params); \
 }
 
 GETTEXENVFUNC(GetTexEnvfv,GLfloat)
@@ -1513,7 +1786,7 @@ VALUE obj,arg1,arg2; \
 			break; \
 	} \
 	gl##_name_(coord,pname,params); \
-	RET_ARRAY_OR_SINGLE(size,RETCONV_##_type_,params) \
+	RET_ARRAY_OR_SINGLE("gl" #_name_, size, RETCONV_##_type_, params); \
 }
 
 GETTEXGENFUNC(GetTexGendv,GLdouble)
@@ -1581,13 +1854,13 @@ VALUE obj;
 				default:
 					rb_raise(rb_eArgError, "Target type not supported");
 			}
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetTexLevelParameteriv");
 			pixels = allocate_buffer_with_string(GetDataSize(type,format,size));
 		
 			FORCE_PIXEL_STORE_MODE
 			glGetTexImage(tex,lod,format,type,(GLvoid*)RSTRING_PTR(pixels));
 			RESTORE_PIXEL_STORE_MODE
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetTexImage");
 			return pixels;
 			break;
 		case 5:
@@ -1597,7 +1870,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			glGetTexImage(tex,lod,format,type,(GLvoid*)NUM2LONG(args[4]));
 			RESTORE_PIXEL_STORE_MODE
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetTexImage");
 		return Qnil;
 	}
 }
@@ -1624,7 +1897,7 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	glGetTexParameterfv(target,pname,params);
-	RET_ARRAY_OR_SINGLE(size,RETCONV_GLfloat,params)
+	RET_ARRAY_OR_SINGLE("glGetTexParameterfv", size, RETCONV_GLfloat, params);
 }
 
 static VALUE
@@ -1649,7 +1922,8 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	glGetTexParameteriv(target,pname,params);
-	RET_ARRAY_OR_SINGLE_BOOL(size,cond_GLBOOL2RUBY,pname,params)
+  RET_ARRAY_OR_SINGLE_BOOL("glGetTexParameteriv", size, cond_GLBOOL2RUBY,
+      pname, params);
 }
 
 static VALUE
@@ -1664,7 +1938,7 @@ VALUE obj,arg1,arg2,arg3;
 	level = (GLint)NUM2INT(arg2);
 	pname = (GLenum)NUM2INT(arg3);
 	glGetTexLevelParameterfv(target,level,pname,&params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetTexLevelParameterfv");
 	return RETCONV_GLfloat(params);
 }
 
@@ -1680,7 +1954,7 @@ VALUE obj,arg1,arg2,arg3;
 	level = (GLint)NUM2INT(arg2);
 	pname = (GLenum)NUM2INT(arg3);
 	glGetTexLevelParameteriv(target,level,pname,&params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetTexLevelParameteriv");
 	return cond_GLBOOL2RUBY(pname,params);
 }
 
@@ -1692,7 +1966,7 @@ VALUE obj,arg1;
 	GLfloat m[4*4];
 	ary2cmatfloat(arg1, m, 4, 4);
 	glLoadMatrixf(m);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glLoadMatrixf");
 	return Qnil;
 }
 
@@ -1703,7 +1977,7 @@ VALUE obj,arg1;
 	GLdouble m[4*4];
 	ary2cmatdouble(arg1, m, 4, 4);
 	glLoadMatrixd(m);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glLoadMatrixd");
 	return Qnil;
 }
 
@@ -1714,7 +1988,7 @@ VALUE obj,arg1;
 	GLfloat m[4*4];
 	ary2cmatfloat(arg1, m, 4, 4);
 	glMultMatrixf(m);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMultMatrixf");
 	return Qnil;
 }
 
@@ -1725,7 +1999,7 @@ VALUE obj,arg1;
 	GLdouble m[4*4];
 	ary2cmatdouble(arg1, m, 4, 4);
 	glMultMatrixd(m);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMultMatrixd");
 	return Qnil;
 }
 
@@ -1759,7 +2033,7 @@ VALUE obj, arg1, arg2, arg3, arg4; \
 		g_##_func_##_ptr = data; \
 		gl##_func_##Pointer(size, type, stride, (const GLvoid*)RSTRING_PTR(data)); \
 	} \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_func_ "Pointer"); \
 	return Qnil; \
 }
 
@@ -1786,7 +2060,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 		data = pack_array_or_pass_string(type,arg4);
 		glDrawElements(mode, count, type, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glDrawElements");
 	return Qnil;
 }
 
@@ -1806,7 +2080,7 @@ VALUE obj,arg1,arg2;
 		g_EdgeFlag_ptr = data;
 		glEdgeFlagPointer(stride, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glEdgeFlagPointer");
 	return Qnil;
 }
 
@@ -1861,7 +2135,7 @@ VALUE obj,arg1,arg2,arg3;
 		g_Index_ptr = data;
 		glIndexPointer(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glIndexPointer");
 	return Qnil;
 }
 
@@ -1878,7 +2152,7 @@ VALUE obj,arg1,arg2,arg3;
 	data = pack_array_or_pass_string(GL_FLOAT,arg3);
 	rb_str_freeze(data);
 	glInterleavedArrays(format, stride, (const GLvoid*)RSTRING_PTR(data));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glInterleavedArrays");
 	return Qnil;
 }
 
@@ -1900,7 +2174,7 @@ VALUE obj,arg1,arg2,arg3;
 		g_Normal_ptr = data;
 		glNormalPointer(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glNormalPointer");
 	return Qnil;
 }
 
@@ -1925,7 +2199,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		glTexSubImage1D(target,level,xoffset,width,format,type,(GLvoid *)NUM2LONG(arg7));
-		CHECK_GLERROR
+		CHECK_GLERROR_FROM("glTexSubImage1D");
 		return Qnil;
 	}
 
@@ -1933,7 +2207,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	CheckDataSize(type,format,width,data);
 
 	glTexSubImage1D(target,level,xoffset,width,format,type,RSTRING_PTR(data));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexSubImage1D");
 	return Qnil;
 }
 
@@ -1961,7 +2235,7 @@ 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 *)NUM2LONG(arg9));
-		CHECK_GLERROR
+		CHECK_GLERROR_FROM("glTexSubImage2D");
 		return Qnil;
 	}
 
@@ -1969,7 +2243,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	CheckDataSize(type,format,width*height,data);
 
 	glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,RSTRING_PTR(data));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glTexSubImage2D");
 	return Qnil;
 }
 
@@ -2000,7 +2274,7 @@ VALUE obj,arg1;
 	}
 	xfree(textures);
 	xfree(residences);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glAreTexturesResident");
 	return retary;
 }
 
@@ -2025,7 +2299,7 @@ VALUE obj,arg1,arg2;
 	glPrioritizeTextures(size,textures,priorities);
 	xfree(textures);
 	xfree(priorities);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glPrioritizeTextures");
 	return Qnil;
 }
 
@@ -2037,7 +2311,7 @@ VALUE obj,arg1;
 	Check_Type(arg1,T_ARRAY);
 	ary2cubyte(arg1,c,1);
 	glIndexubv(c);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glIndexubv");
 	return Qnil;
 }
 
@@ -2052,11 +2326,11 @@ VALUE *argv; \
 VALUE obj; \
 { \
 	int num; \
-	VALUE ary, args[4]; \
+	VALUE args[4]; \
+	VALUE ary; \
 	switch (num = rb_scan_args(argc, argv, "13", &args[0], &args[1], &args[2], &args[3])) { \
 	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
-		ary = args[0]; \
+    ary = rb_convert_type(args[0], T_ARRAY, "Array", "to_a"); \
 		switch (RARRAY_LEN(ary)) { \
 			case 3: \
 			gl_Color3##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
@@ -2067,9 +2341,6 @@ VALUE obj; \
 			default: \
 			rb_raise(rb_eArgError, "array length:%li", RARRAY_LEN(ary)); \
 		} \
-		} \
-		else \
-			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 3: \
 		gl_Color3##_type_(obj,args[0], args[1], args[2]); \
@@ -2101,21 +2372,18 @@ VALUE *argv; \
 VALUE obj; \
 { \
 	int num; \
-	VALUE ary, args[3]; \
+	VALUE args[3]; \
+	VALUE ary; \
 	switch (num = rb_scan_args(argc, argv, "12", &args[0], &args[1], &args[2])) { \
 	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
-		ary = args[0]; \
+    ary = rb_convert_type(args[0], T_ARRAY, "Array", "to_a"); \
 		switch (RARRAY_LEN(ary)) { \
 			case 3: \
 			gl_Normal3##_type_(obj,RARRAY_PTR(ary)[0], RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2]); \
 			break; \
 			default: \
-			rb_raise(rb_eArgError, "array length:%li", RARRAY_LEN(ary)); \
+			rb_raise(rb_eArgError, "array length: %li", RARRAY_LEN(ary)); \
 		} \
-		} \
-		else \
-			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 3: \
 		gl_Normal3##_type_(obj,args[0], args[1], args[2]); \
@@ -2141,11 +2409,11 @@ VALUE *argv; \
 VALUE obj; \
 { \
 	int num; \
-	VALUE ary, args[4]; \
+	VALUE args[4]; \
+	VALUE ary; \
 	switch (num = rb_scan_args(argc, argv, "13", &args[0], &args[1], &args[2], &args[3])) { \
 	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
-		ary = args[0]; \
+    ary = rb_convert_type(args[0], T_ARRAY, "Array", "to_a"); \
 		switch (RARRAY_LEN(ary)) { \
 			case 2: \
 			gl_RasterPos2##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1]); \
@@ -2159,9 +2427,6 @@ VALUE obj; \
 			default: \
 			rb_raise(rb_eArgError, "array length:%d", num); \
 		} \
-		} \
-		else \
-			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 2: \
 		gl_RasterPos2##_type_(obj,args[0], args[1]); \
@@ -2192,28 +2457,29 @@ VALUE *argv; \
 VALUE obj; \
 { \
 	int num; \
-	VALUE ary, ary2, args[4]; \
+	VALUE args[4]; \
+	VALUE ary1, ary2; \
 	switch (num = rb_scan_args(argc, argv, "22", &args[0], &args[1], &args[2], &args[3])) { \
 	case 2: \
-		if (TYPE(args[0]) == T_ARRAY && TYPE(args[1]) == T_ARRAY) { \
-		ary = args[0]; \
-		ary2 = args[1]; \
-		switch (RARRAY_LEN(ary)) { \
-			case 2: \
-			gl_Rect##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary2)[0],RARRAY_PTR(ary2)[1]); \
-			break; \
-			default: \
-			rb_raise(rb_eArgError, "array length:%li", RARRAY_LEN(ary)); \
-		} \
-		} \
-		else \
-			Check_Type(args[0],T_ARRAY); /* force exception */ \
+    ary1 = rb_convert_type(args[0], T_ARRAY, "Array", "to_a"); \
+    ary2 = rb_convert_type(args[1], T_ARRAY, "Array", "to_a"); \
+    if (RARRAY_LEN(ary1) != 2) \
+			rb_raise(rb_eArgError, "first array must be of length 2 (was %li)", \
+          RARRAY_LEN(ary1)); \
+\
+    if (RARRAY_LEN(ary2) != 2) \
+			rb_raise(rb_eArgError, "second array must be of length 2 (was %li)", \
+          RARRAY_LEN(ary2)); \
+\
+    gl_Rect##_type_(obj, \
+        RARRAY_PTR(ary1)[0], RARRAY_PTR(ary1)[1], \
+        RARRAY_PTR(ary2)[0], RARRAY_PTR(ary2)[1]); \
 		break; \
 	case 4: \
 		gl_Rect##_type_(obj,args[0], args[1], args[2], args[3]); \
 		break; \
 	default: \
-		rb_raise(rb_eArgError, "arg length:%d", num); \
+		rb_raise(rb_eArgError, "arg length: %d", num); \
 	} \
 	return Qnil; \
 }
@@ -2232,11 +2498,11 @@ VALUE *argv; \
 VALUE obj; \
 { \
 	int num; \
-	VALUE ary, args[4]; \
+	VALUE args[4]; \
+	VALUE ary; \
 	switch (num = rb_scan_args(argc, argv, "13", &args[0], &args[1], &args[2], &args[3])) { \
 	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
-		ary = args[0]; \
+    ary = rb_convert_type(args[0], T_ARRAY, "Array", "to_a"); \
 		switch (RARRAY_LEN(ary)) { \
 			case 1: \
 			gl_TexCoord1##_type_(obj,RARRAY_PTR(ary)[0]); \
@@ -2251,11 +2517,8 @@ VALUE obj; \
 			gl_TexCoord4##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2],RARRAY_PTR(ary)[3]); \
 			break; \
 			default: \
-			rb_raise(rb_eArgError, "array length:%d", num); \
+				rb_raise(rb_eArgError, "array length: %d", num); \
 		} \
-		} \
-		else \
-			gl_TexCoord1##_type_(obj,args[0]); \
 		break; \
 	case 2: \
 		gl_TexCoord2##_type_(obj,args[0], args[1]); \
@@ -2286,11 +2549,11 @@ int argc; \
 VALUE *argv; \
 VALUE obj; \
 { \
-	VALUE ary, args[4]; \
+	VALUE args[4]; \
+	VALUE ary; \
 	switch (rb_scan_args(argc, argv, "13", &args[0], &args[1], &args[2], &args[3])) { \
 	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
-		ary = args[0]; \
+    ary = rb_convert_type(args[0], T_ARRAY, "Array", "to_a"); \
 		switch (RARRAY_LEN(ary)) { \
 			case 2: \
 			gl_Vertex2##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1]); \
@@ -2302,11 +2565,8 @@ VALUE obj; \
 			gl_Vertex4##_type_(obj,RARRAY_PTR(ary)[0],RARRAY_PTR(ary)[1],RARRAY_PTR(ary)[2],RARRAY_PTR(ary)[3]); \
 			break; \
 			default: \
-			rb_raise(rb_eRuntimeError, "glVertex vertex num error!:%li", RARRAY_LEN(ary)); \
+			rb_raise(rb_eRuntimeError, "glVertex vertex num error!: %ld", RARRAY_LEN(ary)); \
 		} \
-		} \
-		else \
-			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 2: \
 		gl_Vertex2##_type_(obj,args[0], args[1]); \
@@ -2345,13 +2605,17 @@ VALUE obj,arg1,arg2;
 }
 
 static VALUE
-gl_Material(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_Material(VALUE self, VALUE face, VALUE pname, VALUE param)
 {
-	if (TYPE(arg3) == T_ARRAY)
-		gl_Materialfv(obj,arg1,arg2,arg3);
-	else
-		gl_Materialf(obj,arg1,arg2,arg3);
+  VALUE ary;
+
+	if (RB_TYPE_P(param, T_ARRAY)) {
+		gl_Materialfv(self, face, pname, param);
+  } else if (ary = rb_convert_type(param, T_ARRAY, "Array", "to_a")) {
+		gl_Materialfv(self, face, pname, ary);
+  } else {
+		gl_Materialf(self, face, pname, param);
+  }
 
 	return Qnil;
 }
@@ -2572,8 +2836,8 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glDepthMask", gl_DepthMask, 1);
 	rb_define_module_function(module, "glIndexMask", gl_IndexMask, 1);
 	rb_define_module_function(module, "glAccum", gl_Accum, 2);
-	rb_define_module_function(module, "glDisable", gl_Disable, 1);
-	rb_define_module_function(module, "glEnable", gl_Enable, 1);
+	rb_define_module_function(module, "glDisable", gl_Disable, -1);
+	rb_define_module_function(module, "glEnable", gl_Enable, -1);
 	rb_define_module_function(module, "glFinish", gl_Finish, 0);
 	rb_define_module_function(module, "glFlush", gl_Flush, 0);
 	rb_define_module_function(module, "glPopAttrib", gl_PopAttrib, 0);
@@ -2668,11 +2932,11 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	/* OpenGL 1.1 functions */
 	rb_define_module_function(module, "glArrayElement", gl_ArrayElement, 1);
 	rb_define_module_function(module, "glColorPointer", gl_ColorPointer, 4);
-	rb_define_module_function(module, "glDisableClientState", gl_DisableClientState, 1);
+	rb_define_module_function(module, "glDisableClientState", gl_DisableClientState, -1);
 	rb_define_module_function(module, "glDrawArrays", gl_DrawArrays, 3);
 	rb_define_module_function(module, "glDrawElements", gl_DrawElements, 4);
 	rb_define_module_function(module, "glEdgeFlagPointer", gl_EdgeFlagPointer, 2);
-	rb_define_module_function(module, "glEnableClientState", gl_EnableClientState, 1);
+	rb_define_module_function(module, "glEnableClientState", gl_EnableClientState, -1);
 	rb_define_module_function(module, "glGetPointerv", gl_GetPointerv, 1);
 	rb_define_module_function(module, "glIndexPointer", gl_IndexPointer, 3);
 	rb_define_module_function(module, "glInterleavedArrays", gl_InterleavedArrays, 3);