opengl 0.8.0 → 0.9.0

data/ext/opengl/gl-1.3.c

@@ -46,7 +46,7 @@ VALUE obj; \
 { \
 	int num; \
 	VALUE ary, args[5]; \
-	switch (num = rb_scan_args(argc, argv, "23", &args[0], &args[1], &args[2], &args[3],&args[4])) { \
+	switch (num = rb_scan_args(argc, argv, "23", &args[0], &args[1], &args[2], &args[3], &args[4])) { \
 	case 2: \
 		if (TYPE(args[1]) == T_ARRAY) { \
 		ary = args[1]; \
@@ -139,7 +139,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	border = (GLint)NUM2INT(arg7);
 	imagesize = (GLsizei)NUM2UINT(arg8);
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
-		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,(GLvoid *)NUM2LONG(arg9));
+		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,(GLvoid *)NUM2SIZET(arg9));
 	} else {
 		if (TYPE(arg9) == T_STRING || TYPE(arg9) == T_ARRAY) {
 			VALUE data;
@@ -181,7 +181,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	border = (GLint)NUM2INT(arg6);
 	imagesize = (GLsizei)NUM2UINT(arg7);
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
-		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,(GLvoid *)NUM2LONG(arg8));
+		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,(GLvoid *)NUM2SIZET(arg8));
 	} else {
 		if (TYPE(arg8) == T_STRING || TYPE(arg8) == T_ARRAY) {
 			VALUE data;
@@ -221,7 +221,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	border = (GLint)NUM2INT(arg5);
 	imagesize = (GLsizei)NUM2UINT(arg6);
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
-		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,(GLvoid *)NUM2LONG(arg7));
+		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,(GLvoid *)NUM2SIZET(arg7));
 	} else {
 		if (TYPE(arg7) == T_STRING || TYPE(arg7) == T_ARRAY) {
 			VALUE data;
@@ -269,7 +269,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	format = (GLenum)NUM2INT(arg9);
 	imagesize = (GLsizei)NUM2UINT(arg10);
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
-		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,(GLvoid *)NUM2LONG(arg11));
+		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,(GLvoid *)NUM2SIZET(arg11));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg11);
@@ -307,7 +307,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	format = (GLenum)NUM2INT(arg7);
 	imagesize = (GLsizei)NUM2UINT(arg8);
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
-		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,(GLvoid *)NUM2LONG(arg9));
+		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,(GLvoid *)NUM2SIZET(arg9));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg9);
@@ -340,7 +340,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	format = (GLenum)NUM2INT(arg5);
 	imagesize = (GLsizei)NUM2UINT(arg6);
 	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
-		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,(GLvoid *)NUM2LONG(arg7));
+		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,(GLvoid *)NUM2SIZET(arg7));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg7);
@@ -382,9 +382,9 @@ VALUE obj;
 			CHECK_GLERROR_FROM("glGetCompressedTexImage");
 			return data;
 		case 3:
-			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)NUM2LONG(args[2]));
+			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)NUM2SIZET(args[2]));
 			CHECK_GLERROR_FROM("glGetCompressedTexImage");
-			return Qnil;	
+			return Qnil;
 	}
 }
 

data/ext/opengl/gl-1.4.c

@@ -80,7 +80,7 @@ VALUE obj,arg1,arg2,arg3;
 	stride = (GLsizei)NUM2UINT(arg2);
 	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
 		g_FogCoord_ptr = arg3;
-		fptr_glFogCoordPointer(type, stride, (const GLvoid*)NUM2LONG(arg3));
+		fptr_glFogCoordPointer(type, stride, (const GLvoid*)NUM2SIZET(arg3));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(GL_UNSIGNED_BYTE,arg3);
@@ -100,10 +100,10 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum mode;
 	GLint *ary1;
 	GLsizei *ary2;
-  int len1,len2;
+	int len1,len2;
 	LOAD_GL_FUNC(glMultiDrawArrays, "1.4");
-  len1 = (int)RARRAY_LENINT(arg2);
-  len2 = (int)RARRAY_LENINT(arg3);
+	len1 = (int)RARRAY_LENINT(arg2);
+	len2 = (int)RARRAY_LENINT(arg3);
 	if (len1!=len2)
 			rb_raise(rb_eArgError, "Passed arrays must have same length");
 	mode = (GLenum)NUM2INT(arg1);
@@ -171,7 +171,7 @@ VALUE obj;
 			indices = ALLOC_N(GLvoid*,size);
 			for (i=0;i<size;i++) {
 				counts[i] = (GLsizei)NUM2INT(rb_ary_entry(args[2],i));
-				indices[i] = (GLvoid *)NUM2LONG(rb_ary_entry(args[3],i));
+				indices[i] = (GLvoid *)NUM2SIZET(rb_ary_entry(args[3],i));
 			}
 			fptr_glMultiDrawElements(mode,counts,type,indices,size);
 			xfree(counts);
@@ -198,7 +198,7 @@ VALUE obj,arg1,arg2;
 	else
 		size = 1;
 	ary2cflt(arg2,params,size);
-	fptr_glPointParameterfv(pname,params);	
+	fptr_glPointParameterfv(pname,params);
 	CHECK_GLERROR_FROM("glPointParameterfv");
 	return Qnil;
 }
@@ -219,7 +219,7 @@ VALUE obj,arg1,arg2;
 	else
 		size = 1;
 	ary2cint(arg2,params,size);
-	fptr_glPointParameteriv(pname,params);	
+	fptr_glPointParameteriv(pname,params);
 	CHECK_GLERROR_FROM("glPointParameteriv");
 	return Qnil;
 }
@@ -262,7 +262,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	stride = (GLsizei)NUM2UINT(arg3);
 	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
 		g_SecondaryColor_ptr = arg4;
-		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)NUM2LONG(arg4));
+		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)NUM2SIZET(arg4));
 	} else {
 		VALUE data;
 		data = pack_array_or_pass_string(type,arg4);

data/ext/opengl/gl-1.5.c

@@ -172,7 +172,7 @@ gl_MapBuffer(VALUE self, VALUE _target, VALUE _access) {
 	if (buffer_ptr == NULL || size <= 0)
 		return Qnil;
 
-  return rb_str_new(buffer_ptr, size);
+	return rb_str_new(buffer_ptr, size);
 }
 
 static GLboolean (APIENTRY * fptr_glUnmapBuffer)(GLenum);

data/ext/opengl/gl-2.0.c

@@ -60,17 +60,17 @@ static VALUE
 gl_DrawBuffers(obj,arg1)
 VALUE obj,arg1;
 {
-	GLsizei size;
-	GLenum *buffers;
-	LOAD_GL_FUNC(glDrawBuffers, "2.0");
-	Check_Type(arg1,T_ARRAY); 
-	size = (GLsizei)RARRAY_LENINT(arg1);
-	buffers = ALLOC_N(GLenum,size);
-	ary2cuint(arg1,buffers,size);
-	fptr_glDrawBuffers(size,buffers);
-	xfree(buffers);
-	CHECK_GLERROR_FROM("glDrawBuffers");
-	return Qnil;
+  GLsizei size;
+  GLenum *buffers;
+  LOAD_GL_FUNC(glDrawBuffers, "2.0");
+  Check_Type(arg1,T_ARRAY);
+  size = (GLsizei)RARRAY_LENINT(arg1);
+  buffers = ALLOC_N(GLenum,size);
+  ary2cuint(arg1,buffers,size);
+  fptr_glDrawBuffers(size,buffers);
+  xfree(buffers);
+  CHECK_GLERROR_FROM("glDrawBuffers");
+  return Qnil;
 }
 
 static void (APIENTRY * fptr_glBindAttribLocation)(GLuint,GLuint,GLchar *);
@@ -78,15 +78,15 @@ static VALUE
 gl_BindAttribLocation(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
-	GLuint program;
-	GLuint index;
-	LOAD_GL_FUNC(glBindAttribLocation, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	index = (GLuint)NUM2UINT(arg2);
-	Check_Type(arg3, T_STRING);
-	fptr_glBindAttribLocation(program,index,RSTRING_PTR(arg3));
-	CHECK_GLERROR_FROM("glBindAttribLocation");
-	return Qnil;
+  GLuint program;
+  GLuint index;
+  LOAD_GL_FUNC(glBindAttribLocation, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  index = (GLuint)NUM2UINT(arg2);
+  Check_Type(arg3, T_STRING);
+  fptr_glBindAttribLocation(program,index,RSTRING_PTR(arg3));
+  CHECK_GLERROR_FROM("glBindAttribLocation");
+  return Qnil;
 }
 
 static void (APIENTRY * fptr_glGetProgramiv)(GLuint,GLenum,GLint *);
@@ -94,15 +94,15 @@ static VALUE
 gl_GetProgramiv(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint program;
-	GLenum pname;
-	GLint params = 0;
-	LOAD_GL_FUNC(glGetProgramiv, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	fptr_glGetProgramiv(program,pname,&params);
-	CHECK_GLERROR_FROM("glGetProgramiv");
-	return cond_GLBOOL2RUBY(pname,params);
+  GLuint program;
+  GLenum pname;
+  GLint params = 0;
+  LOAD_GL_FUNC(glGetProgramiv, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  pname = (GLenum)NUM2INT(arg2);
+  fptr_glGetProgramiv(program,pname,&params);
+  CHECK_GLERROR_FROM("glGetProgramiv");
+  return cond_GLBOOL2RUBY(pname,params);
 }
 
 static void (APIENTRY * fptr_glGetActiveAttrib)(GLuint,GLuint,GLsizei,GLsizei *,GLint *,GLenum *,GLchar *);
@@ -110,30 +110,33 @@ static VALUE
 gl_GetActiveAttrib(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint program;
-	GLuint index;
-	GLsizei max_size = 0;
-	GLsizei written = 0;
-	GLint attrib_size = 0;
-	GLenum attrib_type = 0;
-	VALUE buffer;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetActiveAttrib, "2.0");
-	LOAD_GL_FUNC(glGetProgramiv, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	index = (GLuint)NUM2UINT(arg2);
-	fptr_glGetProgramiv(program,GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,&max_size);
-	CHECK_GLERROR_FROM("glGetProgramiv");
-	if (max_size==0)
-		rb_raise(rb_eTypeError, "Can't determine maximum attribute name length");
-	buffer = allocate_buffer_with_string(max_size-1);
-	fptr_glGetActiveAttrib(program,index,max_size,&written,&attrib_size,&attrib_type,RSTRING_PTR(buffer));
-	retary = rb_ary_new2(3);
-	rb_ary_push(retary, INT2NUM(attrib_size));
-	rb_ary_push(retary, INT2NUM(attrib_type));
-	rb_ary_push(retary, buffer);
-	CHECK_GLERROR_FROM("glGetActiveAttrib");
-	return retary;
+  GLuint program;
+  GLuint index;
+  GLsizei max_size = 0;
+  GLsizei written = 0;
+  GLint attrib_size = 0;
+  GLenum attrib_type = 0;
+  VALUE buffer;
+  VALUE retary;
+  LOAD_GL_FUNC(glGetActiveAttrib, "2.0");
+  LOAD_GL_FUNC(glGetProgramiv, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  index = (GLuint)NUM2UINT(arg2);
+  fptr_glGetProgramiv(program,GL_ACTIVE_ATTRIBUTE_MAX_LENGTH,&max_size);
+  CHECK_GLERROR_FROM("glGetProgramiv");
+  /* Can't determine maximum attribute name length, so presume it */
+  if (max_size==0) max_size = 256;
+  buffer = allocate_buffer_with_string(max_size-1);
+
+  fptr_glGetActiveAttrib(program,index,max_size,&written,&attrib_size,&attrib_type,RSTRING_PTR(buffer));
+
+  rb_str_set_len(buffer, written);
+  retary = rb_ary_new2(3);
+  rb_ary_push(retary, INT2NUM(attrib_size));
+  rb_ary_push(retary, INT2NUM(attrib_type));
+  rb_ary_push(retary, buffer);
+  CHECK_GLERROR_FROM("glGetActiveAttrib");
+  return retary;
 }
 
 static void (APIENTRY * fptr_glGetActiveUniform)(GLuint,GLuint,GLsizei,GLsizei*,GLint*,GLenum*,GLchar*);
@@ -141,33 +144,33 @@ static VALUE
 gl_GetActiveUniform(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint program;
-	GLuint index;
-	GLsizei max_size = 0;
-	GLsizei written = 0;
-	GLint uniform_size = 0;
-	GLenum uniform_type = 0;
-	VALUE buffer;
-	VALUE retary;
-	LOAD_GL_FUNC(glGetActiveUniform, "2.0");
-	LOAD_GL_FUNC(glGetProgramiv, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	index = (GLuint)NUM2UINT(arg2);
-	fptr_glGetProgramiv(program,GL_ACTIVE_UNIFORM_MAX_LENGTH,&max_size);
-	CHECK_GLERROR_FROM("glGetProgramiv");
-	if (max_size==0)
-		rb_raise(rb_eTypeError, "Can't determine maximum uniform name length");
-	buffer = allocate_buffer_with_string(max_size-1);
-
-	fptr_glGetActiveUniform(program,index,max_size,&written,&uniform_size,&uniform_type,RSTRING_PTR(buffer));
-
-  rb_str_set_len(buffer, strnlen(RSTRING_PTR(buffer), max_size));
-	retary = rb_ary_new2(3);
-	rb_ary_push(retary, INT2NUM(uniform_size));
-	rb_ary_push(retary, INT2NUM(uniform_type));
-	rb_ary_push(retary, buffer);
-	CHECK_GLERROR_FROM("glGetActiveUniform");
-	return retary;
+  GLuint program;
+  GLuint index;
+  GLsizei max_size = 0;
+  GLsizei written = 0;
+  GLint uniform_size = 0;
+  GLenum uniform_type = 0;
+  VALUE buffer;
+  VALUE retary;
+  LOAD_GL_FUNC(glGetActiveUniform, "2.0");
+  LOAD_GL_FUNC(glGetProgramiv, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  index = (GLuint)NUM2UINT(arg2);
+  fptr_glGetProgramiv(program,GL_ACTIVE_UNIFORM_MAX_LENGTH,&max_size);
+  CHECK_GLERROR_FROM("glGetProgramiv");
+  /* Can't determine maximum uniform name length, so presume it */
+  if (max_size==0) max_size = 256;
+  buffer = allocate_buffer_with_string(max_size-1);
+
+  fptr_glGetActiveUniform(program,index,max_size,&written,&uniform_size,&uniform_type,RSTRING_PTR(buffer));
+
+  rb_str_set_len(buffer, written);
+  retary = rb_ary_new2(3);
+  rb_ary_push(retary, INT2NUM(uniform_size));
+  rb_ary_push(retary, INT2NUM(uniform_type));
+  rb_ary_push(retary, buffer);
+  CHECK_GLERROR_FROM("glGetActiveUniform");
+  return retary;
 }
 
 static void (APIENTRY * fptr_glGetAttachedShaders)(GLuint,GLsizei,GLsizei *,GLuint *);
@@ -175,19 +178,19 @@ static VALUE
 gl_GetAttachedShaders(obj,arg1)
 VALUE obj,arg1;
 {
-	GLuint program;
-	GLint shaders_num = 0;
-	GLuint *shaders;
-	GLsizei count = 0;
-	LOAD_GL_FUNC(glGetAttachedShaders, "2.0");
-	LOAD_GL_FUNC(glGetProgramiv, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	fptr_glGetProgramiv(program,GL_ATTACHED_SHADERS,&shaders_num);
-	CHECK_GLERROR_FROM("glGetProgramiv");
-	if (shaders_num<=0)
-		return Qnil;
-	shaders = ALLOC_N(GLuint,shaders_num);
-	fptr_glGetAttachedShaders(program,shaders_num,&count,shaders);
+  GLuint program;
+  GLint shaders_num = 0;
+  GLuint *shaders;
+  GLsizei count = 0;
+  LOAD_GL_FUNC(glGetAttachedShaders, "2.0");
+  LOAD_GL_FUNC(glGetProgramiv, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  fptr_glGetProgramiv(program,GL_ATTACHED_SHADERS,&shaders_num);
+  CHECK_GLERROR_FROM("glGetProgramiv");
+  if (shaders_num<=0)
+    return Qnil;
+  shaders = ALLOC_N(GLuint,shaders_num);
+  fptr_glGetAttachedShaders(program,shaders_num,&count,shaders);
   RET_ARRAY_OR_SINGLE_FREE("glGetAttachedShaders", count, RETCONV_GLuint,
       shaders);
 }
@@ -197,14 +200,14 @@ static VALUE
 gl_GetAttribLocation(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint program;
-	GLint ret;
-	LOAD_GL_FUNC(glGetAttribLocation, "2.0");
-	program=(GLuint)NUM2UINT(arg1);
-	Check_Type(arg2,T_STRING);
-	ret = fptr_glGetAttribLocation(program,RSTRING_PTR(arg2));
-	CHECK_GLERROR_FROM("glGetAttribLocation");
-	return INT2NUM(ret);
+  GLuint program;
+  GLint ret;
+  LOAD_GL_FUNC(glGetAttribLocation, "2.0");
+  program=(GLuint)NUM2UINT(arg1);
+  Check_Type(arg2,T_STRING);
+  ret = fptr_glGetAttribLocation(program,RSTRING_PTR(arg2));
+  CHECK_GLERROR_FROM("glGetAttribLocation");
+  return INT2NUM(ret);
 }
 
 static void (APIENTRY * fptr_glGetProgramInfoLog)(GLuint,GLsizei,GLsizei *,GLchar *);
@@ -212,21 +215,22 @@ static VALUE
 gl_GetProgramInfoLog(obj,arg1)
 VALUE obj,arg1;
 {
-	GLuint program;	
-	GLint max_size = 0;
-	GLsizei ret_length = 0;
-	VALUE buffer;
-	LOAD_GL_FUNC(glGetProgramInfoLog, "2.0");
-	LOAD_GL_FUNC(glGetProgramiv, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	fptr_glGetProgramiv(program,GL_INFO_LOG_LENGTH,&max_size);
-	CHECK_GLERROR_FROM("glGetProgramiv");
-	if (max_size<=0)
-		return rb_str_new2("");
-	buffer = allocate_buffer_with_string(max_size);
-	fptr_glGetProgramInfoLog(program,max_size,&ret_length,RSTRING_PTR(buffer));
-	CHECK_GLERROR_FROM("glGetProgramInfoLog");
-	return buffer;
+  GLuint program;
+  GLint max_size = 0;
+  GLsizei ret_length = 0;
+  VALUE buffer;
+  LOAD_GL_FUNC(glGetProgramInfoLog, "2.0");
+  LOAD_GL_FUNC(glGetProgramiv, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  fptr_glGetProgramiv(program,GL_INFO_LOG_LENGTH,&max_size);
+  CHECK_GLERROR_FROM("glGetProgramiv");
+  if (max_size<=0)
+    return rb_str_new2("");
+  buffer = allocate_buffer_with_string(max_size);
+  fptr_glGetProgramInfoLog(program,max_size,&ret_length,RSTRING_PTR(buffer));
+  rb_str_set_len(buffer, ret_length);
+  CHECK_GLERROR_FROM("glGetProgramInfoLog");
+  return buffer;
 }
 
 static void (APIENTRY * fptr_glGetShaderiv)(GLuint,GLenum,GLint *);
@@ -234,15 +238,15 @@ static VALUE
 gl_GetShaderiv(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint program;
-	GLenum pname;
-	GLint params = 0;
-	LOAD_GL_FUNC(glGetShaderiv, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	fptr_glGetShaderiv(program,pname,&params);
-	CHECK_GLERROR_FROM("glGetShaderiv");
-	return cond_GLBOOL2RUBY(pname,params);
+  GLuint program;
+  GLenum pname;
+  GLint params = 0;
+  LOAD_GL_FUNC(glGetShaderiv, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  pname = (GLenum)NUM2INT(arg2);
+  fptr_glGetShaderiv(program,pname,&params);
+  CHECK_GLERROR_FROM("glGetShaderiv");
+  return cond_GLBOOL2RUBY(pname,params);
 }
 
 static void (APIENTRY * fptr_glGetShaderInfoLog)(GLuint,GLsizei,GLsizei *,GLchar *);
@@ -250,25 +254,25 @@ static VALUE
 gl_GetShaderInfoLog(obj,arg1)
 VALUE obj,arg1;
 {
-	GLuint program;	
-	GLint max_size = 0;
-	GLsizei ret_length = 0;
-	VALUE ret_buffer;
-	GLchar *buffer;
-	LOAD_GL_FUNC(glGetShaderInfoLog, "2.0");
-	LOAD_GL_FUNC(glGetShaderiv, "2.0");
-	program = (GLuint)NUM2UINT(arg1);
-	fptr_glGetShaderiv(program,GL_INFO_LOG_LENGTH,&max_size);
-	CHECK_GLERROR_FROM("glGetShaderiv");
-	if (max_size<=0)
-		return rb_str_new2("");
-	buffer = ALLOC_N(GLchar,max_size+1);
-	memset(buffer,0,sizeof(GLchar) * (max_size+1));
-	fptr_glGetShaderInfoLog(program,max_size,&ret_length,buffer);
-	ret_buffer = rb_str_new(buffer, ret_length);
-	xfree(buffer);
-	CHECK_GLERROR_FROM("glGetShaderInfoLog");
-	return ret_buffer;
+  GLuint program;
+  GLint max_size = 0;
+  GLsizei ret_length = 0;
+  VALUE ret_buffer;
+  GLchar *buffer;
+  LOAD_GL_FUNC(glGetShaderInfoLog, "2.0");
+  LOAD_GL_FUNC(glGetShaderiv, "2.0");
+  program = (GLuint)NUM2UINT(arg1);
+  fptr_glGetShaderiv(program,GL_INFO_LOG_LENGTH,&max_size);
+  CHECK_GLERROR_FROM("glGetShaderiv");
+  if (max_size<=0)
+    return rb_str_new2("");
+  buffer = ALLOC_N(GLchar,max_size+1);
+  memset(buffer,0,sizeof(GLchar) * (max_size+1));
+  fptr_glGetShaderInfoLog(program,max_size,&ret_length,buffer);
+  ret_buffer = rb_str_new(buffer, ret_length);
+  xfree(buffer);
+  CHECK_GLERROR_FROM("glGetShaderInfoLog");
+  return ret_buffer;
 }
 
 static void (APIENTRY * fptr_glGetShaderSource)(GLuint,GLsizei,GLsizei *,GLchar *);
@@ -276,21 +280,21 @@ static VALUE
 gl_GetShaderSource(obj,arg1)
 VALUE obj,arg1;
 {
-	GLuint shader;
-	GLint max_size = 0;
-	GLsizei ret_length = 0;
-	VALUE buffer;
-	LOAD_GL_FUNC(glGetShaderSource, "2.0");
-	LOAD_GL_FUNC(glGetShaderiv, "2.0");
-	shader = (GLuint)NUM2UINT(arg1);
-	fptr_glGetShaderiv(shader,GL_SHADER_SOURCE_LENGTH,&max_size);
-	CHECK_GLERROR_FROM("glGetShaderiv");
-	if (max_size==0)
-		rb_raise(rb_eTypeError, "Can't determine maximum shader source length");
-	buffer = allocate_buffer_with_string(max_size-1);
-	fptr_glGetShaderSource(shader,max_size,&ret_length,RSTRING_PTR(buffer));
-	CHECK_GLERROR_FROM("glGetShaderSource");
-	return buffer;
+  GLuint shader;
+  GLint max_size = 0;
+  GLsizei ret_length = 0;
+  VALUE buffer;
+  LOAD_GL_FUNC(glGetShaderSource, "2.0");
+  LOAD_GL_FUNC(glGetShaderiv, "2.0");
+  shader = (GLuint)NUM2UINT(arg1);
+  fptr_glGetShaderiv(shader,GL_SHADER_SOURCE_LENGTH,&max_size);
+  CHECK_GLERROR_FROM("glGetShaderiv");
+  if (max_size==0)
+    rb_raise(rb_eTypeError, "Can't determine maximum shader source length");
+  buffer = allocate_buffer_with_string(max_size-1);
+  fptr_glGetShaderSource(shader,max_size,&ret_length,RSTRING_PTR(buffer));
+  CHECK_GLERROR_FROM("glGetShaderSource");
+  return buffer;
 }
 
 static GLint (APIENTRY * fptr_glGetUniformLocation)(GLuint,const GLchar*);
@@ -298,15 +302,15 @@ static VALUE
 gl_GetUniformLocation(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint program;
-	GLint ret;
-	LOAD_GL_FUNC(glGetUniformLocation, "2.0");
-	program=(GLuint)NUM2UINT(arg1);
-	Check_Type(arg2,T_STRING);
-	ret = fptr_glGetUniformLocation(program, RSTRING_PTR(arg2));
+  GLuint program;
+  GLint ret;
+  LOAD_GL_FUNC(glGetUniformLocation, "2.0");
+  program=(GLuint)NUM2UINT(arg1);
+  Check_Type(arg2,T_STRING);
+  ret = fptr_glGetUniformLocation(program, RSTRING_PTR(arg2));
 
   CHECK_GLERROR_FROM("glGetUniformLocation");
-	return INT2NUM(ret);
+  return INT2NUM(ret);
 }
 
 #define GETUNIFORM_FUNC(_name_,_type_) \
@@ -315,28 +319,28 @@ static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
-	GLuint program; \
-	GLint location; \
-	_type_ params[16]; \
-	GLint unused = 0; \
-	GLenum uniform_type = 0; \
-	GLint uniform_size = 0; \
+  GLuint program; \
+  GLint location; \
+  _type_ params[16]; \
+  GLint unused = 0; \
+  GLenum uniform_type = 0; \
+  GLint uniform_size = 0; \
 \
-	LOAD_GL_FUNC(gl##_name_, "2.0"); \
-	LOAD_GL_FUNC(glGetActiveUniform, "2.0"); \
-	program = (GLuint)NUM2UINT(arg1); \
-	location = (GLint)NUM2INT(arg2); \
+  LOAD_GL_FUNC(gl##_name_, "2.0"); \
+  LOAD_GL_FUNC(glGetActiveUniform, "2.0"); \
+  program = (GLuint)NUM2UINT(arg1); \
+  location = (GLint)NUM2INT(arg2); \
 \
-	fptr_glGetActiveUniform(program,location,0,NULL,&unused,&uniform_type,NULL); \
-	CHECK_GLERROR_FROM("glGetActiveUniform"); \
-	if (uniform_type==0) \
-		rb_raise(rb_eTypeError, "Can't determine the uniform's type"); \
+  fptr_glGetActiveUniform(program,location,0,NULL,&unused,&uniform_type,NULL); \
+  CHECK_GLERROR_FROM("glGetActiveUniform"); \
+  if (uniform_type==0) \
+    rb_raise(rb_eTypeError, "Can't determine the uniform's type"); \
 \
-	uniform_size = get_uniform_size(uniform_type); \
+  uniform_size = get_uniform_size(uniform_type); \
 \
-	memset(params,0,16*sizeof(_type_)); \
-	fptr_gl##_name_(program,location,params); \
-	RET_ARRAY_OR_SINGLE("gl" #_name_, uniform_size, RETCONV_##_type_, params); \
+  memset(params,0,16*sizeof(_type_)); \
+  fptr_gl##_name_(program,location,params); \
+  RET_ARRAY_OR_SINGLE("gl" #_name_, uniform_size, RETCONV_##_type_, params); \
 }
 
 GETUNIFORM_FUNC(GetUniformfv,GLfloat)
@@ -349,19 +353,19 @@ static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
-	GLuint index; \
-	GLenum pname; \
-	_type_ params[4] = {0,0,0,0}; \
-	GLint size; \
-	LOAD_GL_FUNC(gl##_name_, "2.0"); \
-	index = (GLuint)NUM2UINT(arg1); \
-	pname = (GLenum)NUM2INT(arg2); \
-	if (pname==GL_CURRENT_VERTEX_ATTRIB) \
-		size = 4; \
-	else \
-		size = 1; \
-	fptr_gl##_name_(index,pname,params); \
-	RET_ARRAY_OR_SINGLE("gl" #_name_, size, RETCONV_##_type_, params); \
+  GLuint index; \
+  GLenum pname; \
+  _type_ params[4] = {0,0,0,0}; \
+  GLint size; \
+  LOAD_GL_FUNC(gl##_name_, "2.0"); \
+  index = (GLuint)NUM2UINT(arg1); \
+  pname = (GLenum)NUM2INT(arg2); \
+  if (pname==GL_CURRENT_VERTEX_ATTRIB) \
+    size = 4; \
+  else \
+    size = 1; \
+  fptr_gl##_name_(index,pname,params); \
+  RET_ARRAY_OR_SINGLE("gl" #_name_, size, RETCONV_##_type_, params); \
 }
 
 GETVERTEXATTRIB_FUNC(GetVertexAttribdv,GLdouble)
@@ -374,18 +378,18 @@ static VALUE
 gl_GetVertexAttribiv(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint index;
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	GLint size;
-	LOAD_GL_FUNC(glGetVertexAttribiv, "2.0");
-	index = (GLuint)NUM2UINT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	if (pname==GL_CURRENT_VERTEX_ATTRIB)
-		size = 4;
-	else
-		size = 1;
-	fptr_glGetVertexAttribiv(index,pname,params);
+  GLuint index;
+  GLenum pname;
+  GLint params[4] = {0,0,0,0};
+  GLint size;
+  LOAD_GL_FUNC(glGetVertexAttribiv, "2.0");
+  index = (GLuint)NUM2UINT(arg1);
+  pname = (GLenum)NUM2INT(arg2);
+  if (pname==GL_CURRENT_VERTEX_ATTRIB)
+    size = 4;
+  else
+    size = 1;
+  fptr_glGetVertexAttribiv(index,pname,params);
   RET_ARRAY_OR_SINGLE_BOOL("glGetVertexAttribiv", size, cond_GLBOOL2RUBY,
       pname, params);
 }
@@ -398,13 +402,13 @@ static VALUE
 gl_GetVertexAttribPointerv(obj,arg1)
 VALUE obj,arg1;
 {
-	GLuint index;
-	LOAD_GL_FUNC(glGetVertexAttribPointerv, "2.0");
-	index =(GLuint) NUM2INT(arg1);
-	if (index>_MAX_VERTEX_ATTRIBS)
-		rb_raise(rb_eArgError, "Index too large, maximum allowed value '%i'",_MAX_VERTEX_ATTRIBS);
+  GLuint index;
+  LOAD_GL_FUNC(glGetVertexAttribPointerv, "2.0");
+  index =(GLuint) NUM2INT(arg1);
+  if (index>_MAX_VERTEX_ATTRIBS)
+    rb_raise(rb_eArgError, "Index too large, maximum allowed value '%i'",_MAX_VERTEX_ATTRIBS);
 
-	return g_VertexAttrib_ptr[index];
+  return g_VertexAttrib_ptr[index];
 }
 
 static void (APIENTRY * fptr_glShaderSource)(GLuint,GLsizei,GLchar**,GLint *);
@@ -412,17 +416,17 @@ static VALUE
 gl_ShaderSource(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
-	GLuint shader;
-	GLint length;
-	GLchar *str;
-	LOAD_GL_FUNC(glShaderSource, "2.0");
-	shader = (GLuint)NUM2UINT(arg1);
-	Check_Type(arg2,T_STRING);
-	str = RSTRING_PTR(arg2);
-	length = (GLint)RSTRING_LENINT(arg2);
-	fptr_glShaderSource(shader,1,&str,&length);
-	CHECK_GLERROR_FROM("glShaderSource");
-	return Qnil;
+  GLuint shader;
+  GLint length;
+  GLchar *str;
+  LOAD_GL_FUNC(glShaderSource, "2.0");
+  shader = (GLuint)NUM2UINT(arg1);
+  Check_Type(arg2,T_STRING);
+  str = RSTRING_PTR(arg2);
+  length = (GLint)RSTRING_LENINT(arg2);
+  fptr_glShaderSource(shader,1,&str,&length);
+  CHECK_GLERROR_FROM("glShaderSource");
+  return Qnil;
 }
 
 #define UNIFORM_FUNC_V(_name_,_type_,_conv_,_size_) \
@@ -431,21 +435,21 @@ static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
-	GLint location; \
-	GLsizei count; \
-	_type_ *value; \
-	LOAD_GL_FUNC(gl##_name_,"2.0"); \
-	Check_Type(arg2,T_ARRAY); \
-	count = (GLsizei)RARRAY_LENINT(arg2); \
-	if (count<=0 || (count % _size_) != 0) \
-		rb_raise(rb_eArgError, "Parameter array size must be multiplication of %i",_size_); \
-	location = (GLint)NUM2INT(arg1); \
-	value = ALLOC_N(_type_,count); \
-	_conv_(arg2,value,count); \
-	fptr_gl##_name_(location,count / _size_,value); \
-	xfree(value); \
-	CHECK_GLERROR_FROM("gl" #_name_); \
-	return Qnil; \
+  GLint location; \
+  GLsizei count; \
+  _type_ *value; \
+  LOAD_GL_FUNC(gl##_name_,"2.0"); \
+  Check_Type(arg2,T_ARRAY); \
+  count = (GLsizei)RARRAY_LENINT(arg2); \
+  if (count<=0 || (count % _size_) != 0) \
+    rb_raise(rb_eArgError, "Parameter array size must be multiplication of %i",_size_); \
+  location = (GLint)NUM2INT(arg1); \
+  value = ALLOC_N(_type_,count); \
+  _conv_(arg2,value,count); \
+  fptr_gl##_name_(location,count / _size_,value); \
+  xfree(value); \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return Qnil; \
 }
 
 UNIFORM_FUNC_V(Uniform1fv,GLfloat,ary2cflt,1)
@@ -464,20 +468,20 @@ static VALUE \
 gl_##_name_(obj,arg1,arg2,arg3) \
 VALUE obj,arg1,arg2,arg3; \
 { \
-	GLint location; \
-	GLsizei count; \
-	GLboolean transpose; \
-	GLfloat *value;	\
-	LOAD_GL_FUNC(gl##_name_, "2.0"); \
-	location = (GLint)NUM2INT(arg1); \
-	count = (GLsizei)RARRAY_LENINT(rb_funcall(rb_Array(arg3), rb_intern("flatten"), 0)); \
-	transpose = (GLboolean)RUBYBOOL2GL(arg2); \
-	value = ALLOC_N(GLfloat, count); \
-	ary2cmatfloatcount(arg3,value,_size_,_size_); \
-	fptr_gl##_name_(location,count / (_size_*_size_),transpose,value); \
-	xfree(value); \
-	CHECK_GLERROR_FROM("gl" #_name_); \
-	return Qnil; \
+  GLint location; \
+  GLsizei count; \
+  GLboolean transpose; \
+  GLfloat *value; \
+  LOAD_GL_FUNC(gl##_name_, "2.0"); \
+  location = (GLint)NUM2INT(arg1); \
+  count = (GLsizei)RARRAY_LENINT(rb_funcall(rb_Array(arg3), rb_intern("flatten"), 0)); \
+  transpose = (GLboolean)RUBYBOOL2GL(arg2); \
+  value = ALLOC_N(GLfloat, count); \
+  ary2cmatfloatcount(arg3,value,_size_,_size_); \
+  fptr_gl##_name_(location,count / (_size_*_size_),transpose,value); \
+  xfree(value); \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return Qnil; \
 }
 
 UNIFORMMATRIX_FUNC(UniformMatrix2fv,2)
@@ -491,14 +495,14 @@ static VALUE \
 gl_##_name_(obj,arg1,arg2) \
 VALUE obj,arg1,arg2; \
 { \
-	GLuint index; \
-	_type_ v[_size_]; \
-	LOAD_GL_FUNC(gl##_name_, "2.0"); \
-	index = (GLuint)NUM2UINT(arg1); \
-	_conv_(arg2,v,_size_); \
-	fptr_gl##_name_(index,v); \
-	CHECK_GLERROR_FROM("gl" #_name_); \
-	return Qnil; \
+  GLuint index; \
+  _type_ v[_size_]; \
+  LOAD_GL_FUNC(gl##_name_, "2.0"); \
+  index = (GLuint)NUM2UINT(arg1); \
+  _conv_(arg2,v,_size_); \
+  fptr_gl##_name_(index,v); \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return Qnil; \
 }
 
 VERTEXATTRIB_FUNC_V(VertexAttrib4Nbv,GLbyte,ary2cbyte,4)
@@ -531,133 +535,133 @@ static VALUE
 gl_VertexAttribPointer(obj,arg1,arg2,arg3,arg4,arg5,arg6)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 {
-	GLuint index;
-	GLuint size;
-	GLenum type;
-	GLboolean normalized;
-	GLsizei stride;
-	LOAD_GL_FUNC(glVertexAttribPointer, "2.0");
-	index = (GLuint)NUM2UINT(arg1);
-	size = (GLuint)NUM2UINT(arg2);
-	type = (GLenum)NUM2INT(arg3);
-	normalized = (GLboolean)RUBYBOOL2GL(arg4);
-	stride = (GLsizei)NUM2UINT(arg5);
-	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] = arg6;
-		fptr_glVertexAttribPointer(index,size,type,normalized,stride,(GLvoid *)NUM2LONG(arg6));
-	} else {
-		VALUE data;
-		data = pack_array_or_pass_string(type,arg6);
-		rb_str_freeze(data);
-		g_VertexAttrib_ptr[index] = data;
-		fptr_glVertexAttribPointer(index,size,type,normalized,stride,(GLvoid *)RSTRING_PTR(data));
-	}
-	CHECK_GLERROR_FROM("glVertexAttribPointer");
-	return Qnil;
+  GLuint index;
+  GLuint size;
+  GLenum type;
+  GLboolean normalized;
+  GLsizei stride;
+  LOAD_GL_FUNC(glVertexAttribPointer, "2.0");
+  index = (GLuint)NUM2UINT(arg1);
+  size = (GLuint)NUM2UINT(arg2);
+  type = (GLenum)NUM2INT(arg3);
+  normalized = (GLboolean)RUBYBOOL2GL(arg4);
+  stride = (GLsizei)NUM2UINT(arg5);
+  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] = arg6;
+    fptr_glVertexAttribPointer(index,size,type,normalized,stride,(GLvoid *)NUM2SIZET(arg6));
+  } else {
+    VALUE data;
+    data = pack_array_or_pass_string(type,arg6);
+    rb_str_freeze(data);
+    g_VertexAttrib_ptr[index] = data;
+    fptr_glVertexAttribPointer(index,size,type,normalized,stride,(GLvoid *)RSTRING_PTR(data));
+  }
+  CHECK_GLERROR_FROM("glVertexAttribPointer");
+  return Qnil;
 }
 
 void gl_init_functions_2_0(VALUE module)
 {
-	rb_define_module_function(module, "glBlendEquationSeparate", gl_BlendEquationSeparate, 2);
-	rb_define_module_function(module, "glDrawBuffers", gl_DrawBuffers, 1);
-	rb_define_module_function(module, "glStencilOpSeparate", gl_StencilOpSeparate, 4);
-	rb_define_module_function(module, "glStencilFuncSeparate", gl_StencilFuncSeparate, 4);
-	rb_define_module_function(module, "glStencilMaskSeparate", gl_StencilMaskSeparate, 2);
-	rb_define_module_function(module, "glAttachShader", gl_AttachShader, 2);
-	rb_define_module_function(module, "glBindAttribLocation", gl_BindAttribLocation, 3);
-	rb_define_module_function(module, "glCompileShader", gl_CompileShader, 1);
-	rb_define_module_function(module, "glCreateProgram", gl_CreateProgram, 0);
-	rb_define_module_function(module, "glCreateShader", gl_CreateShader, 1);
-	rb_define_module_function(module, "glDeleteProgram", gl_DeleteProgram, 1);
-	rb_define_module_function(module, "glDeleteShader", gl_DeleteShader, 1);
-	rb_define_module_function(module, "glDetachShader", gl_DetachShader, 2);
-	rb_define_module_function(module, "glDisableVertexAttribArray", gl_DisableVertexAttribArray, 1);
-	rb_define_module_function(module, "glEnableVertexAttribArray", gl_EnableVertexAttribArray, 1);
-	rb_define_module_function(module, "glGetActiveAttrib", gl_GetActiveAttrib, 2);
-	rb_define_module_function(module, "glGetActiveUniform", gl_GetActiveUniform, 2);
-	rb_define_module_function(module, "glGetAttachedShaders", gl_GetAttachedShaders, 1);
-	rb_define_module_function(module, "glGetAttribLocation", gl_GetAttribLocation, 2);
-	rb_define_module_function(module, "glGetProgramiv", gl_GetProgramiv, 2);
-	rb_define_module_function(module, "glGetProgramInfoLog", gl_GetProgramInfoLog, 1);
-	rb_define_module_function(module, "glGetShaderiv", gl_GetShaderiv, 2);
-	rb_define_module_function(module, "glGetShaderInfoLog", gl_GetShaderInfoLog, 1);
-	rb_define_module_function(module, "glGetShaderSource", gl_GetShaderSource, 1);
-	rb_define_module_function(module, "glGetUniformLocation", gl_GetUniformLocation, 2);
-	rb_define_module_function(module, "glGetUniformfv", gl_GetUniformfv, 2);
-	rb_define_module_function(module, "glGetUniformiv", gl_GetUniformiv, 2);
-	rb_define_module_function(module, "glGetVertexAttribdv", gl_GetVertexAttribdv, 2);
-	rb_define_module_function(module, "glGetVertexAttribfv", gl_GetVertexAttribfv, 2);
-	rb_define_module_function(module, "glGetVertexAttribiv", gl_GetVertexAttribiv, 2);
-	rb_define_module_function(module, "glGetVertexAttribPointerv", gl_GetVertexAttribPointerv, 1);
-	rb_define_module_function(module, "glIsProgram", gl_IsProgram, 1);
-	rb_define_module_function(module, "glIsShader", gl_IsShader, 1);
-	rb_define_module_function(module, "glLinkProgram", gl_LinkProgram, 1);
-	rb_define_module_function(module, "glShaderSource", gl_ShaderSource, 2);
-	rb_define_module_function(module, "glUseProgram", gl_UseProgram, 1);
-	rb_define_module_function(module, "glUniform1f", gl_Uniform1f, 2);
-	rb_define_module_function(module, "glUniform2f", gl_Uniform2f, 3);
-	rb_define_module_function(module, "glUniform3f", gl_Uniform3f, 4);
-	rb_define_module_function(module, "glUniform4f", gl_Uniform4f, 5);
-	rb_define_module_function(module, "glUniform1i", gl_Uniform1i, 2);
-	rb_define_module_function(module, "glUniform2i", gl_Uniform2i, 3);
-	rb_define_module_function(module, "glUniform3i", gl_Uniform3i, 4);
-	rb_define_module_function(module, "glUniform4i", gl_Uniform4i, 5);
-	rb_define_module_function(module, "glUniform1fv", gl_Uniform1fv, 2);
-	rb_define_module_function(module, "glUniform2fv", gl_Uniform2fv, 2);
-	rb_define_module_function(module, "glUniform3fv", gl_Uniform3fv, 2);
-	rb_define_module_function(module, "glUniform4fv", gl_Uniform4fv, 2);
-	rb_define_module_function(module, "glUniform1iv", gl_Uniform1iv, 2);
-	rb_define_module_function(module, "glUniform2iv", gl_Uniform2iv, 2);
-	rb_define_module_function(module, "glUniform3iv", gl_Uniform3iv, 2);
-	rb_define_module_function(module, "glUniform4iv", gl_Uniform4iv, 2);
-	rb_define_module_function(module, "glUniformMatrix2fv", gl_UniformMatrix2fv, 3);
-	rb_define_module_function(module, "glUniformMatrix3fv", gl_UniformMatrix3fv, 3);
-	rb_define_module_function(module, "glUniformMatrix4fv", gl_UniformMatrix4fv, 3);
-	rb_define_module_function(module, "glValidateProgram", gl_ValidateProgram, 1);
-	rb_define_module_function(module, "glVertexAttrib1d", gl_VertexAttrib1d, 2);
-	rb_define_module_function(module, "glVertexAttrib1f", gl_VertexAttrib1f, 2);
-	rb_define_module_function(module, "glVertexAttrib1s", gl_VertexAttrib1s, 2);
-	rb_define_module_function(module, "glVertexAttrib2d", gl_VertexAttrib2d, 3);
-	rb_define_module_function(module, "glVertexAttrib2f", gl_VertexAttrib2f, 3);
-	rb_define_module_function(module, "glVertexAttrib2s", gl_VertexAttrib2s, 3);
-	rb_define_module_function(module, "glVertexAttrib3d", gl_VertexAttrib3d, 4);
-	rb_define_module_function(module, "glVertexAttrib3f", gl_VertexAttrib3f, 4);
-	rb_define_module_function(module, "glVertexAttrib3s", gl_VertexAttrib3s, 4);
-	rb_define_module_function(module, "glVertexAttrib4Nbv", gl_VertexAttrib4Nbv, 2);
-	rb_define_module_function(module, "glVertexAttrib4Niv", gl_VertexAttrib4Niv, 2);
-	rb_define_module_function(module, "glVertexAttrib4Nsv", gl_VertexAttrib4Nsv, 2);
-	rb_define_module_function(module, "glVertexAttrib4Nub", gl_VertexAttrib4Nub, 5);
-	rb_define_module_function(module, "glVertexAttrib4Nubv", gl_VertexAttrib4Nubv, 2);
-	rb_define_module_function(module, "glVertexAttrib4Nuiv", gl_VertexAttrib4Nuiv, 2);
-	rb_define_module_function(module, "glVertexAttrib4Nusv", gl_VertexAttrib4Nusv, 2);
-	rb_define_module_function(module, "glVertexAttrib4bv", gl_VertexAttrib4bv, 2);
-	rb_define_module_function(module, "glVertexAttrib4d", gl_VertexAttrib4d, 5);
-	rb_define_module_function(module, "glVertexAttrib4f", gl_VertexAttrib4f, 5);
-	rb_define_module_function(module, "glVertexAttrib4iv", gl_VertexAttrib4iv, 2);
-	rb_define_module_function(module, "glVertexAttrib4s", gl_VertexAttrib4s, 5);
-	rb_define_module_function(module, "glVertexAttrib4ubv", gl_VertexAttrib4ubv, 2);
-	rb_define_module_function(module, "glVertexAttrib4uiv", gl_VertexAttrib4uiv, 2);
-	rb_define_module_function(module, "glVertexAttrib4usv", gl_VertexAttrib4usv, 2);
-	rb_define_module_function(module, "glVertexAttrib1dv", gl_VertexAttrib1dv, 2);
-	rb_define_module_function(module, "glVertexAttrib1fv", gl_VertexAttrib1fv, 2);
-	rb_define_module_function(module, "glVertexAttrib1sv", gl_VertexAttrib1sv, 2);
-	rb_define_module_function(module, "glVertexAttrib2dv", gl_VertexAttrib2dv, 2);
-	rb_define_module_function(module, "glVertexAttrib2fv", gl_VertexAttrib2fv, 2);
-	rb_define_module_function(module, "glVertexAttrib2sv", gl_VertexAttrib2sv, 2);
-	rb_define_module_function(module, "glVertexAttrib3dv", gl_VertexAttrib3dv, 2);
-	rb_define_module_function(module, "glVertexAttrib3fv", gl_VertexAttrib3fv, 2);
-	rb_define_module_function(module, "glVertexAttrib3sv", gl_VertexAttrib3sv, 2);
-	rb_define_module_function(module, "glVertexAttrib4dv", gl_VertexAttrib4dv, 2);
-	rb_define_module_function(module, "glVertexAttrib4fv", gl_VertexAttrib4fv, 2);
-	rb_define_module_function(module, "glVertexAttrib4sv", gl_VertexAttrib4sv, 2);
-	rb_define_module_function(module, "glVertexAttribPointer", gl_VertexAttribPointer, 6);
-
-	{
-		int i;
-		for (i=0;i<_MAX_VERTEX_ATTRIBS;i++)
-			rb_global_variable(&g_VertexAttrib_ptr[i]);
-	}
+  rb_define_module_function(module, "glBlendEquationSeparate", gl_BlendEquationSeparate, 2);
+  rb_define_module_function(module, "glDrawBuffers", gl_DrawBuffers, 1);
+  rb_define_module_function(module, "glStencilOpSeparate", gl_StencilOpSeparate, 4);
+  rb_define_module_function(module, "glStencilFuncSeparate", gl_StencilFuncSeparate, 4);
+  rb_define_module_function(module, "glStencilMaskSeparate", gl_StencilMaskSeparate, 2);
+  rb_define_module_function(module, "glAttachShader", gl_AttachShader, 2);
+  rb_define_module_function(module, "glBindAttribLocation", gl_BindAttribLocation, 3);
+  rb_define_module_function(module, "glCompileShader", gl_CompileShader, 1);
+  rb_define_module_function(module, "glCreateProgram", gl_CreateProgram, 0);
+  rb_define_module_function(module, "glCreateShader", gl_CreateShader, 1);
+  rb_define_module_function(module, "glDeleteProgram", gl_DeleteProgram, 1);
+  rb_define_module_function(module, "glDeleteShader", gl_DeleteShader, 1);
+  rb_define_module_function(module, "glDetachShader", gl_DetachShader, 2);
+  rb_define_module_function(module, "glDisableVertexAttribArray", gl_DisableVertexAttribArray, 1);
+  rb_define_module_function(module, "glEnableVertexAttribArray", gl_EnableVertexAttribArray, 1);
+  rb_define_module_function(module, "glGetActiveAttrib", gl_GetActiveAttrib, 2);
+  rb_define_module_function(module, "glGetActiveUniform", gl_GetActiveUniform, 2);
+  rb_define_module_function(module, "glGetAttachedShaders", gl_GetAttachedShaders, 1);
+  rb_define_module_function(module, "glGetAttribLocation", gl_GetAttribLocation, 2);
+  rb_define_module_function(module, "glGetProgramiv", gl_GetProgramiv, 2);
+  rb_define_module_function(module, "glGetProgramInfoLog", gl_GetProgramInfoLog, 1);
+  rb_define_module_function(module, "glGetShaderiv", gl_GetShaderiv, 2);
+  rb_define_module_function(module, "glGetShaderInfoLog", gl_GetShaderInfoLog, 1);
+  rb_define_module_function(module, "glGetShaderSource", gl_GetShaderSource, 1);
+  rb_define_module_function(module, "glGetUniformLocation", gl_GetUniformLocation, 2);
+  rb_define_module_function(module, "glGetUniformfv", gl_GetUniformfv, 2);
+  rb_define_module_function(module, "glGetUniformiv", gl_GetUniformiv, 2);
+  rb_define_module_function(module, "glGetVertexAttribdv", gl_GetVertexAttribdv, 2);
+  rb_define_module_function(module, "glGetVertexAttribfv", gl_GetVertexAttribfv, 2);
+  rb_define_module_function(module, "glGetVertexAttribiv", gl_GetVertexAttribiv, 2);
+  rb_define_module_function(module, "glGetVertexAttribPointerv", gl_GetVertexAttribPointerv, 1);
+  rb_define_module_function(module, "glIsProgram", gl_IsProgram, 1);
+  rb_define_module_function(module, "glIsShader", gl_IsShader, 1);
+  rb_define_module_function(module, "glLinkProgram", gl_LinkProgram, 1);
+  rb_define_module_function(module, "glShaderSource", gl_ShaderSource, 2);
+  rb_define_module_function(module, "glUseProgram", gl_UseProgram, 1);
+  rb_define_module_function(module, "glUniform1f", gl_Uniform1f, 2);
+  rb_define_module_function(module, "glUniform2f", gl_Uniform2f, 3);
+  rb_define_module_function(module, "glUniform3f", gl_Uniform3f, 4);
+  rb_define_module_function(module, "glUniform4f", gl_Uniform4f, 5);
+  rb_define_module_function(module, "glUniform1i", gl_Uniform1i, 2);
+  rb_define_module_function(module, "glUniform2i", gl_Uniform2i, 3);
+  rb_define_module_function(module, "glUniform3i", gl_Uniform3i, 4);
+  rb_define_module_function(module, "glUniform4i", gl_Uniform4i, 5);
+  rb_define_module_function(module, "glUniform1fv", gl_Uniform1fv, 2);
+  rb_define_module_function(module, "glUniform2fv", gl_Uniform2fv, 2);
+  rb_define_module_function(module, "glUniform3fv", gl_Uniform3fv, 2);
+  rb_define_module_function(module, "glUniform4fv", gl_Uniform4fv, 2);
+  rb_define_module_function(module, "glUniform1iv", gl_Uniform1iv, 2);
+  rb_define_module_function(module, "glUniform2iv", gl_Uniform2iv, 2);
+  rb_define_module_function(module, "glUniform3iv", gl_Uniform3iv, 2);
+  rb_define_module_function(module, "glUniform4iv", gl_Uniform4iv, 2);
+  rb_define_module_function(module, "glUniformMatrix2fv", gl_UniformMatrix2fv, 3);
+  rb_define_module_function(module, "glUniformMatrix3fv", gl_UniformMatrix3fv, 3);
+  rb_define_module_function(module, "glUniformMatrix4fv", gl_UniformMatrix4fv, 3);
+  rb_define_module_function(module, "glValidateProgram", gl_ValidateProgram, 1);
+  rb_define_module_function(module, "glVertexAttrib1d", gl_VertexAttrib1d, 2);
+  rb_define_module_function(module, "glVertexAttrib1f", gl_VertexAttrib1f, 2);
+  rb_define_module_function(module, "glVertexAttrib1s", gl_VertexAttrib1s, 2);
+  rb_define_module_function(module, "glVertexAttrib2d", gl_VertexAttrib2d, 3);
+  rb_define_module_function(module, "glVertexAttrib2f", gl_VertexAttrib2f, 3);
+  rb_define_module_function(module, "glVertexAttrib2s", gl_VertexAttrib2s, 3);
+  rb_define_module_function(module, "glVertexAttrib3d", gl_VertexAttrib3d, 4);
+  rb_define_module_function(module, "glVertexAttrib3f", gl_VertexAttrib3f, 4);
+  rb_define_module_function(module, "glVertexAttrib3s", gl_VertexAttrib3s, 4);
+  rb_define_module_function(module, "glVertexAttrib4Nbv", gl_VertexAttrib4Nbv, 2);
+  rb_define_module_function(module, "glVertexAttrib4Niv", gl_VertexAttrib4Niv, 2);
+  rb_define_module_function(module, "glVertexAttrib4Nsv", gl_VertexAttrib4Nsv, 2);
+  rb_define_module_function(module, "glVertexAttrib4Nub", gl_VertexAttrib4Nub, 5);
+  rb_define_module_function(module, "glVertexAttrib4Nubv", gl_VertexAttrib4Nubv, 2);
+  rb_define_module_function(module, "glVertexAttrib4Nuiv", gl_VertexAttrib4Nuiv, 2);
+  rb_define_module_function(module, "glVertexAttrib4Nusv", gl_VertexAttrib4Nusv, 2);
+  rb_define_module_function(module, "glVertexAttrib4bv", gl_VertexAttrib4bv, 2);
+  rb_define_module_function(module, "glVertexAttrib4d", gl_VertexAttrib4d, 5);
+  rb_define_module_function(module, "glVertexAttrib4f", gl_VertexAttrib4f, 5);
+  rb_define_module_function(module, "glVertexAttrib4iv", gl_VertexAttrib4iv, 2);
+  rb_define_module_function(module, "glVertexAttrib4s", gl_VertexAttrib4s, 5);
+  rb_define_module_function(module, "glVertexAttrib4ubv", gl_VertexAttrib4ubv, 2);
+  rb_define_module_function(module, "glVertexAttrib4uiv", gl_VertexAttrib4uiv, 2);
+  rb_define_module_function(module, "glVertexAttrib4usv", gl_VertexAttrib4usv, 2);
+  rb_define_module_function(module, "glVertexAttrib1dv", gl_VertexAttrib1dv, 2);
+  rb_define_module_function(module, "glVertexAttrib1fv", gl_VertexAttrib1fv, 2);
+  rb_define_module_function(module, "glVertexAttrib1sv", gl_VertexAttrib1sv, 2);
+  rb_define_module_function(module, "glVertexAttrib2dv", gl_VertexAttrib2dv, 2);
+  rb_define_module_function(module, "glVertexAttrib2fv", gl_VertexAttrib2fv, 2);
+  rb_define_module_function(module, "glVertexAttrib2sv", gl_VertexAttrib2sv, 2);
+  rb_define_module_function(module, "glVertexAttrib3dv", gl_VertexAttrib3dv, 2);
+  rb_define_module_function(module, "glVertexAttrib3fv", gl_VertexAttrib3fv, 2);
+  rb_define_module_function(module, "glVertexAttrib3sv", gl_VertexAttrib3sv, 2);
+  rb_define_module_function(module, "glVertexAttrib4dv", gl_VertexAttrib4dv, 2);
+  rb_define_module_function(module, "glVertexAttrib4fv", gl_VertexAttrib4fv, 2);
+  rb_define_module_function(module, "glVertexAttrib4sv", gl_VertexAttrib4sv, 2);
+  rb_define_module_function(module, "glVertexAttribPointer", gl_VertexAttribPointer, 6);
+
+  {
+    int i;
+    for (i=0;i<_MAX_VERTEX_ATTRIBS;i++)
+      rb_global_variable(&g_VertexAttrib_ptr[i]);
+  }
 }