Mesa (master): main: use inline function wrapper for _mesa_reference_buffer_object()
Brian Paul
brianp at kemper.freedesktop.org
Thu Jul 14 14:16:32 UTC 2011
Module: Mesa
Branch: master
Commit: 6214963c00769a724da8c599c3aee6920f7f6c31
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6214963c00769a724da8c599c3aee6920f7f6c31
Author: Brian Paul <brianp at vmware.com>
Date: Thu Jul 14 08:09:21 2011 -0600
main: use inline function wrapper for _mesa_reference_buffer_object()
---
src/mesa/main/bufferobj.c | 11 +++++------
src/mesa/main/bufferobj.h | 12 +++++++++++-
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 3e28d34..c52358e 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -241,15 +241,14 @@ _mesa_delete_buffer_object(struct gl_context *ctx,
/**
* Set ptr to bufObj w/ reference counting.
+ * This is normally only called from the _mesa_reference_buffer_object() macro
+ * when there's a real pointer change.
*/
void
-_mesa_reference_buffer_object(struct gl_context *ctx,
- struct gl_buffer_object **ptr,
- struct gl_buffer_object *bufObj)
+_mesa_reference_buffer_object_(struct gl_context *ctx,
+ struct gl_buffer_object **ptr,
+ struct gl_buffer_object *bufObj)
{
- if (*ptr == bufObj)
- return;
-
if (*ptr) {
/* Unreference the old buffer */
GLboolean deleteFlag = GL_FALSE;
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 91fa073..f82e414 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -75,9 +75,19 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
GLuint name, GLenum target );
extern void
+_mesa_reference_buffer_object_(struct gl_context *ctx,
+ struct gl_buffer_object **ptr,
+ struct gl_buffer_object *bufObj);
+
+static INLINE void
_mesa_reference_buffer_object(struct gl_context *ctx,
struct gl_buffer_object **ptr,
- struct gl_buffer_object *bufObj);
+ struct gl_buffer_object *bufObj)
+{
+ if (*ptr != bufObj)
+ _mesa_reference_buffer_object_(ctx, ptr, bufObj);
+}
+
extern void
_mesa_init_buffer_object_functions(struct dd_function_table *driver);
More information about the mesa-commit
mailing list