r300: clean fog_attr/wpos_attr if code accessing these attributes has been removed...

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index 61ea5e4d9a35fb5c88fefe56ca20a9279996db0c..0646da46249ea9b5fe36714f0031ff838b03bdb9 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -256,6 +256,19 @@ static void translate_fragment_program(GLcontext *ctx, struct r300_fragment_prog
 
        fp->InputsRead = compiler.Base.Program.InputsRead;
 
+       /* Clear the fog/wpos_attr if code accessing these
+        * attributes has been removed during compilation
+        */
+       if (fp->fog_attr != FRAG_ATTRIB_MAX) {
+               if (!(fp->InputsRead & (1 << fp->fog_attr)))
+                       fp->fog_attr = FRAG_ATTRIB_MAX;
+       }
+
+       if (fp->wpos_attr != FRAG_ATTRIB_MAX) {
+               if (!(fp->InputsRead & (1 << fp->wpos_attr)))
+                       fp->wpos_attr = FRAG_ATTRIB_MAX;
+       }
+
        rc_destroy(&compiler.Base);
 }