fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965/fs: Pass the compression mode to brw_reg_from_fs_reg().

Browse source 
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 <kenneth@whitecape.org>
[ Francisco Jerez: Pass boolean flag instead of brw_compression enum. ]
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke 2016-05-18 19:02:45 -07:00 • committed by Francisco Jerez
parent 3340a66fce
commit dabaf4fb96
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/mesa/drivers/dri/i965/brw_fs_generator.cpp
View file

@ -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);
@ -1593,7 +1592,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
@ -1605,7 +1605,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);