i965/fs: Fix Broadwell texture header setup to be uncompressed.

MOV_RAW disables masking, but doesn't force the instruction to be
uncompressed.  That needs to be done by hand.

Fixes textureGather and texture offset tests.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
index e0b52126705cdcad30bcad9acc6533329fe56d02..f9026912b1f737ffbbf2ac48bd5a4bb05c02d744 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
@@ -241,6 +241,9 @@ gen8_fs_generator::generate_tex(fs_inst *ir,
       if (dispatch_width == 16)
          src.nr++;
 
+      unsigned save_exec_size = default_state.exec_size;
+      default_state.exec_size = BRW_EXECUTE_8;
+
       MOV_RAW(src, brw_vec8_grf(0, 0));
 
       if (ir->texture_offset) {
@@ -248,6 +251,8 @@ gen8_fs_generator::generate_tex(fs_inst *ir,
          MOV_RAW(retype(brw_vec1_grf(src.nr, 2), BRW_REGISTER_TYPE_UD),
                  brw_imm_ud(ir->texture_offset));
       }
+
+      default_state.exec_size = save_exec_size;
    }
 
    uint32_t surf_index =