summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2010-09-20 08:19:08 -0600
committerBrian Paul <[email protected]>2010-09-20 08:21:00 -0600
commit55228878420733e77a09c67d5175e90e4b2e7245 (patch)
tree9a181fa8547bf5bec3a40b672bcf3c51e64c09cc /src/mesa/main
parente053d62aa573651abdd78666d299272c8219a3aa (diff)
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.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texobj.c7
1 files changed, 2 insertions, 5 deletions
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);