Merge branch 'mesa_7_5_branch'

1 files changed, 12 insertions, 3 deletions

diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 299aa762c20..5219119c818 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -142,9 +142,18 @@ find_translated_vp(struct st_context *st,
             if ((fragInputsRead & FRAG_BIT_FOGC)) {
                /* leave placeholders for the
                 * extra registers we extract from fog */
-               if (stfp->Base.UsesFrontFacing ||
-                   stfp->Base.UsesPointCoord) {
-                  numIn += 2;
+               if (stfp->Base.UsesFrontFacing) {
+                  if (!stfp->Base.UsesFogFragCoord)
+                     --stfp->input_to_slot[inAttr];
+                  else
+                     ++numIn;
+               }
+               if (stfp->Base.UsesPointCoord) {
+                  if (!stfp->Base.UsesFrontFacing &&
+                      !stfp->Base.UsesFogFragCoord)
+                     stfp->input_to_slot[inAttr] -= 2;
+                  else
+                     ++numIn;
                }
             }
          }