opengl 0.7.0.pre1 → 0.7.0.pre2

data/ext/{gl → opengl}/gl-1.3.c

@@ -13,7 +13,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 /* OpenGL 1.3 functions */
 
@@ -101,10 +101,10 @@ gl_##_name_(obj,arg1) \
 VALUE obj,arg1; \
 { \
 	_type_ m[4*4]; \
-	LOAD_GL_FUNC(gl##_name_,"1.3") \
+	LOAD_GL_FUNC(gl##_name_, "1.3"); \
 	ary2cmat##_type_(arg1, m, 4, 4); \
 	fptr_gl##_name_(m); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -129,7 +129,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexImage3D,"1.3")
+	LOAD_GL_FUNC(glCompressedTexImage3D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	internalformat = (GLenum)NUM2INT(arg3);
@@ -155,7 +155,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 		}
 		fptr_glCompressedTexImage3D(target,level,internalformat,width,height,depth,border,imagesize,pixels);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glCompressedTexImage3D");
 	return Qnil;
 }
 
@@ -172,7 +172,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexImage2D,"1.3")
+	LOAD_GL_FUNC(glCompressedTexImage2D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	internalformat = (GLenum)NUM2INT(arg3);
@@ -197,7 +197,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8;
 		}
 		fptr_glCompressedTexImage2D(target,level,internalformat,width,height,border,imagesize,pixels);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glCompressedTexImage2D");
 	return Qnil;
 }
 
@@ -213,7 +213,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLint border;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexImage1D,"1.3")
+	LOAD_GL_FUNC(glCompressedTexImage1D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	internalformat = (GLenum)NUM2INT(arg3);
@@ -237,7 +237,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 		}
 		fptr_glCompressedTexImage1D(target,level,internalformat,width,border,imagesize,pixels);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glCompressedTexImage1D");
 	return Qnil;
 }
 
@@ -257,7 +257,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexSubImage3D,"1.3")
+	LOAD_GL_FUNC(glCompressedTexSubImage3D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -279,7 +279,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11;
 
 		fptr_glCompressedTexSubImage3D(target,level,xoffset,yoffset,zoffset,width,height,depth,format,imagesize,pixels);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glCompressedTexSubImage3D");
 	return Qnil;
 }
 
@@ -297,7 +297,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexSubImage2D,"1.3")
+	LOAD_GL_FUNC(glCompressedTexSubImage2D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -316,7 +316,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9;
 		pixels = RSTRING_PTR(data);
 		fptr_glCompressedTexSubImage2D(target,level,xoffset,yoffset,width,height,format,imagesize,pixels);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glCompressedTexSubImage2D");
 	return Qnil;
 }
 
@@ -332,7 +332,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 	GLenum format;
 	GLsizei imagesize;
 	GLvoid *pixels;
-	LOAD_GL_FUNC(glCompressedTexSubImage1D,"1.3")
+	LOAD_GL_FUNC(glCompressedTexSubImage1D, "1.3");
 	target = (GLenum)NUM2INT(arg1);
 	level = (GLint)NUM2INT(arg2);
 	xoffset = (GLint)NUM2INT(arg3);
@@ -349,7 +349,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6,arg7;
 		pixels = RSTRING_PTR(data);
 		fptr_glCompressedTexSubImage1D(target,level,xoffset,width,format,imagesize,pixels);
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glCompressedTexSubImage1D");
 	return Qnil;
 }
 
@@ -366,7 +366,7 @@ VALUE obj;
 	VALUE data;
 	VALUE args[3];
 	int numargs;
-	LOAD_GL_FUNC(glGetCompressedTexImage,"1.3")
+	LOAD_GL_FUNC(glGetCompressedTexImage, "1.3");
 	numargs = rb_scan_args(argc, argv, "21", &args[0], &args[1], &args[2]);
 	target = (GLenum)NUM2INT(args[0]);
 	lod = (GLenum)NUM2INT(args[1]);
@@ -376,14 +376,14 @@ VALUE obj;
 			if (CheckBufferBinding(GL_PIXEL_PACK_BUFFER_BINDING))
 				rb_raise(rb_eArgError, "Pixel pack buffer bound, but offset argument missing");
 			glGetTexLevelParameteriv(target,lod,GL_TEXTURE_COMPRESSED_IMAGE_SIZE,&size); /* 1.0 function */
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetTexLevelParameteriv");
 			data = allocate_buffer_with_string(size);
 			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)RSTRING_PTR(data));
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetCompressedTexImage");
 			return data;
 		case 3:
 			fptr_glGetCompressedTexImage(target,lod,(GLvoid*)NUM2LONG(args[2]));
-			CHECK_GLERROR
+			CHECK_GLERROR_FROM("glGetCompressedTexImage");
 			return Qnil;	
 	}
 }

data/ext/{gl → opengl}/gl-1.4.c

@@ -13,7 +13,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 /* OpenGL 1.4 functions */
 
@@ -45,11 +45,11 @@ gl_FogCoordfv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLfloat coord;
-	LOAD_GL_FUNC(glFogCoordfv,"1.4")
+	LOAD_GL_FUNC(glFogCoordfv, "1.4");
 	Check_Type(arg1,T_ARRAY);
 	ary2cflt(arg1,&coord,1);
 	fptr_glFogCoordfv(&coord);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glFogCoordfv");
 	return Qnil;
 }
 
@@ -59,11 +59,11 @@ gl_FogCoorddv(obj,arg1)
 VALUE obj,arg1;
 {
 	GLdouble coord;
-	LOAD_GL_FUNC(glFogCoorddv,"1.4")
+	LOAD_GL_FUNC(glFogCoorddv, "1.4");
 	Check_Type(arg1,T_ARRAY);
 	ary2cdbl(arg1,&coord,1);
 	fptr_glFogCoorddv(&coord);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glFogCoorddv");
 	return Qnil;
 }
 
@@ -75,7 +75,7 @@ VALUE obj,arg1,arg2,arg3;
 {
 	GLenum type;
 	GLsizei stride;
-	LOAD_GL_FUNC(glFogCoordPointer,"1.4")
+	LOAD_GL_FUNC(glFogCoordPointer, "1.4");
 	type = (GLenum)NUM2INT(arg1);
 	stride = (GLsizei)NUM2UINT(arg2);
 	if (CheckBufferBinding(GL_ARRAY_BUFFER_BINDING)) {
@@ -88,7 +88,7 @@ VALUE obj,arg1,arg2,arg3;
 		g_FogCoord_ptr = data;
 		fptr_glFogCoordPointer(type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glFogCoordPointer");
 	return Qnil;
 }
 
@@ -101,7 +101,7 @@ VALUE obj,arg1,arg2,arg3;
 	GLint *ary1;
 	GLsizei *ary2;
   int len1,len2;
-	LOAD_GL_FUNC(glMultiDrawArrays,"1.4")
+	LOAD_GL_FUNC(glMultiDrawArrays, "1.4");
   len1 = (int)RARRAY_LENINT(arg2);
   len2 = (int)RARRAY_LENINT(arg3);
 	if (len1!=len2)
@@ -114,7 +114,7 @@ VALUE obj,arg1,arg2,arg3;
 	fptr_glMultiDrawArrays(mode,ary1,ary2,len1);
 	xfree(ary1);
 	xfree(ary2);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMultiDrawArrays");
 	return Qnil;
 }
 
@@ -132,7 +132,7 @@ VALUE obj;
 	GLint size;
 	int i;
 	VALUE ary, args[4];
-	LOAD_GL_FUNC(glMultiDrawElements,"1.4")
+	LOAD_GL_FUNC(glMultiDrawElements, "1.4");
 	switch (rb_scan_args(argc, argv, "31", &args[0], &args[1], &args[2],&args[3])) {
 		default:
 		case 3:
@@ -178,7 +178,7 @@ VALUE obj;
 			xfree(indices);
 			break;
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glMultiDrawElements");
 	return Qnil;
 }
 
@@ -190,7 +190,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLfloat params[3] = {(GLfloat)0.0,(GLfloat)0.0,(GLfloat)0.0};
 	GLint size;
-	LOAD_GL_FUNC(glPointParameterfv,"1.4")
+	LOAD_GL_FUNC(glPointParameterfv, "1.4");
 	pname = (GLenum)NUM2INT(arg1);
 	Check_Type(arg2,T_ARRAY);
 	if (pname==GL_POINT_DISTANCE_ATTENUATION)
@@ -198,8 +198,8 @@ VALUE obj,arg1,arg2;
 	else
 		size = 1;
 	ary2cflt(arg2,params,size);
-	fptr_glPointParameterfv(pname,params);
-	CHECK_GLERROR
+	fptr_glPointParameterfv(pname,params);	
+	CHECK_GLERROR_FROM("glPointParameterfv");
 	return Qnil;
 }
 
@@ -211,7 +211,7 @@ VALUE obj,arg1,arg2;
 	GLenum pname;
 	GLint params[3] = {0,0,0};
 	GLint size;
-	LOAD_GL_FUNC(glPointParameteriv,"1.4")
+	LOAD_GL_FUNC(glPointParameteriv, "1.4");
 	pname = (GLenum)NUM2INT(arg1);
 	Check_Type(arg2,T_ARRAY);
 	if (pname==GL_POINT_DISTANCE_ATTENUATION)
@@ -219,8 +219,8 @@ VALUE obj,arg1,arg2;
 	else
 		size = 1;
 	ary2cint(arg2,params,size);
-	fptr_glPointParameteriv(pname,params);
-	CHECK_GLERROR
+	fptr_glPointParameteriv(pname,params);	
+	CHECK_GLERROR_FROM("glPointParameteriv");
 	return Qnil;
 }
 
@@ -229,11 +229,11 @@ static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
 VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
 	_type_ cary[3] = {0,0,0}; \
-	LOAD_GL_FUNC(gl##_name_,"1.4") \
+	LOAD_GL_FUNC(gl##_name_, "1.4"); \
 	Check_Type(arg1,T_ARRAY); \
 	_conv_(arg1,cary,3); \
 	fptr_gl##_name_(cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 
@@ -256,7 +256,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLint size;
 	GLenum type;
 	GLsizei stride;
-	LOAD_GL_FUNC(glSecondaryColorPointer,"1.4")
+	LOAD_GL_FUNC(glSecondaryColorPointer, "1.4");
 	size = (GLint)NUM2INT(arg1);
 	type = (GLenum)NUM2INT(arg2);
 	stride = (GLsizei)NUM2UINT(arg3);
@@ -270,7 +270,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 		g_SecondaryColor_ptr = data;
 		fptr_glSecondaryColorPointer(size,type, stride, (const GLvoid*)RSTRING_PTR(data));
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glSecondaryColorPointer");
 	return Qnil;
 }
 
@@ -279,11 +279,11 @@ static void (APIENTRY * fptr_gl##_name_)(_type_ *); \
 VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
 	_type_ cary[3] = {0,0,0}; \
-	LOAD_GL_FUNC(gl##_name_,"1.4") \
+	LOAD_GL_FUNC(gl##_name_, "1.4"); \
 	Check_Type(arg1,T_ARRAY); \
 	_conv_(arg1,cary,_size_); \
 	fptr_gl##_name_(cary); \
-	CHECK_GLERROR \
+	CHECK_GLERROR_FROM("gl" #_name_); \
 	return Qnil; \
 }
 

data/ext/{gl → opengl}/gl-1.5.c

@@ -13,19 +13,19 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "../common/common.h"
+#include "common.h"
 
 /* OpenGL 1.5 functions */
 
-GL_FUNC_LOAD_1(EndQuery,GLvoid, GLenum, "1.5")
-GL_FUNC_LOAD_1(IsQuery,GLboolean, GLuint, "1.5")
-GL_FUNC_LOAD_2(BeginQuery,GLvoid, GLenum,GLuint, "1.5")
-GL_FUNC_LOAD_2(BindBuffer,GLvoid, GLenum,GLuint, "1.5")
-GL_FUNC_LOAD_1(IsBuffer,GLboolean, GLuint, "1.5")
-GL_FUNC_GENOBJECTS_LOAD(GenQueries,"1.5")
-GL_FUNC_DELETEOBJECTS_LOAD(DeleteQueries,"1.5")
-GL_FUNC_GENOBJECTS_LOAD(GenBuffers,"1.5")
-GL_FUNC_DELETEOBJECTS_LOAD(DeleteBuffers,"1.5")
+GL_FUNC_LOAD_1(EndQuery,GLvoid, GLenum, "1.5");
+GL_FUNC_LOAD_1(IsQuery,GLboolean, GLuint, "1.5");
+GL_FUNC_LOAD_2(BeginQuery,GLvoid, GLenum,GLuint, "1.5");
+GL_FUNC_LOAD_2(BindBuffer,GLvoid, GLenum,GLuint, "1.5");
+GL_FUNC_LOAD_1(IsBuffer,GLboolean, GLuint, "1.5");
+GL_FUNC_GENOBJECTS_LOAD(GenQueries, "1.5");
+GL_FUNC_DELETEOBJECTS_LOAD(DeleteQueries, "1.5");
+GL_FUNC_GENOBJECTS_LOAD(GenBuffers, "1.5");
+GL_FUNC_DELETEOBJECTS_LOAD(DeleteBuffers, "1.5");
 
 static void (APIENTRY * fptr_glGetQueryiv)(GLenum,GLenum,GLint *);
 static VALUE
@@ -35,11 +35,11 @@ VALUE obj,arg1,arg2;
 	GLenum target;
 	GLenum pname;
 	GLint params = 0;
-	LOAD_GL_FUNC(glGetQueryiv,"1.5")
+	LOAD_GL_FUNC(glGetQueryiv, "1.5");
 	target = (GLenum)NUM2INT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetQueryiv(target,pname,&params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetQueryiv");
 	return RETCONV_GLint(params);
 }
 
@@ -51,11 +51,11 @@ VALUE obj,arg1,arg2;
 	GLuint id;
 	GLenum pname;
 	GLint params = 0;
-	LOAD_GL_FUNC(glGetQueryObjectiv,"1.5")
+	LOAD_GL_FUNC(glGetQueryObjectiv, "1.5");
 	id = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetQueryObjectiv(id,pname,&params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetQueryObjectiv");
 	return cond_GLBOOL2RUBY(pname,params);
 }
 
@@ -67,11 +67,11 @@ VALUE obj,arg1,arg2;
 	GLuint id;
 	GLenum pname;
 	GLuint params = 0;
-	LOAD_GL_FUNC(glGetQueryObjectuiv,"1.5")
+	LOAD_GL_FUNC(glGetQueryObjectuiv, "1.5");
 	id = (GLuint)NUM2UINT(arg1);
 	pname = (GLenum)NUM2INT(arg2);
 	fptr_glGetQueryObjectuiv(id,pname,&params);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetQueryObjectuiv");
 	return cond_GLBOOL2RUBY_U(pname,params);
 }
 
@@ -83,7 +83,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLenum target;
 	GLsizeiptr size;
 	GLenum usage;
-	LOAD_GL_FUNC(glBufferData,"1.5")
+	LOAD_GL_FUNC(glBufferData, "1.5");
 	target = (GLenum)NUM2INT(arg1);
 	size = (GLsizeiptr)NUM2INT(arg2);
 	usage = (GLenum)NUM2INT(arg4);
@@ -92,9 +92,9 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	} else if (NIL_P(arg3)) {
 		fptr_glBufferData(target,size,NULL,usage);
 	} else {
-		Check_Type(arg3,T_STRING); /* force exception */
+		Check_Type(arg3,T_STRING); /* force exception - HACK do it right */
 	}
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glBufferData");
 	return Qnil;
 }
 
@@ -106,13 +106,13 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLenum target;
 	GLintptr offset;
 	GLsizeiptr size;
-	LOAD_GL_FUNC(glBufferSubData,"1.5")
+	LOAD_GL_FUNC(glBufferSubData, "1.5");
 	target = (GLenum)NUM2INT(arg1);
 	offset = (GLintptr)NUM2INT(arg2);
 	size = (GLsizeiptr)NUM2INT(arg3);
 	Check_Type(arg4,T_STRING);
 	fptr_glBufferSubData(target,offset,size,(GLvoid *)RSTRING_PTR(arg4));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glBufferSubData");
 	return Qnil;
 }
 
@@ -125,13 +125,13 @@ VALUE obj,arg1,arg2,arg3;
 	GLintptr offset;
 	GLsizeiptr size;
 	VALUE data;
-	LOAD_GL_FUNC(glGetBufferSubData,"1.5")
+	LOAD_GL_FUNC(glGetBufferSubData, "1.5");
 	target = (GLenum)NUM2INT(arg1);
 	offset = (GLintptr)NUM2INT(arg2);
 	size = (GLsizeiptr)NUM2INT(arg3);
 	data = allocate_buffer_with_string((long)size);
 	fptr_glGetBufferSubData(target,offset,size,(GLvoid *)RSTRING_PTR(data));
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetBufferSubData");
 	return data;
 }
 
@@ -143,37 +143,36 @@ VALUE obj,arg1,arg2;
 	GLenum target;
 	GLenum value;
 	GLint data = 0;
-	LOAD_GL_FUNC(glGetBufferParameteriv,"1.5")
+	LOAD_GL_FUNC(glGetBufferParameteriv, "1.5");
 	target = (GLenum)NUM2INT(arg1);
 	value = (GLenum)NUM2INT(arg2);
 	fptr_glGetBufferParameteriv(target,value,&data);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetBufferParameteriv");
 	return cond_GLBOOL2RUBY(value,data);
 }
 
 static GLvoid * (APIENTRY * fptr_glMapBuffer)(GLenum,GLenum);
 static VALUE
-gl_MapBuffer(obj,arg1,arg2)
-VALUE obj,arg1,arg2;
-{
-	GLenum target;
-	GLenum access;
+gl_MapBuffer(VALUE self, VALUE _target, VALUE _access) {
+	GLenum target = CONV_GLenum(_target);
+	GLenum access = CONV_GLenum(_access);
 	GLint size = 0;
-	VALUE data;
 	GLvoid *buffer_ptr = NULL;
-	LOAD_GL_FUNC(glMapBuffer,"1.5")
-	LOAD_GL_FUNC(glGetBufferParameteriv,"1.5")
-	target = (GLenum)NUM2INT(arg1);
-	access = (GLenum)NUM2INT(arg2);
-	fptr_glGetBufferParameteriv(target,GL_BUFFER_SIZE,&size);
-	CHECK_GLERROR
-	buffer_ptr = fptr_glMapBuffer(target,access);
-	CHECK_GLERROR
-	if (buffer_ptr==NULL || size<=0)
+
+	LOAD_GL_FUNC(glMapBuffer, "1.5");
+	LOAD_GL_FUNC(glGetBufferParameteriv, "1.5");
+
+	fptr_glGetBufferParameteriv(target, GL_BUFFER_SIZE, &size);
+	CHECK_GLERROR_FROM("glGetBufferParameteriv");
+
+	buffer_ptr = fptr_glMapBuffer(target, access);
+	CHECK_GLERROR_FROM("glMapBuffer");
+
+	/* fail late to avoid GL_INVALID_OPERATION from glUnampBuffer */
+	if (buffer_ptr == NULL || size <= 0)
 		return Qnil;
-	data = allocate_buffer_with_string(size);
-	memcpy(RSTRING_PTR(data), buffer_ptr, size);
-	return data;
+
+  return rb_str_new(buffer_ptr, size);
 }
 
 static GLboolean (APIENTRY * fptr_glUnmapBuffer)(GLenum);
@@ -183,10 +182,10 @@ VALUE obj,arg1;
 {
 	GLenum target;
 	GLboolean ret;
-	LOAD_GL_FUNC(glUnmapBuffer,"1.5")
+	LOAD_GL_FUNC(glUnmapBuffer, "1.5");
 	target = (GLenum)NUM2INT(arg1);
 	ret = fptr_glUnmapBuffer(target);
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glUnmapBuffer");
 	return GLBOOL2RUBY(ret);
 }
 
@@ -195,9 +194,9 @@ static VALUE
 gl_GetBufferPointerv(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
-	LOAD_GL_FUNC(glGetBufferPointerv,"1.5")
+	LOAD_GL_FUNC(glGetBufferPointerv, "1.5");
 	rb_raise(rb_eArgError, "glGetBufferPointerv not implemented");
-	CHECK_GLERROR
+	CHECK_GLERROR_FROM("glGetBufferPointerv");
 	return Qnil;
 }