always set destination horiz stride for Align16 to 1 on Sandybridge.

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>

diff --git a/assembler/src/brw_structs.h b/assembler/src/brw_structs.h
index ba20547..32a52df 100644 (file)
--- a/assembler/src/brw_structs.h
+++ b/assembler/src/brw_structs.h
@@ -1102,7 +1102,7 @@ struct brw_instruction
         GLuint dest_writemask:4;
         GLuint dest_subreg_nr:1;
         GLuint dest_reg_nr:8;
-        GLuint pad1:2;
+        GLuint dest_horiz_stride:2;
         GLuint dest_address_mode:1;
       } da16;
 
@@ -1116,7 +1116,7 @@ struct brw_instruction
         GLuint dest_writemask:4;
         GLint dest_indirect_offset:6;
         GLuint dest_subreg_nr:3;
-        GLuint pad1:2;
+        GLuint dest_horiz_stride:2;
         GLuint dest_address_mode:1;
       } ia16;
    } bits1;

diff --git a/assembler/src/gram.y b/assembler/src/gram.y
index 438559a..f57e97c 100644 (file)
--- a/assembler/src/gram.y
+++ b/assembler/src/gram.y
@@ -1668,6 +1668,7 @@ int set_instruction_dest(struct brw_instruction *instr,
                instr->bits1.da16.dest_subreg_nr = dest->subreg_nr;
                instr->bits1.da16.dest_reg_nr = dest->reg_nr;
                instr->bits1.da16.dest_address_mode = dest->address_mode;
+               instr->bits1.da16.dest_horiz_stride = 1;
                instr->bits1.da16.dest_writemask = dest->writemask;
        } else if (instr->header.access_mode == BRW_ALIGN_1) {
                instr->bits1.ia1.dest_reg_file = dest->reg_file;
@@ -1687,6 +1688,7 @@ int set_instruction_dest(struct brw_instruction *instr,
                instr->bits1.ia16.dest_subreg_nr = dest->address_subreg_nr;
                instr->bits1.ia16.dest_writemask = dest->writemask;
                instr->bits1.ia16.dest_indirect_offset = dest->indirect_offset;
+               instr->bits1.ia16.dest_horiz_stride = 1;
                instr->bits1.ia16.dest_address_mode = dest->address_mode;
        }