opengl 0.9.2-x86-mingw32 → 0.10.0.pre1-x86-mingw32

data/ext/opengl/gl-2.1.c

@@ -16,7 +16,6 @@
 #include "common.h"
 
 #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) \
 VALUE obj,arg1,arg2,arg3; \
@@ -25,6 +24,7 @@ VALUE obj,arg1,arg2,arg3; \
 	GLsizei count; \
 	GLboolean transpose; \
 	GLfloat *value;	\
+	DECL_GL_FUNC_PTR(GLvoid,glUniformMatrix##_x_##x##_y_##fv,(GLint,GLsizei,GLboolean,GLfloat *)); \
 	LOAD_GL_FUNC(glUniformMatrix##_x_##x##_y_##fv,"2.1"); \
 	location = (GLint)NUM2INT(arg1); \
 	count = (GLsizei)RARRAY_LENINT(rb_funcall(rb_Array(arg3),rb_intern("flatten"),0)); \
@@ -46,12 +46,12 @@ UNIFORMMATRIX_FUNC(4,3)
 
 #undef UNIFORMMATRIX_FUNC
 
-void gl_init_functions_2_1(VALUE module)
+void gl_init_functions_2_1(VALUE klass)
 {
-	rb_define_module_function(module, "glUniformMatrix2x3fv", gl_UniformMatrix2x3fv, 3);
-	rb_define_module_function(module, "glUniformMatrix3x2fv", gl_UniformMatrix3x2fv, 3);
-	rb_define_module_function(module, "glUniformMatrix2x4fv", gl_UniformMatrix2x4fv, 3);
-	rb_define_module_function(module, "glUniformMatrix4x2fv", gl_UniformMatrix4x2fv, 3);
-	rb_define_module_function(module, "glUniformMatrix3x4fv", gl_UniformMatrix3x4fv, 3);
-	rb_define_module_function(module, "glUniformMatrix4x3fv", gl_UniformMatrix4x3fv, 3);
+	rb_define_method(klass, "glUniformMatrix2x3fv", gl_UniformMatrix2x3fv, 3);
+	rb_define_method(klass, "glUniformMatrix3x2fv", gl_UniformMatrix3x2fv, 3);
+	rb_define_method(klass, "glUniformMatrix2x4fv", gl_UniformMatrix2x4fv, 3);
+	rb_define_method(klass, "glUniformMatrix4x2fv", gl_UniformMatrix4x2fv, 3);
+	rb_define_method(klass, "glUniformMatrix3x4fv", gl_UniformMatrix3x4fv, 3);
+	rb_define_method(klass, "glUniformMatrix4x3fv", gl_UniformMatrix4x3fv, 3);
 }

data/ext/opengl/gl-3.0.c

@@ -23,7 +23,6 @@
 	GL_NV_half_float
 
 	GL_EXT_transform_feedback
-	GL_APPLE_vertex_array_object --> ARB_vertex_array_object
 
 	-- New commands in OpenGL 3.0:
 
@@ -74,12 +73,12 @@ GL_FUNC_LOAD_4(VertexAttribI3ui,GLvoid, GLuint,GLuint,GLuint,GLuint, "3.0")
 GL_FUNC_LOAD_5(VertexAttribI4ui,GLvoid, GLuint,GLuint,GLuint,GLuint,GLuint, "3.0")
 
 #define GLVERTEXATTRIB_VFUNC(_name_,_type_,_conv_,_size_) \
-static void (APIENTRY * fptr_gl##_name_)(GLuint,const _type_ *); \
 static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
 	_type_ value[_size_]; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(GLuint,const _type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, "3.0"); \
 	_conv_(arg2,value,_size_); \
 	fptr_gl##_name_(NUM2UINT(arg1),value); \
@@ -102,7 +101,6 @@ GLVERTEXATTRIB_VFUNC(VertexAttribI4usv,GLushort,ary2cushort,4)
 #undef GLVERTEXATTRIB_VFUNC
 
 #define GETVERTEXATTRIB_FUNC(_name_,_type_,_conv_,_extension_) \
-static void (APIENTRY * fptr_gl##_name_)(GLuint,GLenum,_type_ *); \
 static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
@@ -111,6 +109,7 @@ VALUE obj,arg1,arg2; \
 	GLenum pname; \
 	_type_ params[4] = {0,0,0,0}; \
 	GLint size; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(GLuint,GLenum,_type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	index = (GLuint)NUM2UINT(arg1); \
 	pname = (GLenum)NUM2INT(arg2); \
@@ -126,9 +125,6 @@ GETVERTEXATTRIB_FUNC(GetVertexAttribIiv,GLint,cond_GLBOOL2RUBY,"3.0")
 GETVERTEXATTRIB_FUNC(GetVertexAttribIuiv,GLuint,cond_GLBOOL2RUBY_U,"3.0")
 #undef GETVERTEXATTRIB_FUNC
 
-extern VALUE g_VertexAttrib_ptr[];
-
-static void (APIENTRY * fptr_glVertexAttribIPointer)(GLuint,GLint,GLenum,GLsizei,const GLvoid *);
 static VALUE gl_VertexAttribIPointer(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3,VALUE arg4,VALUE arg5)
 {
 	GLuint index;
@@ -136,6 +132,7 @@ static VALUE gl_VertexAttribIPointer(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3,
 	GLenum type;
 	GLsizei stride;
 
+  DECL_GL_FUNC_PTR(GLvoid,glVertexAttribIPointer,(GLuint,GLint,GLenum,GLsizei,const GLvoid *));
 	LOAD_GL_FUNC(glVertexAttribIPointer, "3.0");
 
 	index = (GLuint)NUM2UINT(arg1);
@@ -145,14 +142,14 @@ static VALUE gl_VertexAttribIPointer(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3,
 	if (index>_MAX_VERTEX_ATTRIBS)
 		rb_raise(rb_eArgError, "Index too large, maximum allowed value '%i'",_MAX_VERTEX_ATTRIBS);
 
-	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
-		g_VertexAttrib_ptr[index] = arg5;
+	if (CHECK_BUFFER_BINDING(GL_ARRAY_BUFFER_BINDING)) {
+		GET_GLIMPL_VARIABLE(VertexAttrib_ptr)[index] = arg5;
 		fptr_glVertexAttribIPointer(index,size,type,stride,(GLvoid *)NUM2SIZET(arg5));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(type,arg5);
 		rb_str_freeze(data);
-		g_VertexAttrib_ptr[index] = data;
+		GET_GLIMPL_VARIABLE(VertexAttrib_ptr)[index] = data;
 		fptr_glVertexAttribIPointer(index,size,type,stride,(GLvoid *)RSTRING_PTR(data));
 	}
 
@@ -166,7 +163,6 @@ GL_FUNC_LOAD_4(Uniform3ui,GLvoid, GLint,GLuint,GLuint,GLuint, "3.0")
 GL_FUNC_LOAD_5(Uniform4ui,GLvoid, GLint,GLuint,GLuint,GLuint,GLuint, "3.0")
 
 #define GLUNIFORM_VFUNC(_name_,_type_,_conv_,_size_) \
-static void (APIENTRY * fptr_gl##_name_)(GLint,GLsizei,const _type_ *); \
 static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
@@ -174,6 +170,7 @@ VALUE obj,arg1,arg2; \
 	GLint location; \
 	GLsizei count; \
 	_type_ *value; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(GLint,GLsizei,const _type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, "3.0"); \
 	Check_Type(arg2,T_ARRAY); \
 	count = (GLsizei)RARRAY_LENINT(arg2); \
@@ -194,9 +191,7 @@ GLUNIFORM_VFUNC(Uniform3uiv,GLuint,ary2cuint,3)
 GLUNIFORM_VFUNC(Uniform4uiv,GLuint,ary2cuint,4)
 #undef GLUNIFORM_VFUNC
 
-static void (APIENTRY * fptr_glGetActiveUniformARB)(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLchar*);
 #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; \
@@ -208,6 +203,8 @@ VALUE obj,arg1,arg2; \
 	GLenum uniform_type = 0; \
 	GLint uniform_size = 0; \
 \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(GLuint,GLint,_type_ *)); \
+  DECL_GL_FUNC_PTR(GLvoid,glGetActiveUniformARB,(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLchar*)); \
 	LOAD_GL_FUNC(gl##_name_, "3.0"); \
 	LOAD_GL_FUNC(glGetActiveUniformARB, "3.0"); \
 	program = (GLuint)NUM2UINT(arg1); \
@@ -228,9 +225,9 @@ VALUE obj,arg1,arg2; \
 GETUNIFORM_FUNC(GetUniformuiv,GLuint)
 #undef GETUNIFORM_FUNC
 
-static void (APIENTRY * fptr_glBindFragDataLocation)(GLuint,GLuint,const GLchar *);
 static VALUE gl_BindFragDataLocation(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 {
+  DECL_GL_FUNC_PTR(GLvoid,glBindFragDataLocation,(GLuint,GLuint,const GLchar *));
 	LOAD_GL_FUNC(glBindFragDataLocation, "3.0");
 	Check_Type(arg3,T_STRING);
 	fptr_glBindFragDataLocation(NUM2UINT(arg1),NUM2UINT(arg2),RSTRING_PTR(arg3));
@@ -238,10 +235,10 @@ static VALUE gl_BindFragDataLocation(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 	return Qnil;
 }
 
-static GLint (APIENTRY * fptr_glGetFragDataLocation)(GLuint,const GLchar *);
 static VALUE gl_GetFragDataLocation(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint ret;
+  DECL_GL_FUNC_PTR(GLint,glGetFragDataLocation,(GLuint,const GLchar *));
 	LOAD_GL_FUNC(glGetFragDataLocation, "3.0");
 	Check_Type(arg2,T_STRING);
 	ret = fptr_glGetFragDataLocation(NUM2UINT(arg1),RSTRING_PTR(arg2));
@@ -268,10 +265,10 @@ GL_FUNC_LOAD_4(RenderbufferStorage,GLvoid, GLenum,GLenum,GLsizei,GLsizei, "3.0")
 GL_FUNC_GENOBJECTS_LOAD(GenRenderbuffers,"3.0")
 GL_FUNC_DELETEOBJECTS_LOAD(DeleteRenderbuffers,"3.0")
 
-static void (APIENTRY * fptr_glGetRenderbufferParameteriv)(GLenum,GLenum,GLint *);
 static VALUE gl_GetRenderbufferParameteriv(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint param = 0;
+  DECL_GL_FUNC_PTR(GLvoid,glGetRenderbufferParameteriv,(GLenum,GLenum,GLint *));
 	LOAD_GL_FUNC(glGetRenderbufferParameteriv, "3.0");
 	fptr_glGetRenderbufferParameteriv(NUM2UINT(arg1),NUM2UINT(arg2),&param);
 	CHECK_GLERROR_FROM("glGetRenderbufferParameteriv");
@@ -289,10 +286,10 @@ GL_FUNC_LOAD_6(FramebufferTexture3D,GLvoid, GLenum,GLenum,GLenum,GLuint,GLint,GL
 GL_FUNC_LOAD_5(FramebufferTextureLayer,GLvoid, GLenum,GLenum,GLuint,GLint,GLint, "3.0")
 GL_FUNC_LOAD_4(FramebufferRenderbuffer,GLvoid, GLuint,GLuint,GLuint,GLuint, "3.0")
 
-static void (APIENTRY * fptr_glGetFramebufferAttachmentParameteriv)(GLenum,GLenum,GLenum,GLint *);
 static VALUE gl_GetFramebufferAttachmentParameteriv(VALUE obj,VALUE arg1, VALUE arg2, VALUE arg3)
 {
 	GLint ret = 0;
+  DECL_GL_FUNC_PTR(GLvoid,glGetFramebufferAttachmentParameteriv,(GLenum,GLenum,GLenum,GLint *));
 	LOAD_GL_FUNC(glGetFramebufferAttachmentParameteriv, "3.0");
 	fptr_glGetFramebufferAttachmentParameteriv(NUM2UINT(arg1),NUM2UINT(arg2),NUM2UINT(arg3),&ret);
 	CHECK_GLERROR_FROM("glGetFramebufferAttachmentParameteriv");
@@ -314,7 +311,6 @@ GL_FUNC_LOAD_4(ClearColorIi,GLvoid, GLint,GLint,GLint,GLint, "3.0")
 GL_FUNC_LOAD_4(ClearColorIui,GLvoid, GLuint,GLuint,GLuint,GLuint, "3.0")
 
 #define TEXPARAMETER_VFUNC(_name_,_type_,_conv_) \
-static void (APIENTRY * fptr_gl##_name_)(GLenum,GLenum,_type_ *); \
 static VALUE \
 gl_##_name_(obj,arg1,arg2,arg3) \
 VALUE obj,arg1,arg2,arg3; \
@@ -322,6 +318,7 @@ VALUE obj,arg1,arg2,arg3; \
 	GLenum target; \
 	GLenum pname; \
 	_type_ params[4] = {0,0,0,0}; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(GLenum,GLenum,_type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, "3.0"); \
 	target = (GLenum)NUM2UINT(arg1); \
 	pname = (GLenum)NUM2UINT(arg2); \
@@ -337,7 +334,6 @@ TEXPARAMETER_VFUNC(TexParameterIuiv,GLuint,ary2cuint)
 #undef TEXPARAMETER_VFUNC
 
 #define GETTEXPARAMETER_VFUNC(_name_,_type_,_conv_) \
-static void (APIENTRY * fptr_gl##_name_)(GLenum,GLenum,_type_ *); \
 static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
@@ -346,6 +342,7 @@ VALUE obj,arg1,arg2; \
 	GLenum pname; \
 	_type_ params[4] = {0,0,0,0}; \
 	int size; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(GLenum,GLenum,_type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, "3.0"); \
 	target = (GLenum)NUM2INT(arg1); \
 	pname = (GLenum)NUM2INT(arg2); \
@@ -372,7 +369,6 @@ GETTEXPARAMETER_VFUNC(GetTexParameterIuiv,GLuint,cond_GLBOOL2RUBY_U)
 GL_FUNC_LOAD_5(ColorMaski,GLvoid, GLuint,GLboolean,GLboolean,GLboolean,GLboolean, "3.0")
 
 #define GETINDEXED_FUNC(_name_,_type_,_conv_,_extension_) \
-static void (APIENTRY * fptr_gl##_name_)(GLenum,GLenum,_type_ *); \
 static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
@@ -380,6 +376,7 @@ VALUE obj,arg1,arg2; \
 	GLenum target; \
 	GLenum pname; \
 	_type_ result; \
+  DECL_GL_FUNC_PTR(GLvoid,gl##_name_,(GLenum,GLenum,_type_ *)); \
 	LOAD_GL_FUNC(gl##_name_, _extension_); \
 	target = (GLenum)NUM2INT(arg1); \
 	pname  = (GLuint)NUM2INT(arg2); \
@@ -395,99 +392,111 @@ GL_FUNC_LOAD_2(Enablei,GLvoid, GLenum,GLuint, "3.0")
 GL_FUNC_LOAD_2(Disablei,GLvoid, GLenum,GLuint, "3.0")
 GL_FUNC_LOAD_2(IsEnabledi,GLvoid, GLenum,GLuint, "3.0")
 
-void gl_init_functions_3_0(VALUE module)
+/*  GL_APPLE_vertex_array_object --> ARB_vertex_array_object */
+GL_FUNC_GENOBJECTS_LOAD(GenVertexArrays, "3.0");
+GL_FUNC_DELETEOBJECTS_LOAD(DeleteVertexArrays, "3.0");
+GL_FUNC_LOAD_1(BindVertexArray,GLvoid, GLuint, "3.0");
+GL_FUNC_LOAD_1(IsVertexArray,GLboolean, GLuint, "3.0");
+
+
+void gl_init_functions_3_0(VALUE klass)
 {
 	/* GL_NV_conditional_render */
-	rb_define_module_function(module, "glBeginConditionalRender", gl_BeginConditionalRender, 2);
-	rb_define_module_function(module, "glEndConditionalRender", gl_EndConditionalRender, 0);
+	rb_define_method(klass, "glBeginConditionalRender", gl_BeginConditionalRender, 2);
+	rb_define_method(klass, "glEndConditionalRender", gl_EndConditionalRender, 0);
 
 	/* #326 - GL_EXT_gpu_shader4 */
-	rb_define_module_function(module, "glVertexAttribI1i", gl_VertexAttribI1i, 2);
-	rb_define_module_function(module, "glVertexAttribI2i", gl_VertexAttribI2i, 3);
-	rb_define_module_function(module, "glVertexAttribI3i", gl_VertexAttribI3i, 4);
-	rb_define_module_function(module, "glVertexAttribI4i", gl_VertexAttribI4i, 5);
-	rb_define_module_function(module, "glVertexAttribI1ui", gl_VertexAttribI1ui, 2);
-	rb_define_module_function(module, "glVertexAttribI2ui", gl_VertexAttribI2ui, 3);
-	rb_define_module_function(module, "glVertexAttribI3ui", gl_VertexAttribI3ui, 4);
-	rb_define_module_function(module, "glVertexAttribI4ui", gl_VertexAttribI4ui, 5);
-	rb_define_module_function(module, "glVertexAttribI1iv", gl_VertexAttribI1iv, 2);
-	rb_define_module_function(module, "glVertexAttribI2iv", gl_VertexAttribI2iv, 2);
-	rb_define_module_function(module, "glVertexAttribI3iv", gl_VertexAttribI3iv, 2);
-	rb_define_module_function(module, "glVertexAttribI4iv", gl_VertexAttribI4iv, 2);
-	rb_define_module_function(module, "glVertexAttribI1uiv", gl_VertexAttribI1uiv, 2);
-	rb_define_module_function(module, "glVertexAttribI2uiv", gl_VertexAttribI2uiv, 2);
-	rb_define_module_function(module, "glVertexAttribI3uiv", gl_VertexAttribI3uiv, 2);
-	rb_define_module_function(module, "glVertexAttribI4uiv", gl_VertexAttribI4uiv, 2);
-	rb_define_module_function(module, "glVertexAttribI4bv", gl_VertexAttribI4bv, 2);
-	rb_define_module_function(module, "glVertexAttribI4sv", gl_VertexAttribI4sv, 2);
-	rb_define_module_function(module, "glVertexAttribI4ubv", gl_VertexAttribI4ubv, 2);
-	rb_define_module_function(module, "glVertexAttribI4usv", gl_VertexAttribI4usv, 2);
-	rb_define_module_function(module, "glVertexAttribIPointer", gl_VertexAttribIPointer, 5);
-	rb_define_module_function(module, "glGetVertexAttribIiv", gl_GetVertexAttribIiv, 2);
-	rb_define_module_function(module, "glGetVertexAttribIuiv", gl_GetVertexAttribIuiv, 2);
-	rb_define_module_function(module, "glUniform1ui", gl_Uniform1ui, 2);
-	rb_define_module_function(module, "glUniform2ui", gl_Uniform2ui, 3);
-	rb_define_module_function(module, "glUniform3ui", gl_Uniform3ui, 4);
-	rb_define_module_function(module, "glUniform4ui", gl_Uniform4ui, 5);
-	rb_define_module_function(module, "glUniform1uiv", gl_Uniform1uiv, 2);
-	rb_define_module_function(module, "glUniform2uiv", gl_Uniform2uiv, 2);
-	rb_define_module_function(module, "glUniform3uiv", gl_Uniform3uiv, 2);
-	rb_define_module_function(module, "glUniform4uiv", gl_Uniform4uiv, 2);
-	rb_define_module_function(module, "glGetUniformuiv", gl_GetUniformuiv, 2);
-	rb_define_module_function(module, "glBindFragDataLocation", gl_BindFragDataLocation, 3);
-	rb_define_module_function(module, "glGetFragDataLocation", gl_GetFragDataLocation, 2);
+	rb_define_method(klass, "glVertexAttribI1i", gl_VertexAttribI1i, 2);
+	rb_define_method(klass, "glVertexAttribI2i", gl_VertexAttribI2i, 3);
+	rb_define_method(klass, "glVertexAttribI3i", gl_VertexAttribI3i, 4);
+	rb_define_method(klass, "glVertexAttribI4i", gl_VertexAttribI4i, 5);
+	rb_define_method(klass, "glVertexAttribI1ui", gl_VertexAttribI1ui, 2);
+	rb_define_method(klass, "glVertexAttribI2ui", gl_VertexAttribI2ui, 3);
+	rb_define_method(klass, "glVertexAttribI3ui", gl_VertexAttribI3ui, 4);
+	rb_define_method(klass, "glVertexAttribI4ui", gl_VertexAttribI4ui, 5);
+	rb_define_method(klass, "glVertexAttribI1iv", gl_VertexAttribI1iv, 2);
+	rb_define_method(klass, "glVertexAttribI2iv", gl_VertexAttribI2iv, 2);
+	rb_define_method(klass, "glVertexAttribI3iv", gl_VertexAttribI3iv, 2);
+	rb_define_method(klass, "glVertexAttribI4iv", gl_VertexAttribI4iv, 2);
+	rb_define_method(klass, "glVertexAttribI1uiv", gl_VertexAttribI1uiv, 2);
+	rb_define_method(klass, "glVertexAttribI2uiv", gl_VertexAttribI2uiv, 2);
+	rb_define_method(klass, "glVertexAttribI3uiv", gl_VertexAttribI3uiv, 2);
+	rb_define_method(klass, "glVertexAttribI4uiv", gl_VertexAttribI4uiv, 2);
+	rb_define_method(klass, "glVertexAttribI4bv", gl_VertexAttribI4bv, 2);
+	rb_define_method(klass, "glVertexAttribI4sv", gl_VertexAttribI4sv, 2);
+	rb_define_method(klass, "glVertexAttribI4ubv", gl_VertexAttribI4ubv, 2);
+	rb_define_method(klass, "glVertexAttribI4usv", gl_VertexAttribI4usv, 2);
+	rb_define_method(klass, "glVertexAttribIPointer", gl_VertexAttribIPointer, 5);
+	rb_define_method(klass, "glGetVertexAttribIiv", gl_GetVertexAttribIiv, 2);
+	rb_define_method(klass, "glGetVertexAttribIuiv", gl_GetVertexAttribIuiv, 2);
+	rb_define_method(klass, "glUniform1ui", gl_Uniform1ui, 2);
+	rb_define_method(klass, "glUniform2ui", gl_Uniform2ui, 3);
+	rb_define_method(klass, "glUniform3ui", gl_Uniform3ui, 4);
+	rb_define_method(klass, "glUniform4ui", gl_Uniform4ui, 5);
+	rb_define_method(klass, "glUniform1uiv", gl_Uniform1uiv, 2);
+	rb_define_method(klass, "glUniform2uiv", gl_Uniform2uiv, 2);
+	rb_define_method(klass, "glUniform3uiv", gl_Uniform3uiv, 2);
+	rb_define_method(klass, "glUniform4uiv", gl_Uniform4uiv, 2);
+	rb_define_method(klass, "glGetUniformuiv", gl_GetUniformuiv, 2);
+	rb_define_method(klass, "glBindFragDataLocation", gl_BindFragDataLocation, 3);
+	rb_define_method(klass, "glGetFragDataLocation", gl_GetFragDataLocation, 2);
 
 	/* GL_NV_conditional_render */
 
 	/* GL_APPLE_flush_buffer_range */
 
 	/* #39 GL_ARB_color_buffer_float */
-	rb_define_module_function(module, "glClampColor", gl_ClampColor, 2);
+	rb_define_method(klass, "glClampColor", gl_ClampColor, 2);
 
 	/* #334 GL_NV_depth_buffer_float */
-	rb_define_module_function(module, "glDepthRanged", gl_DepthRanged, 2);
-	rb_define_module_function(module, "glClearDepthd", gl_ClearDepthd, 1);
-	rb_define_module_function(module, "glDepthBoundsd", gl_DepthBoundsd, 2);
+	rb_define_method(klass, "glDepthRanged", gl_DepthRanged, 2);
+	rb_define_method(klass, "glClearDepthd", gl_ClearDepthd, 1);
+	rb_define_method(klass, "glDepthBoundsd", gl_DepthBoundsd, 2);
 
 	/* #310 - GL_EXT_framebuffer_object */
-	rb_define_module_function(module, "glIsRenderbuffer", gl_IsRenderbuffer, 1);
-	rb_define_module_function(module, "glBindRenderbuffer", gl_BindRenderbuffer, 2);
-	rb_define_module_function(module, "glDeleteRenderbuffers", gl_DeleteRenderbuffers, 1);
-	rb_define_module_function(module, "glGenRenderbuffers", gl_GenRenderbuffers, 1);
-	rb_define_module_function(module, "glRenderbufferStorage", gl_RenderbufferStorage, 4);
-	rb_define_module_function(module, "glGetRenderbufferParameteriv", gl_GetRenderbufferParameteriv, 2);
-	rb_define_module_function(module, "glIsFramebuffer", gl_IsFramebuffer, 1);
-	rb_define_module_function(module, "glBindFramebuffer", gl_BindFramebuffer, 2);
-	rb_define_module_function(module, "glDeleteFramebuffers", gl_DeleteFramebuffers, 1);
-	rb_define_module_function(module, "glGenFramebuffers", gl_GenFramebuffers, 1);
-	rb_define_module_function(module, "glCheckFramebufferStatus", gl_CheckFramebufferStatus, 1);
-	rb_define_module_function(module, "glFramebufferTexture1D", gl_FramebufferTexture1D, 5);
-	rb_define_module_function(module, "glFramebufferTexture2D", gl_FramebufferTexture2D, 5);
-	rb_define_module_function(module, "glFramebufferTexture3D", gl_FramebufferTexture3D, 6);
-	rb_define_module_function(module, "glFramebufferRenderbuffer", gl_FramebufferRenderbuffer, 4);
-	rb_define_module_function(module, "glFramebufferTextureLayer", gl_FramebufferTextureLayer, 5);
-	rb_define_module_function(module, "glGetFramebufferAttachmentParameteriv", gl_GetFramebufferAttachmentParameteriv, 3);
-	rb_define_module_function(module, "glGenerateMipmap", gl_GenerateMipmap, 1);
+	rb_define_method(klass, "glIsRenderbuffer", gl_IsRenderbuffer, 1);
+	rb_define_method(klass, "glBindRenderbuffer", gl_BindRenderbuffer, 2);
+	rb_define_method(klass, "glDeleteRenderbuffers", gl_DeleteRenderbuffers, 1);
+	rb_define_method(klass, "glGenRenderbuffers", gl_GenRenderbuffers, 1);
+	rb_define_method(klass, "glRenderbufferStorage", gl_RenderbufferStorage, 4);
+	rb_define_method(klass, "glGetRenderbufferParameteriv", gl_GetRenderbufferParameteriv, 2);
+	rb_define_method(klass, "glIsFramebuffer", gl_IsFramebuffer, 1);
+	rb_define_method(klass, "glBindFramebuffer", gl_BindFramebuffer, 2);
+	rb_define_method(klass, "glDeleteFramebuffers", gl_DeleteFramebuffers, 1);
+	rb_define_method(klass, "glGenFramebuffers", gl_GenFramebuffers, 1);
+	rb_define_method(klass, "glCheckFramebufferStatus", gl_CheckFramebufferStatus, 1);
+	rb_define_method(klass, "glFramebufferTexture1D", gl_FramebufferTexture1D, 5);
+	rb_define_method(klass, "glFramebufferTexture2D", gl_FramebufferTexture2D, 5);
+	rb_define_method(klass, "glFramebufferTexture3D", gl_FramebufferTexture3D, 6);
+	rb_define_method(klass, "glFramebufferRenderbuffer", gl_FramebufferRenderbuffer, 4);
+	rb_define_method(klass, "glFramebufferTextureLayer", gl_FramebufferTextureLayer, 5);
+	rb_define_method(klass, "glGetFramebufferAttachmentParameteriv", gl_GetFramebufferAttachmentParameteriv, 3);
+	rb_define_method(klass, "glGenerateMipmap", gl_GenerateMipmap, 1);
 
 	/* #317 - GL_EXT_framebuffer_multisample */
-	rb_define_module_function(module, "glRenderbufferStorageMultisample", gl_RenderbufferStorageMultisample, 5);
+	rb_define_method(klass, "glRenderbufferStorageMultisample", gl_RenderbufferStorageMultisample, 5);
 
 	/* #316 - GL_EXT_framebuffer_blit */
-	rb_define_module_function(module, "glBlitFramebuffer", gl_BlitFramebuffer, 10);
+	rb_define_method(klass, "glBlitFramebuffer", gl_BlitFramebuffer, 10);
 
 	/* #343 - GL_EXT_texture_integer */
-	rb_define_module_function(module, "glClearColorIi", gl_ClearColorIi, 4);
-	rb_define_module_function(module, "glClearColorIui", gl_ClearColorIui, 4);
-	rb_define_module_function(module, "glTexParameterIiv", gl_TexParameterIiv, 3);
-	rb_define_module_function(module, "glTexParameterIuiv", gl_TexParameterIuiv, 3);
-	rb_define_module_function(module, "glGetTexParameterIiv", gl_GetTexParameterIiv, 2);
-	rb_define_module_function(module, "glGetTexParameterIuiv", gl_GetTexParameterIuiv, 2);
+	rb_define_method(klass, "glClearColorIi", gl_ClearColorIi, 4);
+	rb_define_method(klass, "glClearColorIui", gl_ClearColorIui, 4);
+	rb_define_method(klass, "glTexParameterIiv", gl_TexParameterIiv, 3);
+	rb_define_method(klass, "glTexParameterIuiv", gl_TexParameterIuiv, 3);
+	rb_define_method(klass, "glGetTexParameterIiv", gl_GetTexParameterIiv, 2);
+	rb_define_method(klass, "glGetTexParameterIuiv", gl_GetTexParameterIuiv, 2);
 
 	/* #340 - GL_EXT_draw_buffers2 */
-	rb_define_module_function(module, "glColorMaski", gl_ColorMaski, 5);
-	rb_define_module_function(module, "glGetBooleani_v", gl_GetBooleani_v, 2);
-	rb_define_module_function(module, "glGetIntegeri_v", gl_GetIntegeri_v, 2);
-	rb_define_module_function(module, "glEnablei", gl_Enablei, 2);
-	rb_define_module_function(module, "glDisablei", gl_Disablei, 2);
-	rb_define_module_function(module, "glIsEnabledi", gl_IsEnabledi, 2);
-}
+	rb_define_method(klass, "glColorMaski", gl_ColorMaski, 5);
+	rb_define_method(klass, "glGetBooleani_v", gl_GetBooleani_v, 2);
+	rb_define_method(klass, "glGetIntegeri_v", gl_GetIntegeri_v, 2);
+	rb_define_method(klass, "glEnablei", gl_Enablei, 2);
+	rb_define_method(klass, "glDisablei", gl_Disablei, 2);
+	rb_define_method(klass, "glIsEnabledi", gl_IsEnabledi, 2);
+
+  rb_define_method(klass, "glBindVertexArray", gl_BindVertexArray, 1);
+  rb_define_method(klass, "glDeleteVertexArrays", gl_DeleteVertexArrays, 1);
+  rb_define_method(klass, "glGenVertexArrays", gl_GenVertexArrays, 1);
+  rb_define_method(klass, "glIsVertexArray", gl_IsVertexArray, 1);
+}

data/ext/opengl/gl-enums.c

@@ -1,6 +1,6 @@
-/* This file was genereated on 2013-02-27 15:05:34 +0100
-   source: http://www.opengl.org/registry/api/enum.spec
-   source: http://www.opengl.org/registry/api/enumext.spec
+/* This file was genereated on 2015-01-17 21:05:45 +0100
+   source: https://www.opengl.org/registry/oldspecs/enum.spec
+   source: https://www.opengl.org/registry/oldspecs/enumext.spec
 */
 
 #include "common.h"
@@ -92,6 +92,7 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_ALL_COMPLETED_NV", INT2NUM(GL_ALL_COMPLETED_NV));
 	rb_define_const(module, "GL_ALL_SHADER_BITS", INT2NUM(GL_ALL_SHADER_BITS));
 	rb_define_const(module, "GL_ALL_SHADER_BITS_EXT", INT2NUM(GL_ALL_SHADER_BITS_EXT));
+	rb_define_const(module, "GL_ALL_STATIC_DATA_IBM", INT2NUM(GL_ALL_STATIC_DATA_IBM));
 	rb_define_const(module, "GL_ALPHA", INT2NUM(GL_ALPHA));
 	rb_define_const(module, "GL_ALPHA12", INT2NUM(GL_ALPHA12));
 	rb_define_const(module, "GL_ALPHA12_EXT", INT2NUM(GL_ALPHA12_EXT));
@@ -1144,22 +1145,6 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_EVAL_BIT", INT2NUM(GL_EVAL_BIT));
 	rb_define_const(module, "GL_EVAL_FRACTIONAL_TESSELLATION_NV", INT2NUM(GL_EVAL_FRACTIONAL_TESSELLATION_NV));
 	rb_define_const(module, "GL_EVAL_TRIANGULAR_2D_NV", INT2NUM(GL_EVAL_TRIANGULAR_2D_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB0_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB0_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB10_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB10_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB11_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB11_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB12_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB12_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB13_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB13_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB14_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB14_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB15_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB15_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB1_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB1_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB2_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB2_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB3_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB3_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB4_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB4_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB5_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB5_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB6_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB6_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB7_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB7_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB8_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB8_NV));
-	rb_define_const(module, "GL_EVAL_VERTEX_ATRRIB9_NV", INT2NUM(GL_EVAL_VERTEX_ATRRIB9_NV));
 	rb_define_const(module, "GL_EVAL_VERTEX_ATTRIB0_NV", INT2NUM(GL_EVAL_VERTEX_ATTRIB0_NV));
 	rb_define_const(module, "GL_EVAL_VERTEX_ATTRIB10_NV", INT2NUM(GL_EVAL_VERTEX_ATTRIB10_NV));
 	rb_define_const(module, "GL_EVAL_VERTEX_ATTRIB11_NV", INT2NUM(GL_EVAL_VERTEX_ATTRIB11_NV));
@@ -1307,17 +1292,13 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_FOG_DENSITY", INT2NUM(GL_FOG_DENSITY));
 	rb_define_const(module, "GL_FOG_DISTANCE_MODE_NV", INT2NUM(GL_FOG_DISTANCE_MODE_NV));
 	rb_define_const(module, "GL_FOG_END", INT2NUM(GL_FOG_END));
-	rb_define_const(module, "GL_FOG_FACTOR_TO_ALPHA_SGIX", INT2NUM(GL_FOG_FACTOR_TO_ALPHA_SGIX));
 	rb_define_const(module, "GL_FOG_FUNC_POINTS_SGIS", INT2NUM(GL_FOG_FUNC_POINTS_SGIS));
 	rb_define_const(module, "GL_FOG_FUNC_SGIS", INT2NUM(GL_FOG_FUNC_SGIS));
-	rb_define_const(module, "GL_FOG_GEN_MODE_NV", INT2NUM(GL_FOG_GEN_MODE_NV));
 	rb_define_const(module, "GL_FOG_HINT", INT2NUM(GL_FOG_HINT));
 	rb_define_const(module, "GL_FOG_INDEX", INT2NUM(GL_FOG_INDEX));
 	rb_define_const(module, "GL_FOG_MODE", INT2NUM(GL_FOG_MODE));
 	rb_define_const(module, "GL_FOG_OFFSET_SGIX", INT2NUM(GL_FOG_OFFSET_SGIX));
 	rb_define_const(module, "GL_FOG_OFFSET_VALUE_SGIX", INT2NUM(GL_FOG_OFFSET_VALUE_SGIX));
-	rb_define_const(module, "GL_FOG_SCALE_SGIX", INT2NUM(GL_FOG_SCALE_SGIX));
-	rb_define_const(module, "GL_FOG_SCALE_VALUE_SGIX", INT2NUM(GL_FOG_SCALE_VALUE_SGIX));
 	rb_define_const(module, "GL_FOG_SPECULAR_TEXTURE_WIN", INT2NUM(GL_FOG_SPECULAR_TEXTURE_WIN));
 	rb_define_const(module, "GL_FOG_START", INT2NUM(GL_FOG_START));
 	rb_define_const(module, "GL_FONT_ASCENDER_BIT_NV", INT2NUM(GL_FONT_ASCENDER_BIT_NV));
@@ -1970,6 +1951,7 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_MAGNITUDE_BIAS_NV", INT2NUM(GL_MAGNITUDE_BIAS_NV));
 	rb_define_const(module, "GL_MAGNITUDE_SCALE_NV", INT2NUM(GL_MAGNITUDE_SCALE_NV));
 	rb_define_const(module, "GL_MAJOR_VERSION", INT2NUM(GL_MAJOR_VERSION));
+	rb_define_const(module, "GL_MALI_PROGRAM_BINARY_ARM", INT2NUM(GL_MALI_PROGRAM_BINARY_ARM));
 	rb_define_const(module, "GL_MALI_SHADER_BINARY_ARM", INT2NUM(GL_MALI_SHADER_BINARY_ARM));
 	rb_define_const(module, "GL_MANUAL_GENERATE_MIPMAP", INT2NUM(GL_MANUAL_GENERATE_MIPMAP));
 	rb_define_const(module, "GL_MAP1_BINORMAL_EXT", INT2NUM(GL_MAP1_BINORMAL_EXT));
@@ -2308,7 +2290,6 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_MAX_PROGRAM_TEMPORARIES_ARB", INT2NUM(GL_MAX_PROGRAM_TEMPORARIES_ARB));
 	rb_define_const(module, "GL_MAX_PROGRAM_TEXEL_OFFSET", INT2NUM(GL_MAX_PROGRAM_TEXEL_OFFSET));
 	rb_define_const(module, "GL_MAX_PROGRAM_TEXEL_OFFSET_NV", INT2NUM(GL_MAX_PROGRAM_TEXEL_OFFSET_NV));
-	rb_define_const(module, "GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS", INT2NUM(GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS));
 	rb_define_const(module, "GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB", INT2NUM(GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB));
 	rb_define_const(module, "GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET", INT2NUM(GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET));
 	rb_define_const(module, "GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB", INT2NUM(GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB));
@@ -2507,7 +2488,6 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_MODELVIEW8_ARB", INT2NUM(GL_MODELVIEW8_ARB));
 	rb_define_const(module, "GL_MODELVIEW9_ARB", INT2NUM(GL_MODELVIEW9_ARB));
 	rb_define_const(module, "GL_MODELVIEW_MATRIX", INT2NUM(GL_MODELVIEW_MATRIX));
-	rb_define_const(module, "GL_MODELVIEW_MATRIX1_EXT", INT2NUM(GL_MODELVIEW_MATRIX1_EXT));
 	rb_define_const(module, "GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES", INT2NUM(GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES));
 	rb_define_const(module, "GL_MODELVIEW_PROJECTION_NV", INT2NUM(GL_MODELVIEW_PROJECTION_NV));
 	rb_define_const(module, "GL_MODELVIEW_STACK_DEPTH", INT2NUM(GL_MODELVIEW_STACK_DEPTH));
@@ -3453,6 +3433,7 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_RGBA8UI", INT2NUM(GL_RGBA8UI));
 	rb_define_const(module, "GL_RGBA8UI_EXT", INT2NUM(GL_RGBA8UI_EXT));
 	rb_define_const(module, "GL_RGBA8_EXT", INT2NUM(GL_RGBA8_EXT));
+	rb_define_const(module, "GL_RGBA8_OES", INT2NUM(GL_RGBA8_OES));
 	rb_define_const(module, "GL_RGBA8_SNORM", INT2NUM(GL_RGBA8_SNORM));
 	rb_define_const(module, "GL_RGBA_DXT5_S3TC", INT2NUM(GL_RGBA_DXT5_S3TC));
 	rb_define_const(module, "GL_RGBA_FLOAT16_APPLE", INT2NUM(GL_RGBA_FLOAT16_APPLE));
@@ -3832,6 +3813,7 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_STATIC_DRAW_ARB", INT2NUM(GL_STATIC_DRAW_ARB));
 	rb_define_const(module, "GL_STATIC_READ", INT2NUM(GL_STATIC_READ));
 	rb_define_const(module, "GL_STATIC_READ_ARB", INT2NUM(GL_STATIC_READ_ARB));
+	rb_define_const(module, "GL_STATIC_VERTEX_ARRAY_IBM", INT2NUM(GL_STATIC_VERTEX_ARRAY_IBM));
 	rb_define_const(module, "GL_STENCIL", INT2NUM(GL_STENCIL));
 	rb_define_const(module, "GL_STENCIL_ATTACHMENT", INT2NUM(GL_STENCIL_ATTACHMENT));
 	rb_define_const(module, "GL_STENCIL_ATTACHMENT_EXT", INT2NUM(GL_STENCIL_ATTACHMENT_EXT));
@@ -4336,8 +4318,8 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_TEXT_FRAGMENT_SHADER_ATI", INT2NUM(GL_TEXT_FRAGMENT_SHADER_ATI));
 	rb_define_const(module, "GL_TIMEOUT_EXPIRED", INT2NUM(GL_TIMEOUT_EXPIRED));
 	rb_define_const(module, "GL_TIMEOUT_EXPIRED_APPLE", INT2NUM(GL_TIMEOUT_EXPIRED_APPLE));
-	rb_define_const(module, "GL_TIMEOUT_IGNORED", LL2NUM(GL_TIMEOUT_IGNORED));
-	rb_define_const(module, "GL_TIMEOUT_IGNORED_APPLE", LL2NUM(GL_TIMEOUT_IGNORED_APPLE));
+	rb_define_const(module, "GL_TIMEOUT_IGNORED", INT2NUM(GL_TIMEOUT_IGNORED));
+	rb_define_const(module, "GL_TIMEOUT_IGNORED_APPLE", INT2NUM(GL_TIMEOUT_IGNORED_APPLE));
 	rb_define_const(module, "GL_TIMESTAMP", INT2NUM(GL_TIMESTAMP));
 	rb_define_const(module, "GL_TIME_ELAPSED", INT2NUM(GL_TIME_ELAPSED));
 	rb_define_const(module, "GL_TIME_ELAPSED_EXT", INT2NUM(GL_TIME_ELAPSED_EXT));
@@ -4425,7 +4407,6 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_TRIANGLE_STRIP_ADJACENCY_EXT", INT2NUM(GL_TRIANGLE_STRIP_ADJACENCY_EXT));
 	rb_define_const(module, "GL_TRIANGULAR_NV", INT2NUM(GL_TRIANGULAR_NV));
 	rb_define_const(module, "GL_TYPE", INT2NUM(GL_TYPE));
-	rb_define_const(module, "GL_TYPE_RGBA_FLOAT_ATI", INT2NUM(GL_TYPE_RGBA_FLOAT_ATI));
 	rb_define_const(module, "GL_UNDEFINED_APPLE", INT2NUM(GL_UNDEFINED_APPLE));
 	rb_define_const(module, "GL_UNDEFINED_VERTEX", INT2NUM(GL_UNDEFINED_VERTEX));
 	rb_define_const(module, "GL_UNIFORM", INT2NUM(GL_UNIFORM));
@@ -4579,7 +4560,6 @@ void gl_init_enums(VALUE module)
 	rb_define_const(module, "GL_UNSIGNED_INT_VEC4", INT2NUM(GL_UNSIGNED_INT_VEC4));
 	rb_define_const(module, "GL_UNSIGNED_INT_VEC4_EXT", INT2NUM(GL_UNSIGNED_INT_VEC4_EXT));
 	rb_define_const(module, "GL_UNSIGNED_INVERT_NV", INT2NUM(GL_UNSIGNED_INVERT_NV));
-	rb_define_const(module, "GL_UNSIGNED_NEGATE_NV", INT2NUM(GL_UNSIGNED_NEGATE_NV));
 	rb_define_const(module, "GL_UNSIGNED_NORMALIZED", INT2NUM(GL_UNSIGNED_NORMALIZED));
 	rb_define_const(module, "GL_UNSIGNED_NORMALIZED_ARB", INT2NUM(GL_UNSIGNED_NORMALIZED_ARB));
 	rb_define_const(module, "GL_UNSIGNED_NORMALIZED_EXT", INT2NUM(GL_UNSIGNED_NORMALIZED_EXT));