wipcs-33

3 files changed, 12 insertions, 10 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index fcf260548e..ce9f1d17cc 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -1302,11 +1302,11 @@ fs_visitor::emit_cs_local_invocation_id_setup()
    struct brw_reg src =
       brw_vec8_grf(payload.local_invocation_id_reg, 0);
    src = retype(src, BRW_REGISTER_TYPE_UD);
-   emit(MOV(*reg, src));
+   bld.MOV(*reg, src);
    src.nr += dispatch_width / 8;
-   emit(MOV(offset(*reg, 1), src));
+   bld.MOV(offset(*reg, 1), src);
    src.nr += dispatch_width / 8;
-   emit(MOV(offset(*reg, 2), src));
+   bld.MOV(offset(*reg, 2), src);
 
    return reg;
 }
@@ -1322,9 +1322,9 @@ fs_visitor::emit_cs_work_group_id_setup()
    struct brw_reg r0_6(retype(brw_vec1_grf(0, 6), BRW_REGISTER_TYPE_UD));
    struct brw_reg r0_7(retype(brw_vec1_grf(0, 7), BRW_REGISTER_TYPE_UD));
 
-   emit(MOV(*reg, r0_1));
-   emit(MOV(offset(*reg, 1), r0_6));
-   emit(MOV(offset(*reg, 2), r0_7));
+   bld.MOV(*reg, r0_1);
+   bld.MOV(offset(*reg, 1), r0_6);
+   bld.MOV(offset(*reg, 2), r0_7);
 
    return reg;
 }
diff --git a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
index 1d99df1909..aafd2f4b3c 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_nir.cpp
@@ -1594,7 +1594,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
       assert(local_invocation_id.file != BAD_FILE);
       dest.type = local_invocation_id.type;
       for (unsigned i = 0; i < 3; i++)
-         emit(MOV(offset(dest, i), offset(local_invocation_id, i)));
+         bld.MOV(offset(dest, i), offset(local_invocation_id, i));
       break;
    }
 
@@ -1603,7 +1603,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
       assert(work_group_id.file != BAD_FILE);
       dest.type = work_group_id.type;
       for (unsigned i = 0; i < 3; i++)
-         emit(MOV(offset(dest, i), offset(work_group_id, i)));
+         bld.MOV(offset(dest, i), offset(work_group_id, i));
       break;
    }
 
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index e3ee7b474a..cbbb2cacd2 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -1944,11 +1944,13 @@ fs_visitor::emit_cs_terminate()
     * make sure it uses the appropriate register range.
     */
    struct brw_reg g0 = retype(brw_vec8_grf(0, 0), BRW_REGISTER_TYPE_UD);
-   fs_reg payload = fs_reg(GRF, alloc.allocate(1), BRW_REGISTER_TYPE_UD);
+   fs_reg payload = fs_reg(GRF, alloc.allocate(dispatch_width / 8),
+                           BRW_REGISTER_TYPE_UD);
    bld.exec_all().MOV(payload, g0);
 
    /* Send a message to the thread spawner to terminate the thread. */
-   fs_inst *inst = bld.emit(CS_OPCODE_CS_TERMINATE, reg_undef, payload);
+   fs_inst *inst = bld.exec_all()
+                      .emit(CS_OPCODE_CS_TERMINATE, reg_undef, payload);
    inst->eot = true;
 }