ruby-opengl 0.50.0 → 0.60.0

data/ext/gl/gl-1.2.c

@@ -19,8 +19,19 @@
 
 /* OpenGL 1.2 functions */
 
-GL_SIMPLE_FUNC_LOAD(BlendColor,4,GLclampf,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(BlendEquation,1,GLenum,NUM2INT)
+GL_FUNC_LOAD_4(BlendColor,GLvoid, GLclampf,GLclampf,GLclampf,GLclampf, "1.2")
+GL_FUNC_LOAD_1(BlendEquation,GLvoid, GLenum, "1.2")
+GL_FUNC_LOAD_5(CopyColorTable,GLvoid, GLenum,GLenum,GLint,GLint,GLsizei, "1.2")
+GL_FUNC_LOAD_5(CopyColorSubTable,GLvoid, GLenum,GLsizei,GLint,GLint,GLsizei, "1.2")
+GL_FUNC_LOAD_3(ConvolutionParameterf,GLvoid, GLenum,GLenum,GLfloat, "1.2")
+GL_FUNC_LOAD_3(ConvolutionParameteri,GLvoid, GLenum,GLenum,GLint, "1.2")
+GL_FUNC_LOAD_5(CopyConvolutionFilter1D,GLvoid, GLenum,GLenum,GLint,GLint,GLsizei, "1.2")
+GL_FUNC_LOAD_6(CopyConvolutionFilter2D,GLvoid, GLenum,GLenum,GLint,GLint,GLsizei,GLsizei, "1.2")
+GL_FUNC_LOAD_4(Histogram,GLvoid, GLenum,GLsizei,GLenum,GLboolean, "1.2")
+GL_FUNC_LOAD_3(Minmax,GLvoid, GLenum,GLenum,GLboolean, "1.2")
+GL_FUNC_LOAD_1(ResetHistogram,GLvoid, GLenum, "1.2")
+GL_FUNC_LOAD_1(ResetMinmax,GLvoid, GLenum, "1.2")
+GL_FUNC_LOAD_9(CopyTexSubImage3D,GLvoid, GLenum,GLint,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei, "1.2")
 
 static void (APIENTRY * fptr_glDrawRangeElements)(GLenum,GLuint,GLuint,GLsizei,GLenum,GLvoid*);
 static VALUE
@@ -32,7 +43,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	GLuint end;
 	GLsizei count;
 	GLenum type;
-	LOAD_GL_FUNC(glDrawRangeElements)
+	LOAD_GL_FUNC(glDrawRangeElements,"1.2")
 	mode = (GLenum)NUM2INT(arg1);
 	start = (GLuint)NUM2UINT(arg2);
 	end = (GLuint)NUM2UINT(arg3);
@@ -41,9 +52,11 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	if (CheckBufferBinding(GL_ELEMENT_ARRAY_BUFFER_BINDING)) {
 		fptr_glDrawRangeElements(mode, start, end, count, type, (GLvoid *)NUM2INT(arg6));
 	} else {
-		Check_Type(arg6, T_STRING);
-		fptr_glDrawRangeElements(mode, start, end, count, type, RSTRING(arg6)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg6);
+		fptr_glDrawRangeElements(mode, start, end, count, type, RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -57,7 +70,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	GLsizei width;
 	GLenum format;
 	GLenum type;
-	LOAD_GL_FUNC(glColorTable)
+	LOAD_GL_FUNC(glColorTable,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	internalformat = (GLenum)NUM2INT(arg2);
 	width = (GLsizei)NUM2UINT(arg3);
@@ -66,10 +79,12 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glColorTable(target,internalformat,width,format,type,(GLvoid *)NUM2INT(arg6));
 	} else {
-		Check_Type(arg6,T_STRING);
-		CheckDataSize(type,format,width,arg6);
-		fptr_glColorTable(target,internalformat,width,format,type,RSTRING(arg6)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg6);
+		CheckDataSize(type,format,width,data);
+		fptr_glColorTable(target,internalformat,width,format,type,RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -81,12 +96,13 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	LOAD_GL_FUNC(glColorTableParameterfv)
+	LOAD_GL_FUNC(glColorTableParameterfv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	fptr_glColorTableParameterfv(target,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -98,34 +114,16 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
-	LOAD_GL_FUNC(glColorTableParameteriv)
+	LOAD_GL_FUNC(glColorTableParameteriv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	fptr_glColorTableParameteriv(target,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glCopyColorTable)(GLenum,GLenum,GLint,GLint,GLsizei);
-static VALUE
-gl_CopyColorTable(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum target;
-	GLenum internalformat;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	LOAD_GL_FUNC(glCopyColorTable)
-	target = (GLenum)NUM2INT(arg1);
-	internalformat = (GLenum)NUM2INT(arg2);
-	x = (GLint)NUM2INT(arg3);
-	y = (GLint)NUM2INT(arg4);
-	width = (GLsizei)NUM2INT(arg5);
-	fptr_glCopyColorTable(target,internalformat,x,y,width);
-	return Qnil;
-}
 
 static void (APIENTRY * fptr_glGetColorTableParameterfv)(GLenum,GLenum,GLfloat *);
 static VALUE
@@ -136,9 +134,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	GLsizei size;
-	VALUE retary;
-	int i;
-	LOAD_GL_FUNC(glGetColorTableParameterfv)
+	LOAD_GL_FUNC(glGetColorTableParameterfv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch (pname) {
@@ -151,10 +147,7 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	fptr_glGetColorTableParameterfv(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 void (APIENTRY * fptr_glGetColorTableParameteriv)(GLenum,GLenum,GLint *);
@@ -166,9 +159,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	GLsizei size;
-	VALUE retary;
-	int i;
-	LOAD_GL_FUNC(glGetColorTableParameteriv)
+	LOAD_GL_FUNC(glGetColorTableParameteriv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch (pname) {
@@ -181,10 +172,7 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	fptr_glGetColorTableParameteriv(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(size,RETCONV_GLint,params)
 }
 
 static void (APIENTRY * fptr_glGetColorTable)(GLenum,GLenum,GLenum,GLvoid *);
@@ -197,16 +185,18 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum type;
 	GLsizei width = 0;
 	VALUE data;
-	LOAD_GL_FUNC(glGetColorTable)
-	LOAD_GL_FUNC(glGetColorTableParameteriv)
+	LOAD_GL_FUNC(glGetColorTable,"1.2")
+	LOAD_GL_FUNC(glGetColorTableParameteriv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	format = (GLenum)NUM2INT(arg2);
 	type = (GLenum)NUM2INT(arg3);
 	fptr_glGetColorTableParameteriv(target,GL_COLOR_TABLE_WIDTH,&width);
+	CHECK_GLERROR
 	data = allocate_buffer_with_string(GetDataSize(type,format,width));
 	FORCE_PIXEL_STORE_MODE
-	fptr_glGetColorTable(target,format,type,(GLvoid*)RSTRING(data)->ptr);	
+	fptr_glGetColorTable(target,format,type,(GLvoid*)RSTRING_PTR(data));	
 	RESTORE_PIXEL_STORE_MODE
+	CHECK_GLERROR
 	return data;
 }
 
@@ -220,7 +210,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	GLsizei count;
 	GLenum format;
 	GLenum type;
-	LOAD_GL_FUNC(glColorSubTable)
+	LOAD_GL_FUNC(glColorSubTable,"1.2")
 	target = (GLenum)NUM2INT(arg1);	
 	start = (GLsizei)NUM2UINT(arg2);	
 	count = (GLsizei)NUM2UINT(arg3);	
@@ -229,30 +219,12 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glColorSubTable(target,start,count,format,type,(GLvoid *)NUM2INT(arg6));
 	} else {
-		Check_Type(arg6,T_STRING);
-		CheckDataSize(type,format,count,arg6);
-		fptr_glColorSubTable(target,start,count,format,type,RSTRING(arg6)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg6);
+		CheckDataSize(type,format,count,data);
+		fptr_glColorSubTable(target,start,count,format,type,RSTRING_PTR(data));
 	}
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glCopyColorSubTable)(GLenum,GLsizei,GLint,GLint,GLsizei);
-static VALUE
-gl_CopyColorSubTable(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum target;
-	GLsizei start;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	LOAD_GL_FUNC(glCopyColorSubTable)
-	target = (GLenum)NUM2INT(arg1);
-	start = (GLsizei)NUM2UINT(arg2);
-	x = (GLint)NUM2INT(arg3);
-	y = (GLint)NUM2INT(arg4);
-	width = (GLsizei)NUM2UINT(arg5);
-	fptr_glCopyColorSubTable(target,start,x,y,width);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -266,7 +238,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	GLsizei width;
 	GLenum format;
 	GLenum type;
-	LOAD_GL_FUNC(glConvolutionFilter1D)
+	LOAD_GL_FUNC(glConvolutionFilter1D,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	internalformat = (GLenum)NUM2INT(arg2);
 	width = (GLsizei)NUM2UINT(arg3);
@@ -275,10 +247,12 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glConvolutionFilter1D(target,internalformat,width,format,type,(GLvoid *)NUM2INT(arg6));
 	} else {
-		Check_Type(arg6,T_STRING);
-		CheckDataSize(type,format,width,arg6);
-		fptr_glConvolutionFilter1D(target,internalformat,width,format,type,RSTRING(arg6)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg6);
+		CheckDataSize(type,format,width,data);
+		fptr_glConvolutionFilter1D(target,internalformat,width,format,type,RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -293,7 +267,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLsizei height;
 	GLenum format;
 	GLenum type;
-	LOAD_GL_FUNC(glConvolutionFilter2D)
+	LOAD_GL_FUNC(glConvolutionFilter2D,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	internalformat = (GLenum)NUM2INT(arg2);
 	width = (GLsizei)NUM2UINT(arg3);
@@ -303,26 +277,13 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glConvolutionFilter2D(target,internalformat,width,height,format,type,(GLvoid *)NUM2INT(arg7));
 	} else {
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg7);
 		Check_Type(arg7,T_STRING);
-		CheckDataSize(type,format,width*height,arg7);
-		fptr_glConvolutionFilter2D(target,internalformat,width,height,format,type,RSTRING(arg7)->ptr);
+		CheckDataSize(type,format,width*height,data);
+		fptr_glConvolutionFilter2D(target,internalformat,width,height,format,type,RSTRING_PTR(data));
 	}
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glConvolutionParameterf)(GLenum,GLenum,GLfloat);
-static VALUE
-gl_ConvolutionParameterf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum pname;
-	GLfloat params;
-	LOAD_GL_FUNC(glConvolutionParameterf)
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	params = (GLfloat)NUM2INT(arg3);
-	fptr_glConvolutionParameterf(target,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -334,28 +295,13 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	LOAD_GL_FUNC(glConvolutionParameterfv)
+	LOAD_GL_FUNC(glConvolutionParameterfv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	fptr_glConvolutionParameterfv(target,pname,params);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glConvolutionParameteri)(GLenum,GLenum,GLint);
-static VALUE
-gl_ConvolutionParameteri(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum pname;
-	GLint params;
-	LOAD_GL_FUNC(glConvolutionParameteri)
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	params = (GLint)NUM2INT(arg3);
-	fptr_glConvolutionParameteri(target,pname,params);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -367,54 +313,13 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
-	LOAD_GL_FUNC(glConvolutionParameteriv)
+	LOAD_GL_FUNC(glConvolutionParameteriv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	fptr_glConvolutionParameteriv(target,pname,params);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glCopyConvolutionFilter1D)(GLenum,GLenum,GLint,GLint,GLsizei);
-static VALUE
-gl_CopyConvolutionFilter1D(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum target;
-	GLenum internalformat;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	LOAD_GL_FUNC(glCopyConvolutionFilter1D)
-	target = (GLenum)NUM2INT(arg1);
-	internalformat = (GLenum)NUM2INT(arg2);
-	x = (GLint)NUM2INT(arg3);
-	y = (GLint)NUM2INT(arg4);
-	width = (GLsizei)NUM2UINT(arg5);
-	fptr_glCopyConvolutionFilter1D(target,internalformat,x,y,width);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glCopyConvolutionFilter2D)(GLenum,GLenum,GLint,GLint,GLsizei,GLsizei);
-static VALUE
-gl_CopyConvolutionFilter2D(obj,arg1,arg2,arg3,arg4,arg5,arg6)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
-{
-	GLenum target;
-	GLenum internalformat;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLsizei height;
-	LOAD_GL_FUNC(glCopyConvolutionFilter2D)
-	target = (GLenum)NUM2INT(arg1);
-	internalformat = (GLenum)NUM2INT(arg2);
-	x = (GLint)NUM2INT(arg3);
-	y = (GLint)NUM2INT(arg4);
-	width = (GLsizei)NUM2UINT(arg5);
-	height = (GLsizei)NUM2UINT(arg6);
-	fptr_glCopyConvolutionFilter2D(target,internalformat,x,y,width,height);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -427,9 +332,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	GLsizei size;
-	int i;
-	VALUE retary;	
-	LOAD_GL_FUNC(glGetConvolutionParameterfv)
+	LOAD_GL_FUNC(glGetConvolutionParameterfv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -443,10 +346,7 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	fptr_glGetConvolutionParameterfv(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 void (APIENTRY * fptr_glGetConvolutionParameteriv)(GLenum,GLenum,GLint *);
@@ -458,9 +358,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	GLsizei size;
-	int i;
-	VALUE retary;	
-	LOAD_GL_FUNC(glGetConvolutionParameteriv)
+	LOAD_GL_FUNC(glGetConvolutionParameteriv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
@@ -474,10 +372,7 @@ VALUE obj,arg1,arg2;
 			break;
 	}
 	fptr_glGetConvolutionParameteriv(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(size,RETCONV_GLint,params)
 }
 
 static void (APIENTRY * fptr_glGetConvolutionFilter)(GLenum,GLenum,GLenum,GLvoid *);
@@ -490,14 +385,12 @@ VALUE obj;
 	GLenum target;
 	GLenum format;
 	GLenum type;
-	//GLsizei format_size;
-	//GLsizei type_size;
 	GLint size = 0;
 	VALUE data;
 	VALUE args[4];
 	int numargs;
-	LOAD_GL_FUNC(glGetConvolutionFilter)
-	LOAD_GL_FUNC(glGetConvolutionParameteriv)
+	LOAD_GL_FUNC(glGetConvolutionFilter,"1.2")
+	LOAD_GL_FUNC(glGetConvolutionParameteriv,"1.2")
 	numargs = rb_scan_args(argc, argv, "31", &args[0], &args[1], &args[2], &args[3]);
 	target = (GLenum)NUM2INT(args[0]);
 	format = (GLenum)NUM2INT(args[1]);
@@ -517,10 +410,12 @@ VALUE obj;
 				fptr_glGetConvolutionParameteriv(target,GL_CONVOLUTION_HEIGHT,&size);
 				size *=tmp;
 			}
+			CHECK_GLERROR
 			data = allocate_buffer_with_string(GetDataSize(type,format,size));
 			FORCE_PIXEL_STORE_MODE
-			fptr_glGetConvolutionFilter(target,format,type,(GLvoid*)RSTRING(data)->ptr);
+			fptr_glGetConvolutionFilter(target,format,type,(GLvoid*)RSTRING_PTR(data));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return data;
 		case 4:
 			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
@@ -529,6 +424,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			fptr_glGetConvolutionFilter(target,format,type,(GLvoid*)NUM2INT(args[3]));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return Qnil;
 	}
 }
@@ -550,8 +446,8 @@ VALUE obj;
 	VALUE retary;
 	VALUE args[6];
 	int numargs;
-	LOAD_GL_FUNC(glGetSeparableFilter)
-	LOAD_GL_FUNC(glGetConvolutionParameteriv)
+	LOAD_GL_FUNC(glGetSeparableFilter,"1.2")
+	LOAD_GL_FUNC(glGetConvolutionParameteriv,"1.2")
 	numargs = rb_scan_args(argc, argv, "33", &args[0], &args[1], &args[2], &args[3], &args[4], &args[5]);
 	target = (GLenum)NUM2INT(args[0]);
 	format = (GLenum)NUM2INT(args[1]);
@@ -565,14 +461,16 @@ VALUE obj;
 
 			fptr_glGetConvolutionParameteriv(target,GL_CONVOLUTION_WIDTH,&size_row);
 			fptr_glGetConvolutionParameteriv(target,GL_CONVOLUTION_HEIGHT,&size_column);
+			CHECK_GLERROR
 			data_row = allocate_buffer_with_string(GetDataSize(type,format,size_row));
 			data_column = allocate_buffer_with_string(GetDataSize(type,format,size_column));
 			FORCE_PIXEL_STORE_MODE
-			fptr_glGetSeparableFilter(target,format,type,(GLvoid*)RSTRING(data_row)->ptr,(GLvoid*)RSTRING(data_column)->ptr,0);
+			fptr_glGetSeparableFilter(target,format,type,(GLvoid*)RSTRING_PTR(data_row),(GLvoid*)RSTRING_PTR(data_column),0);
 			RESTORE_PIXEL_STORE_MODE
 			retary = rb_ary_new2(2);
 			rb_ary_push(retary, data_row);
 			rb_ary_push(retary, data_column);
+			CHECK_GLERROR
 			return retary;
 			break;
 		case 6:
@@ -581,6 +479,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			fptr_glGetSeparableFilter(target,format,type,(GLvoid*)NUM2INT(args[3]),(GLvoid*)NUM2INT(args[4]),(GLvoid*)NUM2INT(args[5]));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return Qnil;		
 		}
 }
@@ -596,7 +495,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	GLsizei height;
 	GLenum format;
 	GLenum type;
-	LOAD_GL_FUNC(glSeparableFilter2D)
+	LOAD_GL_FUNC(glSeparableFilter2D,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	internalformat = (GLenum)NUM2INT(arg2);
 	width = (GLsizei)NUM2UINT(arg3);
@@ -606,12 +505,15 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glSeparableFilter2D(target,internalformat,width,height,format,type,(GLvoid *)NUM2INT(arg7),(GLvoid *)NUM2INT(arg8));
 	} else {
-		Check_Type(arg7,T_STRING);
-		Check_Type(arg8,T_STRING);
-		CheckDataSize(type,format,width,arg7);
-		CheckDataSize(type,format,height,arg8);
-		fptr_glSeparableFilter2D(target,internalformat,width,height,format,type,RSTRING(arg7)->ptr,RSTRING(arg8)->ptr);
+		VALUE data_1,data_2;
+		data_1 = pack_array_or_pass_string(type,arg7);
+		data_2 = pack_array_or_pass_string(type,arg8);
+
+		CheckDataSize(type,format,width,data_1);
+		CheckDataSize(type,format,height,data_2);
+		fptr_glSeparableFilter2D(target,internalformat,width,height,format,type,RSTRING_PTR(data_1),RSTRING_PTR(data_2));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -623,14 +525,12 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLenum pname;
 	GLfloat params = 0.0;
-	VALUE retary;	
-	LOAD_GL_FUNC(glGetHistogramParameterfv)
+	LOAD_GL_FUNC(glGetHistogramParameterfv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetHistogramParameterfv(target,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary, rb_float_new(params));
-	return retary;
+	CHECK_GLERROR
+	return RETCONV_GLfloat(params);
 }
 
 static void (APIENTRY * fptr_glGetHistogramParameteriv)(GLenum,GLenum,GLint *);
@@ -641,14 +541,12 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLenum pname;
 	GLint params = 0;
-	VALUE retary;	
-	LOAD_GL_FUNC(glGetHistogramParameteriv)
+	LOAD_GL_FUNC(glGetHistogramParameteriv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetHistogramParameteriv(target,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary, INT2NUM(params));
-	return retary;
+	CHECK_GLERROR
+	return cond_GLBOOL2RUBY(pname,params);
 }
 
 static void (APIENTRY * fptr_glGetHistogram)(GLenum,GLboolean,GLenum,GLenum,GLvoid*);
@@ -666,8 +564,8 @@ VALUE obj;
 	VALUE data;
 	VALUE args[5];
 	int numargs;
-	LOAD_GL_FUNC(glGetHistogram)
-	LOAD_GL_FUNC(glGetHistogramParameteriv)
+	LOAD_GL_FUNC(glGetHistogram,"1.2")
+	LOAD_GL_FUNC(glGetHistogramParameteriv,"1.2")
 	numargs = rb_scan_args(argc, argv, "41", &args[0], &args[1], &args[2], &args[3], &args[4]);
 	target = (GLenum)NUM2INT(args[0]);
 	reset = (GLboolean)NUM2INT(args[1]);
@@ -681,10 +579,12 @@ VALUE obj;
 				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing");
 
 			fptr_glGetHistogramParameteriv(target,GL_HISTOGRAM_WIDTH,&size);
+			CHECK_GLERROR
 			data = allocate_buffer_with_string(GetDataSize(type,format,size));
 			FORCE_PIXEL_STORE_MODE
-			fptr_glGetHistogram(target,reset,format,type,(GLvoid*)RSTRING(data)->ptr);
+			fptr_glGetHistogram(target,reset,format,type,(GLvoid*)RSTRING_PTR(data));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return data;
 			break;
 		case 5:
@@ -694,6 +594,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			fptr_glGetHistogram(target,reset,format,type,(GLvoid*)NUM2INT(args[4]));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return Qnil;
 	}
 }
@@ -712,7 +613,7 @@ VALUE obj;
 	VALUE data;
 	VALUE args[5];
 	int numargs;
-	LOAD_GL_FUNC(glGetMinmax)
+	LOAD_GL_FUNC(glGetMinmax,"1.2")
 	numargs = rb_scan_args(argc, argv, "41", &args[0], &args[1], &args[2], &args[3], &args[4]);
 	target = (GLenum)NUM2INT(args[0]);
 	reset = (GLboolean)NUM2INT(args[1]);
@@ -727,8 +628,9 @@ VALUE obj;
 
 			data = allocate_buffer_with_string(GetDataSize(type,format,2));
 			FORCE_PIXEL_STORE_MODE
-			fptr_glGetMinmax(target,reset,format,type,(GLvoid*)RSTRING(data)->ptr);
+			fptr_glGetMinmax(target,reset,format,type,(GLvoid*)RSTRING_PTR(data));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return data;
 			break;
 		case 5:
@@ -738,6 +640,7 @@ VALUE obj;
 			FORCE_PIXEL_STORE_MODE
 			fptr_glGetMinmax(target,reset,format,type,(GLvoid*)NUM2INT(args[4]));
 			RESTORE_PIXEL_STORE_MODE
+			CHECK_GLERROR
 			return Qnil;
 	}
 }
@@ -750,14 +653,12 @@ VALUE obj,arg1,arg2;
 	GLenum target;
 	GLenum pname;
 	GLfloat params = 0.0;
-	VALUE retary;	
-	LOAD_GL_FUNC(glGetMinmaxParameterfv)
+	LOAD_GL_FUNC(glGetMinmaxParameterfv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetMinmaxParameterfv(target,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary, rb_float_new(params));
-	return retary;
+	CHECK_GLERROR
+	return RETCONV_GLfloat(params);
 }
 
 static void (APIENTRY * fptr_glGetMinmaxParameteriv)(GLenum,GLenum,GLint *);
@@ -768,72 +669,12 @@ VALUE obj,arg1,arg2;
 	GLenum target;
 	GLenum pname;
 	GLint params = 0;
-	VALUE retary;	
-	LOAD_GL_FUNC(glGetMinmaxParameteriv)
+	LOAD_GL_FUNC(glGetMinmaxParameteriv,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetMinmaxParameteriv(target,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary, INT2NUM(params));
-	return retary;
-}
-
-static void (APIENTRY * fptr_glHistogram)(GLenum,GLsizei,GLenum,GLboolean);
-static VALUE
-gl_Histogram(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum target;
-	GLsizei width;
-	GLenum internalformat;
-	GLboolean sink;
-	LOAD_GL_FUNC(glHistogram)
-	target = (GLenum)NUM2INT(arg1);
-	width = (GLsizei)NUM2UINT(arg2);
-	internalformat = (GLenum)NUM2INT(arg3);
-	sink = (GLboolean)NUM2INT(arg4);
-	fptr_glHistogram(target,width,internalformat,sink);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMinmax)(GLenum,GLenum,GLboolean);
-static VALUE
-gl_Minmax(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum internalformat;
-	GLboolean sink;
-	LOAD_GL_FUNC(glMinmax)
-	target = (GLenum)NUM2INT(arg1);
-	internalformat = (GLenum)NUM2INT(arg2);
-	sink = (GLboolean)NUM2INT(arg3);
-	fptr_glMinmax(target,internalformat,sink);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glResetHistogram)(GLenum);
-static VALUE
-gl_ResetHistogram(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum target;
-	LOAD_GL_FUNC(glResetHistogram)
-	target = (GLenum)NUM2INT(arg1);
-	fptr_glResetHistogram(target);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glResetMinmax)(GLenum);
-static VALUE
-gl_ResetMinmax(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum target;
-	LOAD_GL_FUNC(glResetMinmax)
-	target = (GLenum)NUM2INT(arg1);
-	fptr_glResetMinmax(target);
-	return Qnil;
+	CHECK_GLERROR
+	return cond_GLBOOL2RUBY(pname,params);
 }
 
 static void (APIENTRY * fptr_glTexImage3D)(GLenum,GLint,GLint,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*);
@@ -851,7 +692,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	GLenum format;
 	GLenum type;
 	const char *pixels;
-	LOAD_GL_FUNC(glTexImage3D)
+	LOAD_GL_FUNC(glTexImage3D,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	internalFormat = (GLint)NUM2INT(arg3);
@@ -865,6 +706,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glTexImage3D( target, level, internalFormat, width, height,
 					  depth, border, format, type,(GLvoid *)NUM2INT(arg10));
+		CHECK_GLERROR
 		return Qnil;
 	}
 
@@ -875,19 +717,22 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 			NIL_P(arg10)) { /* proxy texture, no data read */
 		pixels = NULL;
 	} else {
-		Check_Type(arg10,T_STRING);
-		CheckDataSize(type,format,width*height*depth,arg10);
-		pixels = RSTRING(arg10)->ptr;
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg10);
+
+		CheckDataSize(type,format,width*height*depth,data);
+		pixels = RSTRING_PTR(data);
 	}
 	fptr_glTexImage3D( target, level, internalFormat, width, height,
 				  depth, border, format, type,pixels);
+	CHECK_GLERROR
 	return Qnil;
 }
 
 static void (APIENTRY * fptr_glTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*);
 static VALUE
 gl_TexSubImage3D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11)
-VALUE arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
+VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 {
 	GLenum target;
 	GLint level;
@@ -899,7 +744,7 @@ VALUE arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	GLsizei depth;
 	GLenum format;
 	GLenum type;
-	LOAD_GL_FUNC(glTexSubImage3D)
+	LOAD_GL_FUNC(glTexSubImage3D,"1.2")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -915,42 +760,14 @@ VALUE arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 				width, height, depth,
 				format, type, (GLvoid *)NUM2INT(arg11));
 	} else {
-		Check_Type(arg11, T_STRING);
-		CheckDataSize(type,format,height*width*depth,arg11);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg11);
+		CheckDataSize(type,format,height*width*depth,data);
 		fptr_glTexSubImage3D( target, level, xoffset, yoffset, zoffset,
 			width, height, depth,
-			format, type, RSTRING(arg11)->ptr);
+			format, type, RSTRING_PTR(data));
 	}
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glCopyTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei);
-static VALUE
-gl_CopyTexSubImage3D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
-{
-	GLenum target;
-	GLint level;
-	GLint xoffset;
-	GLint yoffset;
-	GLint zoffset;
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLsizei height;
-	LOAD_GL_FUNC(glCopyTexSubImage3D)
-	target = (GLenum)NUM2INT(arg1);
-	level = (GLint)NUM2INT(arg2);
-	xoffset = (GLint)NUM2INT(arg3);
-	yoffset = (GLint)NUM2INT(arg4);
-	zoffset = (GLint)NUM2INT(arg5);
-	x = (GLint)NUM2INT(arg6);
-	y = (GLint)NUM2INT(arg7);
-	width = (GLsizei)NUM2UINT(arg8);
-	height = (GLsizei)NUM2UINT(arg9);
-	fptr_glCopyTexSubImage3D( target, level,
-			xoffset, yoffset, zoffset,
-			x, y, width, height );
+	CHECK_GLERROR
 	return Qnil;
 }