Fix broken fog.

Note that fogcoord and front-facing attribs are in the same register, in the
X and Y channels, respectively.

1 files changed, 11 insertions, 7 deletions

diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.c b/src/mesa/pipe/softpipe/sp_prim_setup.c
index 722cadc5c0b..7847027caed 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.c
+++ b/src/mesa/pipe/softpipe/sp_prim_setup.c
@@ -554,12 +554,6 @@ static void setup_tri_coefficients( struct setup_stage *setup )
           */
          setup_fragcoord_coeff(setup);
       }
-      else if (fs->input_semantic_name[fragSlot] == TGSI_SEMANTIC_FOG) {
-         /* FOG.y = front/back facing  XXX fix this */
-         setup->coef[fragSlot].a0[1] = 1 - setup->quad.facing;
-         setup->coef[fragSlot].dadx[1] = 0.0;
-         setup->coef[fragSlot].dady[1] = 0.0;
-      }
       else {
 #endif
          uint j;
@@ -578,8 +572,18 @@ static void setup_tri_coefficients( struct setup_stage *setup )
             break;
          default:
             /* invalid interp mode */
-            assert(0);
+            /* assert(0); re-enable this and run demos/fogcoord.c ... */
+            ;
+         }
+
+         if (fs->input_semantic_name[fragSlot] == TGSI_SEMANTIC_FOG) {
+            /* FOG.y = front/back facing  XXX fix this */
+            setup->coef[fragSlot].a0[1] = 1 - setup->quad.facing;
+            setup->coef[fragSlot].dadx[1] = 0.0;
+            setup->coef[fragSlot].dady[1] = 0.0;
          }
+
+
 #if USE_INPUT_MAP
       }
 #endif