From: Brian Paul <brianp@vmware.com>
Date: Mon, 20 Sep 2010 14:19:08 +0000 (-0600)
Subject: mesa: don't call valid_texture_object() in non-debug builds
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55228878420733e77a09c67d5175e90e4b2e7245;p=mesa.git

mesa: don't call valid_texture_object() in non-debug builds

This reverts commit c32bac57ed445e48856d74113364287ed6e5cdd4
and silences the warning differently.

The _mesa_reference_texobj() function is called quite a bit and
we don't want to call valid_texture_object() all the time in non-
debug builds.
---

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index c96226df597..1fedc870285 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -330,11 +330,8 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,
       GLboolean deleteFlag = GL_FALSE;
       struct gl_texture_object *oldTex = *ptr;
 
-      {
-         GLboolean valid = valid_texture_object(oldTex);
-         ASSERT(valid);
-         (void) valid;
-      }
+      ASSERT(valid_texture_object(oldTex));
+      (void) valid_texture_object; /* silence warning in release builds */
 
       _glthread_LOCK_MUTEX(oldTex->Mutex);
       ASSERT(oldTex->RefCount > 0);