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

data/examples/misc/OGLBench.rb

@@ -18,7 +18,7 @@ include Gl,Glu,Glut
 
 require 'getoptlong'
 
-$VERSION = '0.1.4'
+VER = '0.1.4'
 
 # Cached config and state, for simpler API
 $CACHED = {}
@@ -334,4 +334,4 @@ end
 # def texture_from_texels
 
 end # end module
-	
+	

data/examples/misc/trislam.rb

@@ -19,7 +19,7 @@ require 'mathn'
 
 require 'OGLBench'
 
-$VERSION = '0.1.24-ruby-p1'
+VER = '0.1.24-ruby-p1'
 
 $test = 0
 $run = 0
@@ -144,7 +144,7 @@ The configuration for this series of tests will be as follows:
 
 EOM
 
-	OGLBench.show_basic_config($conf, $gl_info, $VERSION)
+	OGLBench.show_basic_config($conf, $gl_info, VER)
 	
 	puts "standard runs:    #{$slow.join(' ')}"
 	puts "extra fast runs:  #{$fast.join(' ')}"

data/ext/{common → opengl}/common.h

@@ -107,8 +107,6 @@
 /* at least GL_MAX_VERTEX_ATTRIBS - usually 16 or 32 on today's high-end cards */
 #define _MAX_VERTEX_ATTRIBS 64
 
-typedef struct RArray RArray;
-
 extern VALUE cProc;
 
 /* For now we do not honor pixel store modes, so we need to
@@ -389,19 +387,12 @@ static inline void *load_gl_function(const char *name,int raise)
 
 #if defined(__APPLE__)
 	void *library = NULL;
-	char* symbolName;
-  library = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY);
+  library = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY | RTLD_LOCAL | RTLD_FIRST);
 
 	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);
-
-  func_ptr = dlsym(library, symbolName);
-	xfree(symbolName);
+  func_ptr = dlsym(library, name);
   dlclose(library);
 #elif HAVE_WGLGETPROCADDRESS
 	func_ptr = wglGetProcAddress((LPCSTR)name);

data/ext/{common → opengl}/conv.h

@@ -65,8 +65,12 @@ FASTCONV(num2uint,unsigned long,FIX2ULONG,(unsigned int)NUM2ULONG)
 
 #undef FASTCONV
 
+#define RUBY2GLENUM(x) \
+    (x) == Qtrue ? GL_TRUE : (((x) == Qfalse) ? GL_FALSE : NUM2INT(x))
+
 /* For conversion between ruby and GL boolean values */
-#define GLBOOL2RUBY(x) (x)==GL_TRUE? Qtrue :( (x)==GL_FALSE? Qfalse : INT2NUM((x)))
+#define GLBOOL2RUBY(x) \
+    (x) == GL_TRUE ? Qtrue : ((x)==GL_FALSE ? Qfalse : INT2NUM((x)))
 #define RUBYBOOL2GL(x) (x)==Qtrue? GL_TRUE : GL_FALSE
 
 #define cond_GLBOOL2RUBY_FUNC(_name_,_type_,_conv_) \
@@ -110,8 +114,10 @@ cond_GLBOOL2RUBY_FUNC(cond_GLBOOL2RUBY_F,GLfloat,rb_float_new)
 cond_GLBOOL2RUBY_FUNC(cond_GLBOOL2RUBY_D,GLdouble,rb_float_new)
 
 
-/* For conversion between ruby array (or object that can be converted to array) and C array.
-   The C array has to be preallocated by calling function. */
+/* For conversion between ruby array (or object that can be converted to
+ * array) and C array.
+ *
+ * The C array has to be preallocated by calling function. */
 #define ARY2CTYPE(_type_,_convert_) \
 static inline long ary2c##_type_( arg, cary, maxlen ) \
 VALUE arg; \
@@ -135,7 +141,7 @@ ARY2CTYPE(byte,NUM2INT)
 ARY2CTYPE(ubyte,NUM2INT)
 ARY2CTYPE(short,NUM2INT)
 ARY2CTYPE(ushort,NUM2INT)
-ARY2CTYPE(boolean,NUM2INT)
+ARY2CTYPE(boolean,GLBOOL2RUBY)
 ARY2CTYPE(float,NUM2DBL)
 ARY2CTYPE(double,NUM2DBL)
 
@@ -191,34 +197,39 @@ ARY2CMATCNT(double)
 ARY2CMATCNT(float)
 #undef ARY2CMATCNT
 
-
 #define EMPTY
 #define FREE(_x_) xfree(_x_);
 
-#define RET_ARRAY_OR_SINGLE(_size_,_conv_,_params_) RET_ARRAY_OR_SINGLE_FUNC(_size_,_conv_,_params_,EMPTY)
-#define RET_ARRAY_OR_SINGLE_FREE(_size_,_conv_,_params_) RET_ARRAY_OR_SINGLE_FUNC(_size_,_conv_,_params_,FREE(_params_))
-
-#define RET_ARRAY_OR_SINGLE_FUNC(_size_,_conv_,_params_,_extra_) \
-{ \
-	int iter; \
-	VALUE return_array; \
-	if (_size_ == 1) { \
-		return_array = _conv_(_params_[0]); \
-	} else { \
-		return_array = rb_ary_new2(_size_); \
-		for(iter=0;iter<_size_;iter++) \
-			rb_ary_push(return_array, _conv_(_params_[iter])); \
-	} \
-	_extra_ \
-	CHECK_GLERROR \
-	return return_array; \
-}
-
-#define RET_ARRAY_OR_SINGLE_BOOL(_size_,_conv_,_enum_,_params_) RET_ARRAY_OR_SINGLE_BOOL_FUNC(_size_,_conv_,_enum_,_params_,EMPTY)
-#define RET_ARRAY_OR_SINGLE_BOOL_FREE(_size_,_conv_,_enum_,_params_) RET_ARRAY_OR_SINGLE_BOOL_FUNC(_size_,_conv_,_enum_,_params_,FREE(_params_))
-
-#define RET_ARRAY_OR_SINGLE_BOOL_FUNC(_size_,_conv_,_enum_,_params_,_extra_) \
-{ \
+#define RET_ARRAY_OR_SINGLE(_name_, _size_, _conv_, _params_) \
+    RET_ARRAY_OR_SINGLE_FUNC(_name_, _size_, _conv_, _params_, EMPTY)
+
+#define RET_ARRAY_OR_SINGLE_FREE(_name, _size_, _conv_, _params_) \
+    RET_ARRAY_OR_SINGLE_FUNC(_name, _size_, _conv_, _params_, FREE(_params_))
+
+#define RET_ARRAY_OR_SINGLE_FUNC(_name_, _size_, _conv_, _params_, _extra_) \
+do { \
+  int iter; \
+  VALUE return_array; \
+  if (_size_ == 1) { \
+    return_array = _conv_(_params_[0]); \
+  } else { \
+    return_array = rb_ary_new2(_size_); \
+    for(iter=0;iter<_size_;iter++) \
+    rb_ary_push(return_array, _conv_(_params_[iter])); \
+  } \
+  _extra_ \
+  CHECK_GLERROR_FROM(_name_); \
+  return return_array; \
+} while (0)
+
+#define RET_ARRAY_OR_SINGLE_BOOL(_name_, _size_, _conv_, _enum_, _params_) \
+    RET_ARRAY_OR_SINGLE_BOOL_FUNC(_name_, _size_, _conv_, _enum_, _params_, EMPTY)
+
+#define RET_ARRAY_OR_SINGLE_BOOL_FREE(_name_, _size_, _conv_, _enum_, _params_) \
+    RET_ARRAY_OR_SINGLE_BOOL_FUNC(_name_, _size_, _conv_, _enum_, _params_, FREE(_params_))
+
+#define RET_ARRAY_OR_SINGLE_BOOL_FUNC(_name_, _size_, _conv_, _enum_, _params_, _extra_) \
+do { \
 	int iter; \
 	VALUE return_array; \
 	if (_size_ == 1) { \
@@ -229,6 +240,7 @@ ARY2CMATCNT(float)
 			rb_ary_push(return_array, _conv_(_enum_,_params_[iter])); \
 	} \
 	_extra_ \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM(_name_); \
 	return return_array; \
-}
+} while (0)
+

data/ext/{glut → opengl}/extconf.rb

@@ -13,16 +13,23 @@ def have_framework(fw, &b)
   end
 end unless respond_to? :have_framework
 
-dir_config("installed")
-$defs.push "-DGLUT_DISABLE_ATEXIT_HACK"
+if ENV['CROSS_COMPILING']
+  dir_config("installed")
+
+  $defs.push "-DFREEGLUT_EXPORTS"
+
+  # libfreeglut is linked to gdi32 and winmm
+  have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
+  have_library( 'winmm', 'timeBeginPeriod' ) && append_library( $libs, 'winmm' )
+end
 
 ok =
-  (have_library('opengl32.lib') &&
-   have_library('glu32.lib') &&
-   have_library('glut32.lib')) ||
+  (have_library('opengl32.lib', 'glVertex3d') &&
+   have_library('glu32.lib',    'gluLookAt') &&
+   have_library('glut32.lib',   'gluSolidTeapot')) ||
   (have_library('opengl32') &&
    have_library('glu32') &&
-   have_library('glut32')) ||
+   have_library('glut')) ||
   (have_library('GL',   'glVertex3d') &&
    have_library('GLU',  'gluLookAt') &&
    have_library('glut', 'glutSolidTeapot')) ||
@@ -62,6 +69,6 @@ end
 
 if ok then
   create_header
-  create_makefile 'glut'
+  create_makefile 'opengl/opengl'
 end
 

data/ext/{common → opengl}/funcdef.h

@@ -14,39 +14,47 @@
  */
 
 /* These macros are for simplification of function definition, as passing
-  arguments from/to OpenGL usually follows the same few patterns. It would
-  be probably wise to adapt the whole bindings to C++ (templates, overloaded
-  functions, etc.), but for now supporting ruby extension for Windows means
-  MSVC6, and that in turn means unspeakable horrors and pains for everyone
-  attempting to merely write, much less debug or maintain any template-based
-  code.
-*/
+   arguments from/to OpenGL usually follows the same few patterns. It would
+   be probably wise to adapt the whole bindings to C++ (templates, overloaded
+   functions, etc.), but for now supporting ruby extension for Windows means
+   MSVC6, and that in turn means unspeakable horrors and pains for everyone
+   attempting to merely write, much less debug or maintain any template-based
+   code.
+ */
 
-/* Will load function pointer for function _NAME_ on first call to the
-  function, or raise if the OpenGL version is less then required or the
-  required extension is not supported */
-#define LOAD_GL_FUNC(_NAME_,_VEREXT_) \
-if (fptr_##_NAME_==NULL) { \
-	if (CheckVersionExtension(_VEREXT_)==GL_FALSE) { \
-		if (isdigit(_VEREXT_[0])) \
-			rb_raise(rb_eNotImpError,"OpenGL version %s is not available on this system",_VEREXT_); \
-		else \
-			rb_raise(rb_eNotImpError,"Extension %s is not available on this system",_VEREXT_); \
-	} \
-	fptr_##_NAME_ = load_gl_function(#_NAME_, 1); \
-}
+/*
+ * Loads the function pointer for function _NAME_ on first call to the
+ * function, or raises a NotImplementedError if the OpenGL version is less
+ * then required or the required extension is not supported.
+ */
+#define LOAD_GL_FUNC(_NAME_, _VEREXT_) \
+  do { \
+    if (fptr_##_NAME_==NULL) { \
+      if (CheckVersionExtension(_VEREXT_) == GL_FALSE) { \
+        if (isdigit(_VEREXT_[0])) { \
+          rb_raise(rb_eNotImpError, \
+              "OpenGL version %s is not available on this system",_VEREXT_); \
+        } else { \
+          rb_raise(rb_eNotImpError, \
+              "Extension %s is not available on this system",_VEREXT_); \
+        } \
+      } \
+      \
+      fptr_##_NAME_ = load_gl_function(#_NAME_, 1); \
+    } \
+  } while (0)
 
 /* Macroset for defining simple functions, i.e. functions that take n arguments and
-  pass them to GL API function without any additional processing.
+   pass them to GL API function without any additional processing.
 
-  Some checking is implicit in _conversion_ argument - e.g. NUM2INT makes sure that
-  user is really passing type that can be converted to INT, otherwire raises.
-  
-  *_LOAD version of macros are for defining functions where we load function pointer
-  instead of direct call - that means all functions above OpenGL 1.1 (including all extensions)
-*/
+   Some checking is implicit in _conversion_ argument - e.g. NUM2INT makes sure that
+   user is really passing type that can be converted to INT, otherwire raises.
 
-#define ARGLIST0 
+ *_LOAD version of macros are for defining functions where we load function pointer
+ instead of direct call - that means all functions above OpenGL 1.1 (including all extensions)
+ */
+
+#define ARGLIST0
 #define ARGLIST1 ,arg1
 #define ARGLIST2 ,arg1,arg2
 #define ARGLIST3 ,arg1,arg2,arg3
@@ -58,8 +66,8 @@ if (fptr_##_NAME_==NULL) { \
 #define ARGLIST9 ,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9
 #define ARGLIST10 ,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10
 
-#define CONV_GLenum (GLenum)NUM2UINT
-#define CONV_GLboolean (GLboolean)NUM2UINT
+#define CONV_GLenum (GLenum)RUBY2GLENUM
+#define CONV_GLboolean (GLboolean)GLBOOL2RUBY
 #define CONV_GLbitfield (GLbitfield)NUM2UINT
 #define CONV_GLbyte (GLbyte)NUM2INT
 #define CONV_GLshort (GLshort)NUM2INT
@@ -150,131 +158,153 @@ if (fptr_##_NAME_==NULL) { \
 #define CALLCONV10(cv1,cv2,cv3,cv4,cv5,cv6,cv7,cv8,cv9,cv10) CONV_##cv1(arg1),CONV_##cv2(arg2),CONV_##cv3(arg3),CONV_##cv4(arg4),CONV_##cv5(arg5),CONV_##cv6(arg6),CONV_##cv7(arg7),CONV_##cv8(arg8),CONV_##cv9(arg9),CONV_##cv10(arg10)
 
 #define GL_FUNC_LOAD(_num_,_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_) \
-static _returntype_ (APIENTRY * fptr_gl##_name_)(PROTOPARAM##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
+  static _returntype_ (APIENTRY * fptr_gl##_name_)(PROTOPARAM##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
 static VALUE \
 gl_##_name_(obj ARGLIST##_num_) \
 VALUE obj ARGLIST##_num_; \
 { \
-	RETDECL_##_returntype_ \
-	LOAD_GL_FUNC(gl##_name_,_ver_) \
-	RETSTAT_##_returntype_ fptr_gl##_name_(CALLCONV##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
-	CHECK_GLERROR \
-	return RETCONV_##_returntype_(ret) ; \
+  RETDECL_##_returntype_ \
+  LOAD_GL_FUNC(gl##_name_,_ver_); \
+  RETSTAT_##_returntype_ fptr_gl##_name_(CALLCONV##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return RETCONV_##_returntype_(ret) ; \
 }
 
 #define GL_FUNC_STATIC(_num_,_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10) \
-static VALUE \
+  static VALUE \
 gl_##_name_(obj ARGLIST##_num_) \
 VALUE obj ARGLIST##_num_; \
 { \
-	RETDECL_##_returntype_ \
-	RETSTAT_##_returntype_ gl##_name_(CALLCONV##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
-	CHECK_GLERROR \
-	return RETCONV_##_returntype_(ret) ; \
+  RETDECL_##_returntype_ \
+  RETSTAT_##_returntype_ gl##_name_(CALLCONV##_num_(targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)); \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return RETCONV_##_returntype_(ret) ; \
 }
 
-#define GL_FUNC_LOAD_0(_name_,_returntype_,_ver_) GL_FUNC_LOAD(0, _name_,_returntype_,0,0,0,0,0,0,0,0,0,0,_ver_)
-#define GL_FUNC_LOAD_1(_name_,_returntype_,targ1,_ver_) GL_FUNC_LOAD(1, _name_,_returntype_,targ1,0,0,0,0,0,0,0,0,0,_ver_)
-#define GL_FUNC_LOAD_2(_name_,_returntype_,targ1,targ2,_ver_) GL_FUNC_LOAD(2, _name_,_returntype_,targ1,targ2,0,0,0,0,0,0,0,0,_ver_)
-#define GL_FUNC_LOAD_3(_name_,_returntype_,targ1,targ2,targ3,_ver_) GL_FUNC_LOAD(3, _name_,_returntype_,targ1,targ2,targ3,0,0,0,0,0,0,0,_ver_)
-#define GL_FUNC_LOAD_4(_name_,_returntype_,targ1,targ2,targ3,targ4,_ver_) GL_FUNC_LOAD(4, _name_,_returntype_,targ1,targ2,targ3,targ4,0,0,0,0,0,0,_ver_)
-#define GL_FUNC_LOAD_5(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,_ver_) GL_FUNC_LOAD(5, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,0,0,0,0,0,_ver_)
-#define GL_FUNC_LOAD_6(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,_ver_) GL_FUNC_LOAD(6, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,0,0,0,0,_ver_)
-#define GL_FUNC_LOAD_7(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,_ver_) GL_FUNC_LOAD(7, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,0,0,0,_ver_)
-#define GL_FUNC_LOAD_8(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,_ver_) GL_FUNC_LOAD(8, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,0,0,_ver_)
-#define GL_FUNC_LOAD_9(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,_ver_) GL_FUNC_LOAD(9, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,0,_ver_)
-#define GL_FUNC_LOAD_10(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_) GL_FUNC_LOAD(10, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_)
+#define GL_FUNC_LOAD_0(_name_,_returntype_,_ver_) \
+  GL_FUNC_LOAD(0, _name_,_returntype_,0,0,0,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_1(_name_,_returntype_,targ1,_ver_) \
+  GL_FUNC_LOAD(1, _name_,_returntype_,targ1,0,0,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_2(_name_,_returntype_,targ1,targ2,_ver_) \
+  GL_FUNC_LOAD(2, _name_,_returntype_,targ1,targ2,0,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_3(_name_,_returntype_,targ1,targ2,targ3,_ver_) \
+  GL_FUNC_LOAD(3, _name_,_returntype_,targ1,targ2,targ3,0,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_4(_name_,_returntype_,targ1,targ2,targ3,targ4,_ver_) \
+  GL_FUNC_LOAD(4, _name_,_returntype_,targ1,targ2,targ3,targ4,0,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_5(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,_ver_) \
+  GL_FUNC_LOAD(5, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,0,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_6(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,_ver_) \
+  GL_FUNC_LOAD(6, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,0,0,0,0,_ver_)
+#define GL_FUNC_LOAD_7(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,_ver_) \
+  GL_FUNC_LOAD(7, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,0,0,0,_ver_)
+#define GL_FUNC_LOAD_8(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,_ver_) \
+  GL_FUNC_LOAD(8, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,0,0,_ver_)
+#define GL_FUNC_LOAD_9(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,_ver_) \
+  GL_FUNC_LOAD(9, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,0,_ver_)
+#define GL_FUNC_LOAD_10(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_) \
+  GL_FUNC_LOAD(10, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10,_ver_)
 
-#define GL_FUNC_STATIC_0(_name_,_returntype_) GL_FUNC_STATIC(0, _name_,_returntype_,0,0,0,0,0,0,0,0,0,0)
-#define GL_FUNC_STATIC_1(_name_,_returntype_,targ1) GL_FUNC_STATIC(1, _name_,_returntype_,targ1,0,0,0,0,0,0,0,0,0)
-#define GL_FUNC_STATIC_2(_name_,_returntype_,targ1,targ2) GL_FUNC_STATIC(2, _name_,_returntype_,targ1,targ2,0,0,0,0,0,0,0,0)
-#define GL_FUNC_STATIC_3(_name_,_returntype_,targ1,targ2,targ3) GL_FUNC_STATIC(3, _name_,_returntype_,targ1,targ2,targ3,0,0,0,0,0,0,0)
-#define GL_FUNC_STATIC_4(_name_,_returntype_,targ1,targ2,targ3,targ4) GL_FUNC_STATIC(4, _name_,_returntype_,targ1,targ2,targ3,targ4,0,0,0,0,0,0)
-#define GL_FUNC_STATIC_5(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5) GL_FUNC_STATIC(5, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,0,0,0,0,0)
-#define GL_FUNC_STATIC_6(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6) GL_FUNC_STATIC(6, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,0,0,0,0)
-#define GL_FUNC_STATIC_7(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7) GL_FUNC_STATIC(7, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,0,0,0)
-#define GL_FUNC_STATIC_8(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8) GL_FUNC_STATIC(8, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,0,0)
-#define GL_FUNC_STATIC_9(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9) GL_FUNC_STATIC(9, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,0)
-#define GL_FUNC_STATIC_10(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10_ver_) GL_FUNC_STATIC(10, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)
+#define GL_FUNC_STATIC_0(_name_,_returntype_) \
+  GL_FUNC_STATIC(0, _name_,_returntype_,0,0,0,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_1(_name_,_returntype_,targ1) \
+  GL_FUNC_STATIC(1, _name_,_returntype_,targ1,0,0,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_2(_name_,_returntype_,targ1,targ2) \
+  GL_FUNC_STATIC(2, _name_,_returntype_,targ1,targ2,0,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_3(_name_,_returntype_,targ1,targ2,targ3) \
+  GL_FUNC_STATIC(3, _name_,_returntype_,targ1,targ2,targ3,0,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_4(_name_,_returntype_,targ1,targ2,targ3,targ4) \
+  GL_FUNC_STATIC(4, _name_,_returntype_,targ1,targ2,targ3,targ4,0,0,0,0,0,0)
+#define GL_FUNC_STATIC_5(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5) \
+  GL_FUNC_STATIC(5, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,0,0,0,0,0)
+#define GL_FUNC_STATIC_6(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6) \
+  GL_FUNC_STATIC(6, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,0,0,0,0)
+#define GL_FUNC_STATIC_7(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7) \
+  GL_FUNC_STATIC(7, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,0,0,0)
+#define GL_FUNC_STATIC_8(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8) \
+  GL_FUNC_STATIC(8, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,0,0)
+#define GL_FUNC_STATIC_9(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9) \
+  GL_FUNC_STATIC(9, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,0)
+#define GL_FUNC_STATIC_10(_name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10_ver_) \
+  GL_FUNC_STATIC(10, _name_,_returntype_,targ1,targ2,targ3,targ4,targ5,targ6,targ7,targ8,targ9,targ10)
 
 /* Templates for glGen* and glDelete* */
 
 #define GL_FUNC_GENOBJECTS_LOAD(_name_,_ver_) \
-static void (APIENTRY * fptr_gl##_name_)(GLsizei,GLuint *); \
+  static void (APIENTRY * fptr_gl##_name_)(GLsizei,GLuint *); \
 static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
-	GLsizei n; \
-	GLuint *objects; \
-	VALUE ret; \
-	GLsizei i; \
-	LOAD_GL_FUNC(gl##_name_,_ver_) \
-	n = CONV_GLsizei(arg1); \
-	objects = ALLOC_N(GLuint, n); \
-	fptr_gl##_name_(n,objects); \
-	ret = rb_ary_new2(n); \
-	for (i = 0; i < n; i++) \
-		rb_ary_push(ret, RETCONV_GLuint(objects[i])); \
-	xfree(objects); \
-	CHECK_GLERROR \
-	return ret; \
+  GLsizei n; \
+  GLuint *objects; \
+  VALUE ret; \
+  GLsizei i; \
+  LOAD_GL_FUNC(gl##_name_,_ver_); \
+  n = CONV_GLsizei(arg1); \
+  objects = ALLOC_N(GLuint, n); \
+  fptr_gl##_name_(n,objects); \
+  ret = rb_ary_new2(n); \
+  for (i = 0; i < n; i++) \
+  rb_ary_push(ret, RETCONV_GLuint(objects[i])); \
+  xfree(objects); \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return ret; \
 }
 
 #define GL_FUNC_GENOBJECTS(_name_) \
-static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
+  static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
-	GLsizei n; \
-	GLuint *objects; \
-	VALUE ret; \
-	GLsizei i; \
-	n = CONV_GLsizei(arg1); \
-	objects = ALLOC_N(GLuint, n); \
-	gl##_name_(n,objects); \
-	ret = rb_ary_new2(n); \
-	for (i = 0; i < n; i++) \
-		rb_ary_push(ret, RETCONV_GLuint(objects[i])); \
-	xfree(objects); \
-	CHECK_GLERROR \
-	return ret; \
+  GLsizei n; \
+  GLuint *objects; \
+  VALUE ret; \
+  GLsizei i; \
+  n = CONV_GLsizei(arg1); \
+  objects = ALLOC_N(GLuint, n); \
+  gl##_name_(n,objects); \
+  ret = rb_ary_new2(n); \
+  for (i = 0; i < n; i++) \
+  rb_ary_push(ret, RETCONV_GLuint(objects[i])); \
+  xfree(objects); \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return ret; \
 }
 
 #define GL_FUNC_DELETEOBJECTS_LOAD(_name_,_ver_) \
-static void (APIENTRY * fptr_gl##_name_)(GLsizei,const GLuint *); \
+  static void (APIENTRY * fptr_gl##_name_)(GLsizei,const GLuint *); \
 static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
-	GLsizei n; \
-	LOAD_GL_FUNC(gl##_name_,_ver_) \
-	if (TYPE(arg1)==T_ARRAY) { \
-		GLuint *objects; \
-		n = (GLsizei)RARRAY_LENINT(arg1); \
-		objects = ALLOC_N(GLuint,n); \
-		ary2cuint(arg1,objects,n);  \
-		fptr_gl##_name_(n,objects); \
-		xfree(objects); \
-	} else { \
-		GLuint object; \
-		object = CONV_GLsizei(arg1); \
-		fptr_gl##_name_(1,&object);  \
-	} \
-	CHECK_GLERROR \
-	return Qnil; \
+  GLsizei n; \
+  LOAD_GL_FUNC(gl##_name_,_ver_); \
+  if (TYPE(arg1)==T_ARRAY) { \
+    GLuint *objects; \
+    n = (GLsizei)RARRAY_LENINT(arg1); \
+    objects = ALLOC_N(GLuint,n); \
+    ary2cuint(arg1,objects,n);  \
+    fptr_gl##_name_(n,objects); \
+    xfree(objects); \
+  } else { \
+    GLuint object; \
+    object = CONV_GLsizei(arg1); \
+    fptr_gl##_name_(1,&object);  \
+  } \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return Qnil; \
 }
 
 #define GL_FUNC_DELETEOBJECTS(_name_) \
-static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
+  static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
-	GLsizei n; \
-	if (TYPE(arg1)==T_ARRAY) { \
-		GLuint *objects; \
-		n = (GLsizei)RARRAY_LENINT(arg1); \
-		objects = ALLOC_N(GLuint,n); \
-		ary2cuint(arg1,objects,n);  \
-		gl##_name_(n,objects); \
-		xfree(objects); \
-	} else { \
-		GLuint object; \
-		object = CONV_GLsizei(arg1); \
-		gl##_name_(1,&object);  \
-	} \
-	CHECK_GLERROR \
-	return Qnil; \
+  GLsizei n; \
+  if (TYPE(arg1)==T_ARRAY) { \
+    GLuint *objects; \
+    n = (GLsizei)RARRAY_LENINT(arg1); \
+    objects = ALLOC_N(GLuint,n); \
+    ary2cuint(arg1,objects,n);  \
+    gl##_name_(n,objects); \
+    xfree(objects); \
+  } else { \
+    GLuint object; \
+    object = CONV_GLsizei(arg1); \
+    gl##_name_(1,&object);  \
+  } \
+  CHECK_GLERROR_FROM("gl" #_name_); \
+  return Qnil; \
 }