i965: support destination horiz strides in align1 access mode.
authorGary Wong <gtw@gnu.org>
Wed, 29 Oct 2008 23:53:33 +0000 (19:53 -0400)
committerGary Wong <gtw@gnu.org>
Fri, 31 Oct 2008 21:34:32 +0000 (17:34 -0400)
This is required for scatter writes in destination regions to work.

src/mesa/drivers/dri/i965/brw_eu.h
src/mesa/drivers/dri/i965/brw_eu_emit.c

index 207b8b7..8cbe421 100644 (file)
@@ -65,7 +65,7 @@ struct brw_reg
    GLuint abs:1;               /* source only */
    GLuint vstride:4;           /* source only */
    GLuint width:3;             /* src only, align1 only */
-   GLuint hstride:2;                   /* src only, align1 only */
+   GLuint hstride:2;                   /* align1 only */
    GLuint address_mode:1;      /* relative addressing, hopefully! */
    GLuint pad0:1;
 
index 0bfbec9..4605216 100644 (file)
@@ -64,7 +64,7 @@ static void brw_set_dest( struct brw_instruction *insn,
 
       if (insn->header.access_mode == BRW_ALIGN_1) {
         insn->bits1.da1.dest_subreg_nr = dest.subnr;
-        insn->bits1.da1.dest_horiz_stride = BRW_HORIZONTAL_STRIDE_1;
+        insn->bits1.da1.dest_horiz_stride = dest.hstride;
       }
       else {
         insn->bits1.da16.dest_subreg_nr = dest.subnr / 16;
@@ -78,7 +78,7 @@ static void brw_set_dest( struct brw_instruction *insn,
        */
       if (insn->header.access_mode == BRW_ALIGN_1) {
         insn->bits1.ia1.dest_indirect_offset = dest.dw1.bits.indirect_offset;
-        insn->bits1.ia1.dest_horiz_stride = BRW_HORIZONTAL_STRIDE_1;
+        insn->bits1.ia1.dest_horiz_stride = dest.hstride;
       }
       else {
         insn->bits1.ia16.dest_indirect_offset = dest.dw1.bits.indirect_offset;