opengl 0.9.2-x64-mingw32 → 0.10.0-x64-mingw32

data/ext/opengl/gl-1.2.c

@@ -23,7 +23,6 @@ GL_FUNC_LOAD_4(BlendColor,GLvoid, GLclampf,GLclampf,GLclampf,GLclampf, "1.2")
 GL_FUNC_LOAD_1(BlendEquation,GLvoid, GLenum, "1.2")
 GL_FUNC_LOAD_9(CopyTexSubImage3D,GLvoid, GLenum,GLint,GLint,GLint,GLint,GLint,GLint,GLsizei,GLsizei, "1.2")
 
-static void (APIENTRY * fptr_glDrawRangeElements)(GLenum,GLuint,GLuint,GLsizei,GLenum,GLvoid*);
 static VALUE
 gl_DrawRangeElements(obj,arg1,arg2,arg3,arg4,arg5,arg6)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
@@ -33,13 +32,14 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	GLuint end;
 	GLsizei count;
 	GLenum type;
+  DECL_GL_FUNC_PTR(GLvoid,glDrawRangeElements,(GLenum,GLuint,GLuint,GLsizei,GLenum,GLvoid*));
 	LOAD_GL_FUNC(glDrawRangeElements, "1.2");
 	mode = (GLenum)NUM2INT(arg1);
 	start = (GLuint)NUM2UINT(arg2);
 	end = (GLuint)NUM2UINT(arg3);
 	count = (GLsizei)NUM2UINT(arg4);
 	type = (GLenum)NUM2INT(arg5);
-	if (CheckBufferBinding(GL_ELEMENT_ARRAY_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_ELEMENT_ARRAY_BUFFER_BINDING)) {
 		fptr_glDrawRangeElements(mode, start, end, count, type, (GLvoid *)NUM2SIZET(arg6));
 	} else {
 		VALUE data;
@@ -50,7 +50,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glTexImage3D)(GLenum,GLint,GLint,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*);
 static VALUE
 gl_TexImage3D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
@@ -65,6 +64,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	GLenum format;
 	GLenum type;
 	const char *pixels;
+  DECL_GL_FUNC_PTR(GLvoid,glTexImage3D,(GLenum,GLint,GLint,GLsizei,GLsizei,GLsizei,GLint,GLenum,GLenum,const GLvoid*));
 	LOAD_GL_FUNC(glTexImage3D, "1.2");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -76,7 +76,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	format = (GLenum)NUM2INT(arg8);
 	type = (GLenum)NUM2INT(arg9);
 
-	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glTexImage3D( target, level, internalFormat, width, height,
 						depth, border, format, type,(GLvoid *)NUM2SIZET(arg10));
 		CHECK_GLERROR_FROM("glTexImage3D");
@@ -102,7 +102,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*);
 static VALUE
 gl_TexSubImage3D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
@@ -117,6 +116,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	GLsizei depth;
 	GLenum format;
 	GLenum type;
+  DECL_GL_FUNC_PTR(GLvoid,glTexSubImage3D,(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLenum,const GLvoid*));
 	LOAD_GL_FUNC(glTexSubImage3D, "1.2");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -128,7 +128,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	depth = (GLsizei)NUM2UINT(arg8);
 	format = (GLenum)NUM2INT(arg9);
 	type = (GLenum)NUM2INT(arg10);
-	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glTexSubImage3D( target, level, xoffset, yoffset, zoffset,
 				width, height, depth,
 				format, type, (GLvoid *)NUM2SIZET(arg11));
@@ -144,12 +144,12 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	return Qnil;
 }
 
-void gl_init_functions_1_2(VALUE module)
+void gl_init_functions_1_2(VALUE klass)
 {
-	rb_define_module_function(module, "glBlendColor", gl_BlendColor, 4);
-	rb_define_module_function(module, "glBlendEquation", gl_BlendEquation, 1);
-	rb_define_module_function(module, "glDrawRangeElements", gl_DrawRangeElements, 6);
-	rb_define_module_function(module, "glTexImage3D", gl_TexImage3D, 10);
-	rb_define_module_function(module, "glTexSubImage3D", gl_TexSubImage3D, 11);
-	rb_define_module_function(module, "glCopyTexSubImage3D", gl_CopyTexSubImage3D, 9);
+	rb_define_method(klass, "glBlendColor", gl_BlendColor, 4);
+	rb_define_method(klass, "glBlendEquation", gl_BlendEquation, 1);
+	rb_define_method(klass, "glDrawRangeElements", gl_DrawRangeElements, 6);
+	rb_define_method(klass, "glTexImage3D", gl_TexImage3D, 10);
+	rb_define_method(klass, "glTexSubImage3D", gl_TexSubImage3D, 11);
+	rb_define_method(klass, "glCopyTexSubImage3D", gl_CopyTexSubImage3D, 9);
 }

data/ext/opengl/gl-1.3.c

@@ -95,12 +95,12 @@ GLMULTITEXCOORD_VFUNC(s)
 #undef GLTEXCOORD_VFUNC
 
 #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]; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(const _type_[])); \
 	LOAD_GL_FUNC(gl##_name_, "1.3"); \
 	ary2cmat##_type_(arg1, m, 4, 4); \
 	fptr_gl##_name_(m); \
@@ -115,7 +115,6 @@ TRANSPOSEMATRIX_FUNC(MultTransposeMatrixd,double)
 
 #undef TRANSPOSEMATRIX_FUNC
 
-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)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
@@ -129,6 +128,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
+  DECL_GL_FUNC_PTR(GLvoid,glCompressedTexImage3D,(GLenum,GLint,GLenum,GLsizei,GLsizei,GLsizei,GLint,GLsizei,GLvoid*));
 	LOAD_GL_FUNC(glCompressedTexImage3D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -138,7 +138,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	depth = (GLsizei)NUM2UINT(arg6);
 	border = (GLint)NUM2INT(arg7);
 	imagesize = (GLsizei)NUM2UINT(arg8);
-	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,(GLvoid *)NUM2SIZET(arg9));
 	} else {
 		if (TYPE(arg9) == T_STRING || TYPE(arg9) == T_ARRAY) {
@@ -159,7 +159,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glCompressedTexImage2D)(GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,GLvoid*);
 static VALUE
 gl_CompressedTexImage2D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
@@ -172,6 +171,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
+  DECL_GL_FUNC_PTR(GLvoid,glCompressedTexImage2D,(GLenum,GLint,GLenum,GLsizei,GLsizei,GLint,GLsizei,GLvoid*));
 	LOAD_GL_FUNC(glCompressedTexImage2D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -180,7 +180,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	height = (GLsizei)NUM2UINT(arg5);
 	border = (GLint)NUM2INT(arg6);
 	imagesize = (GLsizei)NUM2UINT(arg7);
-	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,(GLvoid *)NUM2SIZET(arg8));
 	} else {
 		if (TYPE(arg8) == T_STRING || TYPE(arg8) == T_ARRAY) {
@@ -201,7 +201,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glCompressedTexImage1D)(GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,GLvoid*);
 static VALUE
 gl_CompressedTexImage1D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
@@ -213,6 +212,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
+  DECL_GL_FUNC_PTR(GLvoid,glCompressedTexImage1D,(GLenum,GLint,GLenum,GLsizei,GLint,GLsizei,GLvoid*));
 	LOAD_GL_FUNC(glCompressedTexImage1D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -220,7 +220,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	width = (GLsizei)NUM2UINT(arg4);
 	border = (GLint)NUM2INT(arg5);
 	imagesize = (GLsizei)NUM2UINT(arg6);
-	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,(GLvoid *)NUM2SIZET(arg7));
 	} else {
 		if (TYPE(arg7) == T_STRING || TYPE(arg7) == T_ARRAY) {
@@ -241,7 +241,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glCompressedTexSubImage3D)(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,GLvoid*);
 static VALUE
 gl_CompressedTexSubImage3D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
@@ -257,6 +256,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
+  DECL_GL_FUNC_PTR(GLvoid,glCompressedTexSubImage3D,(GLenum,GLint,GLint,GLint,GLint,GLsizei,GLsizei,GLsizei,GLenum,GLsizei,GLvoid*));
 	LOAD_GL_FUNC(glCompressedTexSubImage3D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -268,7 +268,7 @@ 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 (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,(GLvoid *)NUM2SIZET(arg11));
 	} else {
 		VALUE data;
@@ -283,7 +283,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glCompressedTexSubImage2D)(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,GLvoid*);
 static VALUE
 gl_CompressedTexSubImage2D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
@@ -297,6 +296,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
+  DECL_GL_FUNC_PTR(GLvoid,glCompressedTexSubImage2D,(GLenum,GLint,GLint,GLint,GLsizei,GLsizei,GLenum,GLsizei,GLvoid*));
 	LOAD_GL_FUNC(glCompressedTexSubImage2D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -306,7 +306,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	height = (GLsizei)NUM2UINT(arg6);
 	format = (GLenum)NUM2INT(arg7);
 	imagesize = (GLsizei)NUM2UINT(arg8);
-	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,(GLvoid *)NUM2SIZET(arg9));
 	} else {
 		VALUE data;
@@ -320,7 +320,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glCompressedTexSubImage1D)(GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,GLvoid*);
 static VALUE
 gl_CompressedTexSubImage1D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
@@ -332,6 +331,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
+  DECL_GL_FUNC_PTR(GLvoid,glCompressedTexSubImage1D,(GLenum,GLint,GLint,GLsizei,GLenum,GLsizei,GLvoid*));
 	LOAD_GL_FUNC(glCompressedTexSubImage1D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -339,7 +339,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	width = (GLsizei)NUM2UINT(arg4);
 	format = (GLenum)NUM2INT(arg5);
 	imagesize = (GLsizei)NUM2UINT(arg6);
-	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+	if (CHECK_BUFFER_BINDING(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
 		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,(GLvoid *)NUM2SIZET(arg7));
 	} else {
 		VALUE data;
@@ -353,7 +353,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glGetCompressedTexImage)(GLenum,GLint,GLvoid*);
 static VALUE
 gl_GetCompressedTexImage(argc,argv,obj)
 int argc;
@@ -366,6 +365,7 @@ VALUE obj;
 	VALUE data;
 	VALUE args[3];
 	int numargs;
+  DECL_GL_FUNC_PTR(GLvoid,glGetCompressedTexImage,(GLenum,GLint,GLvoid*));
 	LOAD_GL_FUNC(glGetCompressedTexImage, "1.3");
 	numargs = rb_scan_args(argc, argv, "21", &args[0], &args[1], &args[2]);
 	target = (GLenum)NUM2INT(args[0]);
@@ -373,9 +373,13 @@ VALUE obj;
 	switch(numargs) {
 		default:
 		case 2:
-			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
+			if (CHECK_BUFFER_BINDING(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 */
+      {
+        DECL_GL_FUNC_PTR(void,glGetTexLevelParameteriv,(GLenum target, GLint level, GLenum pname, GLint *params));
+        LOAD_GL_FUNC(glGetTexLevelParameteriv, NULL);
+        fptr_glGetTexLevelParameteriv(target,lod,GL_TEXTURE_COMPRESSED_IMAGE_SIZE,&size); /* 1.0 function */
+      }
 			CHECK_GLERROR_FROM("glGetTexLevelParameteriv");
 			data = allocate_buffer_with_string(size);
 			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)RSTRING_PTR(data));
@@ -388,56 +392,56 @@ VALUE obj;
 	}
 }
 
-void gl_init_functions_1_3(VALUE module)
+void gl_init_functions_1_3(VALUE klass)
 {
-	rb_define_module_function(module, "glActiveTexture", gl_ActiveTexture, 1);
-	rb_define_module_function(module, "glClientActiveTexture", gl_ClientActiveTexture, 1);
-	rb_define_module_function(module, "glMultiTexCoord1d", gl_MultiTexCoord1d, 2);
-	rb_define_module_function(module, "glMultiTexCoord1f", gl_MultiTexCoord1f, 2);
-	rb_define_module_function(module, "glMultiTexCoord1i", gl_MultiTexCoord1i, 2);
-	rb_define_module_function(module, "glMultiTexCoord1s", gl_MultiTexCoord1s, 2);
-	rb_define_module_function(module, "glMultiTexCoord2d", gl_MultiTexCoord2d, 3);
-	rb_define_module_function(module, "glMultiTexCoord2f", gl_MultiTexCoord2f, 3);
-	rb_define_module_function(module, "glMultiTexCoord2i", gl_MultiTexCoord2i, 3);
-	rb_define_module_function(module, "glMultiTexCoord2s", gl_MultiTexCoord2s, 3);
-	rb_define_module_function(module, "glMultiTexCoord3d", gl_MultiTexCoord3d, 4);
-	rb_define_module_function(module, "glMultiTexCoord3f", gl_MultiTexCoord3f, 4);
-	rb_define_module_function(module, "glMultiTexCoord3i", gl_MultiTexCoord3i, 4);
-	rb_define_module_function(module, "glMultiTexCoord3s", gl_MultiTexCoord3s, 4);
-	rb_define_module_function(module, "glMultiTexCoord4d", gl_MultiTexCoord4d, 5);
-	rb_define_module_function(module, "glMultiTexCoord4f", gl_MultiTexCoord4f, 5);
-	rb_define_module_function(module, "glMultiTexCoord4i", gl_MultiTexCoord4i, 5);
-	rb_define_module_function(module, "glMultiTexCoord4s", gl_MultiTexCoord4s, 5);
-	rb_define_module_function(module, "glLoadTransposeMatrixf", gl_LoadTransposeMatrixf, 1);
-	rb_define_module_function(module, "glLoadTransposeMatrixd", gl_LoadTransposeMatrixd, 1);
-	rb_define_module_function(module, "glMultTransposeMatrixf", gl_MultTransposeMatrixf, 1);
-	rb_define_module_function(module, "glMultTransposeMatrixd", gl_MultTransposeMatrixd, 1);
-	rb_define_module_function(module, "glSampleCoverage", gl_SampleCoverage, 2);
-	rb_define_module_function(module, "glCompressedTexImage3D", gl_CompressedTexImage3D, 9);
-	rb_define_module_function(module, "glCompressedTexImage2D", gl_CompressedTexImage2D, 8);
-	rb_define_module_function(module, "glCompressedTexImage1D", gl_CompressedTexImage1D, 7);
-	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, -1);
+	rb_define_method(klass, "glActiveTexture", gl_ActiveTexture, 1);
+	rb_define_method(klass, "glClientActiveTexture", gl_ClientActiveTexture, 1);
+	rb_define_method(klass, "glMultiTexCoord1d", gl_MultiTexCoord1d, 2);
+	rb_define_method(klass, "glMultiTexCoord1f", gl_MultiTexCoord1f, 2);
+	rb_define_method(klass, "glMultiTexCoord1i", gl_MultiTexCoord1i, 2);
+	rb_define_method(klass, "glMultiTexCoord1s", gl_MultiTexCoord1s, 2);
+	rb_define_method(klass, "glMultiTexCoord2d", gl_MultiTexCoord2d, 3);
+	rb_define_method(klass, "glMultiTexCoord2f", gl_MultiTexCoord2f, 3);
+	rb_define_method(klass, "glMultiTexCoord2i", gl_MultiTexCoord2i, 3);
+	rb_define_method(klass, "glMultiTexCoord2s", gl_MultiTexCoord2s, 3);
+	rb_define_method(klass, "glMultiTexCoord3d", gl_MultiTexCoord3d, 4);
+	rb_define_method(klass, "glMultiTexCoord3f", gl_MultiTexCoord3f, 4);
+	rb_define_method(klass, "glMultiTexCoord3i", gl_MultiTexCoord3i, 4);
+	rb_define_method(klass, "glMultiTexCoord3s", gl_MultiTexCoord3s, 4);
+	rb_define_method(klass, "glMultiTexCoord4d", gl_MultiTexCoord4d, 5);
+	rb_define_method(klass, "glMultiTexCoord4f", gl_MultiTexCoord4f, 5);
+	rb_define_method(klass, "glMultiTexCoord4i", gl_MultiTexCoord4i, 5);
+	rb_define_method(klass, "glMultiTexCoord4s", gl_MultiTexCoord4s, 5);
+	rb_define_method(klass, "glLoadTransposeMatrixf", gl_LoadTransposeMatrixf, 1);
+	rb_define_method(klass, "glLoadTransposeMatrixd", gl_LoadTransposeMatrixd, 1);
+	rb_define_method(klass, "glMultTransposeMatrixf", gl_MultTransposeMatrixf, 1);
+	rb_define_method(klass, "glMultTransposeMatrixd", gl_MultTransposeMatrixd, 1);
+	rb_define_method(klass, "glSampleCoverage", gl_SampleCoverage, 2);
+	rb_define_method(klass, "glCompressedTexImage3D", gl_CompressedTexImage3D, 9);
+	rb_define_method(klass, "glCompressedTexImage2D", gl_CompressedTexImage2D, 8);
+	rb_define_method(klass, "glCompressedTexImage1D", gl_CompressedTexImage1D, 7);
+	rb_define_method(klass, "glCompressedTexSubImage3D", gl_CompressedTexSubImage3D, 11);
+	rb_define_method(klass, "glCompressedTexSubImage2D", gl_CompressedTexSubImage2D, 9);
+	rb_define_method(klass, "glCompressedTexSubImage1D", gl_CompressedTexSubImage1D, 7);
+	rb_define_method(klass, "glGetCompressedTexImage", gl_GetCompressedTexImage, -1);
 
 	/* Additional functions */
 
-	rb_define_module_function(module, "glMultiTexCoord", gl_MultiTexCoorddv, -1);
-	rb_define_module_function(module, "glMultiTexCoord1dv", gl_MultiTexCoorddv, -1);
-	rb_define_module_function(module, "glMultiTexCoord1fv", gl_MultiTexCoordfv, -1);
-	rb_define_module_function(module, "glMultiTexCoord1iv", gl_MultiTexCoordiv, -1);
-	rb_define_module_function(module, "glMultiTexCoord1sv", gl_MultiTexCoordsv, -1);
-	rb_define_module_function(module, "glMultiTexCoord2dv", gl_MultiTexCoorddv, -1);
-	rb_define_module_function(module, "glMultiTexCoord2fv", gl_MultiTexCoordfv, -1);
-	rb_define_module_function(module, "glMultiTexCoord2iv", gl_MultiTexCoordiv, -1);
-	rb_define_module_function(module, "glMultiTexCoord2sv", gl_MultiTexCoordsv, -1);
-	rb_define_module_function(module, "glMultiTexCoord3dv", gl_MultiTexCoorddv, -1);
-	rb_define_module_function(module, "glMultiTexCoord3fv", gl_MultiTexCoordfv, -1);
-	rb_define_module_function(module, "glMultiTexCoord3iv", gl_MultiTexCoordiv, -1);
-	rb_define_module_function(module, "glMultiTexCoord3sv", gl_MultiTexCoordsv, -1);
-	rb_define_module_function(module, "glMultiTexCoord4dv", gl_MultiTexCoorddv, -1);
-	rb_define_module_function(module, "glMultiTexCoord4fv", gl_MultiTexCoordfv, -1);
-	rb_define_module_function(module, "glMultiTexCoord4iv", gl_MultiTexCoordiv, -1);
-	rb_define_module_function(module, "glMultiTexCoord4sv", gl_MultiTexCoordsv, -1);
+	rb_define_method(klass, "glMultiTexCoord", gl_MultiTexCoorddv, -1);
+	rb_define_method(klass, "glMultiTexCoord1dv", gl_MultiTexCoorddv, -1);
+	rb_define_method(klass, "glMultiTexCoord1fv", gl_MultiTexCoordfv, -1);
+	rb_define_method(klass, "glMultiTexCoord1iv", gl_MultiTexCoordiv, -1);
+	rb_define_method(klass, "glMultiTexCoord1sv", gl_MultiTexCoordsv, -1);
+	rb_define_method(klass, "glMultiTexCoord2dv", gl_MultiTexCoorddv, -1);
+	rb_define_method(klass, "glMultiTexCoord2fv", gl_MultiTexCoordfv, -1);
+	rb_define_method(klass, "glMultiTexCoord2iv", gl_MultiTexCoordiv, -1);
+	rb_define_method(klass, "glMultiTexCoord2sv", gl_MultiTexCoordsv, -1);
+	rb_define_method(klass, "glMultiTexCoord3dv", gl_MultiTexCoorddv, -1);
+	rb_define_method(klass, "glMultiTexCoord3fv", gl_MultiTexCoordfv, -1);
+	rb_define_method(klass, "glMultiTexCoord3iv", gl_MultiTexCoordiv, -1);
+	rb_define_method(klass, "glMultiTexCoord3sv", gl_MultiTexCoordsv, -1);
+	rb_define_method(klass, "glMultiTexCoord4dv", gl_MultiTexCoorddv, -1);
+	rb_define_method(klass, "glMultiTexCoord4fv", gl_MultiTexCoordfv, -1);
+	rb_define_method(klass, "glMultiTexCoord4iv", gl_MultiTexCoordiv, -1);
+	rb_define_method(klass, "glMultiTexCoord4sv", gl_MultiTexCoordsv, -1);
 }

data/ext/opengl/gl-1.4.c

@@ -39,12 +39,12 @@ GL_FUNC_LOAD_3(WindowPos3f,GLvoid, GLfloat,GLfloat,GLfloat, "1.4")
 GL_FUNC_LOAD_3(WindowPos3i,GLvoid, GLint,GLint,GLint, "1.4")
 GL_FUNC_LOAD_3(WindowPos3s,GLvoid, GLshort,GLshort,GLshort, "1.4")
 
-static void (APIENTRY * fptr_glFogCoordfv)(GLfloat *);
 static VALUE
 gl_FogCoordfv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat coord;
+  DECL_GL_FUNC_PTR(GLvoid,glFogCoordfv,(GLfloat *));
 	LOAD_GL_FUNC(glFogCoordfv, "1.4");
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,&coord,1);
@@ -53,12 +53,12 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glFogCoorddv)(GLdouble *);
 static VALUE
 gl_FogCoorddv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble coord;
+  DECL_GL_FUNC_PTR(GLvoid,glFogCoorddv,(GLdouble *));
 	LOAD_GL_FUNC(glFogCoorddv, "1.4");
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,&coord,1);
@@ -67,32 +67,30 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-extern VALUE g_FogCoord_ptr;
-static void (APIENTRY * fptr_glFogCoordPointer)(GLenum,GLsizei,const GLvoid *);
 static VALUE
 gl_FogCoordPointer(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
 	GLenum type;
 	GLsizei stride;
+  DECL_GL_FUNC_PTR(GLvoid,glFogCoordPointer,(GLenum,GLsizei,const GLvoid *));
 	LOAD_GL_FUNC(glFogCoordPointer, "1.4");
 	type = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
-	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
-		g_FogCoord_ptr = arg3;
+	if (CHECK_BUFFER_BINDING(GL_ARRAY_BUFFER_BINDING)) {
+		SET_GLIMPL_VARIABLE(FogCoord_ptr, arg3);
 		fptr_glFogCoordPointer(type, stride, (const GLvoid*)NUM2SIZET(arg3));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg3);
 		rb_str_freeze(data);
-		g_FogCoord_ptr = data;
+		SET_GLIMPL_VARIABLE(FogCoord_ptr, data);
 		fptr_glFogCoordPointer(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
 	CHECK_GLERROR_FROM("glFogCoordPointer");
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glMultiDrawArrays)(GLenum,GLint*,GLsizei*,GLsizei);
 static VALUE
 gl_MultiDrawArrays(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
@@ -101,6 +99,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint *ary1;
 	GLsizei *ary2;
 	int len1,len2;
+  DECL_GL_FUNC_PTR(GLvoid,glMultiDrawArrays,(GLenum,GLint*,GLsizei*,GLsizei));
 	LOAD_GL_FUNC(glMultiDrawArrays, "1.4");
 	len1 = (int)RARRAY_LENINT(arg2);
 	len2 = (int)RARRAY_LENINT(arg3);
@@ -118,7 +117,6 @@ VALUE obj,arg1,arg2,arg3;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glMultiDrawElements)(GLenum,const GLsizei *,GLenum,GLvoid **,GLsizei);
 static VALUE
 gl_MultiDrawElements(argc,argv,obj)
 int argc;
@@ -132,11 +130,12 @@ VALUE obj;
 	GLint size;
 	int i;
 	VALUE ary, args[4];
+  DECL_GL_FUNC_PTR(GLvoid,glMultiDrawElements,(GLenum,const GLsizei *,GLenum,GLvoid **,GLsizei));
 	LOAD_GL_FUNC(glMultiDrawElements, "1.4");
 	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))
+			if (CHECK_BUFFER_BINDING(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]);
@@ -156,7 +155,7 @@ VALUE obj;
 			xfree(indices);
 			break;
 		case 4:
-			if (!CheckBufferBinding(GL_ELEMENT_ARRAY_BUFFER_BINDING))
+			if (!CHECK_BUFFER_BINDING(GL_ELEMENT_ARRAY_BUFFER_BINDING))
 				rb_raise(rb_eArgError, "Element array buffer not bound");
 			mode = (GLenum)NUM2INT(args[0]);
 			type = (GLenum)NUM2INT(args[1]);
@@ -182,7 +181,6 @@ VALUE obj;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glPointParameterfv)(GLenum,GLfloat *);
 static VALUE
 gl_PointParameterfv(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
@@ -190,6 +188,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[3] = {(GLfloat)0.0,(GLfloat)0.0,(GLfloat)0.0};
 	GLint size;
+  DECL_GL_FUNC_PTR(GLvoid,glPointParameterfv,(GLenum,GLfloat *));
 	LOAD_GL_FUNC(glPointParameterfv, "1.4");
 	pname = (GLenum)NUM2INT(arg1);
 	Check_Type(arg2,T_ARRAY);
@@ -203,7 +202,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static void (APIENTRY * fptr_glPointParameteriv)(GLenum,GLint *);
 static VALUE
 gl_PointParameteriv(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
@@ -211,6 +209,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[3] = {0,0,0};
 	GLint size;
+  DECL_GL_FUNC_PTR(GLvoid,glPointParameteriv,(GLenum,GLint *));
 	LOAD_GL_FUNC(glPointParameteriv, "1.4");
 	pname = (GLenum)NUM2INT(arg1);
 	Check_Type(arg2,T_ARRAY);
@@ -225,10 +224,10 @@ VALUE obj,arg1,arg2;
 }
 
 #define GLSECONDARYCOLOR_VFUNC(_name_,_type_,_conv_) \
-static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
 VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
 	_type_ cary[3] = {0,0,0}; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(_type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, "1.4"); \
 	Check_Type(arg1,T_ARRAY); \
 	_conv_(arg1,cary,3); \
@@ -247,8 +246,6 @@ GLSECONDARYCOLOR_VFUNC(SecondaryColor3ubv,GLubyte,ary2cubyte)
 GLSECONDARYCOLOR_VFUNC(SecondaryColor3usv,GLushort,ary2cushort)
 #undef GLSECONDARYCOLOR_VFUNC
 
-extern VALUE g_SecondaryColor_ptr;
-static void (APIENTRY * fptr_glSecondaryColorPointer)(GLint,GLenum,GLsizei,const GLvoid *);
 static VALUE
 gl_SecondaryColorPointer(obj,arg1,arg2,arg3,arg4)
 VALUE obj,arg1,arg2,arg3,arg4;
@@ -256,18 +253,19 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLint size;
 	GLenum type;
 	GLsizei stride;
+  DECL_GL_FUNC_PTR(GLvoid,glSecondaryColorPointer,(GLint,GLenum,GLsizei,const GLvoid *));
 	LOAD_GL_FUNC(glSecondaryColorPointer, "1.4");
 	size = (GLint)NUM2INT(arg1);
 	type = (GLenum)NUM2INT(arg2);
 	stride = (GLsizei)NUM2UINT(arg3);
-	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
-		g_SecondaryColor_ptr = arg4;
+	if (CHECK_BUFFER_BINDING(GL_ARRAY_BUFFER_BINDING)) {
+		SET_GLIMPL_VARIABLE(SecondaryColor_ptr, arg4);
 		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)NUM2SIZET(arg4));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(type,arg4);
 		rb_str_freeze(data);
-		g_SecondaryColor_ptr = data;
+		SET_GLIMPL_VARIABLE(SecondaryColor_ptr, data);
 		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
 	CHECK_GLERROR_FROM("glSecondaryColorPointer");
@@ -275,10 +273,10 @@ VALUE obj,arg1,arg2,arg3,arg4;
 }
 
 #define GLWINDOWPOS_VFUNC(_name_,_type_,_size_,_conv_) \
-static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
 VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
 	_type_ cary[3] = {0,0,0}; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(_type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, "1.4"); \
 	Check_Type(arg1,T_ARRAY); \
 	_conv_(arg1,cary,_size_); \
@@ -298,51 +296,51 @@ GLWINDOWPOS_VFUNC(WindowPos3sv,GLshort,3,ary2cshort)
 #undef GLWINDOWPOS_VFUNC
 
 
-void gl_init_functions_1_4(VALUE module)
+void gl_init_functions_1_4(VALUE klass)
 {
-	rb_define_module_function(module, "glBlendFuncSeparate", gl_BlendFuncSeparate, 4);
-	rb_define_module_function(module, "glFogCoordf", gl_FogCoordf, 1);
-	rb_define_module_function(module, "glFogCoordfv", gl_FogCoordfv, 1);
-	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, 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);
-	rb_define_module_function(module, "glPointParameteriv", gl_PointParameteriv, 2);
-	rb_define_module_function(module, "glSecondaryColor3b", gl_SecondaryColor3b, 3);
-	rb_define_module_function(module, "glSecondaryColor3d", gl_SecondaryColor3d, 3);
-	rb_define_module_function(module, "glSecondaryColor3f", gl_SecondaryColor3f, 3);
-	rb_define_module_function(module, "glSecondaryColor3i", gl_SecondaryColor3i, 3);
-	rb_define_module_function(module, "glSecondaryColor3s", gl_SecondaryColor3s, 3);
-	rb_define_module_function(module, "glSecondaryColor3ub", gl_SecondaryColor3ub, 3);
-	rb_define_module_function(module, "glSecondaryColor3ui", gl_SecondaryColor3ui, 3);
-	rb_define_module_function(module, "glSecondaryColor3us", gl_SecondaryColor3us, 3);
-	rb_define_module_function(module, "glSecondaryColor3bv", gl_SecondaryColor3bv, 1);
-	rb_define_module_function(module, "glSecondaryColor3dv", gl_SecondaryColor3dv, 1);
-	rb_define_module_function(module, "glSecondaryColor3fv", gl_SecondaryColor3fv, 1);
-	rb_define_module_function(module, "glSecondaryColor3iv", gl_SecondaryColor3iv, 1);
-	rb_define_module_function(module, "glSecondaryColor3sv", gl_SecondaryColor3sv, 1);
-	rb_define_module_function(module, "glSecondaryColor3ubv", gl_SecondaryColor3ubv, 1);
-	rb_define_module_function(module, "glSecondaryColor3uiv", gl_SecondaryColor3uiv, 1);
-	rb_define_module_function(module, "glSecondaryColor3usv", gl_SecondaryColor3usv, 1);
-	rb_define_module_function(module, "glSecondaryColorPointer", gl_SecondaryColorPointer, 4);
-	rb_define_module_function(module, "glWindowPos2d", gl_WindowPos2d, 2);
-	rb_define_module_function(module, "glWindowPos2f", gl_WindowPos2f, 2);
-	rb_define_module_function(module, "glWindowPos2i", gl_WindowPos2i, 2);
-	rb_define_module_function(module, "glWindowPos2s", gl_WindowPos2s, 2);
-	rb_define_module_function(module, "glWindowPos3d", gl_WindowPos3d, 3);
-	rb_define_module_function(module, "glWindowPos3f", gl_WindowPos3f, 3);
-	rb_define_module_function(module, "glWindowPos3i", gl_WindowPos3i, 3);
-	rb_define_module_function(module, "glWindowPos3s", gl_WindowPos3s, 3);
-	rb_define_module_function(module, "glWindowPos2dv", gl_WindowPos2dv, 1);
-	rb_define_module_function(module, "glWindowPos2fv", gl_WindowPos2fv, 1);
-	rb_define_module_function(module, "glWindowPos2iv", gl_WindowPos2iv, 1);
-	rb_define_module_function(module, "glWindowPos2sv", gl_WindowPos2sv, 1);
-	rb_define_module_function(module, "glWindowPos3dv", gl_WindowPos3dv, 1);
-	rb_define_module_function(module, "glWindowPos3fv", gl_WindowPos3fv, 1);
-	rb_define_module_function(module, "glWindowPos3iv", gl_WindowPos3iv, 1);
-	rb_define_module_function(module, "glWindowPos3sv", gl_WindowPos3sv, 1);
+	rb_define_method(klass, "glBlendFuncSeparate", gl_BlendFuncSeparate, 4);
+	rb_define_method(klass, "glFogCoordf", gl_FogCoordf, 1);
+	rb_define_method(klass, "glFogCoordfv", gl_FogCoordfv, 1);
+	rb_define_method(klass, "glFogCoordd", gl_FogCoordd, 1);
+	rb_define_method(klass, "glFogCoorddv", gl_FogCoorddv, 1);
+	rb_define_method(klass, "glFogCoordPointer", gl_FogCoordPointer, 3);
+	rb_define_method(klass, "glMultiDrawArrays", gl_MultiDrawArrays, 3);
+	rb_define_method(klass, "glMultiDrawElements", gl_MultiDrawElements, -1);
+	rb_define_method(klass, "glPointParameterf", gl_PointParameterf, 2);
+	rb_define_method(klass, "glPointParameterfv", gl_PointParameterfv, 2);
+	rb_define_method(klass, "glPointParameteri", gl_PointParameteri, 2);
+	rb_define_method(klass, "glPointParameteriv", gl_PointParameteriv, 2);
+	rb_define_method(klass, "glSecondaryColor3b", gl_SecondaryColor3b, 3);
+	rb_define_method(klass, "glSecondaryColor3d", gl_SecondaryColor3d, 3);
+	rb_define_method(klass, "glSecondaryColor3f", gl_SecondaryColor3f, 3);
+	rb_define_method(klass, "glSecondaryColor3i", gl_SecondaryColor3i, 3);
+	rb_define_method(klass, "glSecondaryColor3s", gl_SecondaryColor3s, 3);
+	rb_define_method(klass, "glSecondaryColor3ub", gl_SecondaryColor3ub, 3);
+	rb_define_method(klass, "glSecondaryColor3ui", gl_SecondaryColor3ui, 3);
+	rb_define_method(klass, "glSecondaryColor3us", gl_SecondaryColor3us, 3);
+	rb_define_method(klass, "glSecondaryColor3bv", gl_SecondaryColor3bv, 1);
+	rb_define_method(klass, "glSecondaryColor3dv", gl_SecondaryColor3dv, 1);
+	rb_define_method(klass, "glSecondaryColor3fv", gl_SecondaryColor3fv, 1);
+	rb_define_method(klass, "glSecondaryColor3iv", gl_SecondaryColor3iv, 1);
+	rb_define_method(klass, "glSecondaryColor3sv", gl_SecondaryColor3sv, 1);
+	rb_define_method(klass, "glSecondaryColor3ubv", gl_SecondaryColor3ubv, 1);
+	rb_define_method(klass, "glSecondaryColor3uiv", gl_SecondaryColor3uiv, 1);
+	rb_define_method(klass, "glSecondaryColor3usv", gl_SecondaryColor3usv, 1);
+	rb_define_method(klass, "glSecondaryColorPointer", gl_SecondaryColorPointer, 4);
+	rb_define_method(klass, "glWindowPos2d", gl_WindowPos2d, 2);
+	rb_define_method(klass, "glWindowPos2f", gl_WindowPos2f, 2);
+	rb_define_method(klass, "glWindowPos2i", gl_WindowPos2i, 2);
+	rb_define_method(klass, "glWindowPos2s", gl_WindowPos2s, 2);
+	rb_define_method(klass, "glWindowPos3d", gl_WindowPos3d, 3);
+	rb_define_method(klass, "glWindowPos3f", gl_WindowPos3f, 3);
+	rb_define_method(klass, "glWindowPos3i", gl_WindowPos3i, 3);
+	rb_define_method(klass, "glWindowPos3s", gl_WindowPos3s, 3);
+	rb_define_method(klass, "glWindowPos2dv", gl_WindowPos2dv, 1);
+	rb_define_method(klass, "glWindowPos2fv", gl_WindowPos2fv, 1);
+	rb_define_method(klass, "glWindowPos2iv", gl_WindowPos2iv, 1);
+	rb_define_method(klass, "glWindowPos2sv", gl_WindowPos2sv, 1);
+	rb_define_method(klass, "glWindowPos3dv", gl_WindowPos3dv, 1);
+	rb_define_method(klass, "glWindowPos3fv", gl_WindowPos3fv, 1);
+	rb_define_method(klass, "glWindowPos3iv", gl_WindowPos3iv, 1);
+	rb_define_method(klass, "glWindowPos3sv", gl_WindowPos3sv, 1);
 }