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

i965: Move up fs_inst::flag_subreg to backend_instruction.

Browse source 
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Francisco Jerez 2015-02-06 01:28:12 +02:00
parent 639696aa05
commit dfe957c02b
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/drivers/dri/i965/brw_ir_fs.h
View file

@ -239,11 +239,6 @@ public:
*/
uint8_t exec_size;
/* Chooses which flag subregister (f0.0 or f0.1) is used for conditional
* mod and predication.
*/
uint8_t flag_subreg;
bool eot:1;
bool force_uncompressed:1;
bool force_sechalf:1;

5
src/mesa/drivers/dri/i965/brw_shader.h
View file

@ -135,6 +135,11 @@ struct backend_instruction {
bool saturate:1;
bool shadow_compare:1;
bool header_present:1;
/* Chooses which flag subregister (f0.0 or f0.1) is used for conditional
* mod and predication.
*/
unsigned flag_subreg:1;
};
#ifdef __cplusplus

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

@ -1283,13 +1283,20 @@ vec4_visitor::dump_instruction(backend_instruction *be_inst, FILE *file)
vec4_instruction *inst = (vec4_instruction *)be_inst;
if (inst->predicate) {
fprintf(file, "(%cf0) ",
inst->predicate_inverse ? '-' : '+');
fprintf(file, "(%cf0.%d) ",
inst->predicate_inverse ? '-' : '+',
inst->flag_subreg);
}
fprintf(file, "%s", brw_instruction_name(inst->opcode));
if (inst->conditional_mod) {
fprintf(file, "%s", conditional_modifier[inst->conditional_mod]);
if (!inst->predicate &&
(brw->gen < 5 || (inst->opcode != BRW_OPCODE_SEL &&
inst->opcode != BRW_OPCODE_IF &&
inst->opcode != BRW_OPCODE_WHILE))) {
fprintf(file, ".f0.%d", inst->flag_subreg);
}
}
fprintf(file, " ");

1
src/mesa/drivers/dri/i965/brw_vec4_generator.cpp
View file

@ -1167,6 +1167,7 @@ vec4_generator::generate_code(const cfg_t *cfg)
brw_set_default_predicate_control(p, inst->predicate);
brw_set_default_predicate_inverse(p, inst->predicate_inverse);
brw_set_default_flag_reg(p, 0, inst->flag_subreg);
brw_set_default_saturate(p, inst->saturate);
brw_set_default_mask_control(p, inst->force_writemask_all);
brw_set_default_acc_write_control(p, inst->writes_accumulator);

1
src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp
View file

@ -49,6 +49,7 @@ vec4_instruction::vec4_instruction(enum opcode opcode, const dst_reg &dst,
this->ir = NULL;
this->urb_write_flags = BRW_URB_WRITE_NO_FLAGS;
this->header_present = false;
this->flag_subreg = 0;
this->mlen = 0;
this->base_mrf = 0;
this->offset = 0;