OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: fix implicit fallthrough warnings

Browse Source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5705>
This commit is contained in:
Timothy Arceri
2020-07-01 15:00:59 +10:00
committed by Marge Bot
parent 31dcc173b1
commit dbf016e259
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/nir/nir.c
View File

@@ -1609,8 +1609,8 @@ nir_block_cf_tree_next(nir_block *block)
return nir_if_first_else_block(if_stmt); return nir_if_first_else_block(if_stmt);
assert(block == nir_if_last_else_block(if_stmt)); assert(block == nir_if_last_else_block(if_stmt));
/* fall through */
} }
/* fallthrough */
case nir_cf_node_loop: case nir_cf_node_loop:
return nir_cf_node_as_block(nir_cf_node_next(parent)); return nir_cf_node_as_block(nir_cf_node_next(parent));
@@ -1645,8 +1645,8 @@ nir_block_cf_tree_prev(nir_block *block)
return nir_if_last_then_block(if_stmt); return nir_if_last_then_block(if_stmt);
assert(block == nir_if_first_then_block(if_stmt)); assert(block == nir_if_first_then_block(if_stmt));
/* fall through */
} }
/* fallthrough */
case nir_cf_node_loop: case nir_cf_node_loop:
return nir_cf_node_as_block(nir_cf_node_prev(parent)); return nir_cf_node_as_block(nir_cf_node_prev(parent));

2
src/compiler/nir/nir_gather_info.c
View File

@@ -301,7 +301,7 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader,
case nir_intrinsic_demote: case nir_intrinsic_demote:
case nir_intrinsic_demote_if: case nir_intrinsic_demote_if:
shader->info.fs.uses_demote = true; shader->info.fs.uses_demote = true;
/* fallthrough: quads with helper lanes only might be discarded entirely */ /* fallthrough - quads with helper lanes only might be discarded entirely */
case nir_intrinsic_discard: case nir_intrinsic_discard:
case nir_intrinsic_discard_if: case nir_intrinsic_discard_if:
/* Freedreno uses the discard_if intrinsic to end GS invocations that /* Freedreno uses the discard_if intrinsic to end GS invocations that

1
src/compiler/nir/nir_lower_phis_to_scalar.c
View File

@@ -109,6 +109,7 @@ is_phi_src_scalarizable(nir_phi_src *src,
break; break;
} }
} }
/* fallthrough */
default: default:
/* We can't scalarize this type of instruction */ /* We can't scalarize this type of instruction */

13
src/compiler/nir/nir_opt_gcm.c
View File

@@ -162,6 +162,8 @@ is_src_scalarizable(nir_src *src)
default: default:
break; break;
} }
return false;
} }
default: default:
@@ -199,11 +201,12 @@ gcm_pin_instructions(nir_function_impl *impl, struct gcm_state *state)
instr->pass_flags = GCM_INSTR_SCHEDULE_EARLIER_ONLY; instr->pass_flags = GCM_INSTR_SCHEDULE_EARLIER_ONLY;
break; break;
case nir_op_mov: case nir_op_mov:
if (!is_src_scalarizable(&(nir_instr_as_alu(instr)->src[0].src))) { if (!is_src_scalarizable(&(nir_instr_as_alu(instr)->src[0].src))) {
instr->pass_flags = GCM_INSTR_PINNED; instr->pass_flags = GCM_INSTR_PINNED;
break; break;
} }
/* fallthrough */
default: default:
instr->pass_flags = 0; instr->pass_flags = 0;

2
src/compiler/nir/nir_to_lcssa.c
View File

@@ -178,8 +178,8 @@ instr_is_invariant(nir_instr *instr, nir_loop *loop)
nir_intrinsic_instr *intrinsic = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *intrinsic = nir_instr_as_intrinsic(instr);
if (!(nir_intrinsic_infos[intrinsic->intrinsic].flags & NIR_INTRINSIC_CAN_REORDER)) if (!(nir_intrinsic_infos[intrinsic->intrinsic].flags & NIR_INTRINSIC_CAN_REORDER))
return not_invariant; return not_invariant;
/* fallthrough */
} }
/* fallthrough */
default: default:
return nir_foreach_src(instr, src_is_invariant, loop) ? invariant : not_invariant; return nir_foreach_src(instr, src_is_invariant, loop) ? invariant : not_invariant;
} }