Mesa (mesa_7_5_branch): mesa: fix saturation logic in emit_texenv()

[Brian Paul]

Module: Mesa
Branch: mesa_7_5_branch
Commit: 2241665dc6d77a992edfc49a9d9d9ed8d1b52e60
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2241665dc6d77a992edfc49a9d9d9ed8d1b52e60

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 31 11:14:16 2009 -0600

mesa: fix saturation logic in emit_texenv()

We need to clamp/saturate after each texenv stage, not just the last one.
Fixes glean texEnv failure for softpipe (and probably other fragment program-
based drivers).

---

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

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3ff3005..050a3a9 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1097,7 +1097,7 @@ static struct ureg
 emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 {
    struct state_key *key = p->state;
-   GLboolean saturate = (unit < p->last_tex_stage);
+   GLboolean saturate;
    GLuint rgb_shift, alpha_shift;
    struct ureg out, shift;
    struct ureg dest;
@@ -1125,6 +1125,11 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
       break;
    }
    
+   /* If we'll do rgb/alpha shifting don't saturate in emit_combine().
+    * We don't want to clamp twice.
+    */
+   saturate = !(rgb_shift || alpha_shift);
+
    /* If this is the very last calculation, emit direct to output reg:
     */
    if (key->separate_specular ||
@@ -1173,6 +1178,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    /* Deal with the final shift:
     */
    if (alpha_shift || rgb_shift) {
+      saturate = GL_TRUE;  /* always saturate at this point */
       if (rgb_shift == alpha_shift) {
 	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
       }