summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-05-10 04:35:09 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-05-10 04:35:09 +0000
commitea31ca47200d96b7cc687989ee7f9953819fddbb (patch)
treef6ecd2c249a274e098346760b0a5fcc3b8d8132a /src/mesa/main
parentbaa42c3364b58a7eaf08856c7d213d9ae0e3b021 (diff)
fix MapBufferARB() return type
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/bufferobj.c10
-rw-r--r--src/mesa/main/bufferobj.h4
2 files changed, 8 insertions, 6 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 3a7a413e973..f3844022195 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -174,11 +174,11 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
}
}
-void
+void *
_mesa_MapBufferARB(GLenum target, GLenum access)
{
GET_CURRENT_CONTEXT(ctx);
- ASSERT_OUTSIDE_BEGIN_END(ctx);
+ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
switch (access) {
case GL_READ_ONLY_ARB:
@@ -188,7 +188,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
- return;
+ return NULL;
}
if (target == GL_ARRAY_BUFFER_ARB) {
@@ -199,8 +199,10 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
}
else {
_mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(target)");
- return;
+ return NULL;
}
+
+ return NULL;
}
GLboolean
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 2617eb0c3e2..3f4cd206211 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -1,4 +1,4 @@
-/* $Id: bufferobj.h,v 1.1 2003/03/29 17:01:00 brianp Exp $ */
+/* $Id: bufferobj.h,v 1.2 2003/05/10 04:35:09 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -51,7 +51,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, co
extern void
_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
-extern void
+extern void *
_mesa_MapBufferARB(GLenum target, GLenum access);
GLboolean