Merge branch 'mesa_7_5_branch'

2 files changed, 6 insertions, 1 deletions

diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 5219119c81..8b3bb5cc03 100644
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -139,7 +139,7 @@ find_translated_vp(struct st_context *st,
          if (fragInputsRead & (1 << inAttr)) {
             stfp->input_to_slot[inAttr] = numIn;
             numIn++;
-            if ((fragInputsRead & FRAG_BIT_FOGC)) {
+            if (((1 << inAttr) & FRAG_BIT_FOGC)) {
                /* leave placeholders for the
                 * extra registers we extract from fog */
                if (stfp->Base.UsesFrontFacing) {
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 8aef3fc6dc..e150dff9bb 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -268,6 +268,11 @@ compile_instruction(
       NULL,
       GL_FALSE );
    fulldst->DstRegister.WriteMask = convert_writemask( inst->DstReg.WriteMask );
+   if (inst->DstReg.RelAddr) {
+      fulldst->DstRegister.Indirect = 1;
+      fulldst->DstRegisterInd.File = TGSI_FILE_ADDRESS;
+      fulldst->DstRegisterInd.Index = 0;
+   }
 
    for (i = 0; i < fullinst->Instruction.NumSrcRegs; i++) {
       GLuint j;