Mesa (gallium-0.1): mesa: handle vertex program enabled case also in texenvprogram.c

[Keith Whitwell]

Module: Mesa
Branch: gallium-0.1
Commit: 0370d6b359016790c6b879c2a4b6661adac20dea
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0370d6b359016790c6b879c2a4b6661adac20dea

Author: Keith Whitwell <keith at tungstengraphics.com>
Date:   Sat Oct  4 12:41:56 2008 +0100

mesa: handle vertex program enabled case also in texenvprogram.c

---

 src/mesa/main/texenvprogram.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 7cd82f9..ea2ee16 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -204,7 +204,7 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
 {
    GLuint fp_inputs = 0;
 
-   if (1) {
+   if (!ctx->VertexProgram._Enabled) {
       GLuint varying_inputs = ctx->varying_vp_inputs;
 
       /* First look at what values may be computed by the generated
@@ -232,14 +232,13 @@ static GLuint get_fp_input_mask( GLcontext *ctx )
    }
    else {
       /* calculate from vp->outputs */
-      GLuint vp_outputs = 0;
+      GLuint vp_outputs = ctx->VertexProgram._Current->Base.OutputsWritten;
 
       if (vp_outputs & (1 << VERT_RESULT_COL0)) fp_inputs |= FRAG_BIT_COL0;
       if (vp_outputs & (1 << VERT_RESULT_COL1)) fp_inputs |= FRAG_BIT_COL1;
 
-      fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) 
-                   << VERT_RESULT_TEX0) 
-                  >> FRAG_ATTRIB_TEX0);
+      fp_inputs |= (((vp_outputs & VERT_RESULT_TEX_ANY) >> VERT_RESULT_TEX0) 
+                    << FRAG_ATTRIB_TEX0);
    }
    
    return fp_inputs;