ruby-opengl 0.50.0 → 0.60.0

data/ext/gl/gl-1.3.c

@@ -17,280 +17,25 @@
 
 /* OpenGL 1.3 functions */
 
-GL_SIMPLE_FUNC_LOAD(ActiveTexture,1,GLenum,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(ClientActiveTexture,1,GLenum,NUM2INT)
-
-static void (APIENTRY * fptr_glMultiTexCoord1d)(GLenum,GLdouble);
-static VALUE
-gl_MultiTexCoord1d(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLdouble s;
-	LOAD_GL_FUNC(glMultiTexCoord1d)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLdouble)NUM2DBL(arg2);
-	fptr_glMultiTexCoord1d(target,s);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord1f)(GLenum,GLfloat);
-static VALUE
-gl_MultiTexCoord1f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLfloat s;
-	LOAD_GL_FUNC(glMultiTexCoord1f)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLfloat)NUM2DBL(arg2);
-	fptr_glMultiTexCoord1f(target,s);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord1i)(GLenum,GLint);
-static VALUE
-gl_MultiTexCoord1i(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLint s;
-	LOAD_GL_FUNC(glMultiTexCoord1i)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLint)NUM2INT(arg2);
-	fptr_glMultiTexCoord1i(target,s);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord1s)(GLenum,GLshort);
-static VALUE
-gl_MultiTexCoord1s(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLshort s;
-	LOAD_GL_FUNC(glMultiTexCoord1s)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLshort)NUM2INT(arg2);
-	fptr_glMultiTexCoord1s(target,s);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord2d)(GLenum,GLdouble,GLdouble);
-static VALUE
-gl_MultiTexCoord2d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLdouble s;
-	GLdouble t;
-	LOAD_GL_FUNC(glMultiTexCoord2d)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLdouble)NUM2DBL(arg2);
-	t = (GLdouble)NUM2DBL(arg3);
-	fptr_glMultiTexCoord2d(target,s,t);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord2f)(GLenum,GLfloat,GLfloat);
-static VALUE
-gl_MultiTexCoord2f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLfloat s;
-	GLfloat t;
-	LOAD_GL_FUNC(glMultiTexCoord2f)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLfloat)NUM2DBL(arg2);
-	t = (GLfloat)NUM2DBL(arg3);
-	fptr_glMultiTexCoord2f(target,s,t);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord2i)(GLenum,GLint,GLint);
-static VALUE
-gl_MultiTexCoord2i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLint s;
-	GLint t;
-	LOAD_GL_FUNC(glMultiTexCoord2i)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLint)NUM2INT(arg2);
-	t = (GLint)NUM2INT(arg3);
-	fptr_glMultiTexCoord2i(target,s,t);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord2s)(GLenum,GLshort,GLshort);
-static VALUE
-gl_MultiTexCoord2s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLshort s;
-	GLshort t;
-	LOAD_GL_FUNC(glMultiTexCoord2s)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLshort)NUM2INT(arg2);
-	t = (GLshort)NUM2INT(arg3);
-	fptr_glMultiTexCoord2s(target,s,t);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord3d)(GLenum,GLdouble,GLdouble,GLdouble);
-static VALUE
-gl_MultiTexCoord3d(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum target;
-	GLdouble s;
-	GLdouble t;
-	GLdouble r;
-	LOAD_GL_FUNC(glMultiTexCoord3d)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLdouble)NUM2DBL(arg2);
-	t = (GLdouble)NUM2DBL(arg3);
-	r = (GLdouble)NUM2DBL(arg4);
-	fptr_glMultiTexCoord3d(target,s,t,r);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord3f)(GLenum,GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_MultiTexCoord3f(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum target;
-	GLfloat s;
-	GLfloat t;
-	GLfloat r;
-	LOAD_GL_FUNC(glMultiTexCoord3f)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLfloat)NUM2DBL(arg2);
-	t = (GLfloat)NUM2DBL(arg3);
-	r = (GLfloat)NUM2DBL(arg4);
-	fptr_glMultiTexCoord3f(target,s,t,r);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord3i)(GLenum,GLint,GLint,GLint);
-static VALUE
-gl_MultiTexCoord3i(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum target;
-	GLint s;
-	GLint t;
-	GLint r;
-	LOAD_GL_FUNC(glMultiTexCoord3i)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLint)NUM2INT(arg2);
-	t = (GLint)NUM2INT(arg3);
-	r = (GLint)NUM2INT(arg4);
-	fptr_glMultiTexCoord3i(target,s,t,r);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord3s)(GLenum,GLshort,GLshort,GLshort);
-static VALUE
-gl_MultiTexCoord3s(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum target;
-	GLshort s;
-	GLshort t;
-	GLshort r;
-	LOAD_GL_FUNC(glMultiTexCoord3s)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLshort)NUM2INT(arg2);
-	t = (GLshort)NUM2INT(arg3);
-	r = (GLshort)NUM2INT(arg4);
-	fptr_glMultiTexCoord3s(target,s,t,r);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord4d)(GLenum,GLdouble,GLdouble,GLdouble,GLdouble);
-static VALUE
-gl_MultiTexCoord4d(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum target;
-	GLdouble s;
-	GLdouble t;
-	GLdouble r;
-	GLdouble q;
-	LOAD_GL_FUNC(glMultiTexCoord4d)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLdouble)NUM2DBL(arg2);
-	t = (GLdouble)NUM2DBL(arg3);
-	r = (GLdouble)NUM2DBL(arg4);
-	q = (GLdouble)NUM2DBL(arg5);
-	fptr_glMultiTexCoord4d(target,s,t,r,q);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord4f)(GLenum,GLfloat,GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_MultiTexCoord4f(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum target;
-	GLfloat s;
-	GLfloat t;
-	GLfloat r;
-	GLfloat q;
-	LOAD_GL_FUNC(glMultiTexCoord4f)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLfloat)NUM2DBL(arg2);
-	t = (GLfloat)NUM2DBL(arg3);
-	r = (GLfloat)NUM2DBL(arg4);
-	q = (GLfloat)NUM2DBL(arg5);
-	fptr_glMultiTexCoord4f(target,s,t,r,q);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord4i)(GLenum,GLint,GLint,GLint,GLint);
-static VALUE
-gl_MultiTexCoord4i(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum target;
-	GLint s;
-	GLint t;
-	GLint r;
-	GLint q;
-	LOAD_GL_FUNC(glMultiTexCoord4i)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLint)NUM2INT(arg2);
-	t = (GLint)NUM2INT(arg3);
-	r = (GLint)NUM2INT(arg4);
-	q = (GLint)NUM2INT(arg5);
-	fptr_glMultiTexCoord4i(target,s,t,r,q);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glMultiTexCoord4s)(GLenum,GLshort,GLshort,GLshort,GLshort);
-static VALUE
-gl_MultiTexCoord4s(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLenum target;
-	GLshort s;
-	GLshort t;
-	GLshort r;
-	GLshort q;
-	LOAD_GL_FUNC(glMultiTexCoord4s)
-	target = (GLenum)NUM2INT(arg1);
-	s = (GLshort)NUM2INT(arg2);
-	t = (GLshort)NUM2INT(arg3);
-	r = (GLshort)NUM2INT(arg4);
-	q = (GLshort)NUM2INT(arg5);
-	fptr_glMultiTexCoord4s(target,s,t,r,q);
-	return Qnil;
-}
+GL_FUNC_LOAD_1(ActiveTexture,GLvoid, GLenum, "1.3")
+GL_FUNC_LOAD_1(ClientActiveTexture,GLvoid, GLenum, "1.3")
+GL_FUNC_LOAD_2(MultiTexCoord1d,GLvoid, GLenum,GLdouble, "1.3")
+GL_FUNC_LOAD_2(MultiTexCoord1f,GLvoid, GLenum,GLfloat, "1.3")
+GL_FUNC_LOAD_2(MultiTexCoord1i,GLvoid, GLenum,GLint, "1.3")
+GL_FUNC_LOAD_2(MultiTexCoord1s,GLvoid, GLenum,GLshort, "1.3")
+GL_FUNC_LOAD_3(MultiTexCoord2d,GLvoid, GLenum,GLdouble,GLdouble, "1.3")
+GL_FUNC_LOAD_3(MultiTexCoord2f,GLvoid, GLenum,GLfloat,GLfloat, "1.3")
+GL_FUNC_LOAD_3(MultiTexCoord2i,GLvoid, GLenum,GLint,GLint, "1.3")
+GL_FUNC_LOAD_3(MultiTexCoord2s,GLvoid, GLenum,GLshort,GLshort, "1.3")
+GL_FUNC_LOAD_4(MultiTexCoord3d,GLvoid, GLenum,GLdouble,GLdouble,GLdouble, "1.3")
+GL_FUNC_LOAD_4(MultiTexCoord3f,GLvoid, GLenum,GLfloat,GLfloat,GLfloat, "1.3")
+GL_FUNC_LOAD_4(MultiTexCoord3i,GLvoid, GLenum,GLint,GLint,GLint, "1.3")
+GL_FUNC_LOAD_4(MultiTexCoord3s,GLvoid, GLenum,GLshort,GLshort,GLshort, "1.3")
+GL_FUNC_LOAD_5(MultiTexCoord4d,GLvoid, GLenum,GLdouble,GLdouble,GLdouble,GLdouble, "1.3")
+GL_FUNC_LOAD_5(MultiTexCoord4f,GLvoid, GLenum,GLfloat,GLfloat,GLfloat,GLfloat, "1.3")
+GL_FUNC_LOAD_5(MultiTexCoord4i,GLvoid, GLenum,GLint,GLint,GLint,GLint, "1.3")
+GL_FUNC_LOAD_5(MultiTexCoord4s,GLvoid, GLenum,GLshort,GLshort,GLshort,GLshort, "1.3")
+GL_FUNC_LOAD_2(SampleCoverage,GLvoid, GLclampf,GLboolean, "1.3")
 
 #define GLMULTITEXCOORD_VFUNC(_type_) \
 static VALUE \
@@ -350,40 +95,27 @@ GLMULTITEXCOORD_VFUNC(i)
 GLMULTITEXCOORD_VFUNC(s)
 #undef GLTEXCOORD_VFUNC
 
-#define TRANSPOSEMATRIX_FUNC(_name_,_type_,_shorttype_) \
+#define TRANSPOSEMATRIX_FUNC(_name_,_type_) \
 static void (APIENTRY * fptr_gl##_name_)(const _type_[]); \
 static VALUE \
 gl_##_name_(obj,arg1) \
 VALUE obj,arg1; \
 { \
 	_type_ m[4*4]; \
-	LOAD_GL_FUNC(gl##_name_) \
-	ary2cmat4x4##_shorttype_(arg1, m); \
+	LOAD_GL_FUNC(gl##_name_,"1.3") \
+	ary2cmat##_type_(arg1, m, 4, 4); \
 	fptr_gl##_name_(m); \
+	CHECK_GLERROR \
 	return Qnil; \
 }
 
-TRANSPOSEMATRIX_FUNC(LoadTransposeMatrixf,GLfloat,flt)
-TRANSPOSEMATRIX_FUNC(LoadTransposeMatrixd,GLdouble,dbl)
-TRANSPOSEMATRIX_FUNC(MultTransposeMatrixf,GLfloat,flt)
-TRANSPOSEMATRIX_FUNC(MultTransposeMatrixd,GLdouble,dbl)
+TRANSPOSEMATRIX_FUNC(LoadTransposeMatrixf,float)
+TRANSPOSEMATRIX_FUNC(LoadTransposeMatrixd,double)
+TRANSPOSEMATRIX_FUNC(MultTransposeMatrixf,float)
+TRANSPOSEMATRIX_FUNC(MultTransposeMatrixd,double)
 
 #undef TRANSPOSEMATRIX_FUNC
 
-static void (APIENTRY * fptr_glSampleCoverage)(GLclampf,GLboolean);
-static VALUE
-gl_SampleCoverage(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLclampf value;
-	GLboolean invert;
-	LOAD_GL_FUNC(glSampleCoverage)
-	value = (GLclampf)NUM2DBL(arg1);
-	invert = (GLboolean)NUM2INT(arg2);
-	fptr_glSampleCoverage(value,invert);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glCompressedTexImage3D)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,GLvoid*);
 static VALUE
 gl_CompressedTexImage3D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9)
@@ -398,7 +130,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexImage3D)
+	LOAD_GL_FUNC(glCompressedTexImage3D,"1.3")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	internalformat = (GLenum)NUM2INT(arg3);
@@ -410,10 +142,12 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,(GLvoid *)NUM2INT(arg9));
 	} else {
-		if (TYPE(arg9) == T_STRING) {
-			if (RSTRING(arg9)->len < imagesize)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg9)->len);
-			pixels = RSTRING(arg9)->ptr;
+		if (TYPE(arg9) == T_STRING || TYPE(arg9) == T_ARRAY) {
+			VALUE data;
+			data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg9);
+			if (RSTRING_LEN(data) < imagesize)
+				rb_raise(rb_eArgError, "string length:%li",RSTRING_LEN(data));
+			pixels = RSTRING_PTR(data);
 		} else if (NIL_P(arg9)) {
 			pixels = NULL;
 		} else {
@@ -422,6 +156,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 		}
 		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,pixels);
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -438,7 +173,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexImage2D)
+	LOAD_GL_FUNC(glCompressedTexImage2D,"1.3")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	internalformat = (GLenum)NUM2INT(arg3);
@@ -449,10 +184,12 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,(GLvoid *)NUM2INT(arg8));
 	} else {
-		if (TYPE(arg8) == T_STRING) {
-			if (RSTRING(arg8)->len < imagesize)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg8)->len);
-			pixels = RSTRING(arg8)->ptr;
+		if (TYPE(arg8) == T_STRING || TYPE(arg8) == T_ARRAY) {
+			VALUE data;
+			data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg8);
+			if (RSTRING_LEN(data) < imagesize)
+				rb_raise(rb_eArgError, "string length:%li",RSTRING_LEN(data));
+			pixels = RSTRING_PTR(data);
 		} else if (NIL_P(arg8)) {
 			pixels = NULL;
 		} else {
@@ -461,6 +198,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 		}
 		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,pixels);
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -476,7 +214,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexImage1D)
+	LOAD_GL_FUNC(glCompressedTexImage1D,"1.3")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	internalformat = (GLenum)NUM2INT(arg3);
@@ -486,10 +224,12 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,(GLvoid *)NUM2INT(arg7));
 	} else {
-		if (TYPE(arg7) == T_STRING) {
-			if (RSTRING(arg7)->len < imagesize)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg7)->len);
-			pixels = RSTRING(arg7)->ptr;
+		if (TYPE(arg7) == T_STRING || TYPE(arg7) == T_ARRAY) {
+			VALUE data;
+			data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg7);
+			if (RSTRING_LEN(data) < imagesize)
+				rb_raise(rb_eArgError, "string length:%li",RSTRING_LEN(data));
+			pixels = RSTRING_PTR(data);
 		} else if (NIL_P(arg7)) {
 			pixels = NULL;
 		} else {
@@ -498,6 +238,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 		}
 		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,pixels);
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -517,7 +258,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexSubImage3D)
+	LOAD_GL_FUNC(glCompressedTexSubImage3D,"1.3")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -531,16 +272,15 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,(GLvoid *)NUM2INT(arg11));
 	} else {
-		if (TYPE(arg11) == T_STRING) {
-			if (RSTRING(arg11)->len < imagesize)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg11)->len);
-			 pixels = RSTRING(arg11)->ptr;
-		} else {
-			Check_Type(arg11,T_STRING); /* force exception */
-			return Qnil;
-		}
+		VALUE data;
+		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg11);
+		if (RSTRING_LEN(data) < imagesize)
+			rb_raise(rb_eArgError, "string length:%li",RSTRING_LEN(data));
+		pixels = RSTRING_PTR(data);
+
 		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,pixels);
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -558,7 +298,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexSubImage2D)
+	LOAD_GL_FUNC(glCompressedTexSubImage2D,"1.3")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -570,16 +310,14 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,(GLvoid *)NUM2INT(arg9));
 	} else {
-		if (TYPE(arg9) == T_STRING) {
-			if (RSTRING(arg9)->len < imagesize)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg9)->len);
-			 pixels = RSTRING(arg9)->ptr;
-		} else {
-			Check_Type(arg9,T_STRING); /* force exception */
-			return Qnil;
-		}
+		VALUE data;
+		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg9);
+		if (RSTRING_LEN(data) < imagesize)
+			rb_raise(rb_eArgError, "string length:%li",RSTRING_LEN(data));
+		pixels = RSTRING_PTR(data);
 		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,pixels);
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -595,7 +333,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexSubImage1D)
+	LOAD_GL_FUNC(glCompressedTexSubImage1D,"1.3")
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -605,16 +343,14 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,(GLvoid *)NUM2INT(arg7));
 	} else {
-		if (TYPE(arg7) == T_STRING) {
-			if (RSTRING(arg7)->len < imagesize)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg7)->len);
-			 pixels = RSTRING(arg7)->ptr;
-		} else {
-			Check_Type(arg7,T_STRING); /* force exception */
-			return Qnil;
-		}
+		VALUE data;
+		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg7);
+		if (RSTRING_LEN(data) < imagesize)
+			rb_raise(rb_eArgError, "string length:%li",RSTRING_LEN(data));
+		pixels = RSTRING_PTR(data);
 		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,pixels);
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -631,7 +367,7 @@ VALUE obj;
 	VALUE data;
 	VALUE args[3];
 	int numargs;
-	LOAD_GL_FUNC(glGetCompressedTexImage)
+	LOAD_GL_FUNC(glGetCompressedTexImage,"1.3")
 	numargs = rb_scan_args(argc, argv, "21", &args[0], &args[1], &args[2]);
 	target = (GLenum)NUM2INT(args[0]);
 	lod = (GLenum)NUM2INT(args[1]);
@@ -641,11 +377,14 @@ VALUE obj;
 			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
 				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing");
 			glGetTexLevelParameteriv(target,lod,GL_TEXTURE_COMPRESSED_IMAGE_SIZE,&size); /* 1.0 function */
+			CHECK_GLERROR
 			data = allocate_buffer_with_string(size);
-			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)RSTRING(data)->ptr);
+			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)RSTRING_PTR(data));
+			CHECK_GLERROR
 			return data;
 		case 3:
 			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)NUM2INT(args[2]));
+			CHECK_GLERROR
 			return Qnil;	
 	}
 }