i965/fs: Remove unneeded uses of force_uncompressed

Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Matt Turner <[email protected]>

3 files changed, 9 insertions, 25 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h
index cd50da4883b..8953ce83487 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit_eu.h
@@ -92,9 +92,7 @@ protected:
 
    inline void emit_mov_8(const struct brw_reg& dst, const struct brw_reg& src)
    {
-      fs_inst *mv = new (mem_ctx) fs_inst(BRW_OPCODE_MOV, 8, dst, src);
-      mv->force_uncompressed = true;
-      insts.push_tail(mv);
+      insts.push_tail(new (mem_ctx) fs_inst(BRW_OPCODE_MOV, 8, dst, src));
    }
 
    inline void emit_and(const struct brw_reg& dst,
@@ -115,9 +113,7 @@ protected:
                           const struct brw_reg& src1,
                           const struct brw_reg& src2)
    {
-      fs_inst *add = new (mem_ctx) fs_inst(BRW_OPCODE_ADD, 8, dst, src1, src2);
-      add->force_uncompressed = true;
-      insts.push_tail(add);
+      insts.push_tail(new (mem_ctx) fs_inst(BRW_OPCODE_ADD, 8, dst, src1, src2));
    }
 
    inline void emit_mul(const struct brw_reg& dst,
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 73d4916e56d..0fe9cdd86e4 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -463,7 +463,6 @@ fs_visitor::DEP_RESOLVE_MOV(int grf)
     * dependencies, and to avoid having to deal with aligning its regs to 2.
     */
    inst->exec_size = 8;
-   inst->force_uncompressed = true;
 
    return inst;
 }
@@ -688,7 +687,6 @@ fs_visitor::get_timestamp()
     * even if it's not enabled in the dispatch.
     */
    mov->force_writemask_all = true;
-   mov->force_uncompressed = true;
    mov->exec_size = 8;
 
    /* The caller wants the low 32 bits of the timestamp.  Since it's running
@@ -1450,7 +1448,6 @@ fs_visitor::compute_sample_position(fs_reg dst, fs_reg int_sample_pos)
 fs_reg *
 fs_visitor::emit_samplepos_setup()
 {
-   fs_inst *inst;
    assert(brw->gen >= 6);
 
    this->current_annotation = "compute sample position";
@@ -1477,11 +1474,9 @@ fs_visitor::emit_samplepos_setup()
    if (dispatch_width == 8) {
       emit(MOV(int_sample_x, fs_reg(sample_pos_reg)));
    } else {
-      inst = emit(MOV(half(int_sample_x, 0), fs_reg(sample_pos_reg)));
-      inst->force_uncompressed = true;
-      inst = emit(MOV(half(int_sample_x, 1),
-                      fs_reg(suboffset(sample_pos_reg, 16))));
-      inst->force_sechalf = true;
+      emit(MOV(half(int_sample_x, 0), fs_reg(sample_pos_reg)));
+      emit(MOV(half(int_sample_x, 1), fs_reg(suboffset(sample_pos_reg, 16))))
+         ->force_sechalf = true;
    }
    /* Compute gl_SamplePosition.x */
    compute_sample_position(pos, int_sample_x);
@@ -1489,12 +1484,10 @@ fs_visitor::emit_samplepos_setup()
    if (dispatch_width == 8) {
       emit(MOV(int_sample_y, fs_reg(suboffset(sample_pos_reg, 1))));
    } else {
-      inst = emit(MOV(half(int_sample_y, 0),
-                      fs_reg(suboffset(sample_pos_reg, 1))));
-      inst->force_uncompressed = true;
-      inst = emit(MOV(half(int_sample_y, 1),
-                      fs_reg(suboffset(sample_pos_reg, 17))));
-      inst->force_sechalf = true;
+      emit(MOV(half(int_sample_y, 0),
+               fs_reg(suboffset(sample_pos_reg, 1))));
+      emit(MOV(half(int_sample_y, 1), fs_reg(suboffset(sample_pos_reg, 17))))
+         ->force_sechalf = true;
    }
    /* Compute gl_SamplePosition.y */
    compute_sample_position(pos, int_sample_y);
@@ -2578,7 +2571,6 @@ fs_visitor::emit_repclear_shader()
    fs_inst *mov = emit(MOV(vec4(brw_message_reg(color_mrf)),
                            fs_reg(UNIFORM, 0, BRW_REGISTER_TYPE_F)));
    mov->force_writemask_all = true;
-   mov->force_uncompressed = true;
 
    fs_inst *write;
    if (key->nr_color_regions == 1) {
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
index 23c371b2736..5822f2293e4 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
@@ -3015,11 +3015,9 @@ fs_visitor::emit_color_write(fs_reg color, int index, int first_color_mrf)
                          color));
 	 inst->saturate = key->clamp_fragment_color;
       } else {
-	 push_force_uncompressed();
 	 inst = emit(MOV(fs_reg(MRF, first_color_mrf + index, color.type),
                          color));
 	 inst->saturate = key->clamp_fragment_color;
-	 pop_force_uncompressed();
 
 	 inst = emit(MOV(fs_reg(MRF, first_color_mrf + index + 4, color.type),
                          half(color, 1)));
@@ -3119,10 +3117,8 @@ fs_visitor::emit_single_fb_write(fs_reg color0, fs_reg color1,
       nr += 2;
 
    if (payload.aa_dest_stencil_reg) {
-      push_force_uncompressed();
       emit(MOV(fs_reg(MRF, nr++),
                fs_reg(brw_vec8_grf(payload.aa_dest_stencil_reg, 0))));
-      pop_force_uncompressed();
    }
 
    prog_data->uses_omask =