diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-28 08:08:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-28 08:08:21 +0200 |
| commit | 67551627d34fff4a0fbe719bce33a3bacb55ccef (patch) | |
| tree | 37b58281a1186148a56dbb3b9eed6eaf759cbe7b /mesalib/src/mesa/main/arrayobj.c | |
| parent | 7baa3d795c87c11550f1686488c968320428cbf9 (diff) | |
| download | vcxsrv-67551627d34fff4a0fbe719bce33a3bacb55ccef.tar.gz vcxsrv-67551627d34fff4a0fbe719bce33a3bacb55ccef.tar.bz2 vcxsrv-67551627d34fff4a0fbe719bce33a3bacb55ccef.zip | |
xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012
Diffstat (limited to 'mesalib/src/mesa/main/arrayobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/arrayobj.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c index 4c50066de..3439ab6b5 100644 --- a/mesalib/src/mesa/main/arrayobj.c +++ b/mesalib/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 */ |