aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/texobj.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-07-15 11:25:17 +0200
committermarha <marha@users.sourceforge.net>2011-07-15 11:25:17 +0200
commit2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (patch)
tree7001b0332aba46855f1d01d7ef8ed80d134453a9 /mesalib/src/mesa/main/texobj.c
parentd03a5f20114203fd00e0004659fd2617f4c03a32 (diff)
downloadvcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.gz
vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.tar.bz2
vcxsrv-2ce12f084113a0097fa1a0d67e2f8fe1ab70092b.zip
xserver libX11 mesa git update 15 July
Diffstat (limited to 'mesalib/src/mesa/main/texobj.c')
-rw-r--r--mesalib/src/mesa/main/texobj.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 0e84b8744..3021716a0 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -325,16 +325,14 @@ valid_texture_object(const struct gl_texture_object *tex)
* Reference (or unreference) a texture object.
* If '*ptr', decrement *ptr's refcount (and delete if it becomes zero).
* If 'tex' is non-null, increment its refcount.
+ * This is normally only called from the _mesa_reference_texobj() macro
+ * when there's a real pointer change.
*/
void
-_mesa_reference_texobj(struct gl_texture_object **ptr,
- struct gl_texture_object *tex)
+_mesa_reference_texobj_(struct gl_texture_object **ptr,
+ struct gl_texture_object *tex)
{
assert(ptr);
- if (*ptr == tex) {
- /* no change */
- return;
- }
if (*ptr) {
/* Unreference the old texture */