opengl 0.7.0.pre1-x86-mingw32 → 0.7.0.pre2-x86-mingw32

data/ext/{gl → opengl}/gl-ext-ati.c

@@ -13,7 +13,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 /* OpenGL ATI extensions */
 
@@ -23,14 +23,14 @@ static VALUE gl_DrawBuffersATI(VALUE obj,VALUE arg1)
 {
 	GLsizei size;
 	GLenum *buffers;
-	LOAD_GL_FUNC(glDrawBuffersATI,"GL_ATI_draw_buffers")
+	LOAD_GL_FUNC(glDrawBuffersATI, "GL_ATI_draw_buffers");
 	Check_Type(arg1,T_ARRAY); 
 	size = (GLsizei)RARRAY_LENINT(arg1);
 	buffers = ALLOC_N(GLenum,size);
 	ary2cuint(arg1,buffers,size);
 	fptr_glDrawBuffersATI(size,buffers);
 	xfree(buffers);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glDrawBuffersATI");
 	return Qnil;
 }
 

data/ext/{gl → opengl}/gl-ext-ext.c

@@ -13,7 +13,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 /* OpenGL EXT extensions */
 /* Those are extensions that are not blessed by ARB committee but were
@@ -38,19 +38,19 @@ VALUE obj,arg1,arg2;
 	GLuint *textures;
 	GLclampf *priorities;
 	GLsizei size;
-	LOAD_GL_FUNC(glPrioritizeTexturesEXT,"GL_EXT_texture_object")
+	LOAD_GL_FUNC(glPrioritizeTexturesEXT, "GL_EXT_texture_object");
 	Check_Type(arg1,T_ARRAY);
 	Check_Type(arg2,T_ARRAY);
 	if ((size = (GLsizei)RARRAY_LENINT(arg1)) != (GLsizei)RARRAY_LENINT(arg2))
 		rb_raise(rb_eArgError, "passed arrays must have the same length");
 	textures = ALLOC_N(GLuint,size);
 	priorities = ALLOC_N(GLclampf,size);
-	ary2cuint(arg1,textures,size);
-	ary2cflt(arg2,priorities,size);
+	ary2cuint(arg1,textures,size);	
+	ary2cflt(arg2,priorities,size);	
 	fptr_glPrioritizeTexturesEXT(size,textures,priorities);
 	xfree(textures);
 	xfree(priorities);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glPrioritizeTexturesEXT");
 	return Qnil;
 }
 
@@ -66,12 +66,12 @@ VALUE obj,arg1;
 	VALUE retary;
 	VALUE ary;
 	int i;
-	LOAD_GL_FUNC(glAreTexturesResidentEXT,"GL_EXT_texture_object")
+	LOAD_GL_FUNC(glAreTexturesResidentEXT, "GL_EXT_texture_object");
 	ary = rb_Array(arg1);
 	size = (GLsizei)RARRAY_LENINT(ary);
 	textures = ALLOC_N(GLuint,size);
 	residences = ALLOC_N(GLboolean,size);
-	ary2cuint(ary,textures,size);
+	ary2cuint(ary,textures,size);	
 	r = fptr_glAreTexturesResidentEXT(size,textures,residences);
 	retary = rb_ary_new2(size);
 	if (r==GL_TRUE) { /* all are resident */
@@ -83,7 +83,7 @@ VALUE obj,arg1;
 	}
 	xfree(textures);
 	xfree(residences);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glAreTexturesResidentEXT");
 	return retary;
 }
 
@@ -101,7 +101,7 @@ static VALUE gl_PointParameterfvEXT(VALUE obj,VALUE arg1,VALUE arg2)
 	GLfloat params[3] = {(GLfloat)0.0,(GLfloat)0.0,(GLfloat)0.0};
 	GLenum pname;
 	GLint size;
-	LOAD_GL_FUNC(glPointParameterfvEXT,"GL_EXT_point_parameters")
+	LOAD_GL_FUNC(glPointParameterfvEXT, "GL_EXT_point_parameters");
 	pname = NUM2UINT(arg1);
 	Check_Type(arg2,T_ARRAY);
 	if (pname==GL_POINT_DISTANCE_ATTENUATION)
@@ -110,7 +110,7 @@ static VALUE gl_PointParameterfvEXT(VALUE obj,VALUE arg1,VALUE arg2)
 		size = 1;
 	ary2cflt(arg2,params,size);
 	fptr_glPointParameterfvEXT(pname,params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glPointParameterfvEXT");
 	return Qnil;
 }
 
@@ -129,11 +129,11 @@ static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
 VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
 	_type_ cary[3] = {0,0,0}; \
-	LOAD_GL_FUNC(gl##_name_,"GL_EXT_secondary_color") \
+	LOAD_GL_FUNC(gl##_name_, "GL_EXT_secondary_color"); \
 	Check_Type(arg1,T_ARRAY); \
 	_conv_(arg1,cary,3); \
 	fptr_gl##_name_(cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -156,7 +156,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLint size;
 	GLenum type;
 	GLsizei stride;
-	LOAD_GL_FUNC(glSecondaryColorPointerEXT,"GL_EXT_secondary_color")
+	LOAD_GL_FUNC(glSecondaryColorPointerEXT, "GL_EXT_secondary_color");
 	size = (GLint)NUM2INT(arg1);
 	type = (GLenum)NUM2INT(arg2);
 	stride = (GLsizei)NUM2UINT(arg3);
@@ -170,7 +170,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 		g_SecondaryColor_ptr = data;
 		fptr_glSecondaryColorPointerEXT(size,type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glSecondaryColorPointerEXT");
 	return Qnil;
 }
 
@@ -189,7 +189,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	GLuint end;
 	GLsizei count;
 	GLenum type;
-	LOAD_GL_FUNC(glDrawRangeElementsEXT,"GL_EXT_draw_range_elements")
+	LOAD_GL_FUNC(glDrawRangeElementsEXT, "GL_EXT_draw_range_elements");
 	mode = (GLenum)NUM2INT(arg1);
 	start = (GLuint)NUM2UINT(arg2);
 	end = (GLuint)NUM2UINT(arg3);
@@ -202,7 +202,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 		data = pack_array_or_pass_string(type,arg6);
 		fptr_glDrawRangeElementsEXT(mode, start, end, count, type, RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glDrawRangeElementsEXT");
 	return Qnil;
 }
 
@@ -216,7 +216,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint *ary1;
 	GLsizei *ary2;
   int len1,len2;
-	LOAD_GL_FUNC(glMultiDrawArraysEXT,"GL_EXT_multi_draw_arrays")
+	LOAD_GL_FUNC(glMultiDrawArraysEXT, "GL_EXT_multi_draw_arrays");
   len1 = (int)RARRAY_LENINT(arg2);
   len2 = (int)RARRAY_LENINT(arg3);
 	if (len1!=len2)
@@ -229,7 +229,7 @@ VALUE obj,arg1,arg2,arg3;
 	fptr_glMultiDrawArraysEXT(mode,ary1,ary2,len1);
 	xfree(ary1);
 	xfree(ary2);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMultiDrawArraysEXT");
 	return Qnil;
 }
 
@@ -247,7 +247,7 @@ VALUE obj;
 	GLint size;
 	int i;
 	VALUE ary, args[4];
-	LOAD_GL_FUNC(glMultiDrawElementsEXT,"GL_EXT_multi_draw_arrays")
+	LOAD_GL_FUNC(glMultiDrawElementsEXT, "GL_EXT_multi_draw_arrays");
 	switch (rb_scan_args(argc, argv, "31", &args[0], &args[1], &args[2],&args[3])) {
 		default:
 		case 3:
@@ -294,7 +294,7 @@ VALUE obj;
 			xfree(indices);
 			break;
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMultiDrawElementsEXT");
 	return Qnil;
 }
 
@@ -307,11 +307,11 @@ static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
 VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
 	_type_ cary = 0; \
-	LOAD_GL_FUNC(gl##_name_,"GL_EXT_secondary_color") \
+	LOAD_GL_FUNC(gl##_name_, "GL_EXT_secondary_color"); \
 	Check_Type(arg1,T_ARRAY); \
 	_conv_(arg1,&cary,1); \
 	fptr_gl##_name_(&cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 GLFOGCOORD_VFUNC(FogCoordfvEXT,GLfloat,ary2cflt)
@@ -326,7 +326,7 @@ VALUE obj,arg1,arg2,arg3;
 {
 	GLenum type;
 	GLsizei stride;
-	LOAD_GL_FUNC(glFogCoordPointerEXT,"GL_EXT_secondary_color")
+	LOAD_GL_FUNC(glFogCoordPointerEXT, "GL_EXT_secondary_color");
 	type = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
 	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
@@ -339,7 +339,7 @@ VALUE obj,arg1,arg2,arg3;
 		g_FogCoord_ptr = data;
 		fptr_glFogCoordPointerEXT(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glFogCoordPointerEXT");
 	return Qnil;
 }
 
@@ -366,9 +366,9 @@ static void (APIENTRY * fptr_glGetRenderbufferParameterivEXT)(GLenum,GLenum,GLin
 static VALUE gl_GetRenderbufferParameterivEXT(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint param = 0;
-	LOAD_GL_FUNC(glGetRenderbufferParameterivEXT,"GL_EXT_framebuffer_object")
+	LOAD_GL_FUNC(glGetRenderbufferParameterivEXT, "GL_EXT_framebuffer_object");
 	fptr_glGetRenderbufferParameterivEXT(NUM2UINT(arg1),NUM2UINT(arg2),&param);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetRenderbufferParameterivEXT");
 	return INT2NUM(param);
 }
 
@@ -387,9 +387,9 @@ static void (APIENTRY * fptr_glGetFramebufferAttachmentParameterivEXT)(GLenum,GL
 static VALUE gl_GetFramebufferAttachmentParameterivEXT(VALUE obj,VALUE arg1, VALUE arg2, VALUE arg3)
 {
 	GLint ret = 0;
-	LOAD_GL_FUNC(glGetFramebufferAttachmentParameterivEXT,"GL_EXT_framebuffer_object")
+	LOAD_GL_FUNC(glGetFramebufferAttachmentParameterivEXT, "GL_EXT_framebuffer_object");
 	fptr_glGetFramebufferAttachmentParameterivEXT(NUM2UINT(arg1),NUM2UINT(arg2),NUM2UINT(arg3),&ret);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetFramebufferAttachmentParameterivEXT");
 	return cond_GLBOOL2RUBY(NUM2UINT(arg3),ret);
 }
 
@@ -411,9 +411,9 @@ static void (APIENTRY * fptr_gl##_name_)(GLuint,GLenum,_type_ *); \
 static VALUE gl_##_name_(VALUE obj,VALUE arg1,VALUE arg2) \
 { \
 	_type_ ret = 0; \
-	LOAD_GL_FUNC(gl##_name_,"GL_EXT_timer_query") \
+	LOAD_GL_FUNC(gl##_name_, "GL_EXT_timer_query"); \
 	fptr_gl##_name_(NUM2INT(arg1),NUM2INT(arg2),&ret); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return _conv_(NUM2INT(arg2),ret); \
 }
 
@@ -431,7 +431,7 @@ VALUE obj,arg1,arg2,arg3; \
 { \
 	_type_ *cary; \
 	GLsizei len; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	len = (GLsizei)RARRAY_LENINT(rb_Array(arg3)); \
 	if (len<=0 || (len % 4) != 0) \
 		rb_raise(rb_eArgError, "Parameter array size must be multiplication of 4"); \
@@ -439,7 +439,7 @@ VALUE obj,arg1,arg2,arg3; \
 	_conv_(arg3,cary,len); \
 	fptr_gl##_name_((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),len / 4, cary); \
 	xfree(cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -467,10 +467,10 @@ gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
 	_type_ value[_size_]; \
-	LOAD_GL_FUNC(gl##_name_,"GL_ARB_shader_objects") \
+	LOAD_GL_FUNC(gl##_name_, "GL_ARB_shader_objects"); \
 	_conv_(arg2,value,_size_); \
 	fptr_gl##_name_(NUM2UINT(arg1),value); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -498,7 +498,7 @@ VALUE obj,arg1,arg2; \
 	GLenum pname; \
 	_type_ params[4] = {0,0,0,0}; \
 	GLint size; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	index = (GLuint)NUM2UINT(arg1); \
 	pname = (GLenum)NUM2INT(arg2); \
 	if (pname==GL_CURRENT_VERTEX_ATTRIB_ARB) \
@@ -506,7 +506,7 @@ VALUE obj,arg1,arg2; \
 	else \
 		size = 1; \
 	fptr_gl##_name_(index,pname,params); \
-	RET_ARRAY_OR_SINGLE_BOOL(size,_conv_,pname,params) \
+	RET_ARRAY_OR_SINGLE_BOOL("gl" #_name_, size, _conv_, pname, params); \
 }
 
 GETVERTEXATTRIB_FUNC(GetVertexAttribIivEXT,GLint,cond_GLBOOL2RUBY,"GL_EXT_gpu_shader4")
@@ -523,7 +523,7 @@ static VALUE gl_VertexAttribIPointerEXT(VALUE obj,VALUE arg1,VALUE arg2,VALUE ar
 	GLenum type;
 	GLsizei stride;
 
-	LOAD_GL_FUNC(glVertexAttribIPointerEXT,"GL_EXT_gpu_shader4")
+	LOAD_GL_FUNC(glVertexAttribIPointerEXT, "GL_EXT_gpu_shader4");
 
 	index = (GLuint)NUM2UINT(arg1);
 	size = (GLuint)NUM2UINT(arg2);
@@ -543,7 +543,7 @@ static VALUE gl_VertexAttribIPointerEXT(VALUE obj,VALUE arg1,VALUE arg2,VALUE ar
 		fptr_glVertexAttribIPointerEXT(index,size,type,stride,(GLvoid *)RSTRING_PTR(data));
 	}
 
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glVertexAttribIPointerEXT");
 	return Qnil;
 }
 
@@ -561,7 +561,7 @@ VALUE obj,arg1,arg2; \
 	GLint location; \
 	GLsizei count; \
 	_type_ *value; \
-	LOAD_GL_FUNC(gl##_name_,"GL_EXT_gpu_shader4") \
+	LOAD_GL_FUNC(gl##_name_, "GL_EXT_gpu_shader4"); \
 	Check_Type(arg2,T_ARRAY); \
 	count = (GLsizei)RARRAY_LENINT(arg2); \
 	if (count<=0 || (count % _size_) != 0) \
@@ -571,7 +571,7 @@ VALUE obj,arg1,arg2; \
 	_conv_(arg2,value,count); \
 	fptr_gl##_name_(location,count / _size_,value); \
 	xfree(value); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -595,13 +595,13 @@ VALUE obj,arg1,arg2; \
 	GLenum uniform_type = 0; \
 	GLint uniform_size = 0; \
 \
-	LOAD_GL_FUNC(gl##_name_,"GL_EXT_gpu_shader4") \
-	LOAD_GL_FUNC(glGetActiveUniformARB,"GL_ARB_shader_objects") \
+	LOAD_GL_FUNC(gl##_name_, "GL_EXT_gpu_shader4"); \
+	LOAD_GL_FUNC(glGetActiveUniformARB, "GL_ARB_shader_objects"); \
 	program = (GLuint)NUM2UINT(arg1); \
 	location = (GLint)NUM2INT(arg2); \
 \
 	fptr_glGetActiveUniformARB(program,location,0,NULL,&unused,&uniform_type,NULL); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("glGetActiveUniformARB"); \
 	if (uniform_type==0) \
 		rb_raise(rb_eTypeError, "Can't determine the uniform's type"); \
 \
@@ -609,7 +609,7 @@ VALUE obj,arg1,arg2; \
 \
 	memset(params,0,16*sizeof(_type_)); \
 	fptr_gl##_name_(program,location,params); \
-	RET_ARRAY_OR_SINGLE(uniform_size,RETCONV_##_type_,params) \
+	RET_ARRAY_OR_SINGLE("gl" #_name_, uniform_size, RETCONV_##_type_, params); \
 }
 
 GETUNIFORM_FUNC(GetUniformuivEXT,GLuint)
@@ -618,10 +618,10 @@ GETUNIFORM_FUNC(GetUniformuivEXT,GLuint)
 static void (APIENTRY * fptr_glBindFragDataLocationEXT)(GLuint,GLuint,const GLchar *);
 static VALUE gl_BindFragDataLocationEXT(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 {
-	LOAD_GL_FUNC(glBindFragDataLocationEXT,"GL_EXT_gpu_shader4")
+	LOAD_GL_FUNC(glBindFragDataLocationEXT, "GL_EXT_gpu_shader4");
 	Check_Type(arg3,T_STRING);
 	fptr_glBindFragDataLocationEXT(NUM2UINT(arg1),NUM2UINT(arg2),RSTRING_PTR(arg3));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glBindFragDataLocationEXT");
 	return Qnil;
 }
 
@@ -629,10 +629,10 @@ static GLint (APIENTRY * fptr_glGetFragDataLocationEXT)(GLuint,const GLchar *);
 static VALUE gl_GetFragDataLocationEXT(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint ret;
-	LOAD_GL_FUNC(glGetFragDataLocationEXT,"GL_EXT_gpu_shader4")
+	LOAD_GL_FUNC(glGetFragDataLocationEXT, "GL_EXT_gpu_shader4");
 	Check_Type(arg2,T_STRING);
 	ret = fptr_glGetFragDataLocationEXT(NUM2UINT(arg1),RSTRING_PTR(arg2));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetFragDataLocationEXT");
 	return INT2NUM(ret);
 }
 
@@ -647,7 +647,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 	GLsizei count;
 	GLenum type;
 	GLsizei primcount;
-	LOAD_GL_FUNC(glDrawElementsInstancedEXT,"GL_EXT_draw_instanced")
+	LOAD_GL_FUNC(glDrawElementsInstancedEXT, "GL_EXT_draw_instanced");
 	mode = (GLenum)NUM2INT(arg1);
 	count = (GLsizei)NUM2UINT(arg2);
 	type = (GLenum)NUM2INT(arg3);
@@ -659,7 +659,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 		data = pack_array_or_pass_string(type,arg4);
 		fptr_glDrawElementsInstancedEXT(mode, count, type, (const GLvoid*)RSTRING_PTR(data), primcount);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glDrawArraysInstancedEXT");
 	return Qnil;
 }
 
@@ -679,13 +679,13 @@ VALUE obj,arg1,arg2,arg3; \
 	GLenum target; \
 	GLenum pname; \
 	_type_ params[4] = {0,0,0,0}; \
-	LOAD_GL_FUNC(gl##_name_,"GL_EXT_texture_integer") \
+	LOAD_GL_FUNC(gl##_name_, "GL_EXT_texture_integer"); \
 	target = (GLenum)NUM2UINT(arg1); \
 	pname = (GLenum)NUM2UINT(arg2); \
 	Check_Type(arg3,T_ARRAY); \
 	_conv_(arg3,params,4); \
 	fptr_gl##_name_(target,pname,params); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -703,7 +703,7 @@ VALUE obj,arg1,arg2; \
 	GLenum pname; \
 	_type_ params[4] = {0,0,0,0}; \
 	int size; \
-	LOAD_GL_FUNC(gl##_name_,"GL_EXT_texture_integer") \
+	LOAD_GL_FUNC(gl##_name_, "GL_EXT_texture_integer"); \
 	target = (GLenum)NUM2INT(arg1); \
 	pname = (GLenum)NUM2INT(arg2); \
 	switch(pname) { \
@@ -718,7 +718,7 @@ VALUE obj,arg1,arg2; \
 			break; \
 	} \
 	fptr_gl##_name_(target,pname,params); \
-	RET_ARRAY_OR_SINGLE_BOOL(size,_conv_,pname,params) \
+	RET_ARRAY_OR_SINGLE_BOOL("gl" #_name_, size, _conv_, pname, params); \
 }
 
 GETTEXPARAMETER_VFUNC(GetTexParameterIivEXT,GLint,cond_GLBOOL2RUBY)

data/ext/{gl → opengl}/gl-ext-gremedy.c

@@ -13,7 +13,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 /* Graphic Remedy extensions */
 
@@ -21,10 +21,10 @@
 static void (APIENTRY * fptr_glStringMarkerGREMEDY)(GLsizei,const void *);
 static VALUE gl_StringMarkerGREMEDY(VALUE obj,VALUE arg1)
 {
-	LOAD_GL_FUNC(glStringMarkerGREMEDY,"GL_GREMEDY_string_marker")
+	LOAD_GL_FUNC(glStringMarkerGREMEDY, "GL_GREMEDY_string_marker");
 	Check_Type(arg1,T_STRING);
 	fptr_glStringMarkerGREMEDY((GLsizei)RSTRING_LENINT(arg1),RSTRING_PTR(arg1));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glStringMarkerGREMEDY");
 	return Qnil;
 }
 

data/ext/{gl → opengl}/gl-ext-nv.c

@@ -13,7 +13,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 /* OpenGL NVIDIA extensions */
 
@@ -29,9 +29,9 @@ static void (APIENTRY * fptr_glGetFenceivNV)(GLuint,GLenum,GLint *);
 static VALUE gl_GetFenceivNV(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint ret = 0;
-	LOAD_GL_FUNC(glGetFenceivNV,"GL_NV_fence")
+	LOAD_GL_FUNC(glGetFenceivNV, "GL_NV_fence");
 	fptr_glGetFenceivNV(NUM2INT(arg1),NUM2INT(arg2),&ret);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetFenceivNV");
 	return cond_GLBOOL2RUBY(NUM2INT(arg2),ret);
 }
 
@@ -39,10 +39,10 @@ static VALUE gl_GetFenceivNV(VALUE obj,VALUE arg1,VALUE arg2)
 static void (APIENTRY * fptr_glLoadProgramNV)(GLenum,GLuint,GLsizei,const GLubyte *);
 static VALUE gl_LoadProgramNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 {
-	LOAD_GL_FUNC(glLoadProgramNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glLoadProgramNV, "GL_NV_vertex_program");
 	Check_Type(arg3,T_STRING);
 	fptr_glLoadProgramNV((GLenum)NUM2INT(arg1),(GLuint)NUM2UINT(arg2),(GLsizei)RSTRING_LENINT(arg3),(GLubyte *)RSTRING_PTR(arg3));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glLoadProgramNV");
 	return Qnil;
 }
 
@@ -50,9 +50,9 @@ static void (APIENTRY * fptr_glGetProgramivNV)(GLuint,GLenum,GLint *);
 static VALUE gl_GetProgramivNV(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint ret = 0;
-	LOAD_GL_FUNC(glGetProgramivNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glGetProgramivNV, "GL_NV_vertex_program");
 	fptr_glGetProgramivNV(NUM2INT(arg1),NUM2INT(arg2),&ret);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetProgramivNV");
 	return cond_GLBOOL2RUBY(NUM2INT(arg2),ret);
 }
 
@@ -63,11 +63,11 @@ static VALUE gl_GetProgramStringNV(VALUE obj,VALUE arg1,VALUE arg2)
 	char *buffer;
 	VALUE ret_buffer;
 
-	LOAD_GL_FUNC(glGetProgramStringNV,"GL_NV_vertex_program")
-	LOAD_GL_FUNC(glGetProgramivNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glGetProgramStringNV, "GL_NV_vertex_program");
+	LOAD_GL_FUNC(glGetProgramivNV, "GL_NV_vertex_program");
 
 	fptr_glGetProgramivNV(NUM2INT(arg1),GL_PROGRAM_LENGTH_NV,&len);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetProgramivNV");
 	if (len<=0)
 		return rb_str_new2("");
 	
@@ -77,7 +77,7 @@ static VALUE gl_GetProgramStringNV(VALUE obj,VALUE arg1,VALUE arg2)
 	ret_buffer = rb_str_new2(buffer);
 	xfree(buffer);
 
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetProgramStringNV");
 	return ret_buffer;
 }
 
@@ -90,10 +90,10 @@ static void (APIENTRY * fptr_glExecuteProgramNV)(GLenum,GLuint,const GLfloat *);
 static VALUE gl_ExecuteProgramNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 {
 	GLfloat params[4] = {0,0,0,0};
-	LOAD_GL_FUNC(glExecuteProgramNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glExecuteProgramNV, "GL_NV_vertex_program");
 	ary2cflt(arg3,params,4);
 	fptr_glExecuteProgramNV(NUM2UINT(arg1),NUM2UINT(arg2),params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glExecuteProgramNV");
 	return Qnil;
 }
 
@@ -107,7 +107,7 @@ static VALUE gl_VertexAttribPointerNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3
 	GLenum type;
 	GLsizei stride;
 
-	LOAD_GL_FUNC(glVertexAttribPointerNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glVertexAttribPointerNV, "GL_NV_vertex_program");
 
 	index = (GLuint)NUM2UINT(arg1);
 	size = (GLuint)NUM2UINT(arg2);
@@ -127,7 +127,7 @@ static VALUE gl_VertexAttribPointerNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3
 		fptr_glVertexAttribPointerNV(index,size,type,stride,(GLvoid *)RSTRING_PTR(data));
 	}
 
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glVertexAttribPointerNV");
 	return Qnil;
 }
 
@@ -138,7 +138,7 @@ gl_GetVertexAttribPointervNV(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint index;
-	LOAD_GL_FUNC(glGetVertexAttribPointervNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glGetVertexAttribPointervNV, "GL_NV_vertex_program");
 	index =(GLuint) NUM2INT(arg1);
 	if (index>_MAX_VERTEX_ATTRIBS)
 		rb_raise(rb_eArgError, "Index too large, maximum allowed value '%i'",_MAX_VERTEX_ATTRIBS);
@@ -156,10 +156,10 @@ gl_##_name_(obj,arg1,arg2,arg3) \
 VALUE obj,arg1,arg2,arg3; \
 { \
 	_type_ cary[4]; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	_conv_(arg3,cary,4); \
 	fptr_gl##_name_(NUM2UINT(arg1),NUM2UINT(arg2),cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -173,9 +173,9 @@ gl_##_name_(obj,arg1,arg2,arg3) \
 VALUE obj,arg1,arg2,arg3; \
 { \
 	_type_ cary[4] = {(_type_)0.0, (_type_)0.0, (_type_)0.0, (_type_)0.0}; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	fptr_gl##_name_(NUM2UINT(arg1),NUM2UINT(arg2),NUM2UINT(arg3),cary); \
-	RET_ARRAY_OR_SINGLE(4,RETCONV_##_type_,cary) \
+	RET_ARRAY_OR_SINGLE("gl" #_name_, 4, RETCONV_##_type_, cary); \
 }
 
 GETPROGRAMPARAM_FUNC(GetProgramParameterdvNV,GLdouble,"GL_NV_vertex_program")
@@ -190,7 +190,7 @@ VALUE obj,arg1,arg2,arg3; \
 { \
 	_type_ *cary; \
 	GLuint len; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	len = (GLuint)RARRAY_LENINT(rb_Array(arg3)); \
 	if (len<=0 || (len % 4) != 0) \
 		rb_raise(rb_eArgError, "Parameter array size must be multiplication of 4"); \
@@ -198,7 +198,7 @@ VALUE obj,arg1,arg2,arg3; \
 	_conv_(arg3,cary,len); \
 	fptr_gl##_name_((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),len / 4, cary); \
 	xfree(cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -227,11 +227,11 @@ VALUE obj,arg1,arg2; \
 { \
 	GLuint index; \
 	_type_ v[_size_]; \
-	LOAD_GL_FUNC(gl##_name_,_extension_)  \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	index = (GLuint)NUM2UINT(arg1); \
 	_conv_(arg2,v,_size_); \
 	fptr_gl##_name_(index,v); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -259,7 +259,7 @@ VALUE obj,arg1,arg2; \
 	GLuint index; \
 	_type_ *cary; \
 	GLsizei len; \
-	LOAD_GL_FUNC(gl##_name_,_extension_)  \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	len = (GLsizei)RARRAY_LENINT(rb_Array(arg2)); \
 	if (len<=0 || (len % _size_) != 0) \
 		rb_raise(rb_eArgError, "Parameter array size must be multiplication of %i",_size_); \
@@ -268,7 +268,7 @@ VALUE obj,arg1,arg2; \
 	_conv_(arg2,cary,len); \
 	fptr_gl##_name_(index,len / _size_,cary); \
 	xfree(cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -297,7 +297,7 @@ VALUE obj,arg1,arg2; \
 	GLenum pname; \
 	_type_ params[4] = {0,0,0,0}; \
 	GLint size; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	index = (GLuint)NUM2UINT(arg1); \
 	pname = (GLenum)NUM2INT(arg2); \
 	if (pname==GL_CURRENT_ATTRIB_NV) \
@@ -305,7 +305,7 @@ VALUE obj,arg1,arg2; \
 	else \
 		size = 1; \
 	fptr_gl##_name_(index,pname,params); \
-	RET_ARRAY_OR_SINGLE(size,RETCONV_##_type_,params) \
+	RET_ARRAY_OR_SINGLE("gl" #_name_, size, RETCONV_##_type_, params); \
 }
 
 GETVERTEXATTRIB_FUNC(GetVertexAttribdvNV,GLdouble,"GL_NV_vertex_program")
@@ -321,7 +321,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	GLint size;
-	LOAD_GL_FUNC(glGetVertexAttribivNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glGetVertexAttribivNV, "GL_NV_vertex_program");
 	index = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	if (pname==GL_CURRENT_VERTEX_ATTRIB)
@@ -329,7 +329,8 @@ VALUE obj,arg1,arg2;
 	else
 		size = 1;
 	fptr_glGetVertexAttribivNV(index,pname,params);
-	RET_ARRAY_OR_SINGLE_BOOL(size,cond_GLBOOL2RUBY,pname,params) \
+  RET_ARRAY_OR_SINGLE_BOOL("glGetVertexAttribivNV", size, cond_GLBOOL2RUBY,
+      pname, params); \
 }
 
 
@@ -339,16 +340,16 @@ static void (APIENTRY * fptr_glGetTrackMatrixivNV)(GLenum,GLuint,GLenum,GLint *)
 static VALUE gl_GetTrackMatrixivNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 {
 	GLint ret = 0;
-	LOAD_GL_FUNC(glGetTrackMatrixivNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glGetTrackMatrixivNV, "GL_NV_vertex_program");
 	fptr_glGetTrackMatrixivNV(NUM2UINT(arg1),NUM2UINT(arg2),NUM2UINT(arg3),&ret);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetTrackMatrixivNV");
 	return INT2NUM(ret);
 }
 
 static void (APIENTRY * fptr_glRequestResidentProgramsNV)(GLsizei, GLuint *);
 static VALUE gl_RequestResidentProgramsNV(VALUE obj,VALUE arg1)
 {
-	LOAD_GL_FUNC(glRequestResidentProgramsNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glRequestResidentProgramsNV, "GL_NV_vertex_program");
 	if (TYPE(arg1)==T_ARRAY) {
 		GLsizei n;
 		GLuint *programs;
@@ -362,7 +363,7 @@ static VALUE gl_RequestResidentProgramsNV(VALUE obj,VALUE arg1)
 		program = NUM2INT(arg1);
 		fptr_glRequestResidentProgramsNV( 1, &program);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glRequestResidentProgramsNV");
 	return Qnil;
 }
 
@@ -376,7 +377,7 @@ static VALUE gl_AreProgramsResidentNV(VALUE obj,VALUE arg1)
 	VALUE retary;
 	VALUE ary;
 	int i;
-	LOAD_GL_FUNC(glAreProgramsResidentNV,"GL_NV_vertex_program")
+	LOAD_GL_FUNC(glAreProgramsResidentNV, "GL_NV_vertex_program");
 	ary = rb_Array(arg1);
 	size = (GLsizei)RARRAY_LENINT(ary);
 	programs = ALLOC_N(GLuint,size);
@@ -393,7 +394,7 @@ static VALUE gl_AreProgramsResidentNV(VALUE obj,VALUE arg1)
 	}
 	xfree(programs);
 	xfree(residences);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glAreProgramsResidentNV");
 	return retary;
 }
 
@@ -409,9 +410,9 @@ static void (APIENTRY * fptr_gl##_name_)(GLuint,GLenum,_type_ *); \
 static VALUE gl_##_name_(VALUE obj,VALUE arg1,VALUE arg2) \
 { \
 	_type_ ret = 0; \
-	LOAD_GL_FUNC(gl##_name_,"GL_NV_occlusion_query") \
+	LOAD_GL_FUNC(gl##_name_, "GL_NV_occlusion_query"); \
 	fptr_gl##_name_(NUM2INT(arg1),NUM2INT(arg2),&ret); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return _conv_(NUM2INT(arg2),ret); \
 }
 
@@ -426,10 +427,10 @@ static void (APIENTRY * fptr_glPointParameterivNV)(GLenum,const GLint *);
 static VALUE gl_PointParameterivNV(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint param = 0;
-	LOAD_GL_FUNC(glPointParameterivNV,"GL_NV_point_sprite")
+	LOAD_GL_FUNC(glPointParameterivNV, "GL_NV_point_sprite");
 	ary2cint(arg2,&param,1);
 	fptr_glPointParameterivNV(NUM2UINT(arg1),&param);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glPointParameterivNV");
 	return Qnil;
 }
 
@@ -440,10 +441,10 @@ static VALUE \
 gl_##_name_(obj,arg1,arg2,arg3,arg4,arg5,arg6) \
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6; \
 { \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	Check_Type(arg2,T_STRING); \
 	fptr_gl##_name_((GLuint)NUM2UINT(arg1),(GLsizei)RSTRING_LENINT(arg2),(GLubyte *)RSTRING_PTR(arg2),(_type_)_conv_(arg3),(_type_)_conv_(arg4),(_type_)_conv_(arg5),(_type_)_conv_(arg6)); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -458,11 +459,11 @@ gl_##_name_(obj,arg1,arg2,arg3) \
 VALUE obj,arg1,arg2,arg3; \
 { \
 	_type_ cary[4]; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	Check_Type(arg2,T_STRING); \
 	_conv_(arg3,cary,4); \
 	fptr_gl##_name_(NUM2UINT(arg1),(GLsizei)RSTRING_LENINT(arg2),(GLubyte *)RSTRING_PTR(arg2),cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -477,10 +478,10 @@ gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
 	_type_ cary[4] = {(_type_)0.0, (_type_)0.0, (_type_)0.0, (_type_)0.0}; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	Check_Type(arg2,T_STRING); \
 	fptr_gl##_name_((GLuint)NUM2UINT(arg1),(GLsizei)RSTRING_LENINT(arg2),(GLubyte *)RSTRING_PTR(arg2),cary); \
-	RET_ARRAY_OR_SINGLE(4,RETCONV_##_type_,cary) \
+	RET_ARRAY_OR_SINGLE("gl" #_name_, 4, RETCONV_##_type_, cary); \
 }
 
 GETPROGRAMNAMEDPARAM_FUNC(GetProgramNamedParameterdvNV,GLdouble,"GL_NV_vertex_program")
@@ -517,9 +518,9 @@ gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
 	_type_ cary[4] = {(_type_)0.0, (_type_)0.0, (_type_)0.0, (_type_)0.0}; \
-	LOAD_GL_FUNC(gl##_name_,_extension_) \
+	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	fptr_gl##_name_(NUM2UINT(arg1),NUM2UINT(arg2),cary); \
-	RET_ARRAY_OR_SINGLE(4,RETCONV_##_type_,cary) \
+	RET_ARRAY_OR_SINGLE("gl" #_name_, 4, RETCONV_##_type_, cary); \
 }
 
 GETPROGRAMPARAM_FUNC_2(GetProgramLocalParameterIivNV,GLint,"GL_NV_gpu_program4")