Mesa (master): Revert "mesa: only use fallback texture when using shaders, not fixed-function"

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue May  5 16:30:30 2009 -0600

Revert "mesa: only use fallback texture when using shaders, not fixed-function"

This reverts commit a0edbfb28fb2e670c657d52190a7e8b1ccf4f46e.

This patch didn't completely fix the problem.  The next patch will.

---

 src/mesa/main/texstate.c |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 5453331..9664bd5 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -560,20 +560,14 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (!texUnit->_ReallyEnabled) {
-         if (fprog) {
-            /* If we get here it means the shader is expecting a texture
-             * object, but there isn't one (or it's incomplete).  Use the
-             * fallback texture.
-             */
-            struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
-            texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
-            _mesa_reference_texobj(&texUnit->_Current, texObj);
-         }
-         else {
-            /* fixed-function: texture unit is really disabled */
-            continue;
-         }
+      if (fprog && !texUnit->_ReallyEnabled) {
+         /* If we get here it means the shader is expecting a texture
+          * object, but there isn't one (or it's incomplete).  Use the
+          * fallback texture.
+          */
+         struct gl_texture_object *texObj = _mesa_get_fallback_texture(ctx);
+         texUnit->_ReallyEnabled = 1 << TEXTURE_2D_INDEX;
+         _mesa_reference_texobj(&texUnit->_Current, texObj);
       }
 
       /* if we get here, we know this texture unit is enabled */