KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lima/ppir: avoid ppir_codegen_outmod implicit conversion 

Fix some clang -Wenum-conversion warnings like:

  warning: implicit conversion from enumeration type 'ppir_outmod' to
  different enumeration type 'ppir_codegen_outmod' [-Wenum-conversion]

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14894>
This commit is contained in:
Erico Nunes 2022-02-05 19:37:49 +01:00 committed by Marge Bot
parent 3d77950b8b
commit 8a8f34c320
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gallium/drivers/lima/ir/pp/codegen.c
View File

@ -198,6 +198,22 @@ static void ppir_codegen_encode_uniform(ppir_node *node, void *code)
}
}
static ppir_codegen_outmod ppir_codegen_get_outmod(ppir_outmod outmod)
{
switch (outmod) {
case ppir_outmod_none:
return ppir_codegen_outmod_none;
case ppir_outmod_clamp_fraction:
return ppir_codegen_outmod_clamp_fraction;
case ppir_outmod_clamp_positive:
return ppir_codegen_outmod_clamp_positive;
case ppir_outmod_round:
return ppir_codegen_outmod_round;
default:
unreachable("invalid ppir_outmod");
}
}
static unsigned shift_to_op(int shift)
{
assert(shift >= -3 && shift <= 3);
@ -217,7 +233,7 @@ static void ppir_codegen_encode_vec_mul(ppir_node *node, void *code)
f->dest = index >> 2;
f->mask = dest->write_mask << dest_shift;
}
f->dest_modifier = dest->modifier;
f->dest_modifier = ppir_codegen_get_outmod(dest->modifier);
switch (node->op) {
case ppir_op_mul:
@ -290,7 +306,7 @@ static void ppir_codegen_encode_scl_mul(ppir_node *node, void *code)
f->dest = ppir_target_get_dest_reg_index(dest) + dest_component;
f->output_en = true;
}
f->dest_modifier = dest->modifier;
f->dest_modifier = ppir_codegen_get_outmod(dest->modifier);
switch (node->op) {
case ppir_op_mul:
@ -356,7 +372,7 @@ static void ppir_codegen_encode_vec_add(ppir_node *node, void *code)
int dest_shift = index & 0x3;
f->dest = index >> 2;
f->mask = dest->write_mask << dest_shift;
f->dest_modifier = dest->modifier;
f->dest_modifier = ppir_codegen_get_outmod(dest->modifier);
switch (node->op) {
case ppir_op_add:
@ -446,7 +462,7 @@ static void ppir_codegen_encode_scl_add(ppir_node *node, void *code)
f->dest = ppir_target_get_dest_reg_index(dest) + dest_component;
f->output_en = true;
f->dest_modifier = dest->modifier;
f->dest_modifier = ppir_codegen_get_outmod(dest->modifier);
switch (node->op) {
case ppir_op_add:
@ -532,7 +548,7 @@ static void ppir_codegen_encode_combine(ppir_node *node, void *code)
int dest_component = ffs(dest->write_mask) - 1;
assert(dest_component >= 0);
f->scalar.dest = ppir_target_get_dest_reg_index(dest) + dest_component;
f->scalar.dest_modifier = dest->modifier;
f->scalar.dest_modifier = ppir_codegen_get_outmod(dest->modifier);
ppir_src *src = alu->src;
f->scalar.arg0_src = get_scl_reg_index(src, dest_component);