Merge remote-tracking branch 'mesa-public/master' into vulkan

This also reverts commit 1d65abfa58 because now NIR handles texture offsets in a much more sane way.
2016-02-10 17:10:19 -08:00
parent 7ef3e47c27 8750299a42
commit f710f3ca37
35 changed files with 435 additions and 381 deletions
@@ -647,20 +647,6 @@ print_tex_instr(nir_tex_instr *instr, print_state *state)
      fprintf(fp, ", ");
   }

-   bool has_nonzero_offset = false;
-   for (unsigned i = 0; i < 4; i++) {
-      if (instr->const_offset[i] != 0) {
-         has_nonzero_offset = true;
-         break;
-      }
-   }
-
-   if (has_nonzero_offset) {
-      fprintf(fp, "[%i %i %i %i] (offset), ",
-              instr->const_offset[0], instr->const_offset[1],
-              instr->const_offset[2], instr->const_offset[3]);
-   }
-
   if (instr->op == nir_texop_tg4) {
      fprintf(fp, "%u (gather_component), ", instr->component);
   }