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

[Brian Paul]

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

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

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

The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture.  The fallback texture returning
(0,0,0,1) should only be used with shaders.

Fixes glean fbo test regression.

---

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

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 32d55ba..9664bd5 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -560,10 +560,10 @@ update_texture_state( GLcontext *ctx )
          }
       }
 
-      if (!texUnit->_ReallyEnabled) {
-         /* If we get here it means the shader (or fixed-function state)
-          * is expecting a texture object, but there isn't one (or it's
-          * incomplete).  Use the fallback texture.
+      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;