ruby-opengl 0.50.0 → 0.60.0

data/ext/gl/gl-1.4.c

@@ -16,25 +16,28 @@
 #include "../common/common.h"
 
 /* OpenGL 1.4 functions */
-GL_SIMPLE_FUNC_LOAD(BlendFuncSeparate,4,GLenum,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(FogCoordf,1,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(FogCoordd,1,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3b,3,GLbyte,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3d,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3f,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3s,3,GLshort,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3ub,3,GLubyte,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3ui,3,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(SecondaryColor3us,3,GLushort,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(WindowPos2d,2,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(WindowPos2f,2,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(WindowPos2i,2,GLint,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(WindowPos2s,2,GLshort,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(WindowPos3d,3,GLdouble,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(WindowPos3f,3,GLfloat,NUM2DBL)
-GL_SIMPLE_FUNC_LOAD(WindowPos3i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(WindowPos3s,3,GLshort,NUM2INT)
+
+GL_FUNC_LOAD_4(BlendFuncSeparate,GLvoid, GLenum,GLenum,GLenum,GLenum, "1.4")
+GL_FUNC_LOAD_1(FogCoordf,GLvoid, GLfloat, "1.4")
+GL_FUNC_LOAD_1(FogCoordd,GLvoid, GLdouble, "1.4")
+GL_FUNC_LOAD_2(PointParameteri,GLvoid, GLenum,GLint, "1.4")
+GL_FUNC_LOAD_2(PointParameterf,GLvoid, GLenum,GLfloat, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3b,GLvoid, GLbyte,GLbyte,GLbyte, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3d,GLvoid, GLdouble,GLdouble,GLdouble, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3f,GLvoid, GLfloat,GLfloat,GLfloat, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3i,GLvoid, GLint,GLint,GLint, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3s,GLvoid, GLshort,GLshort,GLshort, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3ub,GLvoid, GLubyte,GLubyte,GLubyte, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3ui,GLvoid, GLuint,GLuint,GLuint, "1.4")
+GL_FUNC_LOAD_3(SecondaryColor3us,GLvoid, GLushort,GLushort,GLushort, "1.4")
+GL_FUNC_LOAD_2(WindowPos2d,GLvoid, GLdouble,GLdouble, "1.4")
+GL_FUNC_LOAD_2(WindowPos2f,GLvoid, GLfloat,GLfloat, "1.4")
+GL_FUNC_LOAD_2(WindowPos2i,GLvoid, GLint,GLint, "1.4")
+GL_FUNC_LOAD_2(WindowPos2s,GLvoid, GLshort,GLshort, "1.4")
+GL_FUNC_LOAD_3(WindowPos3d,GLvoid, GLdouble,GLdouble,GLdouble, "1.4")
+GL_FUNC_LOAD_3(WindowPos3f,GLvoid, GLfloat,GLfloat,GLfloat, "1.4")
+GL_FUNC_LOAD_3(WindowPos3i,GLvoid, GLint,GLint,GLint, "1.4")
+GL_FUNC_LOAD_3(WindowPos3s,GLvoid, GLshort,GLshort,GLshort, "1.4")
 
 static void (APIENTRY * fptr_glFogCoordfv)(GLfloat *);
 static VALUE
@@ -42,10 +45,11 @@ gl_FogCoordfv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat coord;
-	LOAD_GL_FUNC(glFogCoordfv)
+	LOAD_GL_FUNC(glFogCoordfv,"1.4")
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,&coord,1);
 	fptr_glFogCoordfv(&coord);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -55,10 +59,11 @@ gl_FogCoorddv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble coord;
-	LOAD_GL_FUNC(glFogCoorddv)
+	LOAD_GL_FUNC(glFogCoorddv,"1.4")
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,&coord,1);
 	fptr_glFogCoorddv(&coord);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -70,18 +75,20 @@ VALUE obj,arg1,arg2,arg3;
 {
 	GLenum type;
 	GLsizei stride;
-	LOAD_GL_FUNC(glFogCoordPointer)
+	LOAD_GL_FUNC(glFogCoordPointer,"1.4")
 	type = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
 	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
 		g_FogCoord_ptr = arg3;
 		fptr_glFogCoordPointer(type, stride, (const GLvoid*)NUM2INT(arg3));
 	} else {
-		Check_Type(arg3, T_STRING);
-		rb_str_freeze(arg3);
-		g_FogCoord_ptr = arg3;
-		fptr_glFogCoordPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg3);
+		rb_str_freeze(data);
+		g_FogCoord_ptr = data;
+		fptr_glFogCoordPointer(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -94,7 +101,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint *ary1;
 	GLsizei *ary2;
   int len1,len2;
-	LOAD_GL_FUNC(glMultiDrawArrays)
+	LOAD_GL_FUNC(glMultiDrawArrays,"1.4")
   len1 = RARRAY(arg2)->len;
   len2 = RARRAY(arg3)->len;
 	if (len1!=len2)
@@ -107,6 +114,7 @@ VALUE obj,arg1,arg2,arg3;
 	fptr_glMultiDrawArrays(mode,ary1,ary2,len1);
 	xfree(ary1);
 	xfree(ary2);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -125,7 +133,7 @@ VALUE obj;
 	RArray *ary;
 	int i;
 	VALUE args[4];
-	LOAD_GL_FUNC(glMultiDrawElements)
+	LOAD_GL_FUNC(glMultiDrawElements,"1.4")
 	switch (rb_scan_args(argc, argv, "31", &args[0], &args[1], &args[2],&args[3])) {
 		default:
 		case 3:
@@ -139,8 +147,10 @@ VALUE obj;
 			counts = ALLOC_N(GLsizei,size);
 			indices = ALLOC_N(GLvoid*,size);
 			for (i=0;i<size;i++) {
-				indices[i] = RSTRING(ary->ptr[i])->ptr;
-				counts[i] = RSTRING(ary->ptr[i])->len;
+				VALUE data;
+				data = pack_array_or_pass_string(type,ary->ptr[i]);
+				indices[i] = RSTRING_PTR(data);
+				counts[i] = RSTRING_LEN(data);
 			}
 			fptr_glMultiDrawElements(mode,counts,type,indices,size);
 			xfree(counts);
@@ -169,20 +179,7 @@ VALUE obj;
 			xfree(indices);
 			break;
 	}
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glPointParameterf)(GLenum,GLfloat);
-static VALUE
-gl_PointParameterf(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat param;
-	LOAD_GL_FUNC(glPointParameterf)
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLfloat)NUM2INT(arg2);
-	fptr_glPointParameterf(pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -194,7 +191,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[3] = {0.0,0.0,0.0};
 	GLint size;
-	LOAD_GL_FUNC(glPointParameterfv)
+	LOAD_GL_FUNC(glPointParameterfv,"1.4")
 	pname = (GLenum)NUM2INT(arg1);
 	Check_Type(arg2,T_ARRAY);
 	if (pname==GL_POINT_DISTANCE_ATTENUATION)
@@ -203,20 +200,7 @@ VALUE obj,arg1,arg2;
 		size = 1;
 	ary2cflt(arg2,params,size);
 	fptr_glPointParameterfv(pname,params);	
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glPointParameteri)(GLenum,GLint);
-static VALUE
-gl_PointParameteri(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint param;
-	LOAD_GL_FUNC(glPointParameteri)
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLint)NUM2INT(arg2);
-	fptr_glPointParameteri(pname,param);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -228,7 +212,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[3] = {0.0,0.0,0.0};
 	GLint size;
-	LOAD_GL_FUNC(glPointParameteriv)
+	LOAD_GL_FUNC(glPointParameteriv,"1.4")
 	pname = (GLenum)NUM2INT(arg1);
 	Check_Type(arg2,T_ARRAY);
 	if (pname==GL_POINT_DISTANCE_ATTENUATION)
@@ -237,52 +221,31 @@ VALUE obj,arg1,arg2;
 		size = 1;
 	ary2cint(arg2,params,size);
 	fptr_glPointParameteriv(pname,params);	
+	CHECK_GLERROR
 	return Qnil;
 }
 
-#define GLSECONDARYCOLOR_VFUNC(_type_) \
-static VALUE \
-gl_SecondaryColor##_type_##v(argc,argv,obj) \
-int argc; \
-VALUE *argv; \
-VALUE obj; \
+#define GLSECONDARYCOLOR_VFUNC(_name_,_type_,_conv_) \
+static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
+VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
-	int num; \
-	VALUE args[3]; \
-	RArray *ary; \
-	switch (num = rb_scan_args(argc, argv, "12", &args[0], &args[1], &args[2])) { \
-	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
-		ary = RARRAY(args[0]); \
-		switch (ary->len) { \
-			case 3: \
-			gl_SecondaryColor3##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
-			break; \
-			default: \
-				rb_raise(rb_eArgError, "array length:%d", num); \
-		} \
-		} \
-		else \
-			rb_raise(rb_eArgError, "array length:%d", num); \
-		break; \
-	case 3: \
-		gl_SecondaryColor3##_type_(obj,args[0], args[1], args[2]); \
-		break; \
-	default: \
-		rb_raise(rb_eArgError, "too many arguments"); \
-		break; \
-	} \
+	_type_ cary[3] = {0,0,0}; \
+	LOAD_GL_FUNC(gl##_name_,"1.4") \
+	Check_Type(arg1,T_ARRAY); \
+	_conv_(arg1,cary,3); \
+	fptr_gl##_name_(cary); \
+	CHECK_GLERROR \
 	return Qnil; \
 }
 
-GLSECONDARYCOLOR_VFUNC(b)
-GLSECONDARYCOLOR_VFUNC(d)
-GLSECONDARYCOLOR_VFUNC(f)
-GLSECONDARYCOLOR_VFUNC(i)
-GLSECONDARYCOLOR_VFUNC(s)
-GLSECONDARYCOLOR_VFUNC(ui)
-GLSECONDARYCOLOR_VFUNC(ub)
-GLSECONDARYCOLOR_VFUNC(us)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3bv,GLbyte,ary2cbyte)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3dv,GLdouble,ary2cdbl)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3fv,GLfloat,ary2cflt)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3iv,GLint,ary2cint)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3sv,GLshort,ary2cshort)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3uiv,GLuint,ary2cuint)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3ubv,GLubyte,ary2cubyte)
+GLSECONDARYCOLOR_VFUNC(SecondaryColor3usv,GLushort,ary2cushort)
 #undef GLSECONDARYCOLOR_VFUNC
 
 extern VALUE g_SecondaryColor_ptr;
@@ -294,7 +257,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLint size;
 	GLenum type;
 	GLsizei stride;
-	LOAD_GL_FUNC(glSecondaryColorPointer)
+	LOAD_GL_FUNC(glSecondaryColorPointer,"1.4")
 	size = (GLint)NUM2INT(arg1);
 	type = (GLenum)NUM2INT(arg2);
 	stride = (GLsizei)NUM2UINT(arg3);
@@ -302,59 +265,37 @@ VALUE obj,arg1,arg2,arg3,arg4;
 		g_SecondaryColor_ptr = arg4;
 		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)NUM2INT(arg4));
 	} else {
-		Check_Type(arg4, T_STRING);
-		rb_str_freeze(arg4);
-		g_SecondaryColor_ptr = arg4;
-		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)RSTRING(arg4)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg4);
+		rb_str_freeze(data);
+		g_SecondaryColor_ptr = data;
+		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
-#define GLWINDOWPOS_VFUNC(_type_) \
-static VALUE \
-gl_WindowPos##_type_##v(argc,argv,obj) \
-int argc; \
-VALUE *argv; \
-VALUE obj; \
+#define GLWINDOWPOS_VFUNC(_name_,_type_,_size_,_conv_) \
+static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
+VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
-	int num; \
-	VALUE args[3]; \
-	RArray *ary; \
-	switch (num = rb_scan_args(argc, argv, "12", &args[0], &args[1], &args[2])) { \
-	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
-		ary = RARRAY(args[0]); \
-		switch (ary->len) { \
-			case 2: \
-			gl_WindowPos2##_type_(obj,ary->ptr[0],ary->ptr[1]); \
-			break; \
-			case 3: \
-			gl_WindowPos3##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
-			break; \
-			default: \
-				rb_raise(rb_eArgError, "array length:%d", num); \
-		} \
-		} \
-		else \
-			rb_raise(rb_eArgError, "array length:%d", num); \
-		break; \
-	case 2: \
-		gl_WindowPos2##_type_(obj,args[0], args[1]); \
-		break; \
-	case 3: \
-		gl_WindowPos3##_type_(obj,args[0], args[1], args[2]); \
-		break; \
-	default: \
-		rb_raise(rb_eArgError, "too many arguments"); \
-		break; \
-	} \
+	_type_ cary[3] = {0,0,0}; \
+	LOAD_GL_FUNC(gl##_name_,"1.4") \
+	Check_Type(arg1,T_ARRAY); \
+	_conv_(arg1,cary,_size_); \
+	fptr_gl##_name_(cary); \
+	CHECK_GLERROR \
 	return Qnil; \
 }
 
-GLWINDOWPOS_VFUNC(d)
-GLWINDOWPOS_VFUNC(f)
-GLWINDOWPOS_VFUNC(i)
-GLWINDOWPOS_VFUNC(s)
+GLWINDOWPOS_VFUNC(WindowPos2dv,GLdouble,2,ary2cdbl)
+GLWINDOWPOS_VFUNC(WindowPos2fv,GLfloat,2,ary2cflt)
+GLWINDOWPOS_VFUNC(WindowPos2iv,GLint,2,ary2cint)
+GLWINDOWPOS_VFUNC(WindowPos2sv,GLshort,2,ary2cshort)
+GLWINDOWPOS_VFUNC(WindowPos3dv,GLdouble,3,ary2cdbl)
+GLWINDOWPOS_VFUNC(WindowPos3fv,GLfloat,3,ary2cflt)
+GLWINDOWPOS_VFUNC(WindowPos3iv,GLint,3,ary2cint)
+GLWINDOWPOS_VFUNC(WindowPos3sv,GLshort,3,ary2cshort)
 #undef GLWINDOWPOS_VFUNC
 
 
@@ -380,6 +321,14 @@ void gl_init_functions_1_4(VALUE module)
 	rb_define_module_function(module, "glSecondaryColor3ub", gl_SecondaryColor3ub, 3);
 	rb_define_module_function(module, "glSecondaryColor3ui", gl_SecondaryColor3ui, 3);
 	rb_define_module_function(module, "glSecondaryColor3us", gl_SecondaryColor3us, 3);
+	rb_define_module_function(module, "glSecondaryColor3bv", gl_SecondaryColor3bv, 1);
+	rb_define_module_function(module, "glSecondaryColor3dv", gl_SecondaryColor3dv, 1);
+	rb_define_module_function(module, "glSecondaryColor3fv", gl_SecondaryColor3fv, 1);
+	rb_define_module_function(module, "glSecondaryColor3iv", gl_SecondaryColor3iv, 1);
+	rb_define_module_function(module, "glSecondaryColor3sv", gl_SecondaryColor3sv, 1);
+	rb_define_module_function(module, "glSecondaryColor3ubv", gl_SecondaryColor3ubv, 1);
+	rb_define_module_function(module, "glSecondaryColor3uiv", gl_SecondaryColor3uiv, 1);
+	rb_define_module_function(module, "glSecondaryColor3usv", gl_SecondaryColor3usv, 1);
 	rb_define_module_function(module, "glSecondaryColorPointer", gl_SecondaryColorPointer, 4);
 	rb_define_module_function(module, "glWindowPos2d", gl_WindowPos2d, 2);
 	rb_define_module_function(module, "glWindowPos2f", gl_WindowPos2f, 2);
@@ -389,23 +338,12 @@ void gl_init_functions_1_4(VALUE module)
 	rb_define_module_function(module, "glWindowPos3f", gl_WindowPos3f, 3);
 	rb_define_module_function(module, "glWindowPos3i", gl_WindowPos3i, 3);
 	rb_define_module_function(module, "glWindowPos3s", gl_WindowPos3s, 3);
-
-	/* Additional Functions */
-	rb_define_module_function(module, "glSecondaryColor3bv", gl_SecondaryColorbv, -1);
-	rb_define_module_function(module, "glSecondaryColor3dv", gl_SecondaryColordv, -1);
-	rb_define_module_function(module, "glSecondaryColor3fv", gl_SecondaryColorfv, -1);
-	rb_define_module_function(module, "glSecondaryColor3iv", gl_SecondaryColoriv, -1);
-	rb_define_module_function(module, "glSecondaryColor3sv", gl_SecondaryColorsv, -1);
-	rb_define_module_function(module, "glSecondaryColor3ubv", gl_SecondaryColorubv, -1);
-	rb_define_module_function(module, "glSecondaryColor3uiv", gl_SecondaryColoruiv, -1);
-	rb_define_module_function(module, "glSecondaryColor3usv", gl_SecondaryColorusv, -1);
-
-	rb_define_module_function(module, "glWindowPos2dv", gl_WindowPosdv, -1);
-	rb_define_module_function(module, "glWindowPos2fv", gl_WindowPosfv, -1);
-	rb_define_module_function(module, "glWindowPos2iv", gl_WindowPosiv, -1);
-	rb_define_module_function(module, "glWindowPos2sv", gl_WindowPossv, -1);
-	rb_define_module_function(module, "glWindowPos3dv", gl_WindowPosdv, -1);
-	rb_define_module_function(module, "glWindowPos3fv", gl_WindowPosfv, -1);
-	rb_define_module_function(module, "glWindowPos3iv", gl_WindowPosiv, -1);
-	rb_define_module_function(module, "glWindowPos3sv", gl_WindowPossv, -1);
+	rb_define_module_function(module, "glWindowPos2dv", gl_WindowPos2dv, 1);
+	rb_define_module_function(module, "glWindowPos2fv", gl_WindowPos2fv, 1);
+	rb_define_module_function(module, "glWindowPos2iv", gl_WindowPos2iv, 1);
+	rb_define_module_function(module, "glWindowPos2sv", gl_WindowPos2sv, 1);
+	rb_define_module_function(module, "glWindowPos3dv", gl_WindowPos3dv, 1);
+	rb_define_module_function(module, "glWindowPos3fv", gl_WindowPos3fv, 1);
+	rb_define_module_function(module, "glWindowPos3iv", gl_WindowPos3iv, 1);
+	rb_define_module_function(module, "glWindowPos3sv", gl_WindowPos3sv, 1);
 }

data/ext/gl/gl-1.5.c

@@ -17,76 +17,15 @@
 
 /* OpenGL 1.5 functions */
 
-GL_SIMPLE_FUNC_LOAD(EndQuery,1,GLenum,NUM2INT)
-
-static void (APIENTRY * fptr_glGenQueries)(GLsizei,GLuint *);
-static VALUE
-gl_GenQueries(obj,arg1)
-VALUE obj,arg1;
-{
-	GLsizei n;
-	GLuint *queries;
-	RArray *ret;
-	int i;
-	LOAD_GL_FUNC(glGenQueries)
-	n = (GLsizei)NUM2UINT(arg1);
-	queries = ALLOC_N(GLuint, n);
-	fptr_glGenQueries(n, queries);
-	ret = RARRAY(rb_ary_new2(n));
-	for (i = 0; i < n; i++)
-		rb_ary_push((VALUE)ret, INT2NUM(queries[i]));
-	xfree(queries);
-	return (VALUE)ret;
-}
-
-static void (APIENTRY * fptr_glDeleteQueries)(GLsizei,GLuint *);
-static VALUE
-gl_DeleteQueries(obj,arg1)
-VALUE obj,arg1;
-{
-	GLsizei n;
-	GLuint *queries;
-	LOAD_GL_FUNC(glDeleteQueries)
-	if (TYPE(arg1)==T_ARRAY) {
-		n = RARRAY(arg1)->len;
-		queries = ALLOC_N(GLuint,n);
-		ary2cuint(arg1,queries,n); 
-		fptr_glDeleteQueries( n, queries);
-		xfree(queries);
-	} else {
-		GLuint query;
-		query = NUM2INT(arg1);
-		fptr_glDeleteQueries( 1, &query);
-	}
-	return Qnil;
-}
-
-static GLboolean (APIENTRY * fptr_glIsQuery)(GLuint);
-static VALUE
-gl_IsQuery(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint query;
-	GLboolean ret;
-	LOAD_GL_FUNC(glIsQuery)
-	query = (GLuint)NUM2UINT(arg1);
-	ret = fptr_glIsQuery(query);
-	return INT2NUM(ret);
-}
-
-static void (APIENTRY * fptr_glBeginQuery)(GLenum,GLuint);
-static VALUE
-gl_BeginQuery(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLuint id;
-	LOAD_GL_FUNC(glBeginQuery)
-	target = (GLenum)NUM2INT(arg1);
-	id = (GLuint)NUM2UINT(arg2);
-	fptr_glBeginQuery(target,id);
-	return Qnil;
-}
+GL_FUNC_LOAD_1(EndQuery,GLvoid, GLenum, "1.5")
+GL_FUNC_LOAD_1(IsQuery,GLboolean, GLuint, "1.5")
+GL_FUNC_LOAD_2(BeginQuery,GLvoid, GLenum,GLuint, "1.5")
+GL_FUNC_LOAD_2(BindBuffer,GLvoid, GLenum,GLuint, "1.5")
+GL_FUNC_LOAD_1(IsBuffer,GLboolean, GLuint, "1.5")
+GL_FUNC_GENOBJECTS_LOAD(GenQueries,"1.5")
+GL_FUNC_DELETEOBJECTS_LOAD(DeleteQueries,"1.5")
+GL_FUNC_GENOBJECTS_LOAD(GenBuffers,"1.5")
+GL_FUNC_DELETEOBJECTS_LOAD(DeleteBuffers,"1.5")
 
 static void (APIENTRY * fptr_glGetQueryiv)(GLenum,GLenum,GLint *);
 static VALUE
@@ -96,14 +35,12 @@ VALUE obj,arg1,arg2;
 	GLenum target;
 	GLenum pname;
 	GLint params = 0;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetQueryiv)
+	LOAD_GL_FUNC(glGetQueryiv,"1.5")
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetQueryiv(target,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary, INT2NUM(params));
-	return retary;
+	CHECK_GLERROR
+	return RETCONV_GLint(params);
 }
 
 static void (APIENTRY * fptr_glGetQueryObjectiv)(GLuint,GLenum,GLint *);
@@ -114,101 +51,28 @@ VALUE obj,arg1,arg2;
 	GLuint id;
 	GLenum pname;
 	GLint params = 0;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetQueryObjectiv)
+	LOAD_GL_FUNC(glGetQueryObjectiv,"1.5")
 	id = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetQueryObjectiv(id,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_glGetQueryObjectuiv)(GLuint,GLenum,GLuint *);
 static VALUE
-gl_GetQueryObjectuiv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_GetQueryObjectuiv(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
 	GLuint id;
 	GLenum pname;
 	GLuint params = 0;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetQueryObjectuiv)
+	LOAD_GL_FUNC(glGetQueryObjectuiv,"1.5")
 	id = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetQueryObjectuiv(id,pname,&params);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary,INT2NUM(params));
-	return retary;
-}
-
-static void (APIENTRY * fptr_glBindBuffer)(GLenum,GLuint);
-static VALUE
-gl_BindBuffer(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLuint buffer;
-	LOAD_GL_FUNC(glBindBuffer)
-	target = (GLenum)NUM2INT(arg1);
-	buffer = (GLenum)NUM2INT(arg2);
-	fptr_glBindBuffer(target,buffer);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glDeleteBuffers)(GLsizei,GLuint *);
-static VALUE
-gl_DeleteBuffers(obj,arg1)
-VALUE obj,arg1;
-{
-	GLsizei n;
-	GLuint *buffers;
-	LOAD_GL_FUNC(glDeleteBuffers)
-	if (TYPE(arg1)==T_ARRAY) {
-		n = RARRAY(arg1)->len;
-		buffers = ALLOC_N(GLuint,n);
-		ary2cuint(arg1,buffers,n); 
-		fptr_glDeleteBuffers(n, buffers);
-		xfree(buffers);
-	} else {
-		GLuint buffer;
-		buffer = NUM2INT(arg1);
-		fptr_glDeleteBuffers(1, &buffer);
-	}
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glGenBuffers)(GLsizei,GLuint *);
-static VALUE
-gl_GenBuffers(obj,arg1)
-VALUE obj,arg1;
-{
-	GLsizei n;
-	GLuint *buffers;
-	RArray *ret;
-	int i;
-	LOAD_GL_FUNC(glGenBuffers)
-	n = (GLsizei)NUM2UINT(arg1);
-	buffers = ALLOC_N(GLuint, n);
-	fptr_glGenBuffers(n, buffers);
-	ret = RARRAY(rb_ary_new2(n));
-	for (i = 0; i < n; i++)
-		rb_ary_push((VALUE)ret, INT2NUM(buffers[i]));
-	xfree(buffers);
-	return (VALUE)ret;
-}
-
-static GLboolean (APIENTRY * fptr_glIsBuffer)(GLuint);
-static VALUE
-gl_IsBuffer(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint buffer;
-	GLboolean ret;
-	LOAD_GL_FUNC(glIsBuffer)
-	buffer = (GLuint)NUM2UINT(arg1);
-	ret = fptr_glIsBuffer(buffer);
-	return INT2NUM(ret);
+	CHECK_GLERROR
+	return cond_GLBOOL2RUBY_U(pname,params);
 }
 
 static void (APIENTRY * fptr_glBufferData)(GLenum,GLsizeiptr,GLvoid *,GLenum);
@@ -219,17 +83,18 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLenum target;
 	GLsizeiptr size;
 	GLenum usage;
-	LOAD_GL_FUNC(glBufferData)
+	LOAD_GL_FUNC(glBufferData,"1.5")
 	target = (GLenum)NUM2INT(arg1);
 	size = (GLsizeiptr)NUM2INT(arg2);
 	usage = (GLenum)NUM2INT(arg4);
 	if (TYPE(arg3) == T_STRING) {
-		fptr_glBufferData(target,size,(GLvoid *)RSTRING(arg3)->ptr,usage);
+		fptr_glBufferData(target,size,(GLvoid *)RSTRING_PTR(arg3),usage);
 	} else if (NIL_P(arg3)) {
 		fptr_glBufferData(target,size,NULL,usage);
 	} else {
 		Check_Type(arg3,T_STRING); /* force exception */
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -241,12 +106,13 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLenum target;
 	GLintptr offset;
 	GLsizeiptr size;
-	LOAD_GL_FUNC(glBufferSubData)
+	LOAD_GL_FUNC(glBufferSubData,"1.5")
 	target = (GLenum)NUM2INT(arg1);
 	offset = (GLintptr)NUM2INT(arg2);
 	size = (GLsizeiptr)NUM2INT(arg3);
 	Check_Type(arg4,T_STRING);
-	fptr_glBufferSubData(target,offset,size,(GLvoid *)RSTRING(arg4)->ptr);
+	fptr_glBufferSubData(target,offset,size,(GLvoid *)RSTRING_PTR(arg4));
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -259,12 +125,13 @@ VALUE obj,arg1,arg2,arg3;
 	GLintptr offset;
 	GLsizeiptr size;
 	VALUE data;
-	LOAD_GL_FUNC(glGetBufferSubData)
+	LOAD_GL_FUNC(glGetBufferSubData,"1.5")
 	target = (GLenum)NUM2INT(arg1);
 	offset = (GLintptr)NUM2INT(arg2);
 	size = (GLsizeiptr)NUM2INT(arg3);
 	data = allocate_buffer_with_string(size);
-	fptr_glGetBufferSubData(target,offset,size,(GLvoid *)RSTRING(data)->ptr);
+	fptr_glGetBufferSubData(target,offset,size,(GLvoid *)RSTRING_PTR(data));
+	CHECK_GLERROR
 	return data;
 }
 
@@ -276,14 +143,12 @@ VALUE obj,arg1,arg2;
 	GLenum target;
 	GLenum value;
 	GLint data = 0;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetBufferParameteriv)
+	LOAD_GL_FUNC(glGetBufferParameteriv,"1.5")
 	target = (GLenum)NUM2INT(arg1);
 	value = (GLenum)NUM2INT(arg2);
 	fptr_glGetBufferParameteriv(target,value,&data);
-	retary = rb_ary_new2(1);
-	rb_ary_push(retary,INT2NUM(data));
-	return retary;
+	CHECK_GLERROR
+	return cond_GLBOOL2RUBY(value,data);
 }
 
 static GLvoid * (APIENTRY * fptr_glMapBuffer)(GLenum,GLenum);
@@ -296,16 +161,18 @@ VALUE obj,arg1,arg2;
 	GLint size = 0;
 	VALUE data;
 	GLvoid *buffer_ptr = NULL;
-	LOAD_GL_FUNC(glMapBuffer)
-	LOAD_GL_FUNC(glGetBufferParameteriv)
+	LOAD_GL_FUNC(glMapBuffer,"1.5")
+	LOAD_GL_FUNC(glGetBufferParameteriv,"1.5")
 	target = (GLenum)NUM2INT(arg1);
 	access = (GLenum)NUM2INT(arg2);
 	fptr_glGetBufferParameteriv(target,GL_BUFFER_SIZE,&size);
+	CHECK_GLERROR
 	buffer_ptr = fptr_glMapBuffer(target,access);
+	CHECK_GLERROR
 	if (buffer_ptr==NULL || size<=0)
 		return Qnil;
 	data = allocate_buffer_with_string(size);
-	memcpy(RSTRING(data)->ptr, buffer_ptr, size);
+	memcpy(RSTRING_PTR(data), buffer_ptr, size);
 	return data;
 }
 
@@ -316,10 +183,11 @@ VALUE obj,arg1;
 {
 	GLenum target;
 	GLboolean ret;
-	LOAD_GL_FUNC(glUnmapBuffer)
+	LOAD_GL_FUNC(glUnmapBuffer,"1.5")
 	target = (GLenum)NUM2INT(arg1);
 	ret = fptr_glUnmapBuffer(target);
-	return INT2NUM(ret);
+	CHECK_GLERROR
+	return GLBOOL2RUBY(ret);
 }
 
 static void (APIENTRY * fptr_glGetBufferPointerv)(GLenum,GLenum,GLvoid **);
@@ -327,8 +195,9 @@ static VALUE
 gl_GetBufferPointerv(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
-	LOAD_GL_FUNC(glGetBufferPointerv)
+	LOAD_GL_FUNC(glGetBufferPointerv,"1.5")
 	rb_raise(rb_eArgError, "glGetBufferPointerv not implemented");
+	CHECK_GLERROR
 	return Qnil;
 }