ruby-opengl 0.40.1 → 0.50.0

data/ext/gl/gl-1.3.c

@@ -13,41 +13,12 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#elif defined WIN32
-#include <windows.h>
-#include <GL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
 #include "../common/common.h"
 
 /* OpenGL 1.3 functions */
 
-static void (APIENTRY * fptr_glActiveTexture)(GLenum);
-static VALUE
-gl_ActiveTexture(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum texture;
-	LOAD_GL_FUNC(glActiveTexture)
-	texture = (GLenum)NUM2INT(arg1);
-	fptr_glActiveTexture(texture);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glClientActiveTexture)(GLenum);
-static VALUE
-gl_ClientActiveTexture(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum texture;
-	LOAD_GL_FUNC(glClientActiveTexture)
-	texture = (GLenum)NUM2INT(arg1);
-	fptr_glClientActiveTexture(texture);
-	return Qnil;
-}
+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
@@ -379,54 +350,25 @@ GLMULTITEXCOORD_VFUNC(i)
 GLMULTITEXCOORD_VFUNC(s)
 #undef GLTEXCOORD_VFUNC
 
-
-static void (APIENTRY * fptr_glLoadTransposeMatrixf)(const GLfloat[]);
-static VALUE
-gl_LoadTransposeMatrixf(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat m[4*4];
-	LOAD_GL_FUNC(glLoadTransposeMatrixf)
-	ary2cmat4x4flt(arg1, m);
-	fptr_glLoadTransposeMatrixf(m);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glLoadTransposeMatrixd)(const GLdouble[]);
-static VALUE
-gl_LoadTransposeMatrixd(obj,arg1)
-VALUE obj,arg1;
-{
-	GLdouble m[4*4];
-	LOAD_GL_FUNC(glLoadTransposeMatrixd)
-	ary2cmat4x4dbl(arg1, m);
-	fptr_glLoadTransposeMatrixd(m);
-	return Qnil;
+#define TRANSPOSEMATRIX_FUNC(_name_,_type_,_shorttype_) \
+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); \
+	fptr_gl##_name_(m); \
+	return Qnil; \
 }
 
-static void (APIENTRY * fptr_glMultTransposeMatrixf)(const GLfloat[]);
-static VALUE
-gl_MultTransposeMatrixf(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat m[4*4];
-	LOAD_GL_FUNC(glMultTransposeMatrixf)
-	ary2cmat4x4flt(arg1, m);
-	fptr_glMultTransposeMatrixf(m);
-	return Qnil;
-}
+TRANSPOSEMATRIX_FUNC(LoadTransposeMatrixf,GLfloat,flt)
+TRANSPOSEMATRIX_FUNC(LoadTransposeMatrixd,GLdouble,dbl)
+TRANSPOSEMATRIX_FUNC(MultTransposeMatrixf,GLfloat,flt)
+TRANSPOSEMATRIX_FUNC(MultTransposeMatrixd,GLdouble,dbl)
 
-static void (APIENTRY * fptr_glMultTransposeMatrixd)(const GLdouble[]);
-static VALUE
-gl_MultTransposeMatrixd(obj,arg1)
-VALUE obj,arg1;
-{
-	GLdouble m[4*4];
-	LOAD_GL_FUNC(glMultTransposeMatrixd)
-	ary2cmat4x4dbl(arg1, m);
-	fptr_glMultTransposeMatrixd(m);
-	return Qnil;
-}
+#undef TRANSPOSEMATRIX_FUNC
 
 static void (APIENTRY * fptr_glSampleCoverage)(GLclampf,GLboolean);
 static VALUE
@@ -465,17 +407,21 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	depth = (GLsizei)NUM2UINT(arg6);
 	border = (GLint)NUM2INT(arg7);
 	imagesize = (GLsizei)NUM2UINT(arg8);
-	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 if (NIL_P(arg9)) {
-		pixels = NULL;
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,(GLvoid *)NUM2INT(arg9));
 	} else {
-		Check_Type(arg9,T_STRING); /* force exception */
-		return Qnil;
+		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 if (NIL_P(arg9)) {
+			pixels = NULL;
+		} else {
+			Check_Type(arg9,T_STRING); /* force exception */
+			return Qnil;
+		}
+		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,pixels);
 	}
-	fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,pixels);
 	return Qnil;
 }
 
@@ -500,17 +446,21 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	height = (GLsizei)NUM2UINT(arg5);
 	border = (GLint)NUM2INT(arg6);
 	imagesize = (GLsizei)NUM2UINT(arg7);
-	if (TYPE(arg8) == T_STRING) {
-		if (RSTRING(arg8)->len < imagesize)
-			rb_raise(rb_eArgError, "string length:%d",RSTRING(arg8)->len);
-		pixels = RSTRING(arg8)->ptr;
-	} else if (NIL_P(arg8)) {
-		pixels = NULL;
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,(GLvoid *)NUM2INT(arg8));
 	} else {
-		Check_Type(arg8,T_STRING); /* force exception */
-		return Qnil;
+		if (TYPE(arg8) == T_STRING) {
+			if (RSTRING(arg8)->len < imagesize)
+				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg8)->len);
+			pixels = RSTRING(arg8)->ptr;
+		} else if (NIL_P(arg8)) {
+			pixels = NULL;
+		} else {
+			Check_Type(arg8,T_STRING); /* force exception */
+			return Qnil;
+		}
+		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,pixels);
 	}
-	fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,pixels);
 	return Qnil;
 }
 
@@ -533,17 +483,21 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	width = (GLsizei)NUM2UINT(arg4);
 	border = (GLint)NUM2INT(arg5);
 	imagesize = (GLsizei)NUM2UINT(arg6);
-	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 if (NIL_P(arg7)) {
-		pixels = NULL;
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,(GLvoid *)NUM2INT(arg7));
 	} else {
-		Check_Type(arg7,T_STRING); /* force exception */
-		return Qnil;
+		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 if (NIL_P(arg7)) {
+			pixels = NULL;
+		} else {
+			Check_Type(arg7,T_STRING); /* force exception */
+			return Qnil;
+		}
+		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,pixels);
 	}
-	fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,pixels);
 	return Qnil;
 }
 
@@ -574,15 +528,19 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	depth = (GLsizei)NUM2UINT(arg8);
 	format = (GLenum)NUM2INT(arg9);
 	imagesize = (GLsizei)NUM2UINT(arg10);
-	if (TYPE(arg11) == T_STRING) {
-		if (RSTRING(arg11)->len < imagesize)
-			rb_raise(rb_eArgError, "string length:%d",RSTRING(arg11)->len);
-		 pixels = RSTRING(arg11)->ptr;
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,(GLvoid *)NUM2INT(arg11));
 	} else {
-		Check_Type(arg11,T_STRING); /* force exception */
-		return Qnil;
+		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;
+		}
+		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,pixels);
 	}
-	fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,pixels);
 	return Qnil;
 }
 
@@ -609,15 +567,19 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	height = (GLsizei)NUM2UINT(arg6);
 	format = (GLenum)NUM2INT(arg7);
 	imagesize = (GLsizei)NUM2UINT(arg8);
-	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 (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,(GLvoid *)NUM2INT(arg9));
 	} else {
-		Check_Type(arg9,T_STRING); /* force exception */
-		return Qnil;
+		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;
+		}
+		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,pixels);
 	}
-	fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,pixels);
 	return Qnil;
 }
 
@@ -640,34 +602,52 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	width = (GLsizei)NUM2UINT(arg4);
 	format = (GLenum)NUM2INT(arg5);
 	imagesize = (GLsizei)NUM2UINT(arg6);
-	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 (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,(GLvoid *)NUM2INT(arg7));
 	} else {
-		Check_Type(arg7,T_STRING); /* force exception */
-		return Qnil;
+		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;
+		}
+		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,pixels);
 	}
-	fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,pixels);
 	return Qnil;
 }
 
 static void (APIENTRY * fptr_glGetCompressedTexImage)(GLenum,GLint,GLvoid*);
 static VALUE
-gl_GetCompressedTexImage(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
+gl_GetCompressedTexImage(argc,argv,obj)
+int argc;
+VALUE *argv;
+VALUE obj;
 {
 	GLenum target;
 	GLint lod;
 	GLsizei size = 0;
 	VALUE data;
+	VALUE args[3];
+	int numargs;
 	LOAD_GL_FUNC(glGetCompressedTexImage)
-	target = (GLenum)NUM2INT(arg1);
-	lod = (GLenum)NUM2INT(arg2);
-	glGetTexLevelParameteriv(target,lod,GL_TEXTURE_COMPRESSED_IMAGE_SIZE,&size); /* 1.0 function */
-	data = allocate_buffer_with_string(size);
-	fptr_glGetCompressedTexImage(target,lod,(GLvoid*)RSTRING(data)->ptr);
-	return data;
+	numargs = rb_scan_args(argc, argv, "21", &args[0], &args[1], &args[2]);
+	target = (GLenum)NUM2INT(args[0]);
+	lod = (GLenum)NUM2INT(args[1]);
+	switch(numargs) {
+		default:
+		case 2:
+			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 */
+			data = allocate_buffer_with_string(size);
+			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)RSTRING(data)->ptr);
+			return data;
+		case 3:
+			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)NUM2INT(args[2]));
+			return Qnil;	
+	}
 }
 
 void gl_init_functions_1_3(VALUE module)
@@ -701,7 +681,7 @@ void gl_init_functions_1_3(VALUE module)
 	rb_define_module_function(module, "glCompressedTexSubImage3D", gl_CompressedTexSubImage3D, 11);
 	rb_define_module_function(module, "glCompressedTexSubImage2D", gl_CompressedTexSubImage2D, 9);
 	rb_define_module_function(module, "glCompressedTexSubImage1D", gl_CompressedTexSubImage1D, 7);
-	rb_define_module_function(module, "glGetCompressedTexImage", gl_GetCompressedTexImage, 2);
+	rb_define_module_function(module, "glGetCompressedTexImage", gl_GetCompressedTexImage, -1);
 
 	/* Additional functions */
 

data/ext/gl/gl-1.4.c

@@ -13,47 +13,28 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#elif defined WIN32
-#include <windows.h>
-#include <GL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
 #include "../common/common.h"
 
 /* OpenGL 1.4 functions */
-
-static void (APIENTRY * fptr_glBlendFuncSeparate)(GLenum,GLenum,GLenum,GLenum);
-static VALUE
-gl_BlendFuncSeparate(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum srcRGB;
-	GLenum dstRGB;
-	GLenum srcAlpha;
-	GLenum dstAlpha;
-	LOAD_GL_FUNC(glBlendFuncSeparate)
-	srcRGB = (GLenum)NUM2INT(arg1);
-	dstRGB = (GLenum)NUM2INT(arg2);
-	srcAlpha = (GLenum)NUM2INT(arg3);
-	dstAlpha = (GLenum)NUM2INT(arg4);
-	fptr_glBlendFuncSeparate(srcRGB,dstRGB,srcAlpha,dstAlpha);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glFogCoordf)(GLfloat);
-static VALUE
-gl_FogCoordf(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat coord;
-	LOAD_GL_FUNC(glFogCoordf)
-	coord=(GLfloat)NUM2DBL(arg1);
-	fptr_glFogCoordf(coord);
-	return Qnil;
-}
+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)
 
 static void (APIENTRY * fptr_glFogCoordfv)(GLfloat *);
 static VALUE
@@ -68,18 +49,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glFogCoordd)(GLdouble);
-static VALUE
-gl_FogCoordd(obj,arg1)
-VALUE obj,arg1;
-{
-	GLdouble coord;
-	LOAD_GL_FUNC(glFogCoordd)
-	coord=(GLdouble)NUM2DBL(arg1);
-	fptr_glFogCoordd(coord);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glFogCoorddv)(GLdouble *);
 static VALUE
 gl_FogCoorddv(obj,arg1)
@@ -104,32 +73,38 @@ VALUE obj,arg1,arg2,arg3;
 	LOAD_GL_FUNC(glFogCoordPointer)
 	type = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
-	Check_Type(arg3, T_STRING);
-	rb_str_freeze(arg3);
-	g_FogCoord_ptr = arg3;
-	fptr_glFogCoordPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+	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);
+	}
 	return Qnil;
 }
 
 static void (APIENTRY * fptr_glMultiDrawArrays)(GLenum,GLint*,GLsizei*,GLsizei);
 static VALUE
-gl_MultiDrawArrays(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_MultiDrawArrays(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	/* TODO: check ary1,ary2 if len < primcount then raise */
-	/* stringy ? */
 	GLenum mode;
-	GLsizei primcount;
 	GLint *ary1;
 	GLsizei *ary2;
+  int len1,len2;
 	LOAD_GL_FUNC(glMultiDrawArrays)
+  len1 = RARRAY(arg2)->len;
+  len2 = RARRAY(arg3)->len;
+	if (len1!=len2)
+			rb_raise(rb_eArgError, "Passed arrays must have same length");
 	mode = (GLenum)NUM2INT(arg1);
-	primcount = (GLsizei)NUM2UINT(arg4);
-	ary1 = ALLOC_N(GLint,primcount);
-	ary2 = ALLOC_N(GLsizei,primcount);
-	ary2cint(arg2,ary1,primcount);
-	ary2cint(arg3,ary2,primcount);
-	fptr_glMultiDrawArrays(mode,ary1,ary2,primcount);
+	ary1 = ALLOC_N(GLint,len1);
+	ary2 = ALLOC_N(GLsizei,len2);
+	ary2cint(arg2,ary1,len1);
+	ary2cint(arg3,ary2,len2);
+	fptr_glMultiDrawArrays(mode,ary1,ary2,len1);
 	xfree(ary1);
 	xfree(ary2);
 	return Qnil;
@@ -137,8 +112,10 @@ VALUE obj,arg1,arg2,arg3,arg4;
 
 static void (APIENTRY * fptr_glMultiDrawElements)(GLenum,const GLsizei *,GLenum,GLvoid **,GLsizei);
 static VALUE
-gl_MultiDrawElements(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_MultiDrawElements(argc,argv,obj)
+int argc;
+VALUE *argv;
+VALUE obj;
 {
 	GLenum mode;
 	GLenum type;
@@ -147,21 +124,51 @@ VALUE obj,arg1,arg2,arg3;
 	GLint size;
 	RArray *ary;
 	int i;
+	VALUE args[4];
 	LOAD_GL_FUNC(glMultiDrawElements)
-	mode = (GLenum)NUM2INT(arg1);
-	type = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary = RARRAY(arg3);
-	size = ary->len;
-	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;
+	switch (rb_scan_args(argc, argv, "31", &args[0], &args[1], &args[2],&args[3])) {
+		default:
+		case 3:
+			if (CheckBufferBinding(GL_ELEMENT_ARRAY_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Element array buffer bound, but offsets array missing");
+			mode = (GLenum)NUM2INT(args[0]);
+			type = (GLenum)NUM2INT(args[1]);
+			Check_Type(args[2],T_ARRAY);
+			ary = RARRAY(args[2]);
+			size = ary->len;
+			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;
+			}
+			fptr_glMultiDrawElements(mode,counts,type,indices,size);
+			xfree(counts);
+			xfree(indices);
+			break;
+		case 4:
+			if (!CheckBufferBinding(GL_ELEMENT_ARRAY_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Element array buffer not bound");
+			mode = (GLenum)NUM2INT(args[0]);
+			type = (GLenum)NUM2INT(args[1]);
+			Check_Type(args[2],T_ARRAY);
+			Check_Type(args[3],T_ARRAY);
+			if (RARRAY(args[2])->len != RARRAY(args[3])->len)
+				rb_raise(rb_eArgError, "Count and indices offset array must have same length");
+
+			size = RARRAY(args[2])->len;
+
+			counts = ALLOC_N(GLsizei,size);
+			indices = ALLOC_N(GLvoid*,size);
+			for (i=0;i<size;i++) {
+				counts[i] = NUM2INT(rb_ary_entry(args[2],i));
+				indices[i] = (GLvoid *) NUM2INT(rb_ary_entry(args[3],i));
+			}
+			fptr_glMultiDrawElements(mode,counts,type,indices,size);
+			xfree(counts);
+			xfree(indices);
+			break;
 	}
-	fptr_glMultiDrawElements(mode,counts,type,indices,size);
-	xfree(counts);
-	xfree(indices);
 	return Qnil;
 }
 
@@ -233,134 +240,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glSecondaryColor3b)(GLbyte,GLbyte,GLbyte);
-static VALUE
-gl_SecondaryColor3b(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLbyte red;
-	GLbyte green;
-	GLbyte blue;
-	LOAD_GL_FUNC(glSecondaryColor3b)
-	red = (GLbyte)NUM2INT(arg1);
-	green = (GLbyte)NUM2INT(arg2);
-	blue = (GLbyte)NUM2INT(arg3);
-	fptr_glSecondaryColor3b(red,green,blue);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glSecondaryColor3d)(GLdouble,GLdouble,GLdouble);
-static VALUE
-gl_SecondaryColor3d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble red;
-	GLdouble green;
-	GLdouble blue;
-	LOAD_GL_FUNC(glSecondaryColor3d)
-	red = (GLdouble)NUM2DBL(arg1);
-	green = (GLdouble)NUM2DBL(arg2);
-	blue = (GLdouble)NUM2DBL(arg3);
-	fptr_glSecondaryColor3d(red,green,blue);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glSecondaryColor3f)(GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_SecondaryColor3f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat red;
-	GLfloat green;
-	GLfloat blue;
-	LOAD_GL_FUNC(glSecondaryColor3f)
-	red = (GLfloat)NUM2DBL(arg1);
-	green = (GLfloat)NUM2DBL(arg2);
-	blue = (GLfloat)NUM2DBL(arg3);
-	fptr_glSecondaryColor3f(red,green,blue);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glSecondaryColor3i)(GLint,GLint,GLint);
-static VALUE
-gl_SecondaryColor3i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint red;
-	GLint green;
-	GLint blue;
-	LOAD_GL_FUNC(glSecondaryColor3i)
-	red = (GLint)NUM2INT(arg1);
-	green = (GLint)NUM2INT(arg2);
-	blue = (GLint)NUM2INT(arg3);
-	fptr_glSecondaryColor3i(red,green,blue);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glSecondaryColor3s)(GLshort,GLshort,GLshort);
-static VALUE
-gl_SecondaryColor3s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLshort red;
-	GLshort green;
-	GLshort blue;
-	LOAD_GL_FUNC(glSecondaryColor3s)
-	red = (GLshort)NUM2INT(arg1);
-	green = (GLshort)NUM2INT(arg2);
-	blue = (GLshort)NUM2INT(arg3);
-	fptr_glSecondaryColor3s(red,green,blue);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glSecondaryColor3ub)(GLubyte,GLubyte,GLubyte);
-static VALUE
-gl_SecondaryColor3ub(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLubyte red;
-	GLubyte green;
-	GLubyte blue;
-	LOAD_GL_FUNC(glSecondaryColor3ub)
-	red = (GLubyte)NUM2INT(arg1);
-	green = (GLubyte)NUM2INT(arg2);
-	blue = (GLubyte)NUM2INT(arg3);
-	fptr_glSecondaryColor3ub(red,green,blue);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glSecondaryColor3ui)(GLuint,GLuint,GLuint);
-static VALUE
-gl_SecondaryColor3ui(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLuint red;
-	GLuint green;
-	GLuint blue;
-	LOAD_GL_FUNC(glSecondaryColor3ui)
-	red = (GLuint)NUM2UINT(arg1);
-	green = (GLuint)NUM2UINT(arg2);
-	blue = (GLuint)NUM2UINT(arg3);
-	fptr_glSecondaryColor3ui(red,green,blue);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glSecondaryColor3us)(GLushort,GLushort,GLushort);
-static VALUE
-gl_SecondaryColor3us(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLushort red;
-	GLushort green;
-	GLushort blue;
-	LOAD_GL_FUNC(glSecondaryColor3us)
-	red = (GLushort)NUM2INT(arg1);
-	green = (GLushort)NUM2INT(arg2);
-	blue = (GLushort)NUM2INT(arg3);
-	fptr_glSecondaryColor3us(red,green,blue);
-	return Qnil;
-}
-
 #define GLSECONDARYCOLOR_VFUNC(_type_) \
 static VALUE \
 gl_SecondaryColor##_type_##v(argc,argv,obj) \
@@ -419,130 +298,15 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	size = (GLint)NUM2INT(arg1);
 	type = (GLenum)NUM2INT(arg2);
 	stride = (GLsizei)NUM2UINT(arg3);
-	Check_Type(arg4, T_STRING);
-	rb_str_freeze(arg4);
-	g_SecondaryColor_ptr = arg4;
-	fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)RSTRING(arg4)->ptr);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos2d)(GLdouble,GLdouble);
-static VALUE
-gl_WindowPos2d(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLdouble x;
-	GLdouble y;
-	LOAD_GL_FUNC(glWindowPos2d)
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	fptr_glWindowPos2d(x,y);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos2f)(GLfloat,GLfloat);
-static VALUE
-gl_WindowPos2f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLfloat x;
-	GLfloat y;
-	LOAD_GL_FUNC(glWindowPos2f)
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	fptr_glWindowPos2f(x,y);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos2i)(GLint,GLint);
-static VALUE
-gl_WindowPos2i(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint x;
-	GLint y;
-	LOAD_GL_FUNC(glWindowPos2i)
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	fptr_glWindowPos2i(x,y);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos2s)(GLshort,GLshort);
-static VALUE
-gl_WindowPos2s(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLshort x;
-	GLshort y;
-	LOAD_GL_FUNC(glWindowPos2s)
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	fptr_glWindowPos2s(x,y);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos3d)(GLdouble,GLdouble,GLdouble);
-static VALUE
-gl_WindowPos3d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	LOAD_GL_FUNC(glWindowPos3d)
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	z = (GLdouble)NUM2DBL(arg3);
-	fptr_glWindowPos3d(x,y,z);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos3f)(GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_WindowPos3f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	LOAD_GL_FUNC(glWindowPos3f)
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	z = (GLfloat)NUM2DBL(arg3);
-	fptr_glWindowPos3f(x,y,z);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos3i)(GLint,GLint,GLint);
-static VALUE
-gl_WindowPos3i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint x;
-	GLint y;
-	GLint z;
-	LOAD_GL_FUNC(glWindowPos3i)
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	z = (GLint)NUM2INT(arg3);
-	fptr_glWindowPos3i(x,y,z);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glWindowPos3s)(GLshort,GLshort,GLshort);
-static VALUE
-gl_WindowPos3s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLshort x;
-	GLshort y;
-	GLshort z;
-	LOAD_GL_FUNC(glWindowPos3s)
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	z = (GLshort)NUM2INT(arg3);
-	fptr_glWindowPos3s(x,y,z);
+	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
+		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);
+	}
 	return Qnil;
 }
 
@@ -602,8 +366,8 @@ void gl_init_functions_1_4(VALUE module)
 	rb_define_module_function(module, "glFogCoordd", gl_FogCoordd, 1);
 	rb_define_module_function(module, "glFogCoorddv", gl_FogCoorddv, 1);
 	rb_define_module_function(module, "glFogCoordPointer", gl_FogCoordPointer, 3);
-	rb_define_module_function(module, "glMultiDrawArrays", gl_MultiDrawArrays, 4);
-	rb_define_module_function(module, "glMultiDrawElements", gl_MultiDrawElements, 3);
+	rb_define_module_function(module, "glMultiDrawArrays", gl_MultiDrawArrays, 3);
+	rb_define_module_function(module, "glMultiDrawElements", gl_MultiDrawElements, -1);
 	rb_define_module_function(module, "glPointParameterf", gl_PointParameterf, 2);
 	rb_define_module_function(module, "glPointParameterfv", gl_PointParameterfv, 2);
 	rb_define_module_function(module, "glPointParameteri", gl_PointParameteri, 2);