Merge branch 'mesa_7_5_branch'

Conflicts:
	src/mesa/main/dlist.c
	src/mesa/vbo/vbo_save_api.c

1 files changed, 17 insertions, 2 deletions

diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index ee649be885..c02ccc3528 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -137,8 +137,23 @@ find_translated_vp(struct st_context *st,
 
       for (inAttr = 0; inAttr < FRAG_ATTRIB_MAX; inAttr++) {
          if (fragInputsRead & (1 << inAttr)) {
-            stfp->input_to_slot[inAttr] = numIn;
-            numIn++;
+            if ((fragInputsRead & FRAG_BIT_FOGC)) {
+               if (stfp->Base.UsesPointCoord) {
+                  stfp->input_to_slot[inAttr] = numIn;
+                  numIn++;
+               }
+               if (stfp->Base.UsesFrontFacing) {
+                  stfp->input_to_slot[inAttr] = numIn;
+                  numIn++;
+               }
+               if (stfp->Base.UsesFogFragCoord) {
+                  stfp->input_to_slot[inAttr] = numIn;
+                  numIn++;
+               }
+            } else {
+               stfp->input_to_slot[inAttr] = numIn;
+               numIn++;
+            }
          }
          else {
             stfp->input_to_slot[inAttr] = UNUSED;