From: Kenneth Graunke <[email protected]> Curro is planning to eliminate p->compressed, so let's avoid using it here and just pass in the value directly.
Signed-off-by: Kenneth Graunke <[email protected]> [ Francisco Jerez: Pass boolean flag instead of brw_compression enum. ] Reviewed-by: Francisco Jerez <[email protected]> --- src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp index f52664a..d74878e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -54,8 +54,7 @@ brw_file_from_reg(fs_reg *reg) } static struct brw_reg -brw_reg_from_fs_reg(const struct brw_codegen *p, - fs_inst *inst, fs_reg *reg, unsigned gen) +brw_reg_from_fs_reg(fs_inst *inst, fs_reg *reg, unsigned gen, bool compressed) { struct brw_reg brw_reg; @@ -66,7 +65,7 @@ brw_reg_from_fs_reg(const struct brw_codegen *p, case VGRF: if (reg->stride == 0) { brw_reg = brw_vec1_reg(brw_file_from_reg(reg), reg->nr, 0); - } else if (!p->compressed && + } else if (!compressed && inst->exec_size * reg->stride * type_sz(reg->type) <= 32) { brw_reg = brw_vecn_reg(inst->exec_size, brw_file_from_reg(reg), reg->nr, 0); @@ -1588,7 +1587,8 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) brw_set_default_group(p, inst->force_sechalf ? 8 : 0); for (unsigned int i = 0; i < inst->sources; i++) { - src[i] = brw_reg_from_fs_reg(p, inst, &inst->src[i], devinfo->gen); + src[i] = brw_reg_from_fs_reg(inst, &inst->src[i], devinfo->gen, + p->compressed); /* The accumulator result appears to get used for the * conditional modifier generation. When negating a UD @@ -1600,7 +1600,8 @@ fs_generator::generate_code(const cfg_t *cfg, int dispatch_width) inst->src[i].type != BRW_REGISTER_TYPE_UD || !inst->src[i].negate); } - dst = brw_reg_from_fs_reg(p, inst, &inst->dst, devinfo->gen); + dst = brw_reg_from_fs_reg(inst, &inst->dst, devinfo->gen, + p->compressed); brw_set_default_access_mode(p, BRW_ALIGN_1); brw_set_default_predicate_control(p, inst->predicate); -- 2.7.3 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
