From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu, 20 Nov 2008 13:44:13 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef2bf418b45c7966e9fe78359058b8d44f570be1;p=mesa.git

Merge commit 'origin/master' into gallium-0.2
---

ef2bf418b45c7966e9fe78359058b8d44f570be1
diff --cc src/mesa/main/texenvprogram.c
index 237ddaa6838,ba7ce4a3cc6..3cb103f51f8
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@@ -301,10 -218,10 +302,12 @@@ static void make_state_key( GLcontext *
        if (!texUnit->_ReallyEnabled || !texUnit->Enabled)
           continue;
  
+       format = texUnit->_Current->Image[0][texUnit->_Current->BaseLevel]->_BaseFormat;
+ 
        key->unit[i].enabled = 1;
        key->enabled_units |= (1<<i);
 +      key->nr_enabled_units = i+1;
 +      inputs_referenced |= FRAG_BIT_TEX(i);
  
        key->unit[i].source_index = 
  	 translate_tex_src_bit(texUnit->_ReallyEnabled);