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

[Brian Paul]

Module: Mesa
Branch: master
Commit: 55228878420733e77a09c67d5175e90e4b2e7245
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=55228878420733e77a09c67d5175e90e4b2e7245

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Sep 20 08:19:08 2010 -0600

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.

---

 src/mesa/main/texobj.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index c96226d..1fedc87 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);