summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/arrayobj.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-06-26 14:47:19 -0600
committerBrian Paul <[email protected]>2012-06-27 07:50:57 -0600
commit8459f4a63aec97847b0e3957ffb82beff94035fa (patch)
treed3bdc54df9630fe0a6a451e9818a53bacab2e94a /src/mesa/main/arrayobj.c
parentdcf1dafa9ec93f9300ecffe5bddfd2b131bc218f (diff)
mesa: make _mesa_reference_array_object() an inline function
As we do for texture objects, buffer objects, etc.
Diffstat (limited to 'src/mesa/main/arrayobj.c')
-rw-r--r--src/mesa/main/arrayobj.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 4c50066de0b..3439ab6b5c1 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -123,14 +123,15 @@ _mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )
/**
* Set ptr to arrayObj w/ reference counting.
+ * Note: this should only be called from the _mesa_reference_array_object()
+ * inline function.
*/
void
-_mesa_reference_array_object(struct gl_context *ctx,
- struct gl_array_object **ptr,
- struct gl_array_object *arrayObj)
+_mesa_reference_array_object_(struct gl_context *ctx,
+ struct gl_array_object **ptr,
+ struct gl_array_object *arrayObj)
{
- if (*ptr == arrayObj)
- return;
+ assert(*ptr != arrayObj);
if (*ptr) {
/* Unreference the old array object */