ruby-opengl 0.40.1 → 0.50.0

data/ext/gl/gl-1.5.c

@@ -13,18 +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.5 functions */
 
+GL_SIMPLE_FUNC_LOAD(EndQuery,1,GLenum,NUM2INT)
+
 static void (APIENTRY * fptr_glGenQueries)(GLsizei,GLuint *);
 static VALUE
 gl_GenQueries(obj,arg1)
@@ -53,12 +47,17 @@ VALUE obj,arg1;
 	GLsizei n;
 	GLuint *queries;
 	LOAD_GL_FUNC(glDeleteQueries)
-	Check_Type(arg1,T_ARRAY);
-	n = RARRAY(arg1)->len;
-	queries = ALLOC_N(GLuint,n);
-	ary2cuint(arg1,queries,n); 
-	fptr_glDeleteQueries( n, queries);
-	xfree(queries);
+	if (TYPE(arg1)==T_ARRAY) {
+		n = RARRAY(arg1)->len;
+		queries = ALLOC_N(GLuint,n);
+		ary2cuint(arg1,queries,n); 
+		fptr_glDeleteQueries( n, queries);
+		xfree(queries);
+	} else {
+		GLuint query;
+		query = NUM2INT(arg1);
+		fptr_glDeleteQueries( 1, &query);
+	}
 	return Qnil;
 }
 
@@ -89,18 +88,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glEndQuery)(GLenum);
-static VALUE
-gl_EndQuery(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum target;
-	LOAD_GL_FUNC(glEndQuery)
-	target = (GLenum)NUM2INT(arg1);
-	fptr_glEndQuery(target);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glGetQueryiv)(GLenum,GLenum,GLint *);
 static VALUE
 gl_GetQueryiv(obj,arg1,arg2)
@@ -177,12 +164,17 @@ VALUE obj,arg1;
 	GLsizei n;
 	GLuint *buffers;
 	LOAD_GL_FUNC(glDeleteBuffers)
-	Check_Type(arg1,T_ARRAY);
-	n = RARRAY(arg1)->len;
-	buffers = ALLOC_N(GLuint,n);
-	ary2cuint(arg1,buffers,n); 
-	fptr_glDeleteBuffers(n, buffers);
-	xfree(buffers);
+	if (TYPE(arg1)==T_ARRAY) {
+		n = RARRAY(arg1)->len;
+		buffers = ALLOC_N(GLuint,n);
+		ary2cuint(arg1,buffers,n); 
+		fptr_glDeleteBuffers(n, buffers);
+		xfree(buffers);
+	} else {
+		GLuint buffer;
+		buffer = NUM2INT(arg1);
+		fptr_glDeleteBuffers(1, &buffer);
+	}
 	return Qnil;
 }
 
@@ -303,13 +295,15 @@ VALUE obj,arg1,arg2;
 	GLenum access;
 	GLint size = 0;
 	VALUE data;
-	GLvoid *buffer_ptr;
+	GLvoid *buffer_ptr = NULL;
 	LOAD_GL_FUNC(glMapBuffer)
 	LOAD_GL_FUNC(glGetBufferParameteriv)
 	target = (GLenum)NUM2INT(arg1);
 	access = (GLenum)NUM2INT(arg2);
 	fptr_glGetBufferParameteriv(target,GL_BUFFER_SIZE,&size);
 	buffer_ptr = fptr_glMapBuffer(target,access);
+	if (buffer_ptr==NULL || size<=0)
+		return Qnil;
 	data = allocate_buffer_with_string(size);
 	memcpy(RSTRING(data)->ptr, buffer_ptr, size);
 	return data;
@@ -334,7 +328,7 @@ gl_GetBufferPointerv(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
 	LOAD_GL_FUNC(glGetBufferPointerv)
-	/* not implemented */
+	rb_raise(rb_eArgError, "glGetBufferPointerv not implemented");
 	return Qnil;
 }
 

data/ext/gl/gl-2.0.c

@@ -13,29 +13,24 @@
  * 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"
 
-static void (APIENTRY * fptr_glBlendEquationSeparate)(GLenum,GLenum);
-static VALUE
-gl_BlendEquationSeparate(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum modeRGB;
-	GLenum modeAlpha;
-	LOAD_GL_FUNC(glBlendEquationSeparate)
-	modeRGB = (GLenum)NUM2INT(arg1);
-	modeAlpha = (GLenum)NUM2INT(arg2);
-	fptr_glBlendEquationSeparate(modeRGB,modeAlpha);
-	return Qnil;
-}
+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)
 
 static void (APIENTRY * fptr_glDrawBuffers)(GLsizei,GLenum *);
 static VALUE
@@ -54,24 +49,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glStencilOpSeparate)(GLenum,GLenum,GLenum,GLenum);
-static VALUE
-gl_StencilOpSeparate(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLenum face;
-	GLenum sfail;
-	GLenum dpfail;
-	GLenum dppass;
-	LOAD_GL_FUNC(glStencilOpSeparate)
-	face = (GLenum)NUM2INT(arg1);
-	sfail = (GLenum)NUM2INT(arg2);
-	dpfail = (GLenum)NUM2INT(arg3);
-	dppass = (GLenum)NUM2INT(arg4);
-	fptr_glStencilOpSeparate(face,sfail,dpfail,dppass);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glStencilFuncSeparate)(GLenum,GLenum,GLint,GLuint);
 static VALUE
 gl_StencilFuncSeparate(obj,arg1,arg2,arg3,arg4)
@@ -104,20 +81,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glAttachShader)(GLuint,GLuint);
-static VALUE
-gl_AttachShader(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint program;
-	GLuint shader;
-	LOAD_GL_FUNC(glAttachShader)
-	program = (GLuint)NUM2UINT(arg1);
-	shader = (GLuint)NUM2UINT(arg2);
-	fptr_glAttachShader(program,shader);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glBindAttribLocation)(GLuint,GLuint,GLchar *);
 static VALUE
 gl_BindAttribLocation(obj,arg1,arg2,arg3)
@@ -133,18 +96,6 @@ VALUE obj,arg1,arg2,arg3;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glCompileShader)(GLuint);
-static VALUE
-gl_CompileShader(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint shader;
-	LOAD_GL_FUNC(glCompileShader)
-	shader = (GLuint)NUM2UINT(arg1);
-	fptr_glCompileShader(shader);
-	return Qnil;
-}
-
 static GLuint (APIENTRY * fptr_glCreateProgram)(void);
 static VALUE
 gl_CreateProgram(obj)
@@ -169,68 +120,6 @@ VALUE obj,arg1;
 	return INT2NUM(ret);
 }
 
-static void (APIENTRY * fptr_glDeleteProgram)(GLuint);
-static VALUE
-gl_DeleteProgram(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint program;
-	LOAD_GL_FUNC(glDeleteProgram)
-	program = (GLuint)NUM2UINT(arg1);
-	fptr_glDeleteProgram(program);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glDeleteShader)(GLuint);
-static VALUE
-gl_DeleteShader(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint shader;
-	LOAD_GL_FUNC(glDeleteShader)
-	shader = (GLuint)NUM2UINT(arg1);
-	fptr_glDeleteShader(shader);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glDetachShader)(GLuint,GLuint);
-static VALUE
-gl_DetachShader(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint program;
-	GLuint shader;
-	LOAD_GL_FUNC(glDetachShader)
-	program=(GLuint)NUM2UINT(arg1);
-	shader=(GLuint)NUM2UINT(arg2);
-	fptr_glDetachShader(program,shader);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glDisableVertexAttribArray)(GLuint);
-static VALUE
-gl_DisableVertexAttribArray(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint index;
-	LOAD_GL_FUNC(glDisableVertexAttribArray)
-	index=(GLuint)NUM2UINT(arg1);
-	fptr_glDisableVertexAttribArray(index);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glEnableVertexAttribArray)(GLuint);
-static VALUE
-gl_EnableVertexAttribArray(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint index;
-	LOAD_GL_FUNC(glEnableVertexAttribArray)
-	index=(GLuint)NUM2UINT(arg1);
-	fptr_glEnableVertexAttribArray(index);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glGetProgramiv)(GLuint,GLenum,GLint *);
 static VALUE
 gl_GetProgramiv(obj,arg1,arg2)
@@ -673,18 +562,6 @@ VALUE obj,arg1;
 	return INT2NUM(ret);
 }
 
-static void (APIENTRY * fptr_glLinkProgram)(GLuint);
-static VALUE
-gl_LinkProgram(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint program;
-	LOAD_GL_FUNC(glLinkProgram)
-	program = (GLuint)NUM2UINT(arg1);
-	fptr_glLinkProgram(program);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glShaderSource)(GLuint,GLsizei,GLchar**,GLint *);
 static VALUE
 gl_ShaderSource(obj,arg1,arg2)
@@ -702,18 +579,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glUseProgram)(GLuint);
-static VALUE
-gl_UseProgram(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint program;
-	LOAD_GL_FUNC(glUseProgram)
-	program = (GLuint)NUM2UINT(arg1);
-	fptr_glUseProgram(program);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glUniform1f)(GLint,GLfloat);
 static VALUE
 gl_Uniform1f(obj,arg1,arg2)
@@ -782,74 +647,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glUniform1i)(GLint,GLint);
-static VALUE
-gl_Uniform1i(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint location;
-	GLint v0;
-	LOAD_GL_FUNC(glUniform1i)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLint)NUM2INT(arg2);
-	fptr_glUniform1i(location,v0);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform2i)(GLint,GLint,GLint);
-static VALUE
-gl_Uniform2i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint location;
-	GLint v0;
-	GLint v1;
-	LOAD_GL_FUNC(glUniform2i)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLint)NUM2INT(arg2);
-	v1 = (GLint)NUM2INT(arg3);
-	fptr_glUniform2i(location,v0,v1);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform3i)(GLint,GLint,GLint,GLint);
-static VALUE
-gl_Uniform3i(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLint v0;
-	GLint v1;
-	GLint v2;
-	LOAD_GL_FUNC(glUniform3i)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLint)NUM2INT(arg2);
-	v1 = (GLint)NUM2INT(arg3);
-	v2 = (GLint)NUM2INT(arg4);
-	fptr_glUniform3i(location,v0,v1,v2);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniform4i)(GLint,GLint,GLint,GLint,GLint);
-static VALUE
-gl_Uniform4i(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
-{
-	GLint location;
-	GLint v0;
-	GLint v1;
-	GLint v2;
-	GLint v3;
-	LOAD_GL_FUNC(glUniform4i)
-	location = (GLint)NUM2INT(arg1);
-	v0 = (GLint)NUM2INT(arg2);
-	v1 = (GLint)NUM2INT(arg3);
-	v2 = (GLint)NUM2INT(arg4);
-	v3 = (GLint)NUM2INT(arg5);
-	fptr_glUniform4i(location,v0,v1,v2,v3);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glUniform1fv)(GLint,GLsizei,GLfloat *);
 static VALUE
 gl_Uniform1fv(obj,arg1,arg2,arg3)
@@ -1054,18 +851,6 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glValidateProgram)(GLuint);
-static VALUE
-gl_ValidateProgram(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint program;
-	LOAD_GL_FUNC(glValidateProgram)
-	program = (GLuint)NUM2UINT(arg1);
-	fptr_glValidateProgram(program);
-	return Qnil;
-}
-
 static void (APIENTRY * fptr_glVertexAttrib1d)(GLuint,GLdouble);
 static VALUE
 gl_VertexAttrib1d(obj,arg1,arg2)
@@ -1519,10 +1304,16 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	stride = (GLsizei)NUM2UINT(arg5);
 	if (index>_MAX_VERTEX_ATTRIBS)
 		rb_raise(rb_eArgError, "Index too large, maximum allowed value '%i'",_MAX_VERTEX_ATTRIBS);
-	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);
+
+	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
+		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);
+	}
 	return Qnil;
 }
 

data/ext/gl/gl-2.1.c

@@ -13,135 +13,42 @@
  * 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"
 
-static void (APIENTRY * fptr_glUniformMatrix2x3fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix2x3fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix2x3fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 2*3*count);
-	ary2cflt(arg4,value,2*3*count);
-	fptr_glUniformMatrix2x3fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniformMatrix3x2fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix3x2fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix3x2fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 3*2*count);
-	ary2cflt(arg4,value,3*2*count);
-	fptr_glUniformMatrix3x2fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniformMatrix2x4fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix2x4fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix2x4fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 2*4*count);
-	ary2cflt(arg4,value,2*4*count);
-	fptr_glUniformMatrix2x4fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
+#define UNIFORMMATRIX_FUNC(_x_,_y_) \
+static void (APIENTRY * fptr_glUniformMatrix##_x_##x##_y_##fv)(GLint,GLsizei,GLboolean,GLfloat *); \
+static VALUE \
+gl_UniformMatrix##_x_##x##_y_##fv(obj,arg1,arg2,arg3,arg4) \
+VALUE obj,arg1,arg2,arg3,arg4; \
+{ \
+	GLint location; \
+	GLsizei count; \
+	GLboolean transpose; \
+	GLfloat *value;	\
+	VALUE ary; \
+	LOAD_GL_FUNC(glUniformMatrix##_x_##x##_y_##fv) \
+	location = (GLint)NUM2INT(arg1); \
+	count = (GLint)NUM2INT(arg2); \
+	transpose = (GLboolean)NUM2INT(arg3); \
+	ary = rb_ary_new(); \
+	mary2ary(arg4, ary); \
+	if (RARRAY(ary)->len!=(_x_*_y_*count)) \
+		rb_raise(rb_eArgError, "Incorrect array length %i",RARRAY(ary)->len); \
+	value = ALLOC_N(GLfloat, _x_*_y_*count); \
+	ary2cflt(arg4,value,_x_*_y_*count); \
+	fptr_glUniformMatrix##_x_##x##_y_##fv(location,count,transpose,value); \
+	xfree(value); \
+	return Qnil; \
 }
 
-static void (APIENTRY * fptr_glUniformMatrix4x2fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix4x2fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix4x2fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 4*2*count);
-	ary2cflt(arg4,value,4*2*count);
-	fptr_glUniformMatrix4x2fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
+UNIFORMMATRIX_FUNC(2,3)
+UNIFORMMATRIX_FUNC(3,2)
+UNIFORMMATRIX_FUNC(2,4)
+UNIFORMMATRIX_FUNC(4,2)
+UNIFORMMATRIX_FUNC(3,4)
+UNIFORMMATRIX_FUNC(4,3)
 
-static void (APIENTRY * fptr_glUniformMatrix3x4fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix3x4fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix3x4fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 3*4*count);
-	ary2cflt(arg4,value,3*4*count);
-	fptr_glUniformMatrix3x4fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
-
-static void (APIENTRY * fptr_glUniformMatrix4x3fv)(GLint,GLsizei,GLboolean,GLfloat *);
-static VALUE
-gl_UniformMatrix4x3fv(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint location;
-	GLsizei count;
-	GLboolean transpose;
-	GLfloat *value;	
-	LOAD_GL_FUNC(glUniformMatrix4x3fv)
-	location = (GLint)NUM2INT(arg1);
-	count = (GLint)NUM2INT(arg2);
-	transpose = (GLboolean)NUM2INT(arg3);
-	value = ALLOC_N(GLfloat, 4*3*count);
-	ary2cflt(arg4,value,4*3*count);
-	fptr_glUniformMatrix4x3fv(location,count,transpose,value);
-	xfree(value);
-	return Qnil;
-}
+#undef UNIFORMMATRIX_FUNC
 
 void gl_init_functions_2_1(VALUE module)
 {