ruby-opengl 0.40.1 → 0.50.0

data/ext/gl/gl-1.0-1.1.c

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 1999 - 2005 Yoshi <yoshi@giganet.net>
  * Copyright (C) 2006 John M. Gabriele <jmg3000@gmail.com>
+ * Copyright (C) 2007 Jan Dvorak <jan.dvorak@kraxnet.cz>
  *
  * This program is distributed under the terms of the MIT license.
  * See the included MIT-LICENSE file for the terms of this license.
@@ -14,14 +15,6 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#elif defined WIN32
-#include <windows.h>
-#include <GL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
 #include "../common/common.h"
 
 #ifndef MAX
@@ -30,6 +23,147 @@
 
 /* OpenGL 1.0 + 1.1 functions */
 
+/* simple functions - see common.h */
+GL_SIMPLE_FUNC(ArrayElement,1,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Begin,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(BlendFunc,2,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(CallList,1,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(Clear,1,GLbitfield,NUM2UINT)
+GL_SIMPLE_FUNC(ClearAccum,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(ClearColor,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(ClearDepth,1,GLclampd,NUM2DBL)
+GL_SIMPLE_FUNC(ClearIndex,1,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(ClearStencil,1,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Color3b,3,GLbyte,NUM2INT)
+GL_SIMPLE_FUNC(Color3d,3,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Color3f,3,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Color3i,3,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Color3s,3,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Color3ub,3,GLubyte,NUM2INT)
+GL_SIMPLE_FUNC(Color3ui,3,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(Color3us,3,GLushort,NUM2INT)
+GL_SIMPLE_FUNC(Color4b,4,GLbyte,NUM2INT)
+GL_SIMPLE_FUNC(Color4d,4,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Color4f,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Color4i,4,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Color4s,4,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Color4ub,4,GLubyte,NUM2INT)
+GL_SIMPLE_FUNC(Color4ui,4,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(Color4us,4,GLushort,NUM2INT)
+GL_SIMPLE_FUNC(ColorMask,4,GLboolean,NUM2INT)
+GL_SIMPLE_FUNC(ColorMaterial,2,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(CullFace,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(DeleteLists,2,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(DepthFunc,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(DepthMask,1,GLboolean,NUM2INT)
+GL_SIMPLE_FUNC(DepthRange,2,GLclampd,NUM2DBL)
+GL_SIMPLE_FUNC(Disable,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(DisableClientState,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(DrawBuffer,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(EdgeFlag,1,GLboolean,NUM2INT)
+GL_SIMPLE_FUNC(Enable,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(EnableClientState,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(End,0,0,0)
+GL_SIMPLE_FUNC(EndList,0,0,0)
+GL_SIMPLE_FUNC(EvalCoord1d,1,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(EvalCoord1f,1,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(EvalCoord2d,2,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(EvalCoord2f,2,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(EvalPoint1,1,GLint,NUM2INT)
+GL_SIMPLE_FUNC(EvalPoint2,2,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Finish,0,0,0)
+GL_SIMPLE_FUNC(Flush,0,0,0)
+GL_SIMPLE_FUNC(FrontFace,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(Frustum,6,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Hint,2,GLenum,NUM2UINT)
+GL_SIMPLE_FUNC(Indexd,1,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Indexf,1,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Indexi,1,GLint,NUM2INT)
+GL_SIMPLE_FUNC(IndexMask,1,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(Indexs,1,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Indexub,1,GLubyte,NUM2INT)
+GL_SIMPLE_FUNC(InitNames,0,0,0)
+GL_SIMPLE_FUNC(LineWidth,1,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(ListBase,1,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(LoadIdentity,0,0,0)
+GL_SIMPLE_FUNC(LoadName,1,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(LogicOp,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(MatrixMode,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(Normal3b,3,GLbyte,NUM2INT)
+GL_SIMPLE_FUNC(Normal3d,3,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Normal3f,3,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Normal3i,3,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Normal3s,3,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Ortho,6,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(PassThrough,1,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(PixelZoom,2,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(PointSize,1,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(PolygonMode,2,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(PopAttrib,0,0,0)
+GL_SIMPLE_FUNC(PopClientAttrib,0,0,0)
+GL_SIMPLE_FUNC(PopMatrix,0,0,0)
+GL_SIMPLE_FUNC(PopName,0,0,0)
+GL_SIMPLE_FUNC(PushAttrib,1,GLbitfield,NUM2UINT)
+GL_SIMPLE_FUNC(PushClientAttrib,1,GLbitfield,NUM2UINT)
+GL_SIMPLE_FUNC(PushMatrix,0,0,0)
+GL_SIMPLE_FUNC(PushName,1,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(RasterPos2d,2,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(RasterPos2f,2,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(RasterPos2i,2,GLint,NUM2INT)
+GL_SIMPLE_FUNC(RasterPos2s,2,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(RasterPos3d,3,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(RasterPos3f,3,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(RasterPos3i,3,GLint,NUM2INT)
+GL_SIMPLE_FUNC(RasterPos3s,3,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(RasterPos4d,4,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(RasterPos4f,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(RasterPos4i,4,GLint,NUM2INT)
+GL_SIMPLE_FUNC(RasterPos4s,4,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(ReadBuffer,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(Rectd,4,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Rectf,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Recti,4,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Rects,4,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Rotated,4,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Rotatef,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Scaled,3,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Scalef,3,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Scissor,4,GLint,NUM2UINT)
+GL_SIMPLE_FUNC(ShadeModel,1,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(StencilMask,1,GLuint,NUM2UINT)
+GL_SIMPLE_FUNC(StencilOp,3,GLenum,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord1d,1,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord1f,1,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord1i,1,GLint,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord1s,1,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord2d,2,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord2f,2,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord2i,2,GLint,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord2s,2,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord3d,3,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord3f,3,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord3i,3,GLint,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord3s,3,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord4d,4,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord4f,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(TexCoord4i,4,GLint,NUM2INT)
+GL_SIMPLE_FUNC(TexCoord4s,4,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Translated,3,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Translatef,3,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Vertex2d,2,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Vertex2f,2,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Vertex2i,2,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Vertex2s,2,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Vertex3d,3,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Vertex3f,3,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Vertex3i,3,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Vertex3s,3,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Vertex4d,4,GLdouble,NUM2DBL)
+GL_SIMPLE_FUNC(Vertex4f,4,GLfloat,NUM2DBL)
+GL_SIMPLE_FUNC(Vertex4i,4,GLint,NUM2INT)
+GL_SIMPLE_FUNC(Vertex4s,4,GLshort,NUM2INT)
+GL_SIMPLE_FUNC(Viewport,4,GLuint,NUM2UINT)
+
 static VALUE
 gl_NewList(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
@@ -42,24 +176,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static VALUE
-gl_EndList(obj)
-VALUE obj;
-{
-	glEndList();
-	return Qnil;
-}
-
-static VALUE
-gl_CallList(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint list;
-	list = (GLuint)NUM2UINT(arg1);
-	glCallList(list);
-	return Qnil;
-}
-
 static VALUE
 gl_CallLists(obj,arg1)
 VALUE obj,arg1;
@@ -84,18 +200,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static VALUE
-gl_DeleteLists(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLuint list;
-	GLsizei range;
-	list = (GLuint)NUM2UINT(arg1);
-	range = (GLsizei)NUM2UINT(arg2);
-	glDeleteLists(list,range);
-	return Qnil;
-}
-
 static VALUE
 gl_GenLists(obj,arg1)
 VALUE obj,arg1;
@@ -107,26 +211,6 @@ VALUE obj,arg1;
 	return INT2NUM(ret);
 }
 
-static VALUE
-gl_ListBase(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint base;
-	base = (GLuint)NUM2UINT(arg1);
-	glListBase(base);
-	return Qnil;
-}
-
-static VALUE
-gl_Begin(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	mode = (GLenum)NUM2INT(arg1);
-	glBegin(mode);
-	return Qnil;
-}
-
 static VALUE
 gl_Bitmap(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
@@ -143,1367 +227,314 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	yorig = (GLfloat)NUM2DBL(arg4);
 	xmove = (GLfloat)NUM2DBL(arg5);
 	ymove = (GLfloat)NUM2DBL(arg6);
-	if (TYPE(arg7) == T_FIXNUM || TYPE(arg7) == T_BIGNUM) { /* offset to unpack buffer */
-		GLuint offset = NUM2UINT(arg7);
-		glBitmap(width, height, xorig, yorig, xmove, ymove, (GLvoid *)offset);
-	} else if (TYPE(arg7) == T_STRING) {
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		glBitmap(width, height, xorig, yorig, xmove, ymove, (GLvoid *)NUM2INT(arg7));
+	} else {
 		const GLubyte *bitmap;
+		Check_Type(arg7,T_STRING); 
+
 		if (RSTRING(arg7)->len < (width * height / 8))
 			rb_raise(rb_eArgError, "string length:%d", RSTRING(arg7)->len);
 
 		bitmap = (const GLubyte*)RSTRING(arg7)->ptr;
 		glBitmap(width, height, xorig, yorig, xmove, ymove, bitmap);
-	} else {
-		Check_Type(arg7,T_STRING); /* force exception */
 	}
 	return Qnil;
 }
 
 static VALUE
-gl_Color3b(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_EdgeFlagv(obj,arg1)
+VALUE obj,arg1;
 {
-	GLbyte red;
-	GLbyte green;
-	GLbyte blue;
-	red = (GLbyte)NUM2INT(arg1);
-	green = (GLbyte)NUM2INT(arg2);
-	blue = (GLbyte)NUM2INT(arg3);
-	glColor3b(red,green,blue);
+	GLboolean flag[1] = { GL_FALSE };
+	Check_Type(arg1,T_ARRAY);
+	ary2cboolean(arg1,flag,1);
+	glEdgeFlagv(flag);
 	return Qnil;
 }
 
 static VALUE
-gl_Color3d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_Indexdv(obj,arg1)
+VALUE obj,arg1;
 {
-	GLdouble red;
-	GLdouble green;
-	GLdouble blue;
-	red = (GLdouble)NUM2DBL(arg1);
-	green = (GLdouble)NUM2DBL(arg2);
-	blue = (GLdouble)NUM2DBL(arg3);
-	glColor3d(red,green,blue);
+	GLdouble c[1] = {0.0};
+	Check_Type(arg1,T_ARRAY);
+	ary2cdbl(arg1,c,1);
+	glIndexdv(c);
 	return Qnil;
 }
 
 static VALUE
-gl_Color3f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_Indexfv(obj,arg1)
+VALUE obj,arg1;
 {
-	GLfloat red;
-	GLfloat green;
-	GLfloat blue;
-	red = (GLfloat)NUM2DBL(arg1);
-	green = (GLfloat)NUM2DBL(arg2);
-	blue = (GLfloat)NUM2DBL(arg3);
-	glColor3f(red,green,blue);
+	GLfloat c[1] = {0.0};
+	Check_Type(arg1,T_ARRAY);
+	ary2cflt(arg1,c,1);
+	glIndexfv(c);
 	return Qnil;
 }
 
 static VALUE
-gl_Color3i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_Indexiv(obj,arg1)
+VALUE obj,arg1;
 {
-	GLint red;
-	GLint green;
-	GLint blue;
-	red = (GLint)NUM2INT(arg1);
-	green = (GLint)NUM2INT(arg2);
-	blue = (GLint)NUM2INT(arg3);
-	glColor3i(red,green,blue);
+	GLint c[1] = {0.0};
+	Check_Type(arg1,T_ARRAY);
+	ary2cint(arg1,c,1);
+	glIndexiv(c);
 	return Qnil;
 }
 
 static VALUE
-gl_Color3s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_Indexsv(obj,arg1)
+VALUE obj,arg1;
 {
-	GLshort red;
-	GLshort green;
-	GLshort blue;
-	red = (GLshort)NUM2INT(arg1);
-	green = (GLshort)NUM2INT(arg2);
-	blue = (GLshort)NUM2INT(arg3);
-	glColor3s(red,green,blue);
+	GLshort c[1] = {0};
+	Check_Type(arg1,T_ARRAY);
+	ary2cshort(arg1,c,1);
+	glIndexsv(c);
 	return Qnil;
 }
 
 static VALUE
-gl_Color3ub(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_ClipPlane(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLubyte red;
-	GLubyte green;
-	GLubyte blue;
-	red = (GLubyte)NUM2INT(arg1);
-	green = (GLubyte)NUM2INT(arg2);
-	blue = (GLubyte)NUM2INT(arg3);
-	glColor3ub(red,green,blue);
+	GLenum plane;
+	GLdouble equation[4];
+	plane = (GLenum)NUM2INT(arg1);
+	Check_Type(arg2,T_ARRAY);
+	ary2cdbl(arg2, equation, 4);
+	glClipPlane(plane,equation);
 	return Qnil;
 }
 
 static VALUE
-gl_Color3ui(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_Fogf(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLuint red;
-	GLuint green;
-	GLuint blue;
-	red = (GLuint)NUM2UINT(arg1);
-	green = (GLuint)NUM2UINT(arg2);
-	blue = (GLuint)NUM2UINT(arg3);
-	glColor3ui(red,green,blue);
+	GLenum pname;
+	GLfloat param;
+	pname = (GLenum)NUM2INT(arg1);
+	param = (GLfloat)NUM2DBL(arg2);
+	glFogf(pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Color3us(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
+gl_Fogfv(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLushort red;
-	GLushort green;
-	GLushort blue;
-	red = (GLushort)NUM2INT(arg1);
-	green = (GLushort)NUM2INT(arg2);
-	blue = (GLushort)NUM2INT(arg3);
-	glColor3us(red,green,blue);
+	GLenum pname;
+	GLfloat params[4] = {0.0,0.0,0.0,0.0};
+	pname = (GLenum)NUM2INT(arg1);
+	Check_Type(arg2,T_ARRAY);
+	ary2cflt(arg2,params,4);
+	glFogfv(pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4b(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_Fogi(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLbyte red;
-	GLbyte green;
-	GLbyte blue;
-	GLbyte alpha;
-	red = (GLbyte)NUM2INT(arg1);
-	green = (GLbyte)NUM2INT(arg2);
-	blue = (GLbyte)NUM2INT(arg3);
-	alpha = (GLbyte)NUM2INT(arg4);
-	glColor4b(red,green,blue,alpha);
+	GLenum pname;
+	GLint param;
+	pname = (GLenum)NUM2INT(arg1);
+	param = (GLint)NUM2INT(arg2);
+	glFogi(pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4d(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_Fogiv(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLdouble red;
-	GLdouble green;
-	GLdouble blue;
-	GLdouble alpha;
-	red = (GLdouble)NUM2DBL(arg1);
-	green = (GLdouble)NUM2DBL(arg2);
-	blue = (GLdouble)NUM2DBL(arg3);
-	alpha = (GLdouble)NUM2DBL(arg4);
-	glColor4d(red,green,blue,alpha);
+	GLenum pname;
+	GLint params[4] = {0,0,0,0};
+	pname = (GLenum)NUM2INT(arg1);
+	Check_Type(arg2,T_ARRAY);
+	ary2cint(arg2,params,4);
+	glFogiv(pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4f(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_Lightf(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLfloat red;
-	GLfloat green;
-	GLfloat blue;
-	GLfloat alpha;
-	red = (GLfloat)NUM2DBL(arg1);
-	green = (GLfloat)NUM2DBL(arg2);
-	blue = (GLfloat)NUM2DBL(arg3);
-	alpha = (GLfloat)NUM2DBL(arg4);
-	glColor4f(red,green,blue,alpha);
+	GLenum light;
+	GLenum pname;
+	GLfloat param;
+	light = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	param = (GLfloat)NUM2DBL(arg3);
+	glLightf(light,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4i(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_Lightfv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLint red;
-	GLint green;
-	GLint blue;
-	GLint alpha;
-	red = (GLint)NUM2INT(arg1);
-	green = (GLint)NUM2INT(arg2);
-	blue = (GLint)NUM2INT(arg3);
-	alpha = (GLint)NUM2INT(arg4);
-	glColor4i(red,green,blue,alpha);
+	GLenum light;
+	GLenum pname;
+	GLfloat params[4] = {0.0,0.0,0.0,0.0};
+	light = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cflt(arg3,params,4);
+	glLightfv(light,pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4s(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_Lighti(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLshort red;
-	GLshort green;
-	GLshort blue;
-	GLshort alpha;
-	red = (GLshort)NUM2INT(arg1);
-	green = (GLshort)NUM2INT(arg2);
-	blue = (GLshort)NUM2INT(arg3);
-	alpha = (GLshort)NUM2INT(arg4);
-	glColor4s(red,green,blue,alpha);
+	GLenum light;
+	GLenum pname;
+	GLint param;
+	light = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	param = (GLint)NUM2INT(arg3);
+	glLighti(light,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4ub(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_Lightiv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLubyte red;
-	GLubyte green;
-	GLubyte blue;
-	GLubyte alpha;
-	red = (GLubyte)NUM2INT(arg1);
-	green = (GLubyte)NUM2INT(arg2);
-	blue = (GLubyte)NUM2INT(arg3);
-	alpha = (GLubyte)NUM2INT(arg4);
-	glColor4ub(red,green,blue,alpha);
+	GLenum light;
+	GLenum pname;
+	GLint params[4]={0,0,0,0};
+	light = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cint(arg3,params,4);
+	glLightiv(light,pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4ui(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_LightModelf(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLuint red;
-	GLuint green;
-	GLuint blue;
-	GLuint alpha;
-	red = (GLuint)NUM2UINT(arg1);
-	green = (GLuint)NUM2UINT(arg2);
-	blue = (GLuint)NUM2UINT(arg3);
-	alpha = (GLuint)NUM2UINT(arg4);
-	glColor4ui(red,green,blue,alpha);
+	GLenum pname;
+	GLfloat param;
+	pname = (GLenum)NUM2INT(arg1);
+	param = (GLfloat)NUM2DBL(arg2);
+	glLightModelf(pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Color4us(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_LightModelfv(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLushort red;
-	GLushort green;
-	GLushort blue;
-	GLushort alpha;
-	red = (GLushort)NUM2INT(arg1);
-	green = (GLushort)NUM2INT(arg2);
-	blue = (GLushort)NUM2INT(arg3);
-	alpha = (GLushort)NUM2INT(arg4);
-	glColor4us(red,green,blue,alpha);
+	GLenum pname;
+	GLfloat params[4] = {0.0,0.0,0.0,0.0};
+	pname = (GLenum)NUM2INT(arg1);
+	Check_Type(arg2,T_ARRAY);
+	ary2cflt(arg2,params,4);
+	glLightModelfv(pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_EdgeFlag(obj,arg1)
-VALUE obj,arg1;
+gl_LightModeli(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLboolean flag;
-	flag = (GLboolean)NUM2INT(arg1);
-	glEdgeFlag(flag);
+	GLenum pname;
+	GLint param;
+	pname = (GLenum)NUM2INT(arg1);
+	param = (GLint)NUM2INT(arg2);
+	glLightModeli(pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_EdgeFlagv(obj,arg1)
-VALUE obj,arg1;
+gl_LightModeliv(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLboolean flag[1] = { GL_FALSE };
-	Check_Type(arg1,T_ARRAY);
-	ary2cboolean(arg1,flag,1);
-	glEdgeFlagv(flag);
+	GLenum pname;
+	GLint params[4] = {0,0,0,0};
+	pname = (GLenum)NUM2INT(arg1);
+	Check_Type(arg2,T_ARRAY);
+	ary2cint(arg2,params,4);
+	glLightModeliv(pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_End(obj)
-VALUE obj;
+gl_LineStipple(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	glEnd();
+	GLint factor;
+	GLushort pattern;
+	factor = (GLint)NUM2INT(arg1);
+	pattern = (GLushort)(NUM2INT(arg2) & 0xFFFF);
+	glLineStipple(factor,pattern);
 	return Qnil;
 }
 
 static VALUE
-gl_Indexd(obj,arg1)
-VALUE obj,arg1;
+gl_Materialf(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLdouble c;
-	c = (GLdouble)NUM2DBL(arg1);
-	glIndexd(c);
+	GLenum face;
+	GLenum pname;
+	GLfloat param;
+	face = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	param = (GLfloat)NUM2DBL(arg3);
+	glMaterialf(face,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Indexdv(obj,arg1)
-VALUE obj,arg1;
+gl_Materialfv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLdouble c[1] = {0.0};
-	Check_Type(arg1,T_ARRAY);
-	ary2cdbl(arg1,c,1);
-	glIndexdv(c);
+	GLenum face;
+	GLenum pname;
+	GLfloat params[4] = {0.0,0.0,0.0,0.0};
+	face = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cflt(arg3,params,4);
+	glMaterialfv(face,pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_Indexf(obj,arg1)
-VALUE obj,arg1;
+gl_Materiali(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLfloat c;
-	c = (GLfloat)NUM2DBL(arg1);
-	glIndexf(c);
+	GLenum face;
+	GLenum pname;
+	GLint param;
+	face = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	param = (GLint)NUM2INT(arg3);
+	glMateriali(face,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Indexfv(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat c[1] = {0.0};
-	Check_Type(arg1,T_ARRAY);
-	ary2cflt(arg1,c,1);
-	glIndexfv(c);
-	return Qnil;
-}
-
-static VALUE
-gl_Indexi(obj,arg1)
-VALUE obj,arg1;
-{
-	GLint c;
-	c = (GLint)NUM2INT(arg1);
-	glIndexi(c);
-	return Qnil;
-}
-
-static VALUE
-gl_Indexiv(obj,arg1)
-VALUE obj,arg1;
-{
-	GLint c[1] = {0.0};
-	Check_Type(arg1,T_ARRAY);
-	ary2cint(arg1,c,1);
-	glIndexiv(c);
-	return Qnil;
-}
-
-static VALUE
-gl_Indexs(obj,arg1)
-VALUE obj,arg1;
-{
-	GLshort c;
-	c = (GLshort)NUM2INT(arg1);
-	glIndexs(c);
-	return Qnil;
-}
-
-static VALUE
-gl_Indexsv(obj,arg1)
-VALUE obj,arg1;
-{
-	GLshort c[1] = {0};
-	Check_Type(arg1,T_ARRAY);
-	ary2cshort(arg1,c,1);
-	glIndexsv(c);
-	return Qnil;
-}
-
-static VALUE
-gl_Normal3b(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLbyte nx;
-	GLbyte ny;
-	GLbyte nz;
-	nx = (GLbyte)NUM2INT(arg1);
-	ny = (GLbyte)NUM2INT(arg2);
-	nz = (GLbyte)NUM2INT(arg3);
-	glNormal3b(nx,ny,nz);
-	return Qnil;
-}
-
-static VALUE
-gl_Normal3d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble nx;
-	GLdouble ny;
-	GLdouble nz;
-	nx = (GLdouble)NUM2DBL(arg1);
-	ny = (GLdouble)NUM2DBL(arg2);
-	nz = (GLdouble)NUM2DBL(arg3);
-	glNormal3d(nx,ny,nz);
-	return Qnil;
-}
-
-static VALUE
-gl_Normal3f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat nx;
-	GLfloat ny;
-	GLfloat nz;
-	nx = (GLfloat)NUM2DBL(arg1);
-	ny = (GLfloat)NUM2DBL(arg2);
-	nz = (GLfloat)NUM2DBL(arg3);
-	glNormal3f(nx,ny,nz);
-	return Qnil;
-}
-
-static VALUE
-gl_Normal3i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint nx;
-	GLint ny;
-	GLint nz;
-	nx = (GLint)NUM2INT(arg1);
-	ny = (GLint)NUM2INT(arg2);
-	nz = (GLint)NUM2INT(arg3);
-	glNormal3i(nx,ny,nz);
-	return Qnil;
-}
-
-static VALUE
-gl_Normal3s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLshort nx;
-	GLshort ny;
-	GLshort nz;
-	nx = (GLshort)NUM2INT(arg1);
-	ny = (GLshort)NUM2INT(arg2);
-	nz = (GLshort)NUM2INT(arg3);
-	glNormal3s(nx,ny,nz);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos2d(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLdouble x;
-	GLdouble y;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	glRasterPos2d(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos2f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLfloat x;
-	GLfloat y;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	glRasterPos2f(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos2i(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint x;
-	GLint y;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	glRasterPos2i(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos2s(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLshort x;
-	GLshort y;
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	glRasterPos2s(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos3d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	z = (GLdouble)NUM2DBL(arg3);
-	glRasterPos3d(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos3f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	z = (GLfloat)NUM2DBL(arg3);
-	glRasterPos3f(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos3i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint x;
-	GLint y;
-	GLint z;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	z = (GLint)NUM2INT(arg3);
-	glRasterPos3i(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos3s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLshort x;
-	GLshort y;
-	GLshort z;
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	z = (GLshort)NUM2INT(arg3);
-	glRasterPos3s(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos4d(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	GLdouble w;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	z = (GLdouble)NUM2DBL(arg3);
-	w = (GLdouble)NUM2DBL(arg4);
-	glRasterPos4d(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos4f(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	GLfloat w;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	z = (GLfloat)NUM2DBL(arg3);
-	w = (GLfloat)NUM2DBL(arg4);
-	glRasterPos4f(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos4i(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint x;
-	GLint y;
-	GLint z;
-	GLint w;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	z = (GLint)NUM2INT(arg3);
-	w = (GLint)NUM2INT(arg4);
-	glRasterPos4i(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_RasterPos4s(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLshort x;
-	GLshort y;
-	GLshort z;
-	GLshort w;
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	z = (GLshort)NUM2INT(arg3);
-	w = (GLshort)NUM2INT(arg4);
-	glRasterPos4s(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_Rectd(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLdouble x1;
-	GLdouble y1;
-	GLdouble x2;
-	GLdouble y2;
-	x1 = (GLdouble)NUM2DBL(arg1);
-	y1 = (GLdouble)NUM2DBL(arg2);
-	x2 = (GLdouble)NUM2DBL(arg3);
-	y2 = (GLdouble)NUM2DBL(arg4);
-	glRectd(x1,y1,x2,y2);
-	return Qnil;
-}
-
-static VALUE
-gl_Rectf(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLfloat x1;
-	GLfloat y1;
-	GLfloat x2;
-	GLfloat y2;
-	x1 = (GLfloat)NUM2DBL(arg1);
-	y1 = (GLfloat)NUM2DBL(arg2);
-	x2 = (GLfloat)NUM2DBL(arg3);
-	y2 = (GLfloat)NUM2DBL(arg4);
-	glRectf(x1,y1,x2,y2);
-	return Qnil;
-}
-
-static VALUE
-gl_Recti(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint x1;
-	GLint y1;
-	GLint x2;
-	GLint y2;
-	x1 = (GLint)NUM2INT(arg1);
-	y1 = (GLint)NUM2INT(arg2);
-	x2 = (GLint)NUM2INT(arg3);
-	y2 = (GLint)NUM2INT(arg4);
-	glRecti(x1,y1,x2,y2);
-	return Qnil;
-}
-
-static VALUE
-gl_Rects(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLshort x1;
-	GLshort y1;
-	GLshort x2;
-	GLshort y2;
-	x1 = (GLshort)NUM2INT(arg1);
-	y1 = (GLshort)NUM2INT(arg2);
-	x2 = (GLshort)NUM2INT(arg3);
-	y2 = (GLshort)NUM2INT(arg4);
-	glRects(x1,y1,x2,y2);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord1d(obj,arg1)
-VALUE obj,arg1;
-{
-	GLdouble s;
-	s = (GLdouble)NUM2DBL(arg1);
-	glTexCoord1d(s);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord1f(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat s;
-	s = (GLfloat)NUM2DBL(arg1);
-	glTexCoord1f(s);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord1i(obj,arg1)
-VALUE obj,arg1;
-{
-	GLint s;
-	s = (GLint)NUM2INT(arg1);
-	glTexCoord1i(s);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord1s(obj,arg1)
-VALUE obj,arg1;
-{
-	GLshort s;
-	s = (GLshort)NUM2INT(arg1);
-	glTexCoord1s(s);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord2d(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLdouble s;
-	GLdouble t;
-	s = (GLdouble)NUM2DBL(arg1);
-	t = (GLdouble)NUM2DBL(arg2);
-	glTexCoord2d(s,t);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord2f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLfloat s;
-	GLfloat t;
-	s = (GLfloat)NUM2DBL(arg1);
-	t = (GLfloat)NUM2DBL(arg2);
-	glTexCoord2f(s,t);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord2i(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint s;
-	GLint t;
-	s = (GLint)NUM2INT(arg1);
-	t = (GLint)NUM2INT(arg2);
-	glTexCoord2i(s,t);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord2s(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLshort s;
-	GLshort t;
-	s = (GLshort)NUM2INT(arg1);
-	t = (GLshort)NUM2INT(arg2);
-	glTexCoord2s(s,t);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord3d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble s;
-	GLdouble t;
-	GLdouble r;
-	s = (GLdouble)NUM2DBL(arg1);
-	t = (GLdouble)NUM2DBL(arg2);
-	r = (GLdouble)NUM2DBL(arg3);
-	glTexCoord3d(s,t,r);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord3f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat s;
-	GLfloat t;
-	GLfloat r;
-	s = (GLfloat)NUM2DBL(arg1);
-	t = (GLfloat)NUM2DBL(arg2);
-	r = (GLfloat)NUM2DBL(arg3);
-	glTexCoord3f(s,t,r);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord3i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint s;
-	GLint t;
-	GLint r;
-	s = (GLint)NUM2INT(arg1);
-	t = (GLint)NUM2INT(arg2);
-	r = (GLint)NUM2INT(arg3);
-	glTexCoord3i(s,t,r);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord3s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLshort s;
-	GLshort t;
-	GLshort r;
-	s = (GLshort)NUM2INT(arg1);
-	t = (GLshort)NUM2INT(arg2);
-	r = (GLshort)NUM2INT(arg3);
-	glTexCoord3s(s,t,r);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord4d(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLdouble s;
-	GLdouble t;
-	GLdouble r;
-	GLdouble q;
-	s = (GLdouble)NUM2DBL(arg1);
-	t = (GLdouble)NUM2DBL(arg2);
-	r = (GLdouble)NUM2DBL(arg3);
-	q = (GLdouble)NUM2DBL(arg4);
-	glTexCoord4d(s,t,r,q);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord4f(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLfloat s;
-	GLfloat t;
-	GLfloat r;
-	GLfloat q;
-	s = (GLfloat)NUM2DBL(arg1);
-	t = (GLfloat)NUM2DBL(arg2);
-	r = (GLfloat)NUM2DBL(arg3);
-	q = (GLfloat)NUM2DBL(arg4);
-	glTexCoord4f(s,t,r,q);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord4i(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint s;
-	GLint t;
-	GLint r;
-	GLint q;
-	s = (GLint)NUM2INT(arg1);
-	t = (GLint)NUM2INT(arg2);
-	r = (GLint)NUM2INT(arg3);
-	q = (GLint)NUM2INT(arg4);
-	glTexCoord4i(s,t,r,q);
-	return Qnil;
-}
-
-static VALUE
-gl_TexCoord4s(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLshort s;
-	GLshort t;
-	GLshort r;
-	GLshort q;
-	s = (GLshort)NUM2INT(arg1);
-	t = (GLshort)NUM2INT(arg2);
-	r = (GLshort)NUM2INT(arg3);
-	q = (GLshort)NUM2INT(arg4);
-	glTexCoord4s(s,t,r,q);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex2d(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLdouble x;
-	GLdouble y;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	glVertex2d(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex2f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLfloat x;
-	GLfloat y;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	glVertex2f(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex2i(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint x;
-	GLint y;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	glVertex2i(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex2s(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLshort x;
-	GLshort y;
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	glVertex2s(x,y);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex3d(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	z = (GLdouble)NUM2DBL(arg3);
-	glVertex3d(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex3f(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	z = (GLfloat)NUM2DBL(arg3);
-	glVertex3f(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex3i(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLint x;
-	GLint y;
-	GLint z;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	z = (GLint)NUM2INT(arg3);
-	glVertex3i(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex3s(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLshort x;
-	GLshort y;
-	GLshort z;
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	z = (GLshort)NUM2INT(arg3);
-	glVertex3s(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex4d(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	GLdouble w;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	z = (GLdouble)NUM2DBL(arg3);
-	w = (GLdouble)NUM2DBL(arg4);
-	glVertex4d(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex4f(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	GLfloat w;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	z = (GLfloat)NUM2DBL(arg3);
-	w = (GLfloat)NUM2DBL(arg4);
-	glVertex4f(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex4i(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint x;
-	GLint y;
-	GLint z;
-	GLint w;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	z = (GLint)NUM2INT(arg3);
-	w = (GLint)NUM2INT(arg4);
-	glVertex4i(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_Vertex4s(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLshort x;
-	GLshort y;
-	GLshort z;
-	GLshort w;
-	x = (GLshort)NUM2INT(arg1);
-	y = (GLshort)NUM2INT(arg2);
-	z = (GLshort)NUM2INT(arg3);
-	w = (GLshort)NUM2INT(arg4);
-	glVertex4s(x,y,z,w);
-	return Qnil;
-}
-
-static VALUE
-gl_ClipPlane(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum plane;
-	GLdouble equation[4];
-	plane = (GLenum)NUM2INT(arg1);
-	Check_Type(arg2,T_ARRAY);
-	ary2cdbl(arg2, equation, 4);
-	glClipPlane(plane,equation);
-	return Qnil;
-}
-
-static VALUE
-gl_ColorMaterial(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum face;
-	GLenum mode;
-	face = (GLenum)NUM2INT(arg1);
-	mode = (GLenum)NUM2INT(arg2);
-	glColorMaterial(face,mode);
-	return Qnil;
-}
-
-static VALUE
-gl_CullFace(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	mode = (GLenum)NUM2INT(arg1);
-	glCullFace(mode);
-	return Qnil;
-}
-
-static VALUE
-gl_Fogf(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLfloat)NUM2DBL(arg2);
-	glFogf(pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_Fogfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	pname = (GLenum)NUM2INT(arg1);
-	Check_Type(arg2,T_ARRAY);
-	ary2cflt(arg2,params,4);
-	glFogfv(pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_Fogi(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLint)NUM2INT(arg2);
-	glFogi(pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_Fogiv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	pname = (GLenum)NUM2INT(arg1);
-	Check_Type(arg2,T_ARRAY);
-	ary2cint(arg2,params,4);
-	glFogiv(pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_FrontFace(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	mode = (GLenum)NUM2INT(arg1);
-	glFrontFace(mode);
-	return Qnil;
-}
-
-static VALUE
-gl_Hint(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLenum mode;
-	target = (GLenum)NUM2UINT(arg1);
-	mode = (GLenum)NUM2UINT(arg2);
-	glHint(target,mode);
-	return Qnil;
-}
-
-static VALUE
-gl_Lightf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum light;
-	GLenum pname;
-	GLfloat param;
-	light = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glLightf(light,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_Lightfv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum light;
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	light = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cflt(arg3,params,4);
-	glLightfv(light,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_Lighti(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum light;
-	GLenum pname;
-	GLint param;
-	light = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glLighti(light,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_Lightiv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum light;
-	GLenum pname;
-	GLint params[4]={0,0,0,0};
-	light = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cint(arg3,params,4);
-	glLightiv(light,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_LightModelf(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLfloat)NUM2DBL(arg2);
-	glLightModelf(pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_LightModelfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	pname = (GLenum)NUM2INT(arg1);
-	Check_Type(arg2,T_ARRAY);
-	ary2cflt(arg2,params,4);
-	glLightModelfv(pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_LightModeli(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint param;
-	pname = (GLenum)NUM2INT(arg1);
-	param = (GLint)NUM2INT(arg2);
-	glLightModeli(pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_LightModeliv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	pname = (GLenum)NUM2INT(arg1);
-	Check_Type(arg2,T_ARRAY);
-	ary2cint(arg2,params,4);
-	glLightModeliv(pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_LineStipple(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint factor;
-	GLushort pattern;
-	factor = (GLint)NUM2INT(arg1);
-	pattern = (GLushort)(NUM2INT(arg2) & 0xFFFF);
-	glLineStipple(factor,pattern);
-	return Qnil;
-}
-
-static VALUE
-gl_LineWidth(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat width;
-	width = (GLfloat)NUM2DBL(arg1);
-	glLineWidth(width);
-	return Qnil;
-}
-
-static VALUE
-gl_Materialf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum face;
-	GLenum pname;
-	GLfloat param;
-	face = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glMaterialf(face,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_Materialfv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum face;
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	face = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cflt(arg3,params,4);
-	glMaterialfv(face,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_Materiali(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum face;
-	GLenum pname;
-	GLint param;
-	face = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glMateriali(face,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_Materialiv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum face;
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	face = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cint(arg3,params,4);
-	glMaterialiv(face,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_PointSize(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat size;
-	size = (GLfloat)NUM2DBL(arg1);
-	glPointSize(size);
-	return Qnil;
-}
-
-static VALUE
-gl_PolygonMode(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
+gl_Materialiv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
 	GLenum face;
-	GLenum mode;
+	GLenum pname;
+	GLint params[4] = {0,0,0,0};
 	face = (GLenum)NUM2INT(arg1);
-	mode = (GLenum)NUM2INT(arg2);
-	glPolygonMode(face,mode);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cint(arg3,params,4);
+	glMaterialiv(face,pname,params);
 	return Qnil;
 }
 
@@ -1512,44 +543,23 @@ gl_PolygonStipple(obj,arg1)
 VALUE obj,arg1;
 {
 	GLubyte mask[128];
-	memset(mask, 0x0, sizeof(GLubyte)*128);
-	if (TYPE(arg1) == T_ARRAY) {
-		ary2cubyte(arg1,mask,128);
-	}
-	else if (TYPE(arg1) == T_STRING) {
-		if (RSTRING(arg1)->len < 128)
-			rb_raise(rb_eArgError, "string length:%d", RSTRING(arg1)->len);
-		memcpy(mask, RSTRING(arg1)->ptr, 128);
-	}
-	else
-		Check_Type(arg1,T_STRING); /* force exception */
-	glPolygonStipple(mask);
-	return Qnil;
-}
-
-static VALUE
-gl_Scissor(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLsizei height;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	width = (GLsizei)NUM2UINT(arg3);
-	height = (GLsizei)NUM2UINT(arg4);
-	glScissor(x,y,width,height);
-	return Qnil;
-}
 
-static VALUE
-gl_ShadeModel(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	mode = (GLenum)NUM2INT(arg1);
-	glShadeModel(mode);
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		glPolygonStipple((GLvoid *)NUM2INT(arg1));
+	} else {
+		memset(mask, 0x0, sizeof(GLubyte)*128);
+		if (TYPE(arg1) == T_ARRAY) {
+			ary2cubyte(arg1,mask,128);
+		}
+		else if (TYPE(arg1) == T_STRING) {
+			if (RSTRING(arg1)->len < 128)
+				rb_raise(rb_eArgError, "string length:%d", RSTRING(arg1)->len);
+			memcpy(mask, RSTRING(arg1)->ptr, 128);
+		}
+		else
+			Check_Type(arg1,T_STRING); /* force exception */
+		glPolygonStipple(mask);
+	}
 	return Qnil;
 }
 
@@ -1611,7 +621,6 @@ VALUE obj,arg1,arg2,arg3;
 	return Qnil;
 }
 
-/* FIXME: spatna funkce ? */
 static VALUE
 gl_TexImage1D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8)
 VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
@@ -1624,9 +633,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	GLenum format;
 	GLenum type;
 	const char *pixels;
-	int size;
-	int type_size;
-	int format_size;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	components = (GLint)NUM2INT(arg3);
@@ -1634,29 +640,18 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	border = (GLint)NUM2INT(arg5);
 	format = (GLenum)NUM2INT(arg6);
 	type = (GLenum)NUM2INT(arg7);
-	type_size = gltype_size(type);
-	format_size = glformat_size(format);
 
-	if (type_size == -1 || format_size == -1)
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		glTexImage1D(target,level,components,width,border,format,type,(GLvoid *)NUM2INT(arg8));
 		return Qnil;
-	if (type==GL_BITMAP)
-		size = format_size*(width/8);
-	else
-		size = type_size*format_size*width;
+	}
 
 	if (target == GL_PROXY_TEXTURE_1D || NIL_P(arg8)) { /* proxy texture, no data read */
 		pixels = NULL;
 	} else {
-		if (TYPE(arg8) == T_FIXNUM || TYPE(arg8) == T_BIGNUM) { /* arg8 is offset to unpack buffer */
-			pixels = (const char *)NUM2UINT(arg8);
-		} else if (TYPE(arg8) == T_STRING) { /* image data */
-			if (RSTRING(arg8)->len < size)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg8)->len);
-			pixels = RSTRING(arg8)->ptr;
-		} else {
-			Check_Type(arg8,T_STRING); /* force exception */
-			return Qnil;
-		}
+		Check_Type(arg8,T_STRING);
+		CheckDataSize(type,format,width,arg8);
+		pixels = RSTRING(arg8)->ptr;
 	}
 	glTexImage1D(target,level,components,width,border,format,type,pixels);
 	return Qnil;
@@ -1675,9 +670,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLenum format;
 	GLenum type;
 	const char *pixels;
-	int size;
-	int type_size;
-	int format_size;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	components = (GLint)NUM2INT(arg3);
@@ -1686,29 +678,18 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	border = (GLint)NUM2INT(arg6);
 	format = (GLenum)NUM2INT(arg7);
 	type = (GLenum)NUM2INT(arg8);
-	type_size = gltype_size(type);
-	format_size = glformat_size(format);
 
-	if (type_size == -1 || format_size == -1)
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		glTexImage2D(target,level,components,width,height,border,format,type,(GLvoid *)NUM2INT(arg9));
 		return Qnil;
-	if (type==GL_BITMAP)
-		size = format_size*((height*width)/8);
-	else
-		size = type_size*format_size*height*width;
+	}
 	
-	if (target == GL_PROXY_TEXTURE_2D || target == GL_PROXY_TEXTURE_CUBE_MAP || NIL_P(arg9)) { /* proxy texture, no data read */
+	if (target == GL_PROXY_TEXTURE_2D || target == GL_PROXY_TEXTURE_1D_ARRAY_EXT || target == GL_PROXY_TEXTURE_CUBE_MAP || NIL_P(arg9)) { /* proxy texture, no data read */
 		pixels = NULL;
 	} else {
-		if (TYPE(arg9) == T_FIXNUM || TYPE(arg9) == T_BIGNUM) { /* arg9 is offset to unpack buffer */
-			pixels = (const char *)NUM2UINT(arg9);
-		} else if (TYPE(arg9) == T_STRING) { /* image data */
-			if (RSTRING(arg9)->len < size)
-				rb_raise(rb_eArgError, "string length:%d",RSTRING(arg9)->len);
-			pixels = RSTRING(arg9)->ptr;
-		} else {
-			Check_Type(arg9,T_STRING); /* force exception */
-			return Qnil;
-		}
+		Check_Type(arg9,T_STRING);
+		CheckDataSize(type,format,width*height,arg9);
+		pixels = RSTRING(arg9)->ptr;
 	}
 	glTexImage2D(target,level,components,width,height,border,format,type,pixels);
 	return Qnil;
@@ -1753,388 +734,160 @@ VALUE obj,arg1,arg2,arg3;
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	param = (GLint)NUM2INT(arg3);
-	glTexEnvi(target,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_TexEnviv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum target;
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	target = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cint(arg3,params,4);
-	glTexEnviv(target,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_TexGend(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLdouble param;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLdouble)NUM2DBL(arg3);
-	glTexGend(coord,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_TexGendv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLdouble params[4] = {0.0,0.0,0.0,0.0};
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cdbl(arg3,params,4);
-	glTexGendv(coord,pname,params);
-	return Qnil;
-}
-
-
-static VALUE
-gl_TexGenf(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLfloat param;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLfloat)NUM2DBL(arg3);
-	glTexGenf(coord,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_TexGenfv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLfloat params[4] = {0.0,0.0,0.0,0.0};
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cflt(arg3,params,4);
-	glTexGenfv(coord,pname,params);
-	return Qnil;
-}
-
-static VALUE
-gl_TexGeni(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLint param;
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	param = (GLint)NUM2INT(arg3);
-	glTexGeni(coord,pname,param);
-	return Qnil;
-}
-
-static VALUE
-gl_TexGeniv(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum coord;
-	GLenum pname;
-	GLint params[4] = {0,0,0,0};
-	coord = (GLenum)NUM2INT(arg1);
-	pname = (GLenum)NUM2INT(arg2);
-	Check_Type(arg3,T_ARRAY);
-	ary2cint(arg3,params,4);
-	glTexGeniv(coord,pname,params);
-	return Qnil;
-}
-static VALUE g_current_feed_buffer;
-static VALUE
-gl_FeedbackBuffer(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLsizei size;
-	GLenum type;
-	size = (GLsizei)NUM2UINT(arg1);
-	type = (GLenum)NUM2INT(arg2);
-	g_current_feed_buffer = allocate_buffer_with_string(sizeof(GLfloat)*size);
-	rb_str_freeze(g_current_feed_buffer);
-	glFeedbackBuffer(size, type, (GLfloat*)RSTRING(g_current_feed_buffer)->ptr);
-	return g_current_feed_buffer;
-}
-
-static VALUE g_current_sel_buffer;
-static VALUE
-gl_SelectBuffer(obj,arg1)
-VALUE obj,arg1;
-{
-	GLsizei size;
-	size = (GLsizei)NUM2UINT(arg1);
-	g_current_sel_buffer = allocate_buffer_with_string(sizeof(GLuint)*size);
-	rb_str_freeze(g_current_sel_buffer);
-	glSelectBuffer(size, (GLuint*)RSTRING(g_current_sel_buffer)->ptr);
-	return g_current_sel_buffer;
-}
-
-static VALUE
-gl_RenderMode(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	GLint ret;
-	mode = (GLenum)NUM2INT(arg1);
-	ret = glRenderMode(mode);
-	return INT2NUM(ret);
-}
-
-static VALUE
-gl_InitNames(obj)
-VALUE obj;
-{
-	glInitNames();
-	return Qnil;
-}
-
-static VALUE
-gl_LoadName(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint name;
-	name = (GLuint)NUM2UINT(arg1);
-	glLoadName(name);
-	return Qnil;
-}
-
-static VALUE
-gl_PassThrough(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat token;
-	token = (GLfloat)NUM2DBL(arg1);
-	glPassThrough(token);
-	return Qnil;
-}
-
-static VALUE
-gl_PopName(obj)
-VALUE obj;
-{
-	glPopName();
-	return Qnil;
-}
-
-static VALUE
-gl_PushName(obj,arg1)
-VALUE obj,arg1;
-{
-	GLuint name;
-	name = (GLuint)NUM2UINT(arg1);
-	glPushName(name);
-	return Qnil;
-}
-
-static VALUE
-gl_DrawBuffer(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	mode = (GLenum)NUM2INT(arg1);
-	glDrawBuffer(mode);
-	return Qnil;
-}
-
-static VALUE
-gl_Clear(obj,arg1)
-VALUE obj,arg1;
-{
-	GLbitfield mask;
-	mask = (GLbitfield)NUM2UINT(arg1);
-	glClear(mask);
-	return Qnil;
-}
-
-static VALUE
-gl_ClearAccum(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLfloat red;
-	GLfloat green;
-	GLfloat blue;
-	GLfloat alpha;
-	red = (GLfloat)NUM2DBL(arg1);
-	green = (GLfloat)NUM2DBL(arg2);
-	blue = (GLfloat)NUM2DBL(arg3);
-	alpha = (GLfloat)NUM2DBL(arg4);
-	glClearAccum(red,green,blue,alpha);
-	return Qnil;
-}
-
-static VALUE
-gl_ClearIndex(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat c;
-	c = (GLfloat)NUM2DBL(arg1);
-	glClearIndex(c);
-	return Qnil;
-}
-
-static VALUE
-gl_ClearColor(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLclampf red;
-	GLclampf green;
-	GLclampf blue;
-	GLclampf alpha;
-	red = (GLclampf)NUM2DBL(arg1);
-	green = (GLclampf)NUM2DBL(arg2);
-	blue = (GLclampf)NUM2DBL(arg3);
-	alpha = (GLclampf)NUM2DBL(arg4);
-	glClearColor(red,green,blue,alpha);
-	return Qnil;
-}
-
-static VALUE
-gl_ClearStencil(obj,arg1)
-VALUE obj,arg1;
-{
-	GLint s;
-	s = (GLint)NUM2INT(arg1);
-	glClearStencil(s);
+	glTexEnvi(target,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_ClearDepth(obj,arg1)
-VALUE obj,arg1;
+gl_TexEnviv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLclampd depth;
-	depth = (GLclampd)NUM2DBL(arg1);
-	glClearDepth(depth);
+	GLenum target;
+	GLenum pname;
+	GLint params[4] = {0,0,0,0};
+	target = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cint(arg3,params,4);
+	glTexEnviv(target,pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_StencilMask(obj,arg1)
-VALUE obj,arg1;
+gl_TexGend(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLuint mask;
-	mask = (GLuint)NUM2UINT(arg1);
-	glStencilMask(mask);
+	GLenum coord;
+	GLenum pname;
+	GLdouble param;
+	coord = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	param = (GLdouble)NUM2DBL(arg3);
+	glTexGend(coord,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_ColorMask(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_TexGendv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLboolean red;
-	GLboolean green;
-	GLboolean blue;
-	GLboolean alpha;
-	red = (GLboolean)NUM2INT(arg1);
-	green = (GLboolean)NUM2INT(arg2);
-	blue = (GLboolean)NUM2INT(arg3);
-	alpha = (GLboolean)NUM2INT(arg4);
-	glColorMask(red,green,blue,alpha);
+	GLenum coord;
+	GLenum pname;
+	GLdouble params[4] = {0.0,0.0,0.0,0.0};
+	coord = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cdbl(arg3,params,4);
+	glTexGendv(coord,pname,params);
 	return Qnil;
 }
 
-static VALUE
-gl_DepthMask(obj,arg1)
-VALUE obj,arg1;
-{
-	GLboolean flag;
-	flag = (GLboolean)NUM2INT(arg1);
-	glDepthMask(flag);
-	return Qnil;
-}
 
 static VALUE
-gl_IndexMask(obj,arg1)
-VALUE obj,arg1;
+gl_TexGenf(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLuint mask;
-	mask = (GLuint)NUM2UINT(arg1);
-	glIndexMask(mask);
+	GLenum coord;
+	GLenum pname;
+	GLfloat param;
+	coord = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	param = (GLfloat)NUM2DBL(arg3);
+	glTexGenf(coord,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Accum(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
+gl_TexGenfv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLenum op;
-	GLfloat value;
-	op = (GLenum)NUM2INT(arg1);
-	value = (GLfloat)NUM2DBL(arg2);
-	glAccum(op,value);
+	GLenum coord;
+	GLenum pname;
+	GLfloat params[4] = {0.0,0.0,0.0,0.0};
+	coord = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cflt(arg3,params,4);
+	glTexGenfv(coord,pname,params);
 	return Qnil;
 }
 
 static VALUE
-gl_Disable(obj,arg1)
-VALUE obj,arg1;
+gl_TexGeni(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLenum cap;
-	cap = (GLenum)NUM2INT(arg1);
-	glDisable(cap);
+	GLenum coord;
+	GLenum pname;
+	GLint param;
+	coord = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	param = (GLint)NUM2INT(arg3);
+	glTexGeni(coord,pname,param);
 	return Qnil;
 }
 
 static VALUE
-gl_Enable(obj,arg1)
-VALUE obj,arg1;
+gl_TexGeniv(obj,arg1,arg2,arg3)
+VALUE obj,arg1,arg2,arg3;
 {
-	GLenum cap;
-	cap = (GLenum)NUM2INT(arg1);
-	glEnable(cap);
+	GLenum coord;
+	GLenum pname;
+	GLint params[4] = {0,0,0,0};
+	coord = (GLenum)NUM2INT(arg1);
+	pname = (GLenum)NUM2INT(arg2);
+	Check_Type(arg3,T_ARRAY);
+	ary2cint(arg3,params,4);
+	glTexGeniv(coord,pname,params);
 	return Qnil;
 }
-
+static VALUE g_current_feed_buffer;
 static VALUE
-gl_Finish(obj)
-VALUE obj;
+gl_FeedbackBuffer(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	glFinish();
-	return Qnil;
+	GLsizei size;
+	GLenum type;
+	size = (GLsizei)NUM2UINT(arg1);
+	type = (GLenum)NUM2INT(arg2);
+	g_current_feed_buffer = allocate_buffer_with_string(sizeof(GLfloat)*size);
+	rb_str_freeze(g_current_feed_buffer);
+	glFeedbackBuffer(size, type, (GLfloat*)RSTRING(g_current_feed_buffer)->ptr);
+	return g_current_feed_buffer;
 }
 
+static VALUE g_current_sel_buffer;
 static VALUE
-gl_Flush(obj)
-VALUE obj;
+gl_SelectBuffer(obj,arg1)
+VALUE obj,arg1;
 {
-	glFlush();
-	return Qnil;
+	GLsizei size;
+	size = (GLsizei)NUM2UINT(arg1);
+	g_current_sel_buffer = allocate_buffer_with_string(sizeof(GLuint)*size);
+	rb_str_freeze(g_current_sel_buffer);
+	glSelectBuffer(size, (GLuint*)RSTRING(g_current_sel_buffer)->ptr);
+	return g_current_sel_buffer;
 }
 
 static VALUE
-gl_PopAttrib(obj)
-VALUE obj;
+gl_RenderMode(obj,arg1)
+VALUE obj,arg1;
 {
-	glPopAttrib();
-	return Qnil;
+	GLenum mode;
+	GLint ret;
+	mode = (GLenum)NUM2INT(arg1);
+	ret = glRenderMode(mode);
+	return INT2NUM(ret);
 }
 
 static VALUE
-gl_PushAttrib(obj,arg1)
-VALUE obj,arg1;
+gl_Accum(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
-	GLbitfield mask;
-	mask = (GLbitfield)NUM2UINT(arg1);
-	glPushAttrib(mask);
+	GLenum op;
+	GLfloat value;
+	op = (GLenum)NUM2INT(arg1);
+	value = (GLfloat)NUM2DBL(arg2);
+	glAccum(op,value);
 	return Qnil;
 }
 
@@ -2330,16 +1083,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	return Qnil;
 }
 
-static VALUE
-gl_EvalCoord1d(obj,arg1)
-VALUE obj,arg1;
-{
-	GLdouble u;
-	u = (GLdouble)NUM2DBL(arg1);
-	glEvalCoord1d(u);
-	return Qnil;
-}
-
 static VALUE
 gl_EvalCoord1dv(obj,arg1)
 VALUE obj,arg1;
@@ -2351,16 +1094,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static VALUE
-gl_EvalCoord1f(obj,arg1)
-VALUE obj,arg1;
-{
-	GLfloat u;
-	u = (GLfloat)NUM2DBL(arg1);
-	glEvalCoord1f(u);
-	return Qnil;
-}
-
 static VALUE
 gl_EvalCoord1fv(obj,arg1)
 VALUE obj,arg1;
@@ -2372,18 +1105,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static VALUE
-gl_EvalCoord2d(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLdouble u;
-	GLdouble v;
-	u = (GLdouble)NUM2DBL(arg1);
-	v = (GLdouble)NUM2DBL(arg2);
-	glEvalCoord2d(u,v);
-	return Qnil;
-}
-
 static VALUE
 gl_EvalCoord2dv(obj,arg1)
 VALUE obj,arg1;
@@ -2395,18 +1116,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static VALUE
-gl_EvalCoord2f(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLfloat u;
-	GLfloat v;
-	u = (GLfloat)NUM2DBL(arg1);
-	v = (GLfloat)NUM2DBL(arg2);
-	glEvalCoord2f(u,v);
-	return Qnil;
-}
-
 static VALUE
 gl_EvalCoord2fv(obj,arg1)
 VALUE obj,arg1;
@@ -2432,16 +1141,6 @@ VALUE obj,arg1,arg2,arg3;
 	return Qnil;
 }
 
-static VALUE
-gl_EvalPoint1(obj,arg1)
-VALUE obj,arg1;
-{
-	GLint i;
-	i = (GLint)NUM2INT(arg1);
-	glEvalPoint1(i);
-	return Qnil;
-}
-
 static VALUE
 gl_EvalMesh2(obj,arg1,arg2,arg3,arg4,arg5)
 VALUE obj,arg1,arg2,arg3,arg4,arg5;
@@ -2460,18 +1159,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 	return Qnil;
 }
 
-static VALUE
-gl_EvalPoint2(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLint i;
-	GLint j;
-	i = (GLint)NUM2INT(arg1);
-	j = (GLint)NUM2INT(arg2);
-	glEvalPoint2(i,j);
-	return Qnil;
-}
-
 static VALUE
 gl_AlphaFunc(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
@@ -2484,28 +1171,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static VALUE
-gl_BlendFunc(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum sfactor;
-	GLenum dfactor;
-	sfactor = (GLenum)NUM2INT(arg1);
-	dfactor = (GLenum)NUM2INT(arg2);
-	glBlendFunc(sfactor,dfactor);
-	return Qnil;
-}
-
-static VALUE
-gl_LogicOp(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum opcode;
-	opcode = (GLenum)NUM2INT(arg1);
-	glLogicOp(opcode);
-	return Qnil;
-}
-
 static VALUE
 gl_StencilFunc(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
@@ -2520,42 +1185,6 @@ VALUE obj,arg1,arg2,arg3;
 	return Qnil;
 }
 
-static VALUE
-gl_StencilOp(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLenum fail;
-	GLenum zfail;
-	GLenum zpass;
-	fail = (GLenum)NUM2INT(arg1);
-	zfail = (GLenum)NUM2INT(arg2);
-	zpass = (GLenum)NUM2INT(arg3);
-	glStencilOp(fail,zfail,zpass);
-	return Qnil;
-}
-
-static VALUE
-gl_DepthFunc(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum func;
-	func = (GLenum)NUM2INT(arg1);
-	glDepthFunc(func);
-	return Qnil;
-}
-
-static VALUE
-gl_PixelZoom(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLfloat xfactor;
-	GLfloat yfactor;
-	xfactor = (GLfloat)NUM2DBL(arg1);
-	yfactor = (GLfloat)NUM2DBL(arg2);
-	glPixelZoom(xfactor,yfactor);
-	return Qnil;
-}
-
 static VALUE
 gl_PixelTransferf(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
@@ -2604,66 +1233,45 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static VALUE
-gl_PixelMapfv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum map;
-	GLfloat *values;
-	GLsizei size;
-	map = (GLenum)NUM2INT(arg1);	
-	Check_Type(arg2,T_ARRAY);
-	size = RARRAY(arg2)->len;
-	values = ALLOC_N(GLfloat,size);
-	ary2cflt(arg2,values,size);
-	glPixelMapfv(map,size,values);
-	xfree(values);
-	return Qnil;
-}
-
-static VALUE
-gl_PixelMapuiv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum map;
-	GLuint *values;
-	GLsizei size;
-	map = (GLenum)NUM2INT(arg1);
-	Check_Type(arg2,T_ARRAY);
-	size = RARRAY(arg2)->len;
-	values = ALLOC_N(GLuint,size);
-	ary2cuint(arg2,values,size);
-	glPixelMapuiv(map,size,values);
-	xfree(values);
-	return Qnil;
-}
-
-static VALUE
-gl_PixelMapusv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum map;
-	GLushort *values;
-	GLsizei size;
-	map = (GLenum)NUM2INT(arg1);
-	Check_Type(arg2,T_ARRAY);
-	size = RARRAY(arg2)->len;
-	values = ALLOC_N(GLushort,size);
-	ary2cushort(arg2,values,size);
-	glPixelMapusv(map,size,values);
-	xfree(values);
-	return Qnil;
+#define GLPIXELMAP_FUNC(_type_,_vartype_,_convert_) \
+static VALUE \
+gl_PixelMap##_type_##v(argc,argv,obj) \
+int argc; \
+VALUE *argv; \
+VALUE obj; \
+{ \
+	GLenum map; \
+	_vartype_ *values; \
+	GLsizei size; \
+	VALUE args[4]; \
+	switch(rb_scan_args(argc, argv, "21", &args[0], &args[1], &args[2])) { \
+		default: \
+		case 2: \
+			if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) \
+				rb_raise(rb_eArgError, "Pixel unpack buffer bound, but offset argument missing"); \
+			map = (GLenum)NUM2INT(args[0]); \
+			Check_Type(args[1],T_ARRAY); \
+			size = RARRAY(args[1])->len; \
+			values = ALLOC_N(_vartype_,size); \
+			_convert_(args[1],values,size); \
+			glPixelMap##_type_##v(map,size,values); \
+			xfree(values); \
+			break; \
+		case 3: \
+			if (!CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) \
+				rb_raise(rb_eArgError, "Pixel unpack buffer not bound"); \
+			map = (GLenum)NUM2INT(args[0]);	 \
+			size = (GLsizei)NUM2INT(args[1]); \
+			glPixelMap##_type_##v(map,size,(GLvoid *)NUM2INT(args[2])); \
+			break; \
+	} \
+	return Qnil; \
 }
 
-static VALUE
-gl_ReadBuffer(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	mode = (GLenum)NUM2INT(arg1);
-	glReadBuffer(mode);
-	return Qnil;
-}
+GLPIXELMAP_FUNC(f,GLfloat,ary2cflt)
+GLPIXELMAP_FUNC(ui,GLuint,ary2cuint)
+GLPIXELMAP_FUNC(us,GLushort,ary2cushort)
+#undef GLPIXELMAP_FUNC
 
 static VALUE
 gl_CopyPixels(obj,arg1,arg2,arg3,arg4,arg5)
@@ -2684,8 +1292,10 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 }
 
 static VALUE
-gl_ReadPixels(obj,arg1,arg2,arg3,arg4,arg5,arg6)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
+gl_ReadPixels(argc,argv,obj)
+int argc;
+VALUE *argv;
+VALUE obj;
 {
 	GLint x;
 	GLint y;
@@ -2694,29 +1304,36 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	int format;
 	int type;
 	VALUE pixels;
-	GLsizei type_size;
-	GLsizei format_size;
-	GLsizei size;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	width = (GLsizei)NUM2UINT(arg3);
-	height = (GLsizei)NUM2UINT(arg4);
-	format = NUM2INT(arg5);
-	type = NUM2INT(arg6);
-	type_size = gltype_size(type);
-	format_size = glformat_size(format);
-	if (type_size == -1 || format_size == -1) 
-		return Qnil;
-
-	if (type==GL_BITMAP)
-		size = format_size*((width*height)/8);
-	else
-		size = width*height*format_size*type_size;
-	pixels = allocate_buffer_with_string(size);
-	FORCE_PIXEL_STORE_MODE
-	glReadPixels(x,y,width,height,format,type,(GLvoid*)RSTRING(pixels)->ptr);
-	RESTORE_PIXEL_STORE_MODE
-	return pixels;
+	VALUE args[7];
+	int numargs;
+	numargs = rb_scan_args(argc, argv, "61", &args[0], &args[1], &args[2], &args[3], &args[4], &args[5], &args[6]);
+	x = (GLint)NUM2INT(args[0]);
+	y = (GLint)NUM2INT(args[1]);
+	width = (GLsizei)NUM2UINT(args[2]);
+	height = (GLsizei)NUM2UINT(args[3]);
+	format = NUM2INT(args[4]);
+	type = NUM2INT(args[5]);
+
+	switch(numargs) {
+		default:
+		case 6:
+			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing");
+			pixels = allocate_buffer_with_string(GetDataSize(type,format,width*height));
+			FORCE_PIXEL_STORE_MODE
+			glReadPixels(x,y,width,height,format,type,(GLvoid*)RSTRING(pixels)->ptr);
+			RESTORE_PIXEL_STORE_MODE
+			return pixels;
+			break;			
+		case 7:
+			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Pixel pack buffer not bound");
+			FORCE_PIXEL_STORE_MODE
+			glReadPixels(x,y,width,height,format,type,(GLvoid*)NUM2INT(args[6]));
+			RESTORE_PIXEL_STORE_MODE
+			return Qnil;
+			break;			
+	}
 }
 
 static VALUE
@@ -2728,26 +1345,18 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 	GLenum format;
 	GLenum type;
 	const char *pixels;
-	GLsizei size;
-	GLsizei type_size;
-	GLsizei format_size;
 	width = (GLsizei)NUM2UINT(arg1);
 	height = (GLsizei)NUM2UINT(arg2);
 	format = (GLenum)NUM2INT(arg3);
 	type = (GLenum)NUM2INT(arg4);
-	Check_Type(arg5,T_STRING);
-	type_size = gltype_size(type);
-	format_size = glformat_size(format);
-	if (type_size == -1 || format_size == -1)
-		rb_raise(rb_eArgError, "type/format mismatch");
-	if (type==GL_BITMAP)
-		size = format_size*(width/8);
-	else
-		size = type_size*format_size*width*height;
-	if (RSTRING(arg5)->len < size)
-		rb_raise(rb_eArgError, "string length:%d", RSTRING(arg5)->len);
-	pixels = RSTRING(arg5)->ptr;
-	glDrawPixels(width,height,format,type,pixels);
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		glDrawPixels(width,height,format,type,(GLvoid *)NUM2INT(arg5));
+	} else {
+		Check_Type(arg5,T_STRING);
+		CheckDataSize(type,format,width*height,arg5);
+		pixels = RSTRING(arg5)->ptr;
+		glDrawPixels(width,height,format,type,pixels);
+	}
 	return Qnil;
 }
 
@@ -2776,7 +1385,7 @@ VALUE obj,arg1; \
 	int nitems; \
 	VALUE ary, ary2; \
 	int i,j; \
-	_type_ items[32];  \
+	_type_ items[64];  \
 	pname = NUM2INT(arg1); \
 	switch(pname) { \
 	case GL_ACCUM_CLEAR_VALUE: \
@@ -2796,10 +1405,25 @@ VALUE obj,arg1; \
 	case GL_SCISSOR_BOX: \
 	case GL_TEXTURE_ENV_COLOR: \
 	case GL_VIEWPORT: \
+	case GL_REFERENCE_PLANE_EQUATION_SGIX: \
+	case GL_FOG_OFFSET_VALUE_SGIX: \
+	case GL_TEXTURE_ENV_BIAS_SGIX: \
+	case GL_CULL_VERTEX_OBJECT_POSITION_EXT: \
+	case GL_CULL_VERTEX_EYE_POSITION_EXT: \
+	case GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX: \
+	case GL_CONSTANT_COLOR0_NV: \
+	case GL_CONSTANT_COLOR1_NV: \
+	case GL_TEXTURE_COLOR_WRITEMASK_SGIS: \
+	case GL_FLOAT_CLEAR_COLOR_VALUE_NV: \
 		nitems = 4; \
 		break; \
 	case GL_CURRENT_NORMAL: \
 	case GL_POINT_DISTANCE_ATTENUATION: \
+	case GL_SPRITE_AXIS_SGIX: \
+	case GL_SPRITE_TRANSLATION_SGIX: \
+	case GL_CURRENT_RASTER_NORMAL_SGIX: \
+	case GL_CURRENT_TANGENT_EXT: \
+	case GL_CURRENT_BINORMAL_EXT: \
 		nitems = 3; \
 		break; \
 	case GL_DEPTH_RANGE:	 \
@@ -2811,11 +1435,56 @@ VALUE obj,arg1; \
 	case GL_POLYGON_MODE: \
 	case GL_ALIASED_LINE_WIDTH_RANGE: \
 	case GL_ALIASED_POINT_SIZE_RANGE: \
+	case GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX: \
+	case GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX: \
+	case GL_FOG_FUNC_SGIS: \
+	case GL_DEPTH_BOUNDS_EXT: \
 		nitems = 2; \
 		break; \
 	case GL_MODELVIEW_MATRIX: \
 	case GL_PROJECTION_MATRIX: \
 	case GL_TEXTURE_MATRIX: \
+	case GL_COLOR_MATRIX: \
+	case GL_TRANSPOSE_MODELVIEW_MATRIX: \
+	case GL_TRANSPOSE_PROJECTION_MATRIX: \
+	case GL_TRANSPOSE_TEXTURE_MATRIX: \
+	case GL_TRANSPOSE_COLOR_MATRIX: \
+	case GL_MODELVIEW0_ARB: \
+	case GL_MODELVIEW1_ARB: \
+	case GL_MODELVIEW2_ARB: \
+	case GL_MODELVIEW3_ARB: \
+	case GL_MODELVIEW4_ARB: \
+	case GL_MODELVIEW5_ARB: \
+	case GL_MODELVIEW6_ARB: \
+	case GL_MODELVIEW7_ARB: \
+	case GL_MODELVIEW8_ARB: \
+	case GL_MODELVIEW9_ARB: \
+	case GL_MODELVIEW10_ARB: \
+	case GL_MODELVIEW11_ARB: \
+	case GL_MODELVIEW12_ARB: \
+	case GL_MODELVIEW13_ARB: \
+	case GL_MODELVIEW14_ARB: \
+	case GL_MODELVIEW15_ARB: \
+	case GL_MODELVIEW16_ARB: \
+	case GL_MODELVIEW17_ARB: \
+	case GL_MODELVIEW18_ARB: \
+	case GL_MODELVIEW19_ARB: \
+	case GL_MODELVIEW20_ARB: \
+	case GL_MODELVIEW21_ARB: \
+	case GL_MODELVIEW22_ARB: \
+	case GL_MODELVIEW23_ARB: \
+	case GL_MODELVIEW24_ARB: \
+	case GL_MODELVIEW25_ARB: \
+	case GL_MODELVIEW26_ARB: \
+	case GL_MODELVIEW27_ARB: \
+	case GL_MODELVIEW28_ARB: \
+	case GL_MODELVIEW29_ARB: \
+	case GL_MODELVIEW30_ARB: \
+	case GL_MODELVIEW31_ARB: \
+	case GL_MATRIX_PALETTE_ARB: \
+	case GL_PIXEL_TRANSFORM_2D_MATRIX_EXT: \
+	case GL_MODELVIEW1_MATRIX_EXT: \
+	case GL_CURRENT_MATRIX_NV: \
 		glGet##_name_##v(pname, items); \
 		ary = rb_ary_new2(4); \
 		for (i = 0; i < 4; i++) { \
@@ -2828,6 +1497,11 @@ VALUE obj,arg1; \
 	case GL_POLYGON_STIPPLE: \
 		glGet##_name_##v(pname, items); \
 		return rb_str_new((const char*)items, 32); \
+	case GL_COMPRESSED_TEXTURE_FORMATS: \
+		glGetIntegerv(GL_NUM_COMPRESSED_TEXTURE_FORMATS, &nitems); \
+		if (nitems<=0||nitems>64) \
+			return INT2NUM(0); \
+		break; \
 	default: /* size=1 */ \
 		glGet##_name_##v(pname, items); \
 		return _conv_(items[0]); \
@@ -3190,124 +1864,89 @@ VALUE obj,arg1,arg2;
 	return retary;
 }
 
-static VALUE
-gl_GetPixelMapfv(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum map;
-	GLenum map_size;
-	GLint size = 0;
-	GLfloat *values;
-	VALUE retary;
-	int i;
-	map = (GLenum)NUM2INT(arg1);
-	switch(map) {
-		case GL_PIXEL_MAP_I_TO_I: map_size=GL_PIXEL_MAP_I_TO_I_SIZE; break;
-		case GL_PIXEL_MAP_S_TO_S: map_size=GL_PIXEL_MAP_S_TO_S_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_R: map_size=GL_PIXEL_MAP_I_TO_R_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_G: map_size=GL_PIXEL_MAP_I_TO_G_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_B: map_size=GL_PIXEL_MAP_I_TO_B_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_A: map_size=GL_PIXEL_MAP_I_TO_A_SIZE; break;
-		case GL_PIXEL_MAP_R_TO_R: map_size=GL_PIXEL_MAP_R_TO_R_SIZE; break;
-		case GL_PIXEL_MAP_G_TO_G: map_size=GL_PIXEL_MAP_G_TO_G_SIZE; break;
-		case GL_PIXEL_MAP_B_TO_B: map_size=GL_PIXEL_MAP_B_TO_B_SIZE; break;
-		case GL_PIXEL_MAP_A_TO_A: map_size=GL_PIXEL_MAP_A_TO_A_SIZE; break;
-		default:
-			rb_raise(rb_eArgError, "unknown map:%d",map);
-			break; /* not reached */
-	}
-	glGetIntegerv(map_size,&size);
-	values = ALLOC_N(GLfloat,size);
-	glGetPixelMapfv(map,values);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_float_new(values[i]));
-	xfree(values);
-	return retary;
-}
-
-static VALUE
-gl_GetPixelMapuiv(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum map;
-	GLenum map_size;
-	GLint size = 0;
-	GLuint *values;
-	VALUE retary;
-	int i;
-	map = (GLenum)NUM2INT(arg1);
-	switch(map) {
-		case GL_PIXEL_MAP_I_TO_I: map_size=GL_PIXEL_MAP_I_TO_I_SIZE; break;
-		case GL_PIXEL_MAP_S_TO_S: map_size=GL_PIXEL_MAP_S_TO_S_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_R: map_size=GL_PIXEL_MAP_I_TO_R_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_G: map_size=GL_PIXEL_MAP_I_TO_G_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_B: map_size=GL_PIXEL_MAP_I_TO_B_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_A: map_size=GL_PIXEL_MAP_I_TO_A_SIZE; break;
-		case GL_PIXEL_MAP_R_TO_R: map_size=GL_PIXEL_MAP_R_TO_R_SIZE; break;
-		case GL_PIXEL_MAP_G_TO_G: map_size=GL_PIXEL_MAP_G_TO_G_SIZE; break;
-		case GL_PIXEL_MAP_B_TO_B: map_size=GL_PIXEL_MAP_B_TO_B_SIZE; break;
-		case GL_PIXEL_MAP_A_TO_A: map_size=GL_PIXEL_MAP_A_TO_A_SIZE; break;
-		default:
-			rb_raise(rb_eArgError, "unknown map:%d",map);
-			break; /* not reached */
-	}
-	glGetIntegerv(map_size,&size);
-	values = ALLOC_N(GLuint,size);
-	glGetPixelMapuiv(map,values);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(values[i]));
-	xfree(values);
-	return retary;
+#define GLGETPIXELMAP_FUNC(_type_,_vartype_,_convert_) \
+static VALUE \
+gl_GetPixelMap##_type_##v(argc,argv,obj) \
+int argc; \
+VALUE *argv; \
+VALUE obj; \
+{ \
+	GLenum map; \
+	GLenum map_size; \
+	GLint size = 0; \
+	_vartype_ *values; \
+	VALUE retary; \
+	VALUE args[2]; \
+	int i; \
+	switch (rb_scan_args(argc, argv, "11", &args[0], &args[1])) { \
+		default: \
+		case 1: \
+			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING)) \
+				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing"); \
+\
+			map = (GLenum)NUM2INT(args[0]); \
+			switch(map) { \
+				case GL_PIXEL_MAP_I_TO_I: map_size=GL_PIXEL_MAP_I_TO_I_SIZE; break; \
+				case GL_PIXEL_MAP_S_TO_S: map_size=GL_PIXEL_MAP_S_TO_S_SIZE; break; \
+				case GL_PIXEL_MAP_I_TO_R: map_size=GL_PIXEL_MAP_I_TO_R_SIZE; break; \
+				case GL_PIXEL_MAP_I_TO_G: map_size=GL_PIXEL_MAP_I_TO_G_SIZE; break; \
+				case GL_PIXEL_MAP_I_TO_B: map_size=GL_PIXEL_MAP_I_TO_B_SIZE; break; \
+				case GL_PIXEL_MAP_I_TO_A: map_size=GL_PIXEL_MAP_I_TO_A_SIZE; break; \
+				case GL_PIXEL_MAP_R_TO_R: map_size=GL_PIXEL_MAP_R_TO_R_SIZE; break; \
+				case GL_PIXEL_MAP_G_TO_G: map_size=GL_PIXEL_MAP_G_TO_G_SIZE; break; \
+				case GL_PIXEL_MAP_B_TO_B: map_size=GL_PIXEL_MAP_B_TO_B_SIZE; break; \
+				case GL_PIXEL_MAP_A_TO_A: map_size=GL_PIXEL_MAP_A_TO_A_SIZE; break; \
+				default: \
+					rb_raise(rb_eArgError, "unknown map:%d",map); \
+					break; \
+			} \
+			glGetIntegerv(map_size,&size); \
+			values = ALLOC_N(_vartype_,size); \
+			glGetPixelMap##_type_##v(map,values); \
+			retary = rb_ary_new2(size); \
+			for(i=0;i<size;i++) \
+				rb_ary_push(retary, _convert_(values[i])); \
+			xfree(values); \
+			return retary; \
+		case 2: \
+			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING)) \
+				rb_raise(rb_eArgError, "Pixel pack buffer not bound"); \
+ \
+			map = (GLenum)NUM2INT(args[0]); \
+			glGetPixelMap##_type_##v(map,(GLvoid*)NUM2INT(args[1])); \
+			return Qnil; \
+	} \
 }
 
-static VALUE
-gl_GetPixelMapusv(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum map;
-	GLenum map_size;
-	GLint size = 0;
-	GLushort *values;
-	VALUE retary;
-	int i;
-	map = (GLenum)NUM2INT(arg1);
-	switch(map) {
-		case GL_PIXEL_MAP_I_TO_I: map_size=GL_PIXEL_MAP_I_TO_I_SIZE; break;
-		case GL_PIXEL_MAP_S_TO_S: map_size=GL_PIXEL_MAP_S_TO_S_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_R: map_size=GL_PIXEL_MAP_I_TO_R_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_G: map_size=GL_PIXEL_MAP_I_TO_G_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_B: map_size=GL_PIXEL_MAP_I_TO_B_SIZE; break;
-		case GL_PIXEL_MAP_I_TO_A: map_size=GL_PIXEL_MAP_I_TO_A_SIZE; break;
-		case GL_PIXEL_MAP_R_TO_R: map_size=GL_PIXEL_MAP_R_TO_R_SIZE; break;
-		case GL_PIXEL_MAP_G_TO_G: map_size=GL_PIXEL_MAP_G_TO_G_SIZE; break;
-		case GL_PIXEL_MAP_B_TO_B: map_size=GL_PIXEL_MAP_B_TO_B_SIZE; break;
-		case GL_PIXEL_MAP_A_TO_A: map_size=GL_PIXEL_MAP_A_TO_A_SIZE; break;
-		default:
-			rb_raise(rb_eArgError, "unknown map:%d",map);
-			break; /* not reached */
-	}
-	glGetIntegerv(map_size,&size);
-	values = ALLOC_N(GLushort,size);
-	glGetPixelMapusv(map,values);
-	retary = rb_ary_new2(size);
-	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2NUM(values[i]));
-	xfree(values);
-	return retary;
-}
+GLGETPIXELMAP_FUNC(f,GLfloat,rb_float_new)
+GLGETPIXELMAP_FUNC(ui,GLuint,INT2NUM)
+GLGETPIXELMAP_FUNC(us,GLushort,INT2NUM)
+#undef GLGETPIXELMAP_FUNC
 
 static VALUE
-gl_GetPolygonStipple(obj)
+gl_GetPolygonStipple(argc,argv,obj)
+int argc;
+VALUE *argv;
 VALUE obj;
 {
+	VALUE args[1];
 	GLubyte mask[128];
-	memset(mask, 0x0, sizeof(GLubyte)*128);
-	FORCE_PIXEL_STORE_MODE
-	glGetPolygonStipple(mask);
-	RESTORE_PIXEL_STORE_MODE
-	return rb_str_new((const char*)mask, 128);
+	switch(rb_scan_args(argc, argv, "01", &args[0])) {
+		default:
+		case 0:
+			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing");
+			memset(mask, 0x0, sizeof(GLubyte)*128);
+			FORCE_PIXEL_STORE_MODE
+			glGetPolygonStipple(mask);
+			RESTORE_PIXEL_STORE_MODE
+			return rb_str_new((const char*)mask, 128);
+		case 1:
+			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Pixel pack buffer not bound");
+			glGetPolygonStipple((GLvoid *)NUM2INT(args[0]));
+			return Qnil;
+	}
 }
 
 static VALUE
@@ -3335,32 +1974,17 @@ VALUE obj,arg1,arg2;
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
 		case GL_TEXTURE_ENV_COLOR:
+		case GL_TEXTURE_ENV_BIAS_SGIX:
+		case GL_CULL_MODES_NV:
+		case GL_OFFSET_TEXTURE_MATRIX_NV:
 			size = 4;
 			break;
-		case GL_TEXTURE_ENV_MODE:
-		case GL_COORD_REPLACE:
-		case GL_TEXTURE_LOD_BIAS:
-		case GL_COMBINE_RGB:
-		case GL_COMBINE_ALPHA:
-		case GL_SRC0_RGB:
-		case GL_SRC1_RGB:
-		case GL_SRC2_RGB:
-		case GL_SRC0_ALPHA:
-		case GL_SRC1_ALPHA:
-		case GL_SRC2_ALPHA:
-		case GL_OPERAND0_RGB:
-		case GL_OPERAND1_RGB:
-		case GL_OPERAND2_RGB:
-		case GL_OPERAND0_ALPHA:
-		case GL_OPERAND1_ALPHA:
-		case GL_OPERAND2_ALPHA:
-		case GL_RGB_SCALE:
-		case GL_ALPHA_SCALE:
-			size = 1;
+		case GL_CONST_EYE_NV:
+			size = 3;
 			break;
 		default:
-			rb_raise(rb_eArgError, "unknown pname:%d",pname);
-			break; /* not reached */
+			size = 1;
+			break;
 	}
 	glGetTexEnvfv(target,pname,params);
 	retary = rb_ary_new2(size);
@@ -3383,32 +2007,17 @@ VALUE obj,arg1,arg2;
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
 		case GL_TEXTURE_ENV_COLOR:
+		case GL_TEXTURE_ENV_BIAS_SGIX:
+		case GL_CULL_MODES_NV:
+		case GL_OFFSET_TEXTURE_MATRIX_NV:
 			size = 4;
 			break;
-		case GL_TEXTURE_ENV_MODE:
-		case GL_COORD_REPLACE:
-		case GL_TEXTURE_LOD_BIAS:
-		case GL_COMBINE_RGB:
-		case GL_COMBINE_ALPHA:
-		case GL_SRC0_RGB:
-		case GL_SRC1_RGB:
-		case GL_SRC2_RGB:
-		case GL_SRC0_ALPHA:
-		case GL_SRC1_ALPHA:
-		case GL_SRC2_ALPHA:
-		case GL_OPERAND0_RGB:
-		case GL_OPERAND1_RGB:
-		case GL_OPERAND2_RGB:
-		case GL_OPERAND0_ALPHA:
-		case GL_OPERAND1_ALPHA:
-		case GL_OPERAND2_ALPHA:
-		case GL_RGB_SCALE:
-		case GL_ALPHA_SCALE:
-			size = 1;
+		case GL_CONST_EYE_NV:
+			size = 3;
 			break;
 		default:
-			rb_raise(rb_eArgError, "unknown pname:%d",pname);
-			break; /* not reached */
+			size = 1;
+			break;
 	}
 	glGetTexEnviv(target,pname,params);
 	retary = rb_ary_new2(size);
@@ -3434,12 +2043,9 @@ VALUE obj,arg1,arg2;
 		case GL_EYE_PLANE:
 			size = 4;
 			break;
-		case GL_TEXTURE_GEN_MODE:
+		default:
 			size = 1;
 			break;
-		default:
-			rb_raise(rb_eArgError, "unknown pname:%d",pname);
-			break; /* not reached */
 	}
 	glGetTexGendv(coord,pname,params);
 	retary = rb_ary_new2(size);
@@ -3465,12 +2071,9 @@ VALUE obj,arg1,arg2;
 		case GL_EYE_PLANE:
 			size = 4;
 			break;
-		case GL_TEXTURE_GEN_MODE:
+		default:
 			size = 1;
 			break;
-		default:
-			rb_raise(rb_eArgError, "unknown pname:%d",pname);
-			break; /* not reached */
 	}
 	glGetTexGenfv(coord,pname,params);
 	retary = rb_ary_new2(size);
@@ -3496,12 +2099,9 @@ VALUE obj,arg1,arg2;
 		case GL_EYE_PLANE:
 			size = 4;
 			break;
-		case GL_TEXTURE_GEN_MODE:
+		default:
 			size = 1;
 			break;
-		default:
-			rb_raise(rb_eArgError, "unknown pname:%d",pname);
-			break; /* not reached */
 	}
 	glGetTexGeniv(coord,pname,params);
 	retary = rb_ary_new2(size);
@@ -3510,10 +2110,11 @@ VALUE obj,arg1,arg2;
 	return retary;
 }
 
-
 static VALUE
-gl_GetTexImage(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
+gl_GetTexImage(argc,argv,obj)
+int argc;
+VALUE *argv;
+VALUE obj;
 {
 	GLenum tex;
 	GLint lod;
@@ -3522,46 +2123,71 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLint width = 0;
 	GLint height = 0;
 	GLint depth = 0;
+	GLint size4d = 0;
 	GLint size;
-	GLint format_size;
-	GLint type_size;
 	VALUE pixels;
-	tex = (GLenum)NUM2INT(arg1);
-	lod = (GLint)NUM2INT(arg2);
-	format = (GLenum)NUM2INT(arg3);
-	type = (GLenum)NUM2INT(arg4);
-	format_size = glformat_size(format);
-	type_size = gltype_size(type);
-	if (type_size == -1 && format_size == -1)
-		return Qnil;
+	VALUE args[5];
+	int numargs;
+	numargs = rb_scan_args(argc, argv, "41", &args[0], &args[1], &args[2], &args[3], &args[4]);
+	tex = (GLenum)NUM2INT(args[0]);
+	lod = (GLint)NUM2INT(args[1]);
+	format = (GLenum)NUM2INT(args[2]);
+	type = (GLenum)NUM2INT(args[3]);
+	switch(numargs) {
+		default:
+		case 4:
+			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing");
 
-	size = 1;
-	switch(tex) {
-		case GL_TEXTURE_3D:
-			glGetTexLevelParameteriv(tex,lod,GL_TEXTURE_DEPTH,&depth);
-			size *= depth;
-			/* fall through */
-		case GL_TEXTURE_2D:
-			glGetTexLevelParameteriv(tex,lod,GL_TEXTURE_HEIGHT,&height);
-			size *= height;
-			/* fall through */
-		case GL_TEXTURE_1D:
-			glGetTexLevelParameteriv(tex,lod,GL_TEXTURE_WIDTH,&width);
-			size *= width;
+			size = 1;
+			switch(tex) {
+				case GL_TEXTURE_4D_SGIS:
+					glGetTexLevelParameteriv(tex,lod,GL_TEXTURE_4DSIZE_SGIS,&size4d);
+					size *= size4d;
+					/* fall through */
+				case GL_TEXTURE_3D:
+				case GL_TEXTURE_1D_STACK_MESAX:
+				case GL_TEXTURE_2D_STACK_MESAX:
+					glGetTexLevelParameteriv(tex,lod,GL_TEXTURE_DEPTH,&depth);
+					size *= depth;
+					/* fall through */
+				case GL_TEXTURE_2D:
+				case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+				case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+				case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+				case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+				case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+				case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+				case GL_TEXTURE_RECTANGLE_ARB:
+				case GL_DETAIL_TEXTURE_2D_SGIS:
+					glGetTexLevelParameteriv(tex,lod,GL_TEXTURE_HEIGHT,&height);
+					size *= height;
+					/* fall through */
+				case GL_TEXTURE_1D:
+					glGetTexLevelParameteriv(tex,lod,GL_TEXTURE_WIDTH,&width);
+					size *= width;
+					break;
+				default:
+					rb_raise(rb_eArgError, "Target type not supported");
+			}
+			pixels = allocate_buffer_with_string(GetDataSize(type,format,size));
+		
+			FORCE_PIXEL_STORE_MODE
+			glGetTexImage(tex,lod,format,type,(GLvoid*)RSTRING(pixels)->ptr);
+			RESTORE_PIXEL_STORE_MODE
+			return pixels;
 			break;
-		default:
-			return Qnil;
-	}
-	size *=	format_size*type_size;
-	pixels = allocate_buffer_with_string(size);
+		case 5:
+			if (!CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
+				rb_raise(rb_eArgError, "Pixel pack buffer not bound");
 
-	FORCE_PIXEL_STORE_MODE
-	glGetTexImage(tex,lod,format,type,(GLvoid*)RSTRING(pixels)->ptr);
-	RESTORE_PIXEL_STORE_MODE
-	return pixels;
+			FORCE_PIXEL_STORE_MODE
+			glGetTexImage(tex,lod,format,type,(GLvoid*)NUM2INT(args[4]));
+			RESTORE_PIXEL_STORE_MODE
+		return Qnil;
+	}
 }
 
-
 static VALUE
 gl_GetTexParameterfv(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
@@ -3576,6 +2202,9 @@ VALUE obj,arg1,arg2;
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
 		case GL_TEXTURE_BORDER_COLOR:
+		case GL_TEXTURE_BORDER_VALUES_NV:
+		case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
+		case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
 			size = 4;
 			break;
 		default:
@@ -3603,6 +2232,9 @@ VALUE obj,arg1,arg2;
 	pname = (GLenum)NUM2INT(arg2);
 	switch(pname) {
 		case GL_TEXTURE_BORDER_COLOR:
+		case GL_TEXTURE_BORDER_VALUES_NV:
+		case GL_POST_TEXTURE_FILTER_BIAS_SGIX:
+		case GL_POST_TEXTURE_FILTER_SCALE_SGIX:
 			size = 4;
 			break;
 		default:
@@ -3674,46 +2306,6 @@ VALUE obj,arg1;
 	return INT2NUM(ret);
 }
 
-static VALUE
-gl_DepthRange(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLclampd near_val;
-	GLclampd far_val;
-	near_val = (GLclampd)NUM2DBL(arg1);
-	far_val = (GLclampd)NUM2DBL(arg2);
-	glDepthRange(near_val,far_val);
-	return Qnil;
-}
-
-static VALUE
-gl_Frustum(obj,arg1,arg2,arg3,arg4,arg5,arg6)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
-{
-	GLdouble left;
-	GLdouble right;
-	GLdouble bottom;
-	GLdouble top;
-	GLdouble near_val;
-	GLdouble far_val;
-	left = (GLdouble)NUM2DBL(arg1);
-	right = (GLdouble)NUM2DBL(arg2);
-	bottom = (GLdouble)NUM2DBL(arg3);
-	top = (GLdouble)NUM2DBL(arg4);
-	near_val = (GLdouble)NUM2DBL(arg5);
-	far_val = (GLdouble)NUM2DBL(arg6);
-	glFrustum(left,right,bottom,top,near_val,far_val);
-	return Qnil;
-}
-
-static VALUE
-gl_LoadIdentity(obj)
-VALUE obj;
-{
-	glLoadIdentity();
-	return Qnil;
-}
-
 static VALUE
 gl_LoadMatrixf(obj,arg1)
 VALUE obj,arg1;
@@ -3734,16 +2326,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static VALUE
-gl_MatrixMode(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum mode;
-	mode = (GLenum)NUM2INT(arg1);
-	glMatrixMode(mode);
-	return Qnil;
-}
-
 static VALUE
 gl_MultMatrixf(obj,arg1)
 VALUE obj,arg1;
@@ -3764,155 +2346,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static VALUE
-gl_Ortho(obj,arg1,arg2,arg3,arg4,arg5,arg6)
-VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
-{
-	GLdouble left;
-	GLdouble right;
-	GLdouble bottom;
-	GLdouble top;
-	GLdouble near_val;
-	GLdouble far_val;
-	left = (GLdouble)NUM2DBL(arg1);
-	right = (GLdouble)NUM2DBL(arg2);
-	bottom = (GLdouble)NUM2DBL(arg3);
-	top = (GLdouble)NUM2DBL(arg4);
-	near_val = (GLdouble)NUM2DBL(arg5);
-	far_val = (GLdouble)NUM2DBL(arg6);
-	glOrtho(left,right,bottom,top,near_val,far_val);
-	return Qnil;
-}
-
-static VALUE
-gl_PopMatrix(obj)
-VALUE obj;
-{
-	glPopMatrix();
-	return Qnil;
-}
-
-static VALUE
-gl_PushMatrix(obj)
-VALUE obj;
-{
-	glPushMatrix();
-	return Qnil;
-}
-
-static VALUE
-gl_Rotated(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLdouble angle;
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	angle = (GLdouble)NUM2DBL(arg1);
-	x = (GLdouble)NUM2DBL(arg2);
-	y = (GLdouble)NUM2DBL(arg3);
-	z = (GLdouble)NUM2DBL(arg4);
-	glRotated(angle,x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Rotatef(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLfloat angle;
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	angle = (GLfloat)NUM2DBL(arg1);
-	x = (GLfloat)NUM2DBL(arg2);
-	y = (GLfloat)NUM2DBL(arg3);
-	z = (GLfloat)NUM2DBL(arg4);
-	glRotatef(angle,x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Scaled(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	z = (GLdouble)NUM2DBL(arg3);
-	glScaled(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Scalef(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	z = (GLfloat)NUM2DBL(arg3);
-	glScalef(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Translated(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLdouble x;
-	GLdouble y;
-	GLdouble z;
-	x = (GLdouble)NUM2DBL(arg1);
-	y = (GLdouble)NUM2DBL(arg2);
-	z = (GLdouble)NUM2DBL(arg3);
-	glTranslated(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Translatef(obj,arg1,arg2,arg3)
-VALUE obj,arg1,arg2,arg3;
-{
-	GLfloat x;
-	GLfloat y;
-	GLfloat z;
-	x = (GLfloat)NUM2DBL(arg1);
-	y = (GLfloat)NUM2DBL(arg2);
-	z = (GLfloat)NUM2DBL(arg3);
-	glTranslatef(x,y,z);
-	return Qnil;
-}
-
-static VALUE
-gl_Viewport(obj,arg1,arg2,arg3,arg4)
-VALUE obj,arg1,arg2,arg3,arg4;
-{
-	GLint x;
-	GLint y;
-	GLsizei width;
-	GLsizei height;
-	x = (GLint)NUM2INT(arg1);
-	y = (GLint)NUM2INT(arg2);
-	width = (GLsizei)NUM2UINT(arg3);
-	height = (GLsizei)NUM2UINT(arg4);
-	glViewport(x,y,width,height);
-	return Qnil;
-}
-
-static VALUE
-gl_ArrayElement(obj,arg1)
-VALUE obj,arg1;
-{
-	GLint i;
-	i = (GLint)NUM2INT(arg1);
-	glArrayElement(i);
-	return Qnil;
-}
 
 static VALUE g_Vertex_ptr;
 static VALUE g_Normal_ptr;
@@ -3933,10 +2366,15 @@ VALUE obj, arg1, arg2, arg3, arg4; \
 	size = (GLint)NUM2INT(arg1); \
 	type = (GLenum)NUM2INT(arg2); \
 	stride = (GLsizei)NUM2UINT(arg3); \
-	Check_Type(arg4, T_STRING); \
-	rb_str_freeze(arg4); \
-	g_##_func_##_ptr = arg4; \
-	gl##_func_##Pointer(size, type, stride, (const GLvoid*)RSTRING(arg4)->ptr); \
+	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) { \
+		g_##_func_##_ptr = arg4; \
+		gl##_func_##Pointer(size, type, stride, (const GLvoid*)NUM2INT(arg4)); \
+	} else { \
+		Check_Type(arg4, T_STRING); \
+		rb_str_freeze(arg4); \
+		g_##_func_##_ptr = arg4; \
+		gl##_func_##Pointer(size, type, stride, (const GLvoid*)RSTRING(arg4)->ptr); \
+	} \
 	return Qnil; \
 }
 
@@ -3946,16 +2384,6 @@ POINTER_FUNC(TexCoord)
 
 #undef POINTER_FUNC
 
-static VALUE
-gl_DisableClientState(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum cap;
-	cap = (GLenum)NUM2INT(arg1);
-	glDisableClientState(cap);
-	return Qnil;
-}
-
 static VALUE
 gl_DrawArrays(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
@@ -3980,8 +2408,12 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	mode = (GLenum)NUM2INT(arg1);
 	count = (GLsizei)NUM2UINT(arg2);
 	type = (GLenum)NUM2INT(arg3);
-	Check_Type(arg4, T_STRING);
-	glDrawElements(mode, count, type, (const GLvoid*)RSTRING(arg4)->ptr);
+	if (CheckBufferBinding(GL_ELEMENT_ARRAY_BUFFER_BINDING)) {
+		glDrawElements(mode, count, type, (const GLvoid*)NUM2INT(arg4));
+	} else {
+		Check_Type(arg4, T_STRING);
+		glDrawElements(mode, count, type, (const GLvoid*)RSTRING(arg4)->ptr);
+	}
 	return Qnil;
 }
 
@@ -3991,20 +2423,15 @@ VALUE obj,arg1,arg2;
 {
 	GLsizei stride;
 	stride = (GLsizei)NUM2UINT(arg1);
-	Check_Type(arg2, T_STRING);
-	rb_str_freeze(arg2);
-	g_EdgeFlag_ptr = arg2;
-	glEdgeFlagPointer(stride, (const GLboolean*)RSTRING(arg2)->ptr);
-	return Qnil;
-}
-
-static VALUE
-gl_EnableClientState(obj,arg1)
-VALUE obj,arg1;
-{
-	GLenum cap;
-	cap = (GLenum)NUM2INT(arg1);
-	glEnableClientState(cap);
+	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
+		g_EdgeFlag_ptr = arg2;
+		glEdgeFlagPointer(stride, (const GLboolean*) NUM2INT(arg2));
+	} else {
+		Check_Type(arg2, T_STRING);
+		rb_str_freeze(arg2);
+		g_EdgeFlag_ptr = arg2;
+		glEdgeFlagPointer(stride, (const GLboolean*)RSTRING(arg2)->ptr);
+	}
 	return Qnil;
 }
 
@@ -4050,10 +2477,15 @@ VALUE obj,arg1,arg2,arg3;
 	GLsizei stride;
 	type = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
-	Check_Type(arg3, T_STRING);
-	rb_str_freeze(arg3);
-	g_Index_ptr = arg3;
-	glIndexPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
+		g_Index_ptr = arg3;
+		glIndexPointer(type, stride, (const GLvoid*)NUM2INT(arg3));
+	} else {
+		Check_Type(arg3, T_STRING);
+		rb_str_freeze(arg3);
+		g_Index_ptr = arg3;
+		glIndexPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+	}
 	return Qnil;
 }
 
@@ -4066,6 +2498,7 @@ VALUE obj,arg1,arg2,arg3;
 	format = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
 	Check_Type(arg3, T_STRING);
+	rb_str_freeze(arg3);
 	glInterleavedArrays(format, stride, (const GLvoid*)RSTRING(arg3)->ptr);
 	return Qnil;
 }
@@ -4078,24 +2511,19 @@ VALUE obj,arg1,arg2,arg3;
 	GLsizei stride;
 	type = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
-	Check_Type(arg3, T_STRING);
-	rb_str_freeze(arg3);
-	g_Normal_ptr = arg3;
-	glNormalPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
+		g_Normal_ptr = arg3;
+		glNormalPointer(type, stride, (const GLvoid*)NUM2INT(arg3));
+	} else {
+		Check_Type(arg3, T_STRING);
+		rb_str_freeze(arg3);
+		g_Normal_ptr = arg3;
+		glNormalPointer(type, stride, (const GLvoid*)RSTRING(arg3)->ptr);
+	}
 	return Qnil;
 }
 
-static VALUE
-gl_PolygonOffset(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLfloat factor;
-	GLfloat units;
-	factor = (GLfloat)NUM2DBL(arg1);
-	units = (GLfloat)NUM2DBL(arg2);
-	glPolygonOffset(factor,units);
-	return Qnil;
-}
+GL_SIMPLE_FUNC(PolygonOffset,2,GLfloat,NUM2DBL)
 
 static VALUE
 gl_CopyTexImage1D(obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7)
@@ -4197,37 +2625,22 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLsizei width;
 	GLenum format;
 	GLenum type;
-	const char *pixels;
-	int size;
-	int type_size;
-	int format_size;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
 	width = (GLsizei)NUM2UINT(arg4);
 	format = (GLenum)NUM2INT(arg5);
 	type = (GLenum)NUM2INT(arg6);
-	type_size = gltype_size(type);
-	format_size = glformat_size(format);
-	if (type_size == -1 || format_size == -1)
-		return Qnil;
 
-	if (type==GL_BITMAP)
-		size = format_size*(width/8);
-	else
-		size = type_size*format_size*width;
-
-	if (TYPE(arg7) == T_STRING) {
-		if (RSTRING(arg7)->len < size)
-			rb_raise(rb_eArgError, "string length:%d",RSTRING(arg7)->len);
-		 pixels = RSTRING(arg7)->ptr;
-	} else if (TYPE(arg7) == T_FIXNUM || TYPE(arg7) == T_BIGNUM) { /* arg7 is offset to unpack buffer */
-			pixels = (const char *)NUM2UINT(arg7);
-	} else {
-		Check_Type(arg7,T_STRING); /* force exception */
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		glTexSubImage1D(target,level,xoffset,width,format,type,(GLvoid *)NUM2INT(arg7));
 		return Qnil;
 	}
-	glTexSubImage1D(target,level,xoffset,width,format,type,pixels);
+	
+	Check_Type(arg7,T_STRING);
+	CheckDataSize(type,format,width,arg7);
+
+	glTexSubImage1D(target,level,xoffset,width,format,type,RSTRING(arg7)->ptr);
 	return Qnil;
 }
 
@@ -4243,10 +2656,6 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLsizei height;
 	GLenum format;
 	GLenum type;
-	const char *pixels;
-	int size;
-	int type_size;
-	int format_size;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -4255,25 +2664,16 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	height = (GLsizei)NUM2UINT(arg6);
 	format = (GLenum)NUM2INT(arg7);
 	type = (GLenum)NUM2INT(arg8);
-	type_size = gltype_size(type);
-	format_size = glformat_size(format);
-	if (type_size == -1 || format_size == -1)
-		return Qnil;
-	if (type==GL_BITMAP)
-		size = format_size*((height*width)/8);
-	else
-		size = type_size*format_size*height*width;
-	if (TYPE(arg9) == T_STRING) {
-		if (RSTRING(arg9)->len < size)
-			rb_raise(rb_eArgError, "string length:%d",RSTRING(arg9)->len);
-		 pixels = RSTRING(arg9)->ptr;
-	} else if (TYPE(arg9) == T_FIXNUM || TYPE(arg9) == T_BIGNUM) { /* arg9 is offset to unpack buffer */
-			pixels = (const char *)NUM2UINT(arg9);
-	} else {
-		Check_Type(arg9,T_STRING); /* force exception */
+
+	if (CheckBufferBinding(GL_PIXEL_UNPACK_BUFFER_BINDING)) {
+		glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,(GLvoid *)NUM2INT(arg9));
 		return Qnil;
 	}
-	glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,pixels);
+	
+	Check_Type(arg9,T_STRING);
+	CheckDataSize(type,format,width*height,arg9);
+
+	glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,(RSTRING(arg9)->ptr));
 	return Qnil;
 }
 
@@ -4324,12 +2724,17 @@ VALUE obj,arg1;
 {
 	GLsizei n;
 	GLuint *textures;
-	Check_Type(arg1,T_ARRAY);
-	n = RARRAY(arg1)->len;
-	textures = ALLOC_N(GLuint,n);
-	ary2cuint(arg1,textures,n); 
-	glDeleteTextures( n, textures);
-	xfree(textures);
+	if (TYPE(arg1)==T_ARRAY) {
+		n = RARRAY(arg1)->len;
+		textures = ALLOC_N(GLuint,n);
+		ary2cuint(arg1,textures,n); 
+		glDeleteTextures( n, textures);
+		xfree(textures);
+	} else {
+		GLuint texture;
+		texture = NUM2INT(arg1);
+		glDeleteTextures( 1, &texture);
+	}
 	return Qnil;
 }
 
@@ -4383,16 +2788,6 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-static VALUE
-gl_Indexub(obj,arg1)
-VALUE obj,arg1;
-{
-	GLubyte c;
-	c = (GLubyte)NUM2INT(arg1);
-	glIndexub(c);
-	return Qnil;
-}
-
 static VALUE
 gl_Indexubv(obj,arg1)
 VALUE obj,arg1;
@@ -4404,23 +2799,6 @@ VALUE obj,arg1;
 	return Qnil;
 }
 
-static VALUE
-gl_PopClientAttrib(obj)
-VALUE obj;
-{
-	glPopClientAttrib();
-	return Qnil;
-}
-
-static VALUE
-gl_PushClientAttrib(obj,arg1)
-VALUE obj,arg1;
-{
-	GLbitfield mask;
-	mask = (GLbitfield)NUM2UINT(arg1);
-	glPushClientAttrib(mask);
-	return Qnil;
-}
 
 /* additional functions */
 
@@ -4995,12 +3373,12 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glPixelTransferi", gl_PixelTransferi, 2);
 	rb_define_module_function(module, "glPixelStoref", gl_PixelStoref, 2);
 	rb_define_module_function(module, "glPixelStorei", gl_PixelStorei, 2);
-	rb_define_module_function(module, "glPixelMapfv", gl_PixelMapfv, 2);
-	rb_define_module_function(module, "glPixelMapuiv", gl_PixelMapuiv, 2);
-	rb_define_module_function(module, "glPixelMapusv", gl_PixelMapusv, 2);
+	rb_define_module_function(module, "glPixelMapfv", gl_PixelMapfv, -1);
+	rb_define_module_function(module, "glPixelMapuiv", gl_PixelMapuiv, -1);
+	rb_define_module_function(module, "glPixelMapusv", gl_PixelMapusv, -1);
 	rb_define_module_function(module, "glReadBuffer", gl_ReadBuffer, 1);
 	rb_define_module_function(module, "glCopyPixels", gl_CopyPixels, 5);
-	rb_define_module_function(module, "glReadPixels", gl_ReadPixels, 6);
+	rb_define_module_function(module, "glReadPixels", gl_ReadPixels, -1);
 	rb_define_module_function(module, "glDrawPixels", gl_DrawPixels, 5);
 	rb_define_module_function(module, "glGetBooleanv", gl_GetBooleanv, 1);
 	rb_define_module_function(module, "glGetClipPlane", gl_GetClipPlane, 1);
@@ -5015,17 +3393,17 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glGetMapiv", gl_GetMapiv, 2);
 	rb_define_module_function(module, "glGetMaterialfv", gl_GetMaterialfv, 2);
 	rb_define_module_function(module, "glGetMaterialiv", gl_GetMaterialiv, 2);
-	rb_define_module_function(module, "glGetPixelMapfv", gl_GetPixelMapfv, 1);
-	rb_define_module_function(module, "glGetPixelMapuiv", gl_GetPixelMapuiv, 1);
-	rb_define_module_function(module, "glGetPixelMapusv", gl_GetPixelMapusv, 1);
-	rb_define_module_function(module, "glGetPolygonStipple", gl_GetPolygonStipple, 0);
+	rb_define_module_function(module, "glGetPixelMapfv", gl_GetPixelMapfv, -1);
+	rb_define_module_function(module, "glGetPixelMapuiv", gl_GetPixelMapuiv, -1);
+	rb_define_module_function(module, "glGetPixelMapusv", gl_GetPixelMapusv, -1);
+	rb_define_module_function(module, "glGetPolygonStipple", gl_GetPolygonStipple, -1);
 	rb_define_module_function(module, "glGetString", gl_GetString, 1);
 	rb_define_module_function(module, "glGetTexEnvfv", gl_GetTexEnvfv, 2);
 	rb_define_module_function(module, "glGetTexEnviv", gl_GetTexEnviv, 2);
 	rb_define_module_function(module, "glGetTexGendv", gl_GetTexGendv, 2);
 	rb_define_module_function(module, "glGetTexGenfv", gl_GetTexGenfv, 2);
 	rb_define_module_function(module, "glGetTexGeniv", gl_GetTexGeniv, 2);
-	rb_define_module_function(module, "glGetTexImage", gl_GetTexImage, 4); 
+	rb_define_module_function(module, "glGetTexImage", gl_GetTexImage, -1); 
 	rb_define_module_function(module, "glGetTexParameterfv", gl_GetTexParameterfv, 2);
 	rb_define_module_function(module, "glGetTexParameteriv", gl_GetTexParameteriv, 2);
 	rb_define_module_function(module, "glGetTexLevelParameterfv", gl_GetTexLevelParameterfv, 3);