ruby-opengl 0.50.0 → 0.60.0

data/ext/gl/gl-2.0.c

@@ -15,22 +15,45 @@
 
 #include "../common/common.h"
 
-GL_SIMPLE_FUNC_LOAD(BlendEquationSeparate,2,GLenum,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(StencilOpSeparate,4,GLenum,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(AttachShader,2,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(CompileShader,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(DeleteProgram,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(DeleteShader,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(DetachShader,2,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(DisableVertexAttribArray,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(EnableVertexAttribArray,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(LinkProgram,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(UseProgram,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(ValidateProgram,1,GLuint,NUM2UINT)
-GL_SIMPLE_FUNC_LOAD(Uniform1i,2,GLint,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(Uniform2i,3,GLint,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(Uniform3i,4,GLint,NUM2INT)
-GL_SIMPLE_FUNC_LOAD(Uniform4i,5,GLint,NUM2INT)
+GL_FUNC_LOAD_2(BlendEquationSeparate,GLvoid, GLenum,GLenum, "2.0")
+GL_FUNC_LOAD_4(StencilOpSeparate,GLvoid, GLenum,GLenum,GLenum,GLenum, "2.0")
+GL_FUNC_LOAD_2(AttachShader,GLvoid, GLuint,GLuint, "2.0")
+GL_FUNC_LOAD_1(CompileShader,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_1(DeleteProgram,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_1(DeleteShader,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_2(DetachShader,GLvoid, GLuint,GLuint, "2.0")
+GL_FUNC_LOAD_1(DisableVertexAttribArray,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_1(EnableVertexAttribArray,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_1(LinkProgram,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_1(UseProgram,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_1(ValidateProgram,GLvoid, GLuint, "2.0")
+GL_FUNC_LOAD_4(StencilFuncSeparate,GLvoid, GLenum,GLenum,GLint,GLuint, "2.0")
+GL_FUNC_LOAD_2(StencilMaskSeparate,GLvoid, GLenum,GLuint, "2.0")
+GL_FUNC_LOAD_0(CreateProgram,GLuint, "2.0")
+GL_FUNC_LOAD_1(CreateShader,GLuint, GLenum, "2.0")
+GL_FUNC_LOAD_1(IsProgram,GLboolean, GLuint, "2.0")
+GL_FUNC_LOAD_1(IsShader,GLboolean, GLuint, "2.0")
+GL_FUNC_LOAD_2(Uniform1f,GLvoid, GLint,GLfloat, "2.0")
+GL_FUNC_LOAD_2(Uniform1i,GLvoid, GLint,GLint, "2.0")
+GL_FUNC_LOAD_3(Uniform2f,GLvoid, GLint,GLfloat,GLfloat, "2.0")
+GL_FUNC_LOAD_3(Uniform2i,GLvoid, GLint,GLint,GLint, "2.0")
+GL_FUNC_LOAD_4(Uniform3f,GLvoid, GLint,GLfloat,GLfloat,GLfloat, "2.0")
+GL_FUNC_LOAD_4(Uniform3i,GLvoid, GLint,GLint,GLint,GLint, "2.0")
+GL_FUNC_LOAD_5(Uniform4f,GLvoid, GLint,GLfloat,GLfloat,GLfloat,GLfloat, "2.0")
+GL_FUNC_LOAD_5(Uniform4i,GLvoid, GLint,GLint,GLint,GLint,GLint, "2.0")
+GL_FUNC_LOAD_2(VertexAttrib1d,GLvoid, GLuint,GLdouble, "2.0")
+GL_FUNC_LOAD_2(VertexAttrib1f,GLvoid, GLuint,GLfloat, "2.0")
+GL_FUNC_LOAD_2(VertexAttrib1s,GLvoid, GLuint,GLshort, "2.0")
+GL_FUNC_LOAD_3(VertexAttrib2d,GLvoid, GLuint,GLdouble,GLdouble, "2.0")
+GL_FUNC_LOAD_3(VertexAttrib2f,GLvoid, GLuint,GLfloat,GLfloat, "2.0")
+GL_FUNC_LOAD_3(VertexAttrib2s,GLvoid, GLuint,GLshort,GLshort, "2.0")
+GL_FUNC_LOAD_4(VertexAttrib3d,GLvoid, GLuint,GLdouble,GLdouble,GLdouble, "2.0")
+GL_FUNC_LOAD_4(VertexAttrib3f,GLvoid, GLuint,GLfloat,GLfloat,GLfloat, "2.0")
+GL_FUNC_LOAD_4(VertexAttrib3s,GLvoid, GLuint,GLshort,GLshort,GLshort, "2.0")
+GL_FUNC_LOAD_5(VertexAttrib4d,GLvoid, GLuint,GLdouble,GLdouble,GLdouble,GLdouble, "2.0")
+GL_FUNC_LOAD_5(VertexAttrib4f,GLvoid, GLuint,GLfloat,GLfloat,GLfloat,GLfloat, "2.0")
+GL_FUNC_LOAD_5(VertexAttrib4s,GLvoid, GLuint,GLshort,GLshort,GLshort,GLshort, "2.0")
+GL_FUNC_LOAD_5(VertexAttrib4Nub,GLvoid, GLuint,GLubyte,GLubyte,GLubyte,GLubyte, "2.0")
 
 static void (APIENTRY * fptr_glDrawBuffers)(GLsizei,GLenum *);
 static VALUE
@@ -39,45 +62,14 @@ VALUE obj,arg1;
 {
 	GLsizei size;
 	GLenum *buffers;
-	LOAD_GL_FUNC(glDrawBuffers)
+	LOAD_GL_FUNC(glDrawBuffers,"2.0")
 	Check_Type(arg1,T_ARRAY); 
 	size = RARRAY(arg1)->len;
 	buffers = ALLOC_N(GLenum,size);
 	ary2cuint(arg1,buffers,size);
 	fptr_glDrawBuffers(size,buffers);
 	xfree(buffers);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glStencilFuncSeparate)(GLenum,GLenum,GLint,GLuint);
-static VALUE
-gl_StencilFuncSeparate(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum face;
-	GLenum func;
-	GLint ref;
-	GLuint mask;
-	LOAD_GL_FUNC(glStencilFuncSeparate)
-	face = (GLenum)NUM2INT(arg1);
-	func = (GLenum)NUM2INT(arg2);
-	ref = (GLint)NUM2INT(arg3);
-	mask = (GLuint)NUM2UINT(arg4);
-	fptr_glStencilFuncSeparate(face,func,ref,mask);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glStencilMaskSeparate)(GLenum face,GLuint mask);
-static VALUE
-gl_StencilMaskSeparate(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum face;
-	GLuint mask;
-	LOAD_GL_FUNC(glStencilMaskSeparate)
-	face = (GLenum)NUM2INT(arg1);
-	mask = (GLenum)NUM2INT(arg2);
-	fptr_glStencilMaskSeparate(face,mask);
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -88,38 +80,15 @@ VALUE obj,arg1,arg2,arg3;
 {
 	GLuint program;
 	GLuint index;
-	LOAD_GL_FUNC(glBindAttribLocation)
+	LOAD_GL_FUNC(glBindAttribLocation,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	index = (GLuint)NUM2UINT(arg2);
 	Check_Type(arg3, T_STRING);
-	fptr_glBindAttribLocation(program,index,RSTRING(arg3)->ptr);
+	fptr_glBindAttribLocation(program,index,RSTRING_PTR(arg3));
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static GLuint (APIENTRY * fptr_glCreateProgram)(void);
-static VALUE
-gl_CreateProgram(obj)
-VALUE obj;
-{
-	GLuint ret;
-	LOAD_GL_FUNC(glCreateProgram)
-	ret = fptr_glCreateProgram();
-	return INT2NUM(ret);
-}
-
-static GLuint (APIENTRY * fptr_glCreateShader)(GLenum);
-static VALUE
-gl_CreateShader(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum shaderType;
-	GLuint ret;
-	LOAD_GL_FUNC(glCreateShader)
-	shaderType = (GLenum)NUM2INT(arg1);
-	ret = fptr_glCreateShader(shaderType);
-	return INT2NUM(ret);
-}
-
 static void (APIENTRY * fptr_glGetProgramiv)(GLuint,GLenum,GLint *);
 static VALUE
 gl_GetProgramiv(obj,arg1,arg2)
@@ -128,11 +97,12 @@ VALUE obj,arg1,arg2;
 	GLuint program;
 	GLenum pname;
 	GLint params = 0;
-	LOAD_GL_FUNC(glGetProgramiv)
+	LOAD_GL_FUNC(glGetProgramiv,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetProgramiv(program,pname,&params);
-	return INT2NUM(params);
+	CHECK_GLERROR
+	return cond_GLBOOL2RUBY(pname,params);
 }
 
 static void (APIENTRY * fptr_glGetActiveAttrib)(GLuint,GLuint,GLsizei,GLsizei *,GLint *,GLenum *,GLchar *);
@@ -148,26 +118,28 @@ VALUE obj,arg1,arg2;
 	GLenum attrib_type = 0;
 	VALUE buffer;
 	VALUE retary;
-	LOAD_GL_FUNC(glGetActiveAttrib)
-	LOAD_GL_FUNC(glGetProgramiv)
+	LOAD_GL_FUNC(glGetActiveAttrib,"2.0")
+	LOAD_GL_FUNC(glGetProgramiv,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	index = (GLuint)NUM2UINT(arg2);
 	fptr_glGetProgramiv(program,GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,&max_size);
+	CHECK_GLERROR
 	if (max_size==0)
 		rb_raise(rb_eTypeError, "Can't determine maximum attribute name length");
 	buffer = allocate_buffer_with_string(max_size-1);
-	fptr_glGetActiveAttrib(program,index,max_size,&written,&attrib_size,&attrib_type,RSTRING(buffer)->ptr);
+	fptr_glGetActiveAttrib(program,index,max_size,&written,&attrib_size,&attrib_type,RSTRING_PTR(buffer));
 	retary = rb_ary_new2(3);
 	rb_ary_push(retary, INT2NUM(attrib_size));
 	rb_ary_push(retary, INT2NUM(attrib_type));
 	rb_ary_push(retary, buffer);
+	CHECK_GLERROR
 	return retary;
 }
 
 static void (APIENTRY * fptr_glGetActiveUniform)(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLchar*);
 static VALUE
-gl_GetActiveUniform(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
+gl_GetActiveUniform(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
 	GLuint program;
 	GLuint index;
@@ -177,19 +149,21 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLenum uniform_type = 0;
 	VALUE buffer;
 	VALUE retary;
-	LOAD_GL_FUNC(glGetActiveUniform)
-	LOAD_GL_FUNC(glGetProgramiv)
+	LOAD_GL_FUNC(glGetActiveUniform,"2.0")
+	LOAD_GL_FUNC(glGetProgramiv,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	index = (GLuint)NUM2UINT(arg2);
 	fptr_glGetProgramiv(program,GL_ACTIVE_UNIFORM_MAX_LENGTH,&max_size);
+	CHECK_GLERROR
 	if (max_size==0)
 		rb_raise(rb_eTypeError, "Can't determine maximum uniform name length");
 	buffer = allocate_buffer_with_string(max_size-1);
-	fptr_glGetActiveUniform(program,index,max_size,&written,&uniform_size,&uniform_type,RSTRING(buffer)->ptr);
+	fptr_glGetActiveUniform(program,index,max_size,&written,&uniform_size,&uniform_type,RSTRING_PTR(buffer));
 	retary = rb_ary_new2(3);
 	rb_ary_push(retary, INT2NUM(uniform_size));
 	rb_ary_push(retary, INT2NUM(uniform_type));
 	rb_ary_push(retary, buffer);
+	CHECK_GLERROR
 	return retary;
 }
 
@@ -201,22 +175,17 @@ VALUE obj,arg1;
 	GLuint program;
 	GLint shaders_num = 0;
 	GLuint *shaders;
-	VALUE retary;
 	GLsizei count = 0;
-	GLint i;
-	LOAD_GL_FUNC(glGetAttachedShaders)
-	LOAD_GL_FUNC(glGetProgramiv)
+	LOAD_GL_FUNC(glGetAttachedShaders,"2.0")
+	LOAD_GL_FUNC(glGetProgramiv,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	fptr_glGetProgramiv(program,GL_ATTACHED_SHADERS,&shaders_num);
+	CHECK_GLERROR
 	if (shaders_num<=0)
 		return Qnil;
 	shaders = ALLOC_N(GLuint,shaders_num);
 	fptr_glGetAttachedShaders(program,shaders_num,&count,shaders);
-	retary = rb_ary_new2(shaders_num);
-	for(i=0;i<shaders_num;i++)
-		rb_ary_push(retary, INT2NUM(shaders[i]));
-	xfree(shaders);
-	return retary;
+	RET_ARRAY_OR_SINGLE_FREE(count,RETCONV_GLuint,shaders)
 }
 
 static GLint (APIENTRY * fptr_glGetAttribLocation)(GLuint, GLchar *);
@@ -226,10 +195,11 @@ VALUE obj,arg1,arg2;
 {
 	GLuint program;
 	GLint ret;
-	LOAD_GL_FUNC(glGetAttribLocation)
+	LOAD_GL_FUNC(glGetAttribLocation,"2.0")
 	program=(GLuint)NUM2UINT(arg1);
 	Check_Type(arg2,T_STRING);
-	ret = fptr_glGetAttribLocation(program,RSTRING(arg2)->ptr);
+	ret = fptr_glGetAttribLocation(program,RSTRING_PTR(arg2));
+	CHECK_GLERROR
 	return INT2NUM(ret);
 }
 
@@ -242,15 +212,16 @@ VALUE obj,arg1;
 	GLint max_size = 0;
 	GLsizei ret_length = 0;
 	VALUE buffer;
-	LOAD_GL_FUNC(glGetProgramInfoLog)
-	LOAD_GL_FUNC(glGetProgramiv)
+	LOAD_GL_FUNC(glGetProgramInfoLog,"2.0")
+	LOAD_GL_FUNC(glGetProgramiv,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	fptr_glGetProgramiv(program,GL_INFO_LOG_LENGTH,&max_size);
+	CHECK_GLERROR
 	if (max_size<=0)
 		return rb_str_new2("");
 	buffer = allocate_buffer_with_string(max_size);
-	fptr_glGetProgramInfoLog(program,max_size,&ret_length,RSTRING(buffer)->ptr);
-	RSTRING(buffer)->len = ret_length;
+	fptr_glGetProgramInfoLog(program,max_size,&ret_length,RSTRING_PTR(buffer));
+	CHECK_GLERROR
 	return buffer;
 }
 
@@ -262,11 +233,12 @@ VALUE obj,arg1,arg2;
 	GLuint program;
 	GLenum pname;
 	GLint params = 0;
-	LOAD_GL_FUNC(glGetShaderiv)
+	LOAD_GL_FUNC(glGetShaderiv,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetShaderiv(program,pname,&params);
-	return INT2NUM(params);
+	CHECK_GLERROR
+	return cond_GLBOOL2RUBY(pname,params);
 }
 
 static void (APIENTRY * fptr_glGetShaderInfoLog)(GLuint,GLsizei,GLsizei *,GLchar *);
@@ -279,10 +251,11 @@ VALUE obj,arg1;
 	GLsizei ret_length = 0;
 	VALUE ret_buffer;
 	GLchar *buffer;
-	LOAD_GL_FUNC(glGetShaderInfoLog)
-	LOAD_GL_FUNC(glGetShaderiv)
+	LOAD_GL_FUNC(glGetShaderInfoLog,"2.0")
+	LOAD_GL_FUNC(glGetShaderiv,"2.0")
 	program = (GLuint)NUM2UINT(arg1);
 	fptr_glGetShaderiv(program,GL_INFO_LOG_LENGTH,&max_size);
+	CHECK_GLERROR
 	if (max_size<=0)
 		return rb_str_new2("");
 	buffer = ALLOC_N(GLchar,max_size+1);
@@ -290,6 +263,7 @@ VALUE obj,arg1;
 	fptr_glGetShaderInfoLog(program,max_size,&ret_length,buffer);
 	ret_buffer = rb_str_new(buffer, ret_length);
 	xfree(buffer);
+	CHECK_GLERROR
 	return ret_buffer;
 }
 
@@ -302,14 +276,16 @@ VALUE obj,arg1;
 	GLint max_size = 0;
 	GLsizei ret_length = 0;
 	VALUE buffer;
-	LOAD_GL_FUNC(glGetShaderSource)
-	LOAD_GL_FUNC(glGetShaderiv)
+	LOAD_GL_FUNC(glGetShaderSource,"2.0")
+	LOAD_GL_FUNC(glGetShaderiv,"2.0")
 	shader = (GLuint)NUM2UINT(arg1);
 	fptr_glGetShaderiv(shader,GL_SHADER_SOURCE_LENGTH,&max_size);
+	CHECK_GLERROR
 	if (max_size==0)
 		rb_raise(rb_eTypeError, "Can't determine maximum shader source length");
 	buffer = allocate_buffer_with_string(max_size-1);
-	fptr_glGetShaderSource(shader,max_size,&ret_length,RSTRING(buffer)->ptr);
+	fptr_glGetShaderSource(shader,max_size,&ret_length,RSTRING_PTR(buffer));
+	CHECK_GLERROR
 	return buffer;
 }
 
@@ -320,179 +296,73 @@ VALUE obj,arg1,arg2;
 {
 	GLuint program;
 	GLint ret;
-	LOAD_GL_FUNC(glGetUniformLocation)
+	LOAD_GL_FUNC(glGetUniformLocation,"2.0")
 	program=(GLuint)NUM2UINT(arg1);
 	Check_Type(arg2,T_STRING);
-	ret = fptr_glGetUniformLocation(program,RSTRING(arg2)->ptr);
+	ret = fptr_glGetUniformLocation(program,RSTRING_PTR(arg2));
+	CHECK_GLERROR
 	return INT2NUM(ret);
 }
 
-
-#define GET_UNIFORM_SIZE \
-	switch (uniform_type) { \
-		case GL_FLOAT: \
-		case GL_INT: \
-		case GL_BOOL: \
-		case GL_SAMPLER_1D: \
-		case GL_SAMPLER_2D: \
-		case GL_SAMPLER_3D: \
-		case GL_SAMPLER_CUBE: \
-		case GL_SAMPLER_1D_SHADOW: \
-		case GL_SAMPLER_2D_SHADOW: \
-			uniform_size = 1; \
-			break; \
-		case GL_FLOAT_VEC2: \
-		case GL_INT_VEC2: \
-		case GL_BOOL_VEC2: \
-			uniform_size = 2; \
-			break; \
-		case GL_FLOAT_VEC3: \
-		case GL_INT_VEC3: \
-		case GL_BOOL_VEC3: \
-			uniform_size = 3; \
-			break; \
-		case GL_FLOAT_VEC4: \
-		case GL_INT_VEC4: \
-		case GL_BOOL_VEC4: \
-		case GL_FLOAT_MAT2: \
-			uniform_size = 4; \
-			break; \
-		case GL_FLOAT_MAT2x3: \
-		case GL_FLOAT_MAT3x2: \
-			uniform_size = 6; \
-			break; \
-		case GL_FLOAT_MAT2x4: \
-		case GL_FLOAT_MAT4x2: \
-			uniform_size = 8; \
-			break; \
-		case GL_FLOAT_MAT3: \
-			uniform_size = 9; \
-			break; \
-		case GL_FLOAT_MAT4x3: \
-		case GL_FLOAT_MAT3x4: \
-			uniform_size = 12; \
-			break; \
-		case GL_FLOAT_MAT4: \
-			uniform_size = 16; \
-			break; \
-		default: \
-			rb_raise(rb_eTypeError, "Unsupported type '%i'",uniform_type); \
-	}
-
-static void (APIENTRY * fptr_glGetUniformfv)(GLuint,GLint,GLfloat *);
-static VALUE
-gl_GetUniformfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint program;
-	GLint location;
-	GLfloat params[16];
-	VALUE retary;
-	GLint i;
-	GLint unused = 0;
-	GLenum uniform_type = 0;
-	GLint uniform_size = 0;
-
-	LOAD_GL_FUNC(glGetUniformfv)
-	LOAD_GL_FUNC(glGetActiveUniform)
-	program = (GLuint)NUM2UINT(arg1);
-	location = (GLint)NUM2INT(arg2);
-
-	fptr_glGetActiveUniform(program,location,0,NULL,&unused,&uniform_type,NULL);
-	if (uniform_type==0)
-		rb_raise(rb_eTypeError, "Can't determine the uniform's type");
-
-	GET_UNIFORM_SIZE
-
-	memset(params,0,16*sizeof(GLfloat));
-	fptr_glGetUniformfv(program,location,params);
-	retary = rb_ary_new2(uniform_size);
-	for(i=0;i<uniform_size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
-}
-
-static void (APIENTRY * fptr_glGetUniformiv)(GLuint,GLint,GLint *);
-static VALUE
-gl_GetUniformiv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint program;
-	GLint location;
-	GLint params[16];
-	VALUE retary;
-	GLint i;
-	GLint unused = 0;
-	GLenum uniform_type = 0;
-	GLint uniform_size = 0;
-	LOAD_GL_FUNC(glGetUniformiv)
-	LOAD_GL_FUNC(glGetActiveUniform)
-	program = (GLuint)NUM2UINT(arg1);
-	location = (GLint)NUM2INT(arg2);
-
-	fptr_glGetActiveUniform(program,location,0,NULL,&unused,&uniform_type,NULL);
-	if (uniform_type==0)
-		rb_raise(rb_eTypeError, "Can't determine the uniform's type");
-
-	GET_UNIFORM_SIZE
-
-	memset(params,0,16*sizeof(GLint));
-	fptr_glGetUniformiv(program,location,params);
-	retary = rb_ary_new2(uniform_size);
-	for(i=0;i<uniform_size;i++)
-		rb_ary_push(retary, INT2NUM(params[i]));
-	return retary;
-}
-
-static void (APIENTRY * fptr_glGetVertexAttribdv)(GLuint,GLenum,GLdouble *);
-static VALUE
-gl_GetVertexAttribdv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLenum pname;
-	GLdouble params[4] = {0.0,0.0,0.0,0.0};
-	GLint size;
-	GLint i;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetVertexAttribdv)
-	index = (GLuint)NUM2UINT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	if (pname==GL_CURRENT_VERTEX_ATTRIB)
-		size = 4;
-	else
-		size = 1;
-	fptr_glGetVertexAttribdv(index,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
-}
-
-static void (APIENTRY * fptr_glGetVertexAttribfv)(GLuint,GLenum,GLfloat *);
-static VALUE
-gl_GetVertexAttribfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	GLint size;
-	GLint i;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetVertexAttribfv)
-	index = (GLuint)NUM2UINT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	if (pname==GL_CURRENT_VERTEX_ATTRIB)
-		size = 4;
-	else
-		size = 1;
-	fptr_glGetVertexAttribfv(index,pname,params);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(params[i]));
-	return retary;
-}
+#define GETUNIFORM_FUNC(_name_,_type_) \
+static void (APIENTRY * fptr_gl##_name_)(GLuint,GLint,_type_ *); \
+static VALUE \
+gl_##_name_(obj,arg1,arg2) \
+VALUE obj,arg1,arg2; \
+{ \
+	GLuint program; \
+	GLint location; \
+	_type_ params[16]; \
+	GLint unused = 0; \
+	GLenum uniform_type = 0; \
+	GLint uniform_size = 0; \
+\
+	LOAD_GL_FUNC(gl##_name_,"2.0") \
+	LOAD_GL_FUNC(glGetActiveUniform,"2.0") \
+	program = (GLuint)NUM2UINT(arg1); \
+	location = (GLint)NUM2INT(arg2); \
+\
+	fptr_glGetActiveUniform(program,location,0,NULL,&unused,&uniform_type,NULL); \
+	CHECK_GLERROR \
+	if (uniform_type==0) \
+		rb_raise(rb_eTypeError, "Can't determine the uniform's type"); \
+\
+	uniform_size = get_uniform_size(uniform_type); \
+\
+	memset(params,0,16*sizeof(_type_)); \
+	fptr_gl##_name_(program,location,params); \
+	RET_ARRAY_OR_SINGLE(uniform_size,RETCONV_##_type_,params) \
+}
+
+GETUNIFORM_FUNC(GetUniformfv,GLfloat)
+GETUNIFORM_FUNC(GetUniformiv,GLint)
+#undef GETUNIFORM_FUNC
+
+#define GETVERTEXATTRIB_FUNC(_name_,_type_) \
+static void (APIENTRY * fptr_gl##_name_)(GLuint,GLenum,_type_ *); \
+static VALUE \
+gl_##_name_(obj,arg1,arg2) \
+VALUE obj,arg1,arg2; \
+{ \
+	GLuint index; \
+	GLenum pname; \
+	_type_ params[4] = {0,0,0,0}; \
+	GLint size; \
+	LOAD_GL_FUNC(gl##_name_,"2.0") \
+	index = (GLuint)NUM2UINT(arg1); \
+	pname = (GLenum)NUM2INT(arg2); \
+	if (pname==GL_CURRENT_VERTEX_ATTRIB) \
+		size = 4; \
+	else \
+		size = 1; \
+	fptr_gl##_name_(index,pname,params); \
+	RET_ARRAY_OR_SINGLE(size,RETCONV_##_type_,params) \
+}
+
+GETVERTEXATTRIB_FUNC(GetVertexAttribdv,GLdouble)
+GETVERTEXATTRIB_FUNC(GetVertexAttribfv,GLfloat)
+//GETVERTEXATTRIB_FUNC(GetVertexAttribiv,GLint,cond_GLBOOL2RUBY)
+#undef GETVERTEXATTRIB_FUNC
 
 static void (APIENTRY * fptr_glGetVertexAttribiv)(GLuint,GLenum,GLint *);
 static VALUE
@@ -503,9 +373,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	GLint size;
-	GLint i;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetVertexAttribiv)
+	LOAD_GL_FUNC(glGetVertexAttribiv,"2.0")
 	index = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	if (pname==GL_CURRENT_VERTEX_ATTRIB)
@@ -513,14 +381,11 @@ VALUE obj,arg1,arg2;
 	else
 		size = 1;
 	fptr_glGetVertexAttribiv(index,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_BOOL(size,cond_GLBOOL2RUBY,pname,params)
 }
 
-#define _MAX_VERTEX_ATTRIBS 64 /* at least GL_MAX_VERTEX_ATTRIBS - usually 16 or 32 on today's high-end cards */
-static VALUE g_VertexAttrib_ptr[_MAX_VERTEX_ATTRIBS];
+
+VALUE g_VertexAttrib_ptr[_MAX_VERTEX_ATTRIBS];
 
 static void (APIENTRY * fptr_glGetVertexAttribPointerv)(GLuint,GLenum,GLvoid **);
 static VALUE
@@ -528,7 +393,7 @@ gl_GetVertexAttribPointerv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint index;
-	LOAD_GL_FUNC(glGetVertexAttribPointerv)
+	LOAD_GL_FUNC(glGetVertexAttribPointerv,"2.0")
 	index =(GLuint) NUM2INT(arg1);
 	if (index>_MAX_VERTEX_ATTRIBS)
 		rb_raise(rb_eArgError, "Index too large, maximum allowed value '%i'",_MAX_VERTEX_ATTRIBS);
@@ -536,32 +401,6 @@ VALUE obj,arg1;
 	return g_VertexAttrib_ptr[index];
 }
 
-static GLboolean (APIENTRY * fptr_glIsProgram)(GLuint);
-static VALUE
-gl_IsProgram(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint program;
-	GLboolean ret;
-	LOAD_GL_FUNC(glIsProgram)
-	program = (GLuint)NUM2UINT(arg1);
-	ret = fptr_glIsProgram(program);
-	return INT2NUM(ret);
-}
-
-static GLboolean (APIENTRY * fptr_glIsShader)(GLuint);
-static VALUE
-gl_IsShader(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint program;
-	GLboolean ret;
-	LOAD_GL_FUNC(glIsShader)
-	program = (GLuint)NUM2UINT(arg1);
-	ret = fptr_glIsShader(program);
-	return INT2NUM(ret);
-}
-
 static void (APIENTRY * fptr_glShaderSource)(GLuint,GLsizei,GLchar**,GLint *);
 static VALUE
 gl_ShaderSource(obj,arg1,arg2)
@@ -570,721 +409,116 @@ VALUE obj,arg1,arg2;
 	GLuint shader;
 	GLint length;
 	GLchar *str;
-	LOAD_GL_FUNC(glShaderSource)
+	LOAD_GL_FUNC(glShaderSource,"2.0")
 	shader = (GLuint)NUM2UINT(arg1);
 	Check_Type(arg2,T_STRING);
-	str = RSTRING(arg2)->ptr;
-	length = RSTRING(arg2)->len;
+	str = RSTRING_PTR(arg2);
+	length = RSTRING_LEN(arg2);
 	fptr_glShaderSource(shader,1,&str,&length);
+	CHECK_GLERROR
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glUniform1f)(GLint,GLfloat);
-static VALUE
-gl_Uniform1f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint location;
-	GLfloat v0;
-	LOAD_GL_FUNC(glUniform1f)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	fptr_glUniform1f(location,v0);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform2f)(GLint,GLfloat,GLfloat);
-static VALUE
-gl_Uniform2f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLfloat v0;
-	GLfloat v1;
-	LOAD_GL_FUNC(glUniform2f)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	v1 = (GLfloat)NUM2DBL(arg3);
-	fptr_glUniform2f(location,v0,v1);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform3f)(GLint,GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_Uniform3f(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLfloat v0;
-	GLfloat v1;
-	GLfloat v2;
-	LOAD_GL_FUNC(glUniform3f)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	v1 = (GLfloat)NUM2DBL(arg3);
-	v2 = (GLfloat)NUM2DBL(arg4);
-	fptr_glUniform3f(location,v0,v1,v2);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform4f)(GLint,GLfloat,GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_Uniform4f(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLint location;
-	GLfloat v0;
-	GLfloat v1;
-	GLfloat v2;
-	GLfloat v3;
-	LOAD_GL_FUNC(glUniform4f)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	v1 = (GLfloat)NUM2DBL(arg3);
-	v2 = (GLfloat)NUM2DBL(arg4);
-	v3 = (GLfloat)NUM2DBL(arg5);
-	fptr_glUniform4f(location,v0,v1,v2,v3);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform1fv)(GLint,GLsizei,GLfloat *);
-static VALUE
-gl_Uniform1fv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLfloat *value;
-	LOAD_GL_FUNC(glUniform1fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLfloat,1*count);
-	ary2cflt(arg3,value,1*count);
-	fptr_glUniform1fv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform2fv)(GLint,GLsizei,GLfloat *);
-static VALUE
-gl_Uniform2fv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLfloat *value;
-	LOAD_GL_FUNC(glUniform2fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLfloat,2*count);
-	ary2cflt(arg3,value,2*count);
-	fptr_glUniform2fv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform3fv)(GLint,GLsizei,GLfloat *);
-static VALUE
-gl_Uniform3fv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLfloat *value;
-	LOAD_GL_FUNC(glUniform3fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLfloat,3*count);
-	ary2cflt(arg3,value,3*count);
-	fptr_glUniform3fv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform4fv)(GLint,GLsizei,GLfloat *);
-static VALUE
-gl_Uniform4fv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLfloat *value;
-	LOAD_GL_FUNC(glUniform4fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLfloat,4*count);
-	ary2cflt(arg3,value,4*count);
-	fptr_glUniform4fv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform1iv)(GLint,GLsizei,GLint *);
-static VALUE
-gl_Uniform1iv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLint *value;
-	LOAD_GL_FUNC(glUniform1iv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLint,1*count);
-	ary2cint(arg3,value,1*count);
-	fptr_glUniform1iv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform2iv)(GLint,GLsizei,GLint *);
-static VALUE
-gl_Uniform2iv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLint *value;
-	LOAD_GL_FUNC(glUniform2iv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLint,2*count);
-	ary2cint(arg3,value,2*count);
-	fptr_glUniform2iv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform3iv)(GLint,GLsizei,GLint *);
-static VALUE
-gl_Uniform3iv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLint *value;
-	LOAD_GL_FUNC(glUniform3iv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLint,3*count);
-	ary2cint(arg3,value,3*count);
-	fptr_glUniform3iv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform4iv)(GLint,GLsizei,GLint *);
-static VALUE
-gl_Uniform4iv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLsizei count;
-	GLint *value;
-	LOAD_GL_FUNC(glUniform4iv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLsizei)NUM2UINT(arg2);
-	value = ALLOC_N(GLint,4*count);
-	ary2cint(arg3,value,4*count);
-	fptr_glUniform4iv(location,count,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniformMatrix2fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix2fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix2fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 2*2*count);
-	ary2cflt(arg4,value,2*2*count);
-	fptr_glUniformMatrix2fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniformMatrix3fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix3fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix3fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 3*3*count);
-	ary2cflt(arg4,value,3*3*count);
-	fptr_glUniformMatrix3fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniformMatrix4fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix4fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix4fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 4*4*count);
-	ary2cflt(arg4,value,4*4*count);
-	fptr_glUniformMatrix4fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib1d)(GLuint,GLdouble);
-static VALUE
-gl_VertexAttrib1d(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLdouble v0;
-	LOAD_GL_FUNC(glVertexAttrib1d)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLdouble)NUM2DBL(arg2);
-	fptr_glVertexAttrib1d(index,v0);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib1f)(GLuint,GLfloat);
-static VALUE
-gl_VertexAttrib1f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLfloat v0;
-	LOAD_GL_FUNC(glVertexAttrib1f)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	fptr_glVertexAttrib1f(index,v0);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib1s)(GLuint,GLshort);
-static VALUE
-gl_VertexAttrib1s(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLshort v0;
-	LOAD_GL_FUNC(glVertexAttrib1s)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLshort)NUM2INT(arg2);
-	fptr_glVertexAttrib1s(index,v0);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib2d)(GLuint,GLdouble,GLdouble);
-static VALUE
-gl_VertexAttrib2d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLuint index;
-	GLdouble v0;
-	GLdouble v1;
-	LOAD_GL_FUNC(glVertexAttrib2d)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLdouble)NUM2DBL(arg2);
-	v1 = (GLdouble)NUM2DBL(arg3);
-	fptr_glVertexAttrib2d(index,v0,v1);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib2f)(GLuint,GLfloat,GLfloat);
-static VALUE
-gl_VertexAttrib2f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLuint index;
-	GLfloat v0;
-	GLfloat v1;
-	LOAD_GL_FUNC(glVertexAttrib2f)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	v1 = (GLfloat)NUM2DBL(arg3);
-	fptr_glVertexAttrib2f(index,v0,v1);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib2s)(GLuint,GLshort,GLshort);
-static VALUE
-gl_VertexAttrib2s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLuint index;
-	GLshort v0;
-	GLshort v1;
-	LOAD_GL_FUNC(glVertexAttrib2s)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLshort)NUM2INT(arg2);
-	v1 = (GLshort)NUM2INT(arg3);
-	fptr_glVertexAttrib2s(index,v0,v1);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib3d)(GLuint,GLdouble,GLdouble,GLdouble);
-static VALUE
-gl_VertexAttrib3d(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLuint index;
-	GLdouble v0;
-	GLdouble v1;
-	GLdouble v2;
-	LOAD_GL_FUNC(glVertexAttrib3d)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLdouble)NUM2DBL(arg2);
-	v1 = (GLdouble)NUM2DBL(arg3);
-	v2 = (GLdouble)NUM2DBL(arg4);
-	fptr_glVertexAttrib3d(index,v0,v1,v2);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib3f)(GLuint,GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_VertexAttrib3f(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLuint index;
-	GLfloat v0;
-	GLfloat v1;
-	GLfloat v2;
-	LOAD_GL_FUNC(glVertexAttrib3f)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	v1 = (GLfloat)NUM2DBL(arg3);
-	v2 = (GLfloat)NUM2DBL(arg4);
-	fptr_glVertexAttrib3f(index,v0,v1,v2);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib3s)(GLuint,GLshort,GLshort,GLshort);
-static VALUE
-gl_VertexAttrib3s(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLuint index;
-	GLshort v0;
-	GLshort v1;
-	GLshort v2;
-	LOAD_GL_FUNC(glVertexAttrib3s)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLshort)NUM2INT(arg2);
-	v1 = (GLshort)NUM2INT(arg3);
-	v2 = (GLshort)NUM2INT(arg4);
-	fptr_glVertexAttrib3s(index,v0,v1,v2);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4Nbv)(GLuint,GLbyte *);
-static VALUE
-gl_VertexAttrib4Nbv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLbyte v[4];
-	LOAD_GL_FUNC(glVertexAttrib4Nbv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cbyte(arg2,v,4);
-	fptr_glVertexAttrib4Nbv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4Niv)(GLuint,GLint *);
-static VALUE
-gl_VertexAttrib4Niv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLint v[4];
-	LOAD_GL_FUNC(glVertexAttrib4Niv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cint(arg2,v,4);
-	fptr_glVertexAttrib4Niv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4Nsv)(GLuint,GLshort *);
-static VALUE
-gl_VertexAttrib4Nsv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLshort v[4];
-	LOAD_GL_FUNC(glVertexAttrib4Nsv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cshort(arg2,v,4);
-	fptr_glVertexAttrib4Nsv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4Nub)(GLuint,GLubyte,GLubyte,GLubyte,GLubyte);
-static VALUE
-gl_VertexAttrib4Nub(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLuint index;
-	GLubyte v0;
-	GLubyte v1;
-	GLubyte v2;
-	GLubyte v3;
-	LOAD_GL_FUNC(glVertexAttrib4Nub)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLubyte)NUM2INT(arg2);
-	v1 = (GLubyte)NUM2INT(arg3);
-	v2 = (GLubyte)NUM2INT(arg4);
-	v3 = (GLubyte)NUM2INT(arg5);
-	fptr_glVertexAttrib4Nub(index,v0,v1,v2,v3);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4Nubv)(GLuint,GLubyte *);
-static VALUE
-gl_VertexAttrib4Nubv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLubyte v[4];
-	LOAD_GL_FUNC(glVertexAttrib4Nubv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cubyte(arg2,v,4);
-	fptr_glVertexAttrib4Nubv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4Nuiv)(GLuint,GLuint *);
-static VALUE
-gl_VertexAttrib4Nuiv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLuint v[4];
-	LOAD_GL_FUNC(glVertexAttrib4Nuiv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cuint(arg2,v,4);
-	fptr_glVertexAttrib4Nuiv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4Nusv)(GLuint,GLushort *);
-static VALUE
-gl_VertexAttrib4Nusv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLushort v[4];
-	LOAD_GL_FUNC(glVertexAttrib4Nusv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cushort(arg2,v,4);
-	fptr_glVertexAttrib4Nusv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4bv)(GLuint,GLbyte *);
-static VALUE
-gl_VertexAttrib4bv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLbyte v[4];
-	LOAD_GL_FUNC(glVertexAttrib4bv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cbyte(arg2,v,4);
-	fptr_glVertexAttrib4bv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4d)(GLuint,GLdouble,GLdouble,GLdouble,GLdouble);
-static VALUE
-gl_VertexAttrib4d(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLuint index;
-	GLdouble v0;
-	GLdouble v1;
-	GLdouble v2;
-	GLdouble v3;
-	LOAD_GL_FUNC(glVertexAttrib4d)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLdouble)NUM2DBL(arg2);
-	v1 = (GLdouble)NUM2DBL(arg3);
-	v2 = (GLdouble)NUM2DBL(arg4);
-	v3 = (GLdouble)NUM2DBL(arg5);
-	fptr_glVertexAttrib4d(index,v0,v1,v2,v3);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4f)(GLuint,GLfloat,GLfloat,GLfloat,GLfloat);
-static VALUE
-gl_VertexAttrib4f(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLuint index;
-	GLfloat v0;
-	GLfloat v1;
-	GLfloat v2;
-	GLfloat v3;
-	LOAD_GL_FUNC(glVertexAttrib4f)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLfloat)NUM2DBL(arg2);
-	v1 = (GLfloat)NUM2DBL(arg3);
-	v2 = (GLfloat)NUM2DBL(arg4);
-	v3 = (GLfloat)NUM2DBL(arg5);
-	fptr_glVertexAttrib4f(index,v0,v1,v2,v3);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4iv)(GLuint,GLint *);
-static VALUE
-gl_VertexAttrib4iv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLint v[4];
-	LOAD_GL_FUNC(glVertexAttrib4iv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cint(arg2,v,4);
-	fptr_glVertexAttrib4iv(index,v);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glVertexAttrib4s)(GLuint,GLshort,GLshort,GLshort,GLshort);
-static VALUE
-gl_VertexAttrib4s(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLuint index;
-	GLshort v0;
-	GLshort v1;
-	GLshort v2;
-	GLshort v3;
-	LOAD_GL_FUNC(glVertexAttrib4s)
-	index = (GLuint)NUM2UINT(arg1);
-	v0 = (GLshort)NUM2INT(arg2);
-	v1 = (GLshort)NUM2INT(arg3);
-	v2 = (GLshort)NUM2INT(arg4);
-	v3 = (GLshort)NUM2INT(arg5);
-	fptr_glVertexAttrib4s(index,v0,v1,v2,v3);
-	return Qnil;
+#define UNIFORM_FUNC_V(_name_,_type_,_conv_,_size_) \
+static void (APIENTRY * fptr_gl##_name_)(GLint,GLsizei,_type_ *); \
+static VALUE \
+gl_##_name_(obj,arg1,arg2) \
+VALUE obj,arg1,arg2; \
+{ \
+	GLint location; \
+	GLsizei count; \
+	_type_ *value; \
+	LOAD_GL_FUNC(gl##_name_,"2.0") \
+	Check_Type(arg2,T_ARRAY); \
+	count = RARRAY_LEN(arg2); \
+	if (count<=0 || (count % _size_) != 0) \
+		rb_raise(rb_eArgError, "Parameter array size must be multiplication of %i",_size_); \
+	location = (GLint)NUM2INT(arg1); \
+	value = ALLOC_N(_type_,count); \
+	_conv_(arg2,value,count); \
+	fptr_gl##_name_(location,count / _size_,value); \
+	xfree(value); \
+	CHECK_GLERROR \
+	return Qnil; \
 }
 
-static void (APIENTRY * fptr_glVertexAttrib4ubv)(GLuint,GLubyte *);
-static VALUE
-gl_VertexAttrib4ubv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLubyte v[4];
-	LOAD_GL_FUNC(glVertexAttrib4ubv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cubyte(arg2,v,4);
-	fptr_glVertexAttrib4ubv(index,v);
-	return Qnil;
-}
+UNIFORM_FUNC_V(Uniform1fv,GLfloat,ary2cflt,1)
+UNIFORM_FUNC_V(Uniform1iv,GLint,ary2cint,1)
+UNIFORM_FUNC_V(Uniform2fv,GLfloat,ary2cflt,2)
+UNIFORM_FUNC_V(Uniform2iv,GLint,ary2cint,2)
+UNIFORM_FUNC_V(Uniform3fv,GLfloat,ary2cflt,3)
+UNIFORM_FUNC_V(Uniform3iv,GLint,ary2cint,3)
+UNIFORM_FUNC_V(Uniform4fv,GLfloat,ary2cflt,4)
+UNIFORM_FUNC_V(Uniform4iv,GLint,ary2cint,4)
+#undef UNIFORM_FUNC_V
 
-static void (APIENTRY * fptr_glVertexAttrib4uiv)(GLuint,GLuint *);
-static VALUE
-gl_VertexAttrib4uiv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLuint v[4];
-	LOAD_GL_FUNC(glVertexAttrib4uiv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cuint(arg2,v,4);
-	fptr_glVertexAttrib4uiv(index,v);
-	return Qnil;
+#define UNIFORMMATRIX_FUNC(_name_,_size_) \
+static void (APIENTRY * fptr_gl##_name_)(GLint,GLsizei,GLboolean,GLfloat *); \
+static VALUE \
+gl_##_name_(obj,arg1,arg2,arg3) \
+VALUE obj,arg1,arg2,arg3; \
+{ \
+	GLint location; \
+	GLsizei count; \
+	GLboolean transpose; \
+	GLfloat *value;	\
+	LOAD_GL_FUNC(gl##_name_,"2.0") \
+	location = (GLint)NUM2INT(arg1); \
+	count = RARRAY_LEN(rb_funcall(rb_Array(arg3),rb_intern("flatten"),0)); \
+	transpose = (GLboolean)NUM2INT(arg2); \
+	value = ALLOC_N(GLfloat, count); \
+	ary2cmatfloatcount(arg3,value,_size_,_size_); \
+	fptr_gl##_name_(location,count / (_size_*_size_),transpose,value); \
+	xfree(value); \
+	CHECK_GLERROR \
+	return Qnil; \
 }
 
-static void (APIENTRY * fptr_glVertexAttrib4usv)(GLuint,GLushort *);
-static VALUE
-gl_VertexAttrib4usv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint index;
-	GLushort v[4];
-	LOAD_GL_FUNC(glVertexAttrib4usv)
-	index = (GLuint)NUM2UINT(arg1);
-	ary2cushort(arg2,v,4);
-	fptr_glVertexAttrib4usv(index,v);
-	return Qnil;
-}
+UNIFORMMATRIX_FUNC(UniformMatrix2fv,2)
+UNIFORMMATRIX_FUNC(UniformMatrix3fv,3)
+UNIFORMMATRIX_FUNC(UniformMatrix4fv,4)
+#undef UNIFORMMATRIX_FUNC
 
-#define GLVERTEXATTRIB_VFUNC(_type_) \
+#define VERTEXATTRIB_FUNC_V(_name_,_type_,_conv_,_size_) \
+static void (APIENTRY * fptr_gl##_name_)(GLuint,_type_ *); \
 static VALUE \
-gl_VertexAttrib##_type_##v(argc,argv,obj) \
-int argc; \
-VALUE *argv; \
-VALUE obj; \
+gl_##_name_(obj,arg1,arg2) \
+VALUE obj,arg1,arg2; \
 { \
-	VALUE args[5]; \
-	RArray *ary; \
-	switch (rb_scan_args(argc, argv, "23", &args[0], &args[1], &args[2], &args[3], &args[4])) { \
-	case 2: \
-		if (TYPE(args[1]) == T_ARRAY) { \
-		ary = RARRAY(args[1]); \
-		switch (ary->len) { \
-			case 1: \
-			gl_VertexAttrib1##_type_(obj,args[0],ary->ptr[0]); \
-			break; \
-			case 2: \
-			gl_VertexAttrib2##_type_(obj,args[0],ary->ptr[0],ary->ptr[1]); \
-			break; \
-			case 3: \
-			gl_VertexAttrib3##_type_(obj,args[0],ary->ptr[0],ary->ptr[1],ary->ptr[2]); \
-			break; \
-			case 4: \
-			gl_VertexAttrib4##_type_(obj,args[0],ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
-			break; \
-			default: \
-			rb_raise(rb_eRuntimeError, "glVertex vertex num error!:%d", ary->len); \
-		} \
-		} \
-		else { \
-			gl_VertexAttrib1##_type_(obj,args[0], args[1]); \
-			break; \
-		} \
-		break; \
-	case 3: \
-		gl_VertexAttrib2##_type_(obj,args[0], args[1], args[2]); \
-		break; \
-	case 4: \
-		gl_VertexAttrib3##_type_(obj,args[0], args[1], args[2], args[3]); \
-		break; \
-	case 5: \
-		gl_VertexAttrib4##_type_(obj,args[0], args[1], args[2], args[3], args[4]); \
-		break; \
-	default: \
-		rb_raise(rb_eArgError, "Argument number error!"); \
-		break; \
-	} \
+	GLuint index; \
+	_type_ v[_size_]; \
+	LOAD_GL_FUNC(gl##_name_,"2.0")  \
+	index = (GLuint)NUM2UINT(arg1); \
+	_conv_(arg2,v,_size_); \
+	fptr_gl##_name_(index,v); \
+	CHECK_GLERROR \
 	return Qnil; \
 }
 
-GLVERTEXATTRIB_VFUNC(d)
-GLVERTEXATTRIB_VFUNC(f)
-GLVERTEXATTRIB_VFUNC(s)
-
-#undef GLVERTEXATTRIB_VFUNC
+VERTEXATTRIB_FUNC_V(VertexAttrib4Nbv,GLbyte,ary2cbyte,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4Niv,GLint,ary2cint,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4Nsv,GLshort,ary2cshort,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4Nubv,GLubyte,ary2cubyte,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4Nuiv,GLuint,ary2cuint,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4Nusv,GLushort,ary2cushort,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4uiv,GLuint,ary2cuint,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4ubv,GLubyte,ary2cubyte,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4usv,GLushort,ary2cushort,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4bv,GLbyte,ary2cbyte,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4iv,GLint,ary2cint,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4dv,GLdouble,ary2cdbl,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4fv,GLfloat,ary2cflt,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib4sv,GLshort,ary2cshort,4)
+VERTEXATTRIB_FUNC_V(VertexAttrib3dv,GLdouble,ary2cdbl,3)
+VERTEXATTRIB_FUNC_V(VertexAttrib3fv,GLfloat,ary2cflt,3)
+VERTEXATTRIB_FUNC_V(VertexAttrib3sv,GLshort,ary2cshort,3)
+VERTEXATTRIB_FUNC_V(VertexAttrib2dv,GLdouble,ary2cdbl,2)
+VERTEXATTRIB_FUNC_V(VertexAttrib2fv,GLfloat,ary2cflt,2)
+VERTEXATTRIB_FUNC_V(VertexAttrib2sv,GLshort,ary2cshort,2)
+VERTEXATTRIB_FUNC_V(VertexAttrib1dv,GLdouble,ary2cdbl,1)
+VERTEXATTRIB_FUNC_V(VertexAttrib1fv,GLfloat,ary2cflt,1)
+VERTEXATTRIB_FUNC_V(VertexAttrib1sv,GLshort,ary2cshort,1)
+#undef VERTEXATTRIB_FUNC_V
 
 static void (APIENTRY * fptr_glVertexAttribPointer)(GLuint,GLint,GLenum,GLboolean,GLsizei,GLvoid *);
 static VALUE
@@ -1296,7 +530,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	GLenum type;
 	GLboolean normalized;
 	GLsizei stride;
-	LOAD_GL_FUNC(glVertexAttribPointer)
+	LOAD_GL_FUNC(glVertexAttribPointer,"2.0")
 	index = (GLuint)NUM2UINT(arg1);
 	size = (GLuint)NUM2UINT(arg2);
 	type = (GLenum)NUM2INT(arg3);
@@ -1309,11 +543,13 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 		g_VertexAttrib_ptr[index] = arg6;
 		fptr_glVertexAttribPointer(index,size,type,normalized,stride,(GLvoid *)NUM2INT(arg6));
 	} else {
-		Check_Type(arg6, T_STRING);
-		rb_str_freeze(arg6);
-		g_VertexAttrib_ptr[index] = arg6;
-		fptr_glVertexAttribPointer(index,size,type,normalized,stride,(GLvoid *)RSTRING(arg6)->ptr);
+		VALUE data;
+		data = pack_array_or_pass_string(type,arg6);
+		rb_str_freeze(data);
+		g_VertexAttrib_ptr[index] = data;
+		fptr_glVertexAttribPointer(index,size,type,normalized,stride,(GLvoid *)RSTRING_PTR(data));
 	}
+	CHECK_GLERROR
 	return Qnil;
 }
 
@@ -1363,17 +599,17 @@ void gl_init_functions_2_0(VALUE module)
 	rb_define_module_function(module, "glUniform2i", gl_Uniform2i, 3);
 	rb_define_module_function(module, "glUniform3i", gl_Uniform3i, 4);
 	rb_define_module_function(module, "glUniform4i", gl_Uniform4i, 5);
-	rb_define_module_function(module, "glUniform1fv", gl_Uniform1fv, 3);
-	rb_define_module_function(module, "glUniform2fv", gl_Uniform2fv, 3);
-	rb_define_module_function(module, "glUniform3fv", gl_Uniform3fv, 3);
-	rb_define_module_function(module, "glUniform4fv", gl_Uniform4fv, 3);
-	rb_define_module_function(module, "glUniform1iv", gl_Uniform1iv, 3);
-	rb_define_module_function(module, "glUniform2iv", gl_Uniform2iv, 3);
-	rb_define_module_function(module, "glUniform3iv", gl_Uniform3iv, 3);
-	rb_define_module_function(module, "glUniform4iv", gl_Uniform4iv, 3);
-	rb_define_module_function(module, "glUniformMatrix2fv", gl_UniformMatrix2fv, 4);
-	rb_define_module_function(module, "glUniformMatrix3fv", gl_UniformMatrix3fv, 4);
-	rb_define_module_function(module, "glUniformMatrix4fv", gl_UniformMatrix4fv, 4);
+	rb_define_module_function(module, "glUniform1fv", gl_Uniform1fv, 2);
+	rb_define_module_function(module, "glUniform2fv", gl_Uniform2fv, 2);
+	rb_define_module_function(module, "glUniform3fv", gl_Uniform3fv, 2);
+	rb_define_module_function(module, "glUniform4fv", gl_Uniform4fv, 2);
+	rb_define_module_function(module, "glUniform1iv", gl_Uniform1iv, 2);
+	rb_define_module_function(module, "glUniform2iv", gl_Uniform2iv, 2);
+	rb_define_module_function(module, "glUniform3iv", gl_Uniform3iv, 2);
+	rb_define_module_function(module, "glUniform4iv", gl_Uniform4iv, 2);
+	rb_define_module_function(module, "glUniformMatrix2fv", gl_UniformMatrix2fv, 3);
+	rb_define_module_function(module, "glUniformMatrix3fv", gl_UniformMatrix3fv, 3);
+	rb_define_module_function(module, "glUniformMatrix4fv", gl_UniformMatrix4fv, 3);
 	rb_define_module_function(module, "glValidateProgram", gl_ValidateProgram, 1);
 	rb_define_module_function(module, "glVertexAttrib1d", gl_VertexAttrib1d, 2);
 	rb_define_module_function(module, "glVertexAttrib1f", gl_VertexAttrib1f, 2);
@@ -1399,22 +635,20 @@ void gl_init_functions_2_0(VALUE module)
 	rb_define_module_function(module, "glVertexAttrib4ubv", gl_VertexAttrib4ubv, 2);
 	rb_define_module_function(module, "glVertexAttrib4uiv", gl_VertexAttrib4uiv, 2);
 	rb_define_module_function(module, "glVertexAttrib4usv", gl_VertexAttrib4usv, 2);
+	rb_define_module_function(module, "glVertexAttrib1dv", gl_VertexAttrib1dv, 2);
+	rb_define_module_function(module, "glVertexAttrib1fv", gl_VertexAttrib1fv, 2);
+	rb_define_module_function(module, "glVertexAttrib1sv", gl_VertexAttrib1sv, 2);
+	rb_define_module_function(module, "glVertexAttrib2dv", gl_VertexAttrib2dv, 2);
+	rb_define_module_function(module, "glVertexAttrib2fv", gl_VertexAttrib2fv, 2);
+	rb_define_module_function(module, "glVertexAttrib2sv", gl_VertexAttrib2sv, 2);
+	rb_define_module_function(module, "glVertexAttrib3dv", gl_VertexAttrib3dv, 2);
+	rb_define_module_function(module, "glVertexAttrib3fv", gl_VertexAttrib3fv, 2);
+	rb_define_module_function(module, "glVertexAttrib3sv", gl_VertexAttrib3sv, 2);
+	rb_define_module_function(module, "glVertexAttrib4dv", gl_VertexAttrib4dv, 2);
+	rb_define_module_function(module, "glVertexAttrib4fv", gl_VertexAttrib4fv, 2);
+	rb_define_module_function(module, "glVertexAttrib4sv", gl_VertexAttrib4sv, 2);
 	rb_define_module_function(module, "glVertexAttribPointer", gl_VertexAttribPointer, 6);
 
-	/* Additional functions */
-	rb_define_module_function(module, "glVertexAttrib1dv", gl_VertexAttribdv, -1);
-	rb_define_module_function(module, "glVertexAttrib1fv", gl_VertexAttribfv, -1);
-	rb_define_module_function(module, "glVertexAttrib1sv", gl_VertexAttribsv, -1);
-	rb_define_module_function(module, "glVertexAttrib2dv", gl_VertexAttribdv, -1);
-	rb_define_module_function(module, "glVertexAttrib2fv", gl_VertexAttribfv, -1);
-	rb_define_module_function(module, "glVertexAttrib2sv", gl_VertexAttribsv, -1);
-	rb_define_module_function(module, "glVertexAttrib3dv", gl_VertexAttribdv, -1);
-	rb_define_module_function(module, "glVertexAttrib3fv", gl_VertexAttribfv, -1);
-	rb_define_module_function(module, "glVertexAttrib3sv", gl_VertexAttribsv, -1);
-	rb_define_module_function(module, "glVertexAttrib4dv", gl_VertexAttribdv, -1);
-	rb_define_module_function(module, "glVertexAttrib4fv", gl_VertexAttribfv, -1);
-	rb_define_module_function(module, "glVertexAttrib4sv", gl_VertexAttribsv, -1);
-
 	{
 		int i;
 		for (i=0;i<_MAX_VERTEX_ATTRIBS;i++)