fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

i965: Drop IMM fs_reg/src_reg -> brw_reg conversions.

Browse source 
The previous two commits make this unnecessary.

Reviewed-by: Emil Velikov <emil.velikov@collabora.co.uk>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Matt Turner 2015-11-02 12:25:24 -08:00
parent f9a9ba5eac
commit a5b3115f0a
2 changed files with 2 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,39 +89,9 @@ brw_reg_from_fs_reg(fs_inst *inst, fs_reg *reg, unsigned gen)
brw_reg.abs = reg->abs;
brw_reg.negate = reg->negate;
break;
case IMM:
assert(reg->stride == ((reg->type == BRW_REGISTER_TYPE_V ||
reg->type == BRW_REGISTER_TYPE_UV ||
reg->type == BRW_REGISTER_TYPE_VF) ? 1 : 0));
switch (reg->type) {
case BRW_REGISTER_TYPE_F:
brw_reg = brw_imm_f(reg->f);
break;
case BRW_REGISTER_TYPE_D:
brw_reg = brw_imm_d(reg->d);
break;
case BRW_REGISTER_TYPE_UD:
brw_reg = brw_imm_ud(reg->ud);
break;
case BRW_REGISTER_TYPE_W:
brw_reg = brw_imm_w(reg->d);
break;
case BRW_REGISTER_TYPE_UW:
brw_reg = brw_imm_uw(reg->ud);
break;
case BRW_REGISTER_TYPE_VF:
brw_reg = brw_imm_vf(reg->ud);
break;
case BRW_REGISTER_TYPE_V:
brw_reg = brw_imm_v(reg->ud);
break;
default:
unreachable("not reached");
}
break;
case ARF:
case FIXED_GRF:
case IMM:
brw_reg = *static_cast<struct brw_reg *>(reg);
break;
case BAD_FILE:

6
src/mesa/drivers/dri/i965/brw_vec4.cpp
View file

@ -1719,11 +1719,6 @@ vec4_visitor::convert_to_hw_regs()
reg.negate = src.negate;
break;
case IMM:
reg = brw_imm_reg(src.type);
reg.ud = src.ud;
break;
case UNIFORM:
reg = stride(brw_vec4_grf(prog_data->base.dispatch_grf_start_reg +
(src.nr + src.reg_offset) / 2,
@ -1740,6 +1735,7 @@ vec4_visitor::convert_to_hw_regs()
case ARF:
case FIXED_GRF:
case IMM:
continue;
case BAD_FILE: