ruby-opengl 0.33.0 → 0.40.0

data/examples/plane.rb

@@ -1,4 +1,4 @@
-#
+#!/usr/bin/env ruby -rubygems
 #/* Copyright (c) Mark J. Kilgard, 1994. */
 #
 #/*

data/examples/smooth.rb

@@ -1,5 +1,7 @@
-require "../lib/gl"
-require "../lib/glut"
+#!/usr/bin/env ruby -rubygems
+
+require "gl"
+require "glut"
 
 STDOUT.sync=TRUE
 disp = Proc.new {

data/examples/test.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby -rubygems
 # Copyright (C) 2006 Peter McLain <peter.mclain@gmail.com>
 #
 # This program is distributed under the terms of the MIT license.
@@ -11,8 +12,8 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require '../lib/glut'
-require '../lib/gl'
+require 'glut'
+require 'gl'
 
 class GlutTest
 

data/ext/common/{rbogl.c → common.h}

@@ -1,6 +1,6 @@
 /*
  * Last edit by previous maintainer:
- * 2003/08/17 03:46:15, yoshi
+ * 2000/01/06 16:37:43, kusano
  *
  * Copyright (C) 1999 - 2005 Yoshi <yoshi@giganet.net>
  * Copyright (C) 2006 John M. Gabriele <jmg3000@gmail.com>
@@ -17,21 +17,55 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef _RBOGL_H_
+#define _RBOGL_H_
+
+#include <ruby.h>
+
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
+#include <mach-o/dyld.h>
+#include <stdlib.h>
+#include <string.h>
 #elif defined WIN32
 #include <windows.h>
 #include <GL/gl.h>
 #else
 #include <GL/gl.h>
+#include <GL/glx.h>
 #endif
 
-#include "rbogl.h"
 #include "gl-enums.h"
 
+
+typedef struct RArray RArray;
+
+extern VALUE cProc;
+
+#define LOAD_GL_FUNC(_NAME_) \
+if (fptr_##_NAME_==NULL) \
+fptr_##_NAME_ = load_gl_function(#_NAME_, 1);
+
+#define FORCE_PIXEL_STORE_MODE \
+	glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); \
+	glPixelStorei(GL_PACK_ALIGNMENT, 1); \
+	glPixelStorei(GL_PACK_SKIP_PIXELS, 0); \
+	glPixelStorei(GL_PACK_SKIP_ROWS, 0); \
+	glPixelStorei(GL_PACK_ROW_LENGTH, 0); \
+	glPixelStorei(GL_PACK_SKIP_IMAGES, 0); \
+	glPixelStorei(GL_PACK_IMAGE_HEIGHT, 0);
+/*	glPixelStorei(GL_PACK_SKIP_VOLUMES_SGIS, 0);
+	glPixelStorei(GL_PACK_IMAGE_DEPTH_SGIS, 0); */
+
+#define RESTORE_PIXEL_STORE_MODE \
+	glPopClientAttrib();
+
+
 /* -------------------------------------------------------------------- */
-#ifdef _NO_NUM2DBL_
-extern double num2double( VALUE val )
+#ifndef NUM2DBL
+#define NUM2DBL(_val) num2double(_val) 
+
+static inline double num2double( VALUE val )
 {
     struct RFloat* flt;
     if (NIL_P(val)) return 0;
@@ -41,8 +75,8 @@ extern double num2double( VALUE val )
 #endif
 
 /* -------------------------------------------------------------------- */
-#define ARY2INTEGRAL(_type_) \
-extern int ary2c##_type_( arg, cary, maxlen ) \
+#define ARY2INTEGRAL(_type_,_convert_) \
+static inline int ary2c##_type_( arg, cary, maxlen ) \
 VALUE arg; \
 GL##_type_ cary[]; \
 int maxlen; \
@@ -58,22 +92,22 @@ int maxlen; \
     for (i=0; i < maxlen; i++) \
     { \
         entry = rb_ary_entry((VALUE)ary,i); \
-        cary[i] = (GL##_type_)NUM2INT(entry); \
+        cary[i] = (GL##_type_)_convert_(entry); \
     } \
     return i; \
 }
 
-ARY2INTEGRAL(int)
-ARY2INTEGRAL(uint)
-ARY2INTEGRAL(byte)
-ARY2INTEGRAL(ubyte)
-ARY2INTEGRAL(short)
-ARY2INTEGRAL(ushort)
-ARY2INTEGRAL(boolean)
+ARY2INTEGRAL(int,NUM2INT)
+ARY2INTEGRAL(uint,NUM2UINT)
+ARY2INTEGRAL(byte,NUM2INT)
+ARY2INTEGRAL(ubyte,NUM2INT)
+ARY2INTEGRAL(short,NUM2INT)
+ARY2INTEGRAL(ushort,NUM2INT)
+ARY2INTEGRAL(boolean,NUM2INT)
 #undef ARY2INTEGRAL
 
 /* -------------------------------------------------------------------- */
-extern int ary2cflt(arg, cary, maxlen)
+static inline int ary2cflt(arg, cary, maxlen)
 VALUE arg;
 float cary[];
 int maxlen;
@@ -91,7 +125,7 @@ int maxlen;
 }
 
 /* -------------------------------------------------------------------- */
-extern int ary2cdbl(arg, cary, maxlen)
+static inline int ary2cdbl(arg, cary, maxlen)
 VALUE arg;
 double cary[];
 int maxlen;
@@ -109,7 +143,7 @@ int maxlen;
 }
 
 /* -------------------------------------------------------------------- */
-extern void mary2ary(src, ary)
+static inline void mary2ary(src, ary)
 VALUE src;
 VALUE ary;
 {
@@ -119,14 +153,14 @@ VALUE ary;
     for (i = 0; i < tmp_ary->len; i++)
     {
         if (TYPE(tmp_ary->ptr[i]) == T_ARRAY)
-            mary2ary((VALUE)tmp_ary, ary);
+            mary2ary((VALUE)tmp_ary->ptr[i], ary);
         else
             rb_ary_push(ary, tmp_ary->ptr[i]);
     }
 }
 
 /* -------------------------------------------------------------------- */
-extern void ary2cmat4x4dbl(ary, cary)
+static inline void ary2cmat4x4dbl(ary, cary)
 VALUE ary;
 double cary[];
 {
@@ -147,7 +181,7 @@ double cary[];
     }
 }
 
-extern void ary2cmat4x4flt(ary, cary)
+static inline void ary2cmat4x4flt(ary, cary)
 VALUE ary;
 float cary[];
 {
@@ -170,7 +204,7 @@ float cary[];
 
 /* -------------------------------------------------------------------- */
 /*Need to find proper size for glReadPixels array*/
-int glformat_size(GLenum format)
+static inline int glformat_size(GLenum format)
 {
     switch(format)
     {
@@ -206,7 +240,7 @@ int glformat_size(GLenum format)
 }
 
 /* -------------------------------------------------------------------- */
-int gltype_size(GLenum type)
+static inline int gltype_size(GLenum type)
 {
     switch(type)
     {
@@ -214,7 +248,7 @@ int gltype_size(GLenum type)
         case GL_UNSIGNED_BYTE:
 		case GL_UNSIGNED_BYTE_3_3_2:
 		case GL_UNSIGNED_BYTE_2_3_3_REV:
-            return 8;
+            return 1;
 
         case GL_SHORT:
         case GL_UNSIGNED_SHORT:
@@ -224,7 +258,7 @@ int gltype_size(GLenum type)
         case GL_UNSIGNED_SHORT_4_4_4_4_REV:
         case GL_UNSIGNED_SHORT_5_5_5_1:
         case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-            return 16;
+            return 2;
 
         case GL_INT:
         case GL_UNSIGNED_INT:
@@ -233,10 +267,10 @@ int gltype_size(GLenum type)
 		case GL_UNSIGNED_INT_8_8_8_8_REV:
 		case GL_UNSIGNED_INT_10_10_10_2:
 		case GL_UNSIGNED_INT_2_10_10_10_REV:
-            return 32;
+            return 4;
 
         case GL_BITMAP:
-            return 1;
+            return 0;
 
         default:
             return -1;
@@ -244,17 +278,50 @@ int gltype_size(GLenum type)
 }
 
 /* -------------------------------------------------------------------- */
-VALUE allocate_buffer_with_string( int size )
+static inline VALUE allocate_buffer_with_string( int size )
 {
     return rb_str_new(NULL, size);
 }
 
 /* -------------------------------------------------------------------- */
-void Init_gl(void);
-
-void Init_opengl()
+static inline void *load_gl_function(const char *name,int raise) 
 {
-  Init_gl(); /* is this needed ? */			  
-  /* RxINC: InitializeGLU(); */
+	void *func_ptr = NULL;
+
+#if defined(__APPLE__)
+	static const struct mach_header* library = NULL;
+	char* symbolName;
+	NSSymbol symbol;
+	if (library == NULL)
+		library = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL",NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+
+	if (library == NULL)
+		rb_raise(rb_eRuntimeError,"Can't load OpenGL library for dynamic loading");
+		
+	/*  prepend a '_' for the Unix C symbol mangling convention  */
+	symbolName = ALLOC_N(char,strlen(name) + 2);
+	symbolName[0] = '_';
+	strcpy(symbolName+1, name);
+
+	symbol = NSLookupSymbolInImage(library,symbolName,NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+	xfree(symbolName);
+
+	if (symbol == NULL)
+		func_ptr = NULL;
+	else
+		func_ptr = NSAddressOfSymbol(symbol);
+#elif defined(WIN32) || defined(_WIN32)
+	func_ptr = wglGetProcAddress((LPCSTR)name);
+#elif defined(GLX_VERSION_1_4)
+    func_ptr = glXGetProcAddress((const GLubyte *)name);
+#else
+    func_ptr = glXGetProcAddressARB((const GLubyte *)name);
+#endif
+
+	if (func_ptr == NULL && raise == 1)
+	    rb_raise(rb_eNotImpError,"Function %s is not available at this machine",name);
+
+	return func_ptr;
 }
 
+#endif /* _RBOGL_H_ */

data/ext/common/gl-enums.h

@@ -1,4 +1,42 @@
-/* This file was genereated on Sun Feb 11 01:24:24 +0100 2007 */
+/* GL types - define if system GLheaders are not recent */
+
+/* GL base */
+#ifndef GL_VERSION_1_5
+typedef ptrdiff_t GLintptr;
+typedef ptrdiff_t GLsizeiptr;
+#endif
+
+#ifndef GL_VERSION_2_0
+typedef char GLchar;
+#endif
+
+/* new GL types introduced by ARB extensions */
+#ifndef GL_ARB_half_float_pixel
+typedef unsigned short GLhalfARB;
+#endif
+
+#ifndef GL_ARB_shader_objects
+typedef char GLcharARB;
+typedef unsigned int GLhandleARB;
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+typedef ptrdiff_t GLintptrARB;
+typedef ptrdiff_t GLsizeiptrARB;
+#endif
+
+/* new GL types introduced by other extensions */
+#ifndef GL_NV_half_float
+typedef unsigned short GLhalfNV;
+#endif
+
+/* List of GL enumerators */
+
+/* The code below was genereated on Sun Feb 11 01:24:24 +0100 2007
+   source: http://www.opengl.org/registry/api/enum.spec
+           http://www.opengl.org/registry/api/enumext.spec
+*/
+
 #ifndef _GLENUMS_H_
 #define _GLENUMS_H_ 
 

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

@@ -22,8 +22,7 @@
 #else
 #include <GL/gl.h>
 #endif
-#include "../common/rbogl.h"
-#include "../common/gl-enums.h"
+#include "../common/common.h"
 
 #ifndef MAX
 #define MAX(a, b)  (((a) > (b)) ? (a) : (b))
@@ -37,7 +36,7 @@ VALUE obj,arg1,arg2;
 {
 	GLuint list;
 	GLenum mode;
-	list = (GLuint)NUM2INT(arg1);
+	list = (GLuint)NUM2UINT(arg1);
 	mode = (GLenum)NUM2INT(arg2);
 	glNewList(list,mode);
 	return Qnil;
@@ -56,7 +55,7 @@ gl_CallList(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint list;
-	list = (GLuint)NUM2INT(arg1);
+	list = (GLuint)NUM2UINT(arg1);
 	glCallList(list);
 	return Qnil;
 }
@@ -74,10 +73,10 @@ VALUE obj,arg1;
 		n = RSTRING(arg1)->len;
 	} else if (TYPE(arg1) == T_ARRAY) {
 		type = GL_INT;
-		lists = ALLOC_N(int, RARRAY(arg1)->len);
+		lists = ALLOC_N(GLint, RARRAY(arg1)->len);
 		n = ary2cint(arg1,lists,0);
 	} else {
-		rb_raise(rb_eArgError,"GL.CallLists wrong arguments");
+		Check_Type(arg1,T_ARRAY); /* force exception */
 		return Qnil; /* not reached */
 	}
 	glCallLists(n, type, lists);
@@ -91,8 +90,8 @@ VALUE obj,arg1,arg2;
 {
 	GLuint list;
 	GLsizei range;
-	list = (GLuint)NUM2INT(arg1);
-	range = (GLsizei)NUM2INT(arg2);
+	list = (GLuint)NUM2UINT(arg1);
+	range = (GLsizei)NUM2UINT(arg2);
 	glDeleteLists(list,range);
 	return Qnil;
 }
@@ -103,7 +102,7 @@ VALUE obj,arg1;
 {
 	GLsizei range;
 	GLuint ret;
-	range = (GLsizei)NUM2INT(arg1);
+	range = (GLsizei)NUM2UINT(arg1);
 	ret = glGenLists(range);
 	return INT2NUM(ret);
 }
@@ -113,7 +112,7 @@ gl_ListBase(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint base;
-	base = (GLuint)NUM2INT(arg1);
+	base = (GLuint)NUM2UINT(arg1);
 	glListBase(base);
 	return Qnil;
 }
@@ -138,19 +137,25 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLfloat yorig;
 	GLfloat xmove;
 	GLfloat ymove;
-	const GLubyte *bitmap;
-	width = (GLsizei)NUM2INT(arg1);
-	height = (GLsizei)NUM2INT(arg2);
+	width = (GLsizei)NUM2UINT(arg1);
+	height = (GLsizei)NUM2UINT(arg2);
 	xorig = (GLfloat)NUM2DBL(arg3);
 	yorig = (GLfloat)NUM2DBL(arg4);
 	xmove = (GLfloat)NUM2DBL(arg5);
 	ymove = (GLfloat)NUM2DBL(arg6);
-	if (TYPE(arg7) != T_STRING)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(CLASS_OF(arg7)));
-	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);
+	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) {
+		const GLubyte *bitmap;
+		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;
 }
 
@@ -245,9 +250,9 @@ VALUE obj,arg1,arg2,arg3;
 	GLuint red;
 	GLuint green;
 	GLuint blue;
-	red = (GLuint)NUM2INT(arg1);
-	green = (GLuint)NUM2INT(arg2);
-	blue = (GLuint)NUM2INT(arg3);
+	red = (GLuint)NUM2UINT(arg1);
+	green = (GLuint)NUM2UINT(arg2);
+	blue = (GLuint)NUM2UINT(arg3);
 	glColor3ui(red,green,blue);
 	return Qnil;
 }
@@ -370,10 +375,10 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLuint green;
 	GLuint blue;
 	GLuint alpha;
-	red = (GLuint)NUM2INT(arg1);
-	green = (GLuint)NUM2INT(arg2);
-	blue = (GLuint)NUM2INT(arg3);
-	alpha = (GLuint)NUM2INT(arg4);
+	red = (GLuint)NUM2UINT(arg1);
+	green = (GLuint)NUM2UINT(arg2);
+	blue = (GLuint)NUM2UINT(arg3);
+	alpha = (GLuint)NUM2UINT(arg4);
 	glColor4ui(red,green,blue,alpha);
 	return Qnil;
 }
@@ -409,8 +414,7 @@ gl_EdgeFlagv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLboolean flag[1] = { GL_FALSE };
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cboolean(arg1,flag,1);
 	glEdgeFlagv(flag);
 	return Qnil;
@@ -439,8 +443,7 @@ gl_Indexdv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble c[1] = {0.0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,c,1);
 	glIndexdv(c);
 	return Qnil;
@@ -461,8 +464,7 @@ gl_Indexfv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat c[1] = {0.0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,c,1);
 	glIndexfv(c);
 	return Qnil;
@@ -483,8 +485,7 @@ gl_Indexiv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLint c[1] = {0.0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cint(arg1,c,1);
 	glIndexiv(c);
 	return Qnil;
@@ -505,8 +506,7 @@ gl_Indexsv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLshort c[1] = {0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cshort(arg1,c,1);
 	glIndexsv(c);
 	return Qnil;
@@ -1197,10 +1197,8 @@ VALUE obj,arg1,arg2;
 	GLenum plane;
 	GLdouble equation[4];
 	plane = (GLenum)NUM2INT(arg1);
-	if (TYPE(arg2) == T_ARRAY)
-		ary2cdbl(arg2, equation, 4);
-	else
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg2,T_ARRAY);
+	ary2cdbl(arg2, equation, 4);
 	glClipPlane(plane,equation);
 	return Qnil;
 }
@@ -1246,8 +1244,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	pname = (GLenum)NUM2INT(arg1);
-	if (TYPE(arg2) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg2));
+	Check_Type(arg2,T_ARRAY);
 	ary2cflt(arg2,params,4);
 	glFogfv(pname,params);
 	return Qnil;
@@ -1272,8 +1269,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	pname = (GLenum)NUM2INT(arg1);
-	if (TYPE(arg2) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg2));
+	Check_Type(arg2,T_ARRAY);
 	ary2cint(arg2,params,4);
 	glFogiv(pname,params);
 	return Qnil;
@@ -1295,8 +1291,8 @@ VALUE obj,arg1,arg2;
 {
 	GLenum target;
 	GLenum mode;
-	target = (GLenum)NUM2INT(arg1);
-	mode = (GLenum)NUM2INT(arg2);
+	target = (GLenum)NUM2UINT(arg1);
+	mode = (GLenum)NUM2UINT(arg2);
 	glHint(target,mode);
 	return Qnil;
 }
@@ -1324,8 +1320,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	light = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glLightfv(light,pname,params);
 	return Qnil;
@@ -1354,8 +1349,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint params[4]={0,0,0,0};
 	light = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glLightiv(light,pname,params);
 	return Qnil;
@@ -1380,8 +1374,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	pname = (GLenum)NUM2INT(arg1);
-	if (TYPE(arg2) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg2));
+	Check_Type(arg2,T_ARRAY);
 	ary2cflt(arg2,params,4);
 	glLightModelfv(pname,params);
 	return Qnil;
@@ -1406,8 +1399,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[4] = {0,0,0,0};
 	pname = (GLenum)NUM2INT(arg1);
-	if (TYPE(arg2) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg2));
+	Check_Type(arg2,T_ARRAY);
 	ary2cint(arg2,params,4);
 	glLightModeliv(pname,params);
 	return Qnil;
@@ -1458,8 +1450,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	face = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glMaterialfv(face,pname,params);
 	return Qnil;
@@ -1488,8 +1479,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint params[4] = {0,0,0,0};
 	face = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glMaterialiv(face,pname,params);
 	return Qnil;
@@ -1522,13 +1512,9 @@ gl_PolygonStipple(obj,arg1)
 VALUE obj,arg1;
 {
 	GLubyte mask[128];
-	RArray* ary;
-	int i;
-	memset(mask, 0x0, sizeof(GLubyte[128]));
+	memset(mask, 0x0, sizeof(GLubyte)*128);
 	if (TYPE(arg1) == T_ARRAY) {
-		ary = RARRAY(arg1);
-		for(i = 0; i < ary->len && i < 128; i++)
-			mask[i] = (GLubyte)NUM2INT(ary->ptr[i]);
+		ary2cubyte(arg1,mask,128);
 	}
 	else if (TYPE(arg1) == T_STRING) {
 		if (RSTRING(arg1)->len < 128)
@@ -1536,7 +1522,7 @@ VALUE obj,arg1;
 		memcpy(mask, RSTRING(arg1)->ptr, 128);
 	}
 	else
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg1));
+		Check_Type(arg1,T_STRING); /* force exception */
 	glPolygonStipple(mask);
 	return Qnil;
 }
@@ -1551,8 +1537,8 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLsizei height;
 	x = (GLint)NUM2INT(arg1);
 	y = (GLint)NUM2INT(arg2);
-	width = (GLsizei)NUM2INT(arg3);
-	height = (GLsizei)NUM2INT(arg4);
+	width = (GLsizei)NUM2UINT(arg3);
+	height = (GLsizei)NUM2UINT(arg4);
 	glScissor(x,y,width,height);
 	return Qnil;
 }
@@ -1590,8 +1576,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexParameterfv(target,pname,params);
 	return Qnil;
@@ -1620,8 +1605,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint params[4] = {0,0,0,0};
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexParameteriv(target,pname,params);
 	return Qnil;
@@ -1646,28 +1630,34 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	components = (GLint)NUM2INT(arg3);
-	width = (GLsizei)NUM2INT(arg4);
+	width = (GLsizei)NUM2UINT(arg4);
 	border = (GLint)NUM2INT(arg5);
 	format = (GLenum)NUM2INT(arg6);
 	type = (GLenum)NUM2INT(arg7);
-	if (TYPE(arg8) == T_STRING) {
-		type_size = gltype_size(type) / 8;
-		format_size = glformat_size(format);
-		if (type_size <= 0 || format_size == -1)
-			return Qnil;
-		size = type_size*format_size*width;
-		if (RSTRING(arg8)->len < size)
-			rb_raise(rb_eArgError, "string length:%d",RSTRING(arg8)->len);
-		pixels = RSTRING(arg8)->ptr;
-	} else if (NIL_P(arg8)) {
-		type_size = gltype_size(type) / 8;
-		format_size = glformat_size(format);
-		if (type_size <= 0 || format_size == -1)
-			return Qnil;
+	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 (target == GL_PROXY_TEXTURE_1D || NIL_P(arg8)) { /* proxy texture, no data read */
 		pixels = NULL;
-	} else
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg8));
+	} 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;
+		}
+	}
 	glTexImage1D(target,level,components,width,border,format,type,pixels);
 	return Qnil;
 }
@@ -1691,29 +1681,35 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	components = (GLint)NUM2INT(arg3);
-	width = (GLsizei)NUM2INT(arg4);
-	height = (GLsizei)NUM2INT(arg5);
+	width = (GLsizei)NUM2UINT(arg4);
+	height = (GLsizei)NUM2UINT(arg5);
 	border = (GLint)NUM2INT(arg6);
 	format = (GLenum)NUM2INT(arg7);
 	type = (GLenum)NUM2INT(arg8);
-	if (TYPE(arg9) == T_STRING) {
-		type_size = gltype_size(type) / 8;
-		format_size = glformat_size(format);
-		if (type_size <= 0 || format_size == -1)
-			return Qnil;
-		size = type_size*format_size*height*width;
-		if (RSTRING(arg9)->len < size)
-			rb_raise(rb_eArgError, "string length:%d",RSTRING(arg9)->len);
-		pixels = RSTRING(arg9)->ptr;
-	} else if (NIL_P(arg9)) {
-		type_size = gltype_size(type) / 8;
-		format_size = glformat_size(format);
-		if (type_size <= 0 || format_size == -1)
-			return Qnil;
+	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 (target == GL_PROXY_TEXTURE_2D || target == GL_PROXY_TEXTURE_CUBE_MAP || NIL_P(arg9)) { /* proxy texture, no data read */
 		pixels = NULL;
-	} else
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg9));
+	} 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;
+		}
+	}
 	glTexImage2D(target,level,components,width,height,border,format,type,pixels);
 	return Qnil;
 }
@@ -1741,8 +1737,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexEnvfv(target,pname,params);
 	return Qnil;
@@ -1771,8 +1766,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint params[4] = {0,0,0,0};
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexEnviv(target,pname,params);
 	return Qnil;
@@ -1801,8 +1795,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLdouble params[4] = {0.0,0.0,0.0,0.0};
 	coord = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cdbl(arg3,params,4);
 	glTexGendv(coord,pname,params);
 	return Qnil;
@@ -1832,8 +1825,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLfloat params[4] = {0.0,0.0,0.0,0.0};
 	coord = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cflt(arg3,params,4);
 	glTexGenfv(coord,pname,params);
 	return Qnil;
@@ -1862,34 +1854,20 @@ VALUE obj,arg1,arg2,arg3;
 	GLint params[4] = {0,0,0,0};
 	coord = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
-	if (TYPE(arg3) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg3));
+	Check_Type(arg3,T_ARRAY);
 	ary2cint(arg3,params,4);
 	glTexGeniv(coord,pname,params);
 	return Qnil;
 }
-
-#define DEFAULT_BUFFER	512
 static VALUE g_current_feed_buffer;
 static VALUE
-gl_FeedbackBuffer(argc, argv, obj)
-int argc;
-VALUE* argv;
-VALUE obj;
+gl_FeedbackBuffer(obj,arg1,arg2)
+VALUE obj,arg1,arg2;
 {
 	GLsizei size;
 	GLenum type;
-	if (argc == 0) {
-		size = DEFAULT_BUFFER;
-		type = GL_4D_COLOR_TEXTURE;
-	}
-	else if (argc == 2) {
-		size = NUM2INT(argv[0]);
-		type = NUM2INT(argv[1]);
-	}
-	else {
-		rb_raise(rb_eTypeError, "GL.FeedbackBuffer");
-	}
+	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);
@@ -1898,17 +1876,11 @@ VALUE obj;
 
 static VALUE g_current_sel_buffer;
 static VALUE
-gl_SelectBuffer(argc,argv,obj)
-int argc;
-VALUE *argv;
-VALUE obj;
+gl_SelectBuffer(obj,arg1)
+VALUE obj,arg1;
 {
-	VALUE args;
 	GLsizei size;
-	size = DEFAULT_BUFFER;
-	rb_scan_args(argc, argv, "01", &args);
-	if (args != Qnil)
-		size = (GLsizei)NUM2INT(args);
+	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);
@@ -1939,7 +1911,7 @@ gl_LoadName(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint name;
-	name = (GLuint)NUM2INT(arg1);
+	name = (GLuint)NUM2UINT(arg1);
 	glLoadName(name);
 	return Qnil;
 }
@@ -1967,7 +1939,7 @@ gl_PushName(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint name;
-	name = (GLuint)NUM2INT(arg1);
+	name = (GLuint)NUM2UINT(arg1);
 	glPushName(name);
 	return Qnil;
 }
@@ -1987,7 +1959,7 @@ gl_Clear(obj,arg1)
 VALUE obj,arg1;
 {
 	GLbitfield mask;
-	mask = (GLbitfield)NUM2INT(arg1);
+	mask = (GLbitfield)NUM2UINT(arg1);
 	glClear(mask);
 	return Qnil;
 }
@@ -2059,7 +2031,7 @@ gl_StencilMask(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint mask;
-	mask = (GLuint)NUM2INT(arg1);
+	mask = (GLuint)NUM2UINT(arg1);
 	glStencilMask(mask);
 	return Qnil;
 }
@@ -2095,7 +2067,7 @@ gl_IndexMask(obj,arg1)
 VALUE obj,arg1;
 {
 	GLuint mask;
-	mask = (GLuint)NUM2INT(arg1);
+	mask = (GLuint)NUM2UINT(arg1);
 	glIndexMask(mask);
 	return Qnil;
 }
@@ -2161,7 +2133,7 @@ gl_PushAttrib(obj,arg1)
 VALUE obj,arg1;
 {
 	GLbitfield mask;
-	mask = (GLbitfield)NUM2INT(arg1);
+	mask = (GLbitfield)NUM2UINT(arg1);
 	glPushAttrib(mask);
 	return Qnil;
 }
@@ -2373,8 +2345,7 @@ gl_EvalCoord1dv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble params[1] = {0.0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,params,1);
 	glEvalCoord1dv(params);
 	return Qnil;
@@ -2395,8 +2366,7 @@ gl_EvalCoord1fv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat params[1] = {0.0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,params,1);
 	glEvalCoord1fv(params);
 	return Qnil;
@@ -2419,8 +2389,7 @@ gl_EvalCoord2dv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble params[2] = {0.0,0.0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,params,2);
 	glEvalCoord2dv(params);
 	return Qnil;
@@ -2443,8 +2412,7 @@ gl_EvalCoord2fv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat params[2] = {0.0,0.0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,params,2);
 	glEvalCoord2fv(params);
 	return Qnil;
@@ -2547,7 +2515,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLuint mask;
 	func = (GLenum)NUM2INT(arg1);
 	ref = (GLint)NUM2INT(arg2);
-	mask = (GLuint)NUM2INT(arg3);
+	mask = (GLuint)NUM2UINT(arg3);
 	glStencilFunc(func,ref,mask);
 	return Qnil;
 }
@@ -2644,8 +2612,7 @@ VALUE obj,arg1,arg2;
 	GLfloat *values;
 	GLsizei size;
 	map = (GLenum)NUM2INT(arg1);	
-	if (TYPE(arg2) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg2));
+	Check_Type(arg2,T_ARRAY);
 	size = RARRAY(arg2)->len;
 	values = ALLOC_N(GLfloat,size);
 	ary2cflt(arg2,values,size);
@@ -2662,8 +2629,7 @@ VALUE obj,arg1,arg2;
 	GLuint *values;
 	GLsizei size;
 	map = (GLenum)NUM2INT(arg1);
-	if (TYPE(arg2) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg2));
+	Check_Type(arg2,T_ARRAY);
 	size = RARRAY(arg2)->len;
 	values = ALLOC_N(GLuint,size);
 	ary2cuint(arg2,values,size);
@@ -2680,8 +2646,7 @@ VALUE obj,arg1,arg2;
 	GLushort *values;
 	GLsizei size;
 	map = (GLenum)NUM2INT(arg1);
-	if (TYPE(arg2) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg2));
+	Check_Type(arg2,T_ARRAY);
 	size = RARRAY(arg2)->len;
 	values = ALLOC_N(GLushort,size);
 	ary2cushort(arg2,values,size);
@@ -2711,8 +2676,8 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 	GLenum type;
 	x = (GLint)NUM2INT(arg1);
 	y = (GLint)NUM2INT(arg2);
-	width = (GLsizei)NUM2INT(arg3);
-	height = (GLsizei)NUM2INT(arg4);
+	width = (GLsizei)NUM2UINT(arg3);
+	height = (GLsizei)NUM2UINT(arg4);
 	type = (GLenum)NUM2INT(arg5);
 	glCopyPixels(x,y,width,height,type);
 	return Qnil;
@@ -2729,22 +2694,29 @@ 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)NUM2INT(arg3);
-	height = (GLsizei)NUM2INT(arg4);
+	width = (GLsizei)NUM2UINT(arg3);
+	height = (GLsizei)NUM2UINT(arg4);
 	format = NUM2INT(arg5);
 	type = NUM2INT(arg6);
-	if (format != -1 && type != -1) {
-		int type_size;
-		int format_size;
-		type_size = gltype_size(type) / 8;
-		format_size = glformat_size(format);
-		pixels = allocate_buffer_with_string(width*height*format_size*type_size);
-		glReadPixels(x,y,width,height,format,type,(GLvoid*)RSTRING(pixels)->ptr);
-		return pixels;
-	}
-	return Qnil;
+	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;
 }
 
 static VALUE
@@ -2756,18 +2728,26 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 	GLenum format;
 	GLenum type;
 	const char *pixels;
-	width = (GLsizei)NUM2INT(arg1);
-	height = (GLsizei)NUM2INT(arg2);
+	GLsizei size;
+	GLsizei type_size;
+	GLsizei format_size;
+	width = (GLsizei)NUM2UINT(arg1);
+	height = (GLsizei)NUM2UINT(arg2);
 	format = (GLenum)NUM2INT(arg3);
 	type = (GLenum)NUM2INT(arg4);
-	if (format != -1 && type != -1) {
-		if (TYPE(arg5) != T_STRING)
-			rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg5));
-		if (RSTRING(arg5)->len < width * height * glformat_size(format) * gltype_size(type) / 8)
-			rb_raise(rb_eArgError, "string length:%d", RSTRING(arg5)->len);
-		pixels = RSTRING(arg5)->ptr;
-		glDrawPixels(width,height,format,type,pixels);
-	}
+	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);
 	return Qnil;
 }
 
@@ -2951,7 +2931,7 @@ VALUE obj,arg1,arg2;
 	glGetLightiv(light,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(params[i]));
+		rb_ary_push(retary, INT2NUM(params[i]));
 	return retary;
 }
 
@@ -3133,7 +3113,7 @@ VALUE obj,arg1,arg2;
 	glGetMapiv(target,query,points);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(points[i]));
+		rb_ary_push(retary, INT2NUM(points[i]));
 	xfree(points);
 	return retary;
 }
@@ -3170,7 +3150,7 @@ VALUE obj,arg1,arg2;
 	glGetMaterialfv(face,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_ary_new2(params[i]));
+		rb_ary_push(retary, rb_float_new(params[i]));
 	return retary;
 }
 
@@ -3206,7 +3186,7 @@ VALUE obj,arg1,arg2;
 	glGetMaterialiv(face,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(params[i]));
+		rb_ary_push(retary, INT2NUM(params[i]));
 	return retary;
 }
 
@@ -3216,7 +3196,7 @@ VALUE obj,arg1;
 {
 	GLenum map;
 	GLenum map_size;
-	GLint size;
+	GLint size = 0;
 	GLfloat *values;
 	VALUE retary;
 	int i;
@@ -3252,7 +3232,7 @@ VALUE obj,arg1;
 {
 	GLenum map;
 	GLenum map_size;
-	GLint size;
+	GLint size = 0;
 	GLuint *values;
 	VALUE retary;
 	int i;
@@ -3277,7 +3257,7 @@ VALUE obj,arg1;
 	glGetPixelMapuiv(map,values);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(values[i]));
+		rb_ary_push(retary, INT2NUM(values[i]));
 	xfree(values);
 	return retary;
 }
@@ -3288,7 +3268,7 @@ VALUE obj,arg1;
 {
 	GLenum map;
 	GLenum map_size;
-	GLint size;
+	GLint size = 0;
 	GLushort *values;
 	VALUE retary;
 	int i;
@@ -3313,17 +3293,20 @@ VALUE obj,arg1;
 	glGetPixelMapusv(map,values);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(values[i]));
+		rb_ary_push(retary, INT2NUM(values[i]));
 	xfree(values);
 	return retary;
 }
 
 static VALUE
-gl_GetPolygonStipple(obj,arg1)
-VALUE obj,arg1;
+gl_GetPolygonStipple(obj)
+VALUE obj;
 {
 	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);
 }
 
@@ -3382,7 +3365,7 @@ VALUE obj,arg1,arg2;
 	glGetTexEnvfv(target,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_ary_new2(params[i]));
+		rb_ary_push(retary, rb_float_new(params[i]));
 	return retary;
 }
 
@@ -3430,7 +3413,7 @@ VALUE obj,arg1,arg2;
 	glGetTexEnviv(target,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(params[i]));
+		rb_ary_push(retary, INT2NUM(params[i]));
 	return retary;
 }
 
@@ -3461,7 +3444,7 @@ VALUE obj,arg1,arg2;
 	glGetTexGendv(coord,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_ary_new2(params[i]));
+		rb_ary_push(retary, rb_float_new(params[i]));
 	return retary;
 }
 
@@ -3492,7 +3475,7 @@ VALUE obj,arg1,arg2;
 	glGetTexGenfv(coord,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, rb_ary_new2(params[i]));
+		rb_ary_push(retary, rb_float_new(params[i]));
 	return retary;
 }
 
@@ -3523,19 +3506,61 @@ VALUE obj,arg1,arg2;
 	glGetTexGeniv(coord,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(params[i]));
+		rb_ary_push(retary, INT2NUM(params[i]));
 	return retary;
 }
 
-/*
+
 static VALUE
-gl_GetTexImage(obj,arg1,arg2,arg3,arg4,arg5)
-VALUE obj,arg1,arg2,arg3,arg4,arg5;
+gl_GetTexImage(obj,arg1,arg2,arg3,arg4)
+VALUE obj,arg1,arg2,arg3,arg4;
 {
-	#warning glGetTexImage not implemented
-	return Qnil;
+	GLenum tex;
+	GLint lod;
+	GLenum format;
+	GLenum type;
+	GLint width = 0;
+	GLint height = 0;
+	GLint depth = 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;
+
+	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;
+			break;
+		default:
+			return Qnil;
+	}
+	size *=	format_size*type_size;
+	pixels = allocate_buffer_with_string(size);
+
+	FORCE_PIXEL_STORE_MODE
+	glGetTexImage(tex,lod,format,type,(GLvoid*)RSTRING(pixels)->ptr);
+	RESTORE_PIXEL_STORE_MODE
+	return pixels;
 }
-*/
+
 
 static VALUE
 gl_GetTexParameterfv(obj,arg1,arg2)
@@ -3587,7 +3612,7 @@ VALUE obj,arg1,arg2;
 	glGetTexParameteriv(target,pname,params);
 	retary = rb_ary_new2(size);
 	for(i=0;i<size;i++)
-		rb_ary_push(retary, INT2FIX(params[i]));
+		rb_ary_push(retary, INT2NUM(params[i]));
 	return retary;
 }
 
@@ -3598,7 +3623,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLint level;
 	GLenum pname;
-	GLfloat params; 
+	GLfloat params = 0.0; 
 	VALUE retary;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
@@ -3616,14 +3641,14 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum target;
 	GLint level;
 	GLenum pname;
-	GLint params; 
+	GLint params = 0; 
 	VALUE retary;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	pname = (GLenum)NUM2INT(arg3);
 	glGetTexLevelParameteriv(target,level,pname,&params);
 	retary = rb_ary_new2(1);
-	rb_ary_push(retary, INT2FIX(params));
+	rb_ary_push(retary, INT2NUM(params));
 	return retary;
 }
 
@@ -3644,7 +3669,7 @@ VALUE obj,arg1;
 {
 	GLuint list;
 	GLboolean ret;
-	list = (GLuint)NUM2INT(arg1);
+	list = (GLuint)NUM2UINT(arg1);
 	ret = glIsList(list);
 	return INT2NUM(ret);
 }
@@ -3873,8 +3898,8 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLsizei height;
 	x = (GLint)NUM2INT(arg1);
 	y = (GLint)NUM2INT(arg2);
-	width = (GLsizei)NUM2INT(arg3);
-	height = (GLsizei)NUM2INT(arg4);
+	width = (GLsizei)NUM2UINT(arg3);
+	height = (GLsizei)NUM2UINT(arg4);
 	glViewport(x,y,width,height);
 	return Qnil;
 }
@@ -3891,12 +3916,12 @@ VALUE obj,arg1;
 
 static VALUE g_Vertex_ptr;
 static VALUE g_Normal_ptr;
-static VALUE g_Color_ptr;
-static VALUE g_Index_ptr;
-static VALUE g_TexCoord_ptr;
-static VALUE g_EdgeFlag_ptr;
-VALUE g_FogCoord_ptr = 0;
-VALUE g_SecondaryColor_ptr = 0;
+static VALUE g_Color_ptr; 
+static VALUE g_Index_ptr; 
+static VALUE g_TexCoord_ptr; 
+static VALUE g_EdgeFlag_ptr; 
+VALUE g_FogCoord_ptr; /* OpenGL 1.4 */
+VALUE g_SecondaryColor_ptr; /* OpenGL 1.4 */
 #define POINTER_FUNC(_func_) \
 static VALUE \
 gl_##_func_##Pointer(obj, arg1, arg2, arg3, arg4) \
@@ -3907,7 +3932,7 @@ VALUE obj, arg1, arg2, arg3, arg4; \
 	GLsizei stride; \
 	size = (GLint)NUM2INT(arg1); \
 	type = (GLenum)NUM2INT(arg2); \
-	stride = (GLsizei)NUM2INT(arg3); \
+	stride = (GLsizei)NUM2UINT(arg3); \
 	Check_Type(arg4, T_STRING); \
 	rb_str_freeze(arg4); \
 	g_##_func_##_ptr = arg4; \
@@ -3940,7 +3965,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLsizei count;
 	mode = (GLenum)NUM2INT(arg1);
 	first = (GLint)NUM2INT(arg2);
-	count = (GLsizei)NUM2INT(arg3);
+	count = (GLsizei)NUM2UINT(arg3);
 	glDrawArrays(mode,first,count);
 	return Qnil;
 }
@@ -3953,7 +3978,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLsizei count;
 	GLenum type;
 	mode = (GLenum)NUM2INT(arg1);
-	count = (GLsizei)NUM2INT(arg2);
+	count = (GLsizei)NUM2UINT(arg2);
 	type = (GLenum)NUM2INT(arg3);
 	Check_Type(arg4, T_STRING);
 	glDrawElements(mode, count, type, (const GLvoid*)RSTRING(arg4)->ptr);
@@ -3965,7 +3990,7 @@ gl_EdgeFlagPointer(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
 	GLsizei stride;
-	stride = (GLsizei)NUM2INT(arg1);
+	stride = (GLsizei)NUM2UINT(arg1);
 	Check_Type(arg2, T_STRING);
 	rb_str_freeze(arg2);
 	g_EdgeFlag_ptr = arg2;
@@ -3984,8 +4009,8 @@ VALUE obj,arg1;
 }
 
 static VALUE
-gl_GetPointerv(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
+gl_GetPointerv(obj,arg1)
+VALUE obj,arg1;
 {
 	GLenum pname;
 	pname = (GLenum)NUM2INT(arg1);
@@ -4006,6 +4031,10 @@ VALUE obj,arg1,arg2;
 			return g_FogCoord_ptr;
 		case GL_SECONDARY_COLOR_ARRAY_POINTER:
 			return g_SecondaryColor_ptr;
+		case GL_FEEDBACK_BUFFER_POINTER:
+			return g_current_feed_buffer;
+		case GL_SELECTION_BUFFER_POINTER:
+			return g_current_sel_buffer;			
 		default:
 			rb_raise(rb_eArgError, "Invalid pname %d",pname);
 			break; /* not reached */
@@ -4020,7 +4049,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum type;
 	GLsizei stride;
 	type = (GLenum)NUM2INT(arg1);
-	stride = (GLsizei)NUM2INT(arg2);
+	stride = (GLsizei)NUM2UINT(arg2);
 	Check_Type(arg3, T_STRING);
 	rb_str_freeze(arg3);
 	g_Index_ptr = arg3;
@@ -4035,7 +4064,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum format;
 	GLsizei stride;
 	format = (GLenum)NUM2INT(arg1);
-	stride = (GLsizei)NUM2INT(arg2);
+	stride = (GLsizei)NUM2UINT(arg2);
 	Check_Type(arg3, T_STRING);
 	glInterleavedArrays(format, stride, (const GLvoid*)RSTRING(arg3)->ptr);
 	return Qnil;
@@ -4048,7 +4077,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLenum type;
 	GLsizei stride;
 	type = (GLenum)NUM2INT(arg1);
-	stride = (GLsizei)NUM2INT(arg2);
+	stride = (GLsizei)NUM2UINT(arg2);
 	Check_Type(arg3, T_STRING);
 	rb_str_freeze(arg3);
 	g_Normal_ptr = arg3;
@@ -4084,7 +4113,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	internalformat = (GLenum)NUM2INT(arg3);
 	x = (GLint)NUM2INT(arg4);
 	y = (GLint)NUM2INT(arg5);
-	width = (GLsizei)NUM2INT(arg6);
+	width = (GLsizei)NUM2UINT(arg6);
 	border = (GLint)NUM2INT(arg7);
 	glCopyTexImage1D(target,level,internalformat,x,y,width,border);
 	return Qnil;
@@ -4107,8 +4136,8 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	internalformat = (GLenum)NUM2INT(arg3);
 	x = (GLint)NUM2INT(arg4);
 	y = (GLint)NUM2INT(arg5);
-	width = (GLsizei)NUM2INT(arg6);
-	height = (GLsizei)NUM2INT(arg7);
+	width = (GLsizei)NUM2UINT(arg6);
+	height = (GLsizei)NUM2UINT(arg7);
 	border = (GLint)NUM2INT(arg8);
 	glCopyTexImage2D(target,level,internalformat,x,y,width,height,border);
 	return Qnil;
@@ -4129,7 +4158,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6;
 	xoffset = (GLint)NUM2INT(arg3);
 	x = (GLint)NUM2INT(arg4);
 	y = (GLint)NUM2INT(arg5);
-	width = (GLsizei)NUM2INT(arg6);
+	width = (GLsizei)NUM2UINT(arg6);
 	glCopyTexSubImage1D(target,level,xoffset,x,y,width);
 	return Qnil;
 }
@@ -4152,8 +4181,8 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	yoffset = (GLint)NUM2INT(arg4);
 	x = (GLint)NUM2INT(arg5);
 	y = (GLint)NUM2INT(arg6);
-	width = (GLsizei)NUM2INT(arg7);
-	height = (GLsizei)NUM2INT(arg8);
+	width = (GLsizei)NUM2UINT(arg7);
+	height = (GLsizei)NUM2UINT(arg8);
 	glCopyTexSubImage2D(target,level,xoffset,yoffset,x,y,width,height);
 	return Qnil;
 }
@@ -4175,20 +4204,29 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
-	width = (GLsizei)NUM2INT(arg4);
+	width = (GLsizei)NUM2UINT(arg4);
 	format = (GLenum)NUM2INT(arg5);
 	type = (GLenum)NUM2INT(arg6);
-	if (TYPE(arg7) == T_STRING) {
-		type_size = gltype_size(type) / 8;
-		format_size = glformat_size(format);
-		if (type_size < 0 || format_size == -1)
-			return Qnil;
+	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
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg7));
+	} 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 */
+		return Qnil;
+	}
 	glTexSubImage1D(target,level,xoffset,width,format,type,pixels);
 	return Qnil;
 }
@@ -4213,21 +4251,28 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
 	yoffset = (GLint)NUM2INT(arg4);
-	width = (GLsizei)NUM2INT(arg5);
-	height = (GLsizei)NUM2INT(arg6);
+	width = (GLsizei)NUM2UINT(arg5);
+	height = (GLsizei)NUM2UINT(arg6);
 	format = (GLenum)NUM2INT(arg7);
 	type = (GLenum)NUM2INT(arg8);
-	if (TYPE(arg9) == T_STRING) {
-		type_size = gltype_size(type) / 8;
-		format_size = glformat_size(format);
-		if (type_size < 0 || format_size == -1)
-			return Qnil;
+	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
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg9));
+	} 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 */
+		return Qnil;
+	}
 	glTexSubImage2D(target,level,xoffset,yoffset,width,height,format,type,pixels);
 	return Qnil;
 }
@@ -4242,8 +4287,7 @@ VALUE obj,arg1;
 	GLboolean r;
 	VALUE retary;
 	int i;
-	if (TYPE(arg1) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	size = RARRAY(arg1)->len;
 	textures = ALLOC_N(GLuint,size);
 	residences = ALLOC_N(GLboolean,size);
@@ -4252,10 +4296,10 @@ VALUE obj,arg1;
 	retary = rb_ary_new2(size);
 	if (r==GL_TRUE) { /* all are resident */
 		for(i=0;i<size;i++)
-			rb_ary_push(retary, INT2FIX(GL_TRUE));
+			rb_ary_push(retary, INT2NUM(GL_TRUE));
 	} else {
 		for(i=0;i<size;i++)
-			rb_ary_push(retary, INT2FIX(residences[i]));
+			rb_ary_push(retary, INT2NUM(residences[i]));
 	}
 	xfree(textures);
 	xfree(residences);
@@ -4269,7 +4313,7 @@ VALUE obj,arg1,arg2;
 	GLenum target;
 	GLuint texture;
 	target = (GLenum)NUM2INT(arg1);
-	texture = (GLuint)NUM2INT(arg2);
+	texture = (GLuint)NUM2UINT(arg2);
 	glBindTexture(target,texture);
 	return Qnil;
 }
@@ -4280,11 +4324,8 @@ VALUE obj,arg1;
 {
 	GLsizei n;
 	GLuint *textures;
-	RArray *ary;
-	if (TYPE(arg1) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg1));
-	ary = RARRAY(arg1);
-	n = ary->len;
+	Check_Type(arg1,T_ARRAY);
+	n = RARRAY(arg1)->len;
 	textures = ALLOC_N(GLuint,n);
 	ary2cuint(arg1,textures,n); 
 	glDeleteTextures( n, textures);
@@ -4300,7 +4341,7 @@ VALUE obj,arg1;
 	GLuint *textures;
 	RArray *ret;
 	int i;
-	n = (GLsizei)NUM2INT(arg1);
+	n = (GLsizei)NUM2UINT(arg1);
 	textures = ALLOC_N(GLuint, n);
 	glGenTextures(n, textures);
 	ret = RARRAY(rb_ary_new2(n));
@@ -4316,7 +4357,7 @@ VALUE obj,arg1;
 {
 	GLuint texture;
 	GLboolean ret;
-	texture = (GLuint)NUM2INT(arg1);
+	texture = (GLuint)NUM2UINT(arg1);
 	ret = glIsTexture(texture);
 	return INT2NUM(ret);
 }
@@ -4328,10 +4369,8 @@ VALUE obj,arg1,arg2;
 	GLuint *textures;
 	GLclampf *priorities;
 	GLsizei size;
-	if (TYPE(arg1) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg1));
-	if (TYPE(arg2) != T_ARRAY)
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(arg2));
+	Check_Type(arg1,T_ARRAY);
+	Check_Type(arg2,T_ARRAY);
 	if ((size = RARRAY(arg1)->len) != RARRAY(arg2)->len)
 		rb_raise(rb_eArgError, "passed arrays must have the same length");
 	textures = ALLOC_N(GLuint,size);
@@ -4359,8 +4398,7 @@ gl_Indexubv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLubyte c[1] = {0};
-	if (TYPE(arg1) != T_ARRAY) 
-		rb_raise(rb_eTypeError, "type mismatch:%s",rb_class2name(arg1));
+	Check_Type(arg1,T_ARRAY);
 	ary2cubyte(arg1,c,1);
 	glIndexubv(c);
 	return Qnil;
@@ -4379,7 +4417,7 @@ gl_PushClientAttrib(obj,arg1)
 VALUE obj,arg1;
 {
 	GLbitfield mask;
-	mask = (GLbitfield)NUM2INT(arg1);
+	mask = (GLbitfield)NUM2UINT(arg1);
 	glPushClientAttrib(mask);
 	return Qnil;
 }
@@ -4412,7 +4450,7 @@ VALUE obj; \
 		} \
 		} \
 		else \
-			rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(CLASS_OF(args[0]))); \
+			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 3: \
 		gl_Color3##_type_(obj,args[0], args[1], args[2]); \
@@ -4459,7 +4497,7 @@ VALUE obj; \
 		} \
 		} \
 		else \
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(CLASS_OF(args[0]))); \
+			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 3: \
 		gl_Normal3##_type_(obj,args[0], args[1], args[2]); \
@@ -4506,7 +4544,7 @@ VALUE obj; \
 		} \
 		} \
 		else \
-		rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(CLASS_OF(args[0]))); \
+			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 2: \
 		gl_RasterPos2##_type_(obj,args[0], args[1]); \
@@ -4538,21 +4576,22 @@ VALUE obj; \
 { \
 	int num; \
 	VALUE args[4]; \
-	RArray *ary; \
-	switch (num = rb_scan_args(argc, argv, "13", &args[0], &args[1], &args[2], &args[3])) { \
-	case 1: \
-		if (TYPE(args[0]) == T_ARRAY) { \
+	RArray *ary,*ary2; \
+	switch (num = rb_scan_args(argc, argv, "22", &args[0], &args[1], &args[2], &args[3])) { \
+	case 2: \
+		if (TYPE(args[0]) == T_ARRAY && TYPE(args[1]) == T_ARRAY) { \
 		ary = RARRAY(args[0]); \
+		ary2 = RARRAY(args[1]); \
 		switch (ary->len) { \
-			case 4: \
-			gl_Rect##_type_(obj,ary->ptr[0],ary->ptr[1],ary->ptr[2],ary->ptr[3]); \
+			case 2: \
+			gl_Rect##_type_(obj,ary->ptr[0],ary->ptr[1],ary2->ptr[0],ary2->ptr[1]); \
 			break; \
 			default: \
 			rb_raise(rb_eArgError, "array length:%d", ary->len); \
 		} \
 		} \
 		else \
-			rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(CLASS_OF(args[0]))); \
+			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 4: \
 		gl_Rect##_type_(obj,args[0], args[1], args[2], args[3]); \
@@ -4584,6 +4623,9 @@ VALUE obj; \
 		if (TYPE(args[0]) == T_ARRAY) { \
 		ary = RARRAY(args[0]); \
 		switch (ary->len) { \
+			case 1: \
+			gl_TexCoord1##_type_(obj,ary->ptr[0]); \
+			break; \
 			case 2: \
 			gl_TexCoord2##_type_(obj,ary->ptr[0],ary->ptr[1]); \
 			break; \
@@ -4598,7 +4640,7 @@ VALUE obj; \
 		} \
 		} \
 		else \
-			rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(CLASS_OF(args[0]))); \
+			gl_TexCoord1##_type_(obj,args[0]); \
 		break; \
 	case 2: \
 		gl_TexCoord2##_type_(obj,args[0], args[1]); \
@@ -4650,7 +4692,7 @@ VALUE obj; \
 		} \
 		} \
 		else \
-			rb_raise(rb_eTypeError, "type mismatch:%s", rb_class2name(CLASS_OF(args[0]))); \
+			Check_Type(args[0],T_ARRAY); /* force exception */ \
 		break; \
 	case 2: \
 		gl_Vertex2##_type_(obj,args[0], args[1]); \
@@ -4763,6 +4805,9 @@ VALUE obj,arg1,arg2,arg3;
 /* init */
 void gl_init_functions_1_0__1_1(VALUE module)
 {
+	g_FogCoord_ptr = 0; /* for use in gl-1.4.c */
+	g_SecondaryColor_ptr = 0; /* for use in gl-1.4.c */
+
 	/* OpenGL 1.0 functions */
 	rb_define_module_function(module, "glNewList", gl_NewList, 2);
 	rb_define_module_function(module, "glEndList", gl_EndList, 0);
@@ -4893,8 +4938,8 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glTexGenfv", gl_TexGenfv, 3);
 	rb_define_module_function(module, "glTexGeni", gl_TexGeni, 3);
 	rb_define_module_function(module, "glTexGeniv", gl_TexGeniv, 3);
-	rb_define_module_function(module, "glFeedbackBuffer", gl_FeedbackBuffer, -1);
-	rb_define_module_function(module, "glSelectBuffer", gl_SelectBuffer, -1);
+	rb_define_module_function(module, "glFeedbackBuffer", gl_FeedbackBuffer, 2);
+	rb_define_module_function(module, "glSelectBuffer", gl_SelectBuffer, 1);
 	rb_define_module_function(module, "glRenderMode", gl_RenderMode, 1);
 	rb_define_module_function(module, "glInitNames", gl_InitNames, 0);
 	rb_define_module_function(module, "glLoadName", gl_LoadName, 1);
@@ -4957,12 +5002,12 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glCopyPixels", gl_CopyPixels, 5);
 	rb_define_module_function(module, "glReadPixels", gl_ReadPixels, 6);
 	rb_define_module_function(module, "glDrawPixels", gl_DrawPixels, 5);
-	rb_define_module_function(module, "glGetBooleanv", gl_GetBooleanv, 2);
+	rb_define_module_function(module, "glGetBooleanv", gl_GetBooleanv, 1);
 	rb_define_module_function(module, "glGetClipPlane", gl_GetClipPlane, 1);
 	rb_define_module_function(module, "glGetDoublev", gl_GetDoublev, 1);
 	rb_define_module_function(module, "glGetError", gl_GetError, 0);
-	rb_define_module_function(module, "glGetFloatv", gl_GetFloatv, 2);
-	rb_define_module_function(module, "glGetIntegerv", gl_GetIntegerv, 2);
+	rb_define_module_function(module, "glGetFloatv", gl_GetFloatv, 1);
+	rb_define_module_function(module, "glGetIntegerv", gl_GetIntegerv, 1);
 	rb_define_module_function(module, "glGetLightfv", gl_GetLightfv, 2);
 	rb_define_module_function(module, "glGetLightiv", gl_GetLightiv, 2);
 	rb_define_module_function(module, "glGetMapdv", gl_GetMapdv, 2);
@@ -4973,14 +5018,14 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	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, "glGetPolygonStipple", gl_GetPolygonStipple, 0);
 	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, 5); */
+	rb_define_module_function(module, "glGetTexImage", gl_GetTexImage, 4); 
 	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);
@@ -5014,7 +5059,7 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glDrawElements", gl_DrawElements, 4);
 	rb_define_module_function(module, "glEdgeFlagPointer", gl_EdgeFlagPointer, 2);
 	rb_define_module_function(module, "glEnableClientState", gl_EnableClientState, 1);
-	rb_define_module_function(module, "glGetPointerv", gl_GetPointerv, 2);
+	rb_define_module_function(module, "glGetPointerv", gl_GetPointerv, 1);
 	rb_define_module_function(module, "glIndexPointer", gl_IndexPointer, 3);
 	rb_define_module_function(module, "glInterleavedArrays", gl_InterleavedArrays, 3);
 	rb_define_module_function(module, "glNormalPointer", gl_NormalPointer, 3);
@@ -5065,18 +5110,18 @@ void gl_init_functions_1_0__1_1(VALUE module)
 	rb_define_module_function(module, "glNormal3sv", gl_Normalsv, -1);
 
 	rb_define_module_function(module, "glRasterPos", gl_RasterPosdv, -1);
-	rb_define_module_function(module, "glRasterPos2d", gl_RasterPosdv, -1);
-	rb_define_module_function(module, "glRasterPos2f", gl_RasterPosfv, -1);
-	rb_define_module_function(module, "glRasterPos2i", gl_RasterPosiv, -1);
-	rb_define_module_function(module, "glRasterPos2s", gl_RasterPossv, -1);
-	rb_define_module_function(module, "glRasterPos3d", gl_RasterPosdv, -1);
-	rb_define_module_function(module, "glRasterPos3f", gl_RasterPosfv, -1);
-	rb_define_module_function(module, "glRasterPos3i", gl_RasterPosiv, -1);
-	rb_define_module_function(module, "glRasterPos3s", gl_RasterPossv, -1);
-	rb_define_module_function(module, "glRasterPos4d", gl_RasterPosdv, -1);
-	rb_define_module_function(module, "glRasterPos4f", gl_RasterPosfv, -1);
-	rb_define_module_function(module, "glRasterPos4i", gl_RasterPosiv, -1);
-	rb_define_module_function(module, "glRasterPos4s", gl_RasterPossv, -1);
+	rb_define_module_function(module, "glRasterPos2dv", gl_RasterPosdv, -1);
+	rb_define_module_function(module, "glRasterPos2fv", gl_RasterPosfv, -1);
+	rb_define_module_function(module, "glRasterPos2iv", gl_RasterPosiv, -1);
+	rb_define_module_function(module, "glRasterPos2sv", gl_RasterPossv, -1);
+	rb_define_module_function(module, "glRasterPos3dv", gl_RasterPosdv, -1);
+	rb_define_module_function(module, "glRasterPos3fv", gl_RasterPosfv, -1);
+	rb_define_module_function(module, "glRasterPos3iv", gl_RasterPosiv, -1);
+	rb_define_module_function(module, "glRasterPos3sv", gl_RasterPossv, -1);
+	rb_define_module_function(module, "glRasterPos4dv", gl_RasterPosdv, -1);
+	rb_define_module_function(module, "glRasterPos4fv", gl_RasterPosfv, -1);
+	rb_define_module_function(module, "glRasterPos4iv", gl_RasterPosiv, -1);
+	rb_define_module_function(module, "glRasterPos4sv", gl_RasterPossv, -1);
 
 	rb_define_module_function(module, "glRect", gl_Rectdv, -1);
 	rb_define_module_function(module, "glRectdv", gl_Rectdv, -1);