From: Eric Anholt <eric@anholt.net>
Date: Tue, 17 May 2011 16:11:38 +0000 (-0700)
Subject: i965: Move prepare_wm_surfaces texobj declarations inside of _ReallyEnabled.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d1946f53482a5a490a1da86d9bf9a3e2e866c0c4;p=mesa.git

i965: Move prepare_wm_surfaces texobj declarations inside of _ReallyEnabled.

Interestingly, the compiler wasn't doing this for us at -O2, so we
were doing the computation for every non-_ReallyEnabled unit.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index de1953ed600..a3111768d62 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -558,10 +558,11 @@ prepare_wm_surfaces(struct brw_context *brw)
 
    for (i = 0; i < BRW_MAX_TEX_UNIT; i++) {
       const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
-      struct gl_texture_object *tObj = texUnit->_Current;
-      struct intel_texture_object *intelObj = intel_texture_object(tObj);
 
       if (texUnit->_ReallyEnabled) {
+	 struct gl_texture_object *tObj = texUnit->_Current;
+	 struct intel_texture_object *intelObj = intel_texture_object(tObj);
+
 	 brw_add_validated_bo(brw, intelObj->mt->region->buffer);
 	 nr_surfaces = SURF_INDEX_TEXTURE(i) + 1;
       }