Module: Mesa Branch: master Commit: 3f4325e44b2a7eda0012577291ef63417fa044c6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f4325e44b2a7eda0012577291ef63417fa044c6
Author: Christian Gmeiner <[email protected]> Date: Tue Dec 1 12:17:13 2020 +0100 etnaviv: update fallthrough comments Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Lucas Stach <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7849> --- src/gallium/drivers/etnaviv/etnaviv_clear_blit.c | 7 ++++--- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c | 3 ++- src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h | 3 ++- src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c | 3 ++- src/gallium/drivers/etnaviv/etnaviv_format.c | 3 ++- src/gallium/drivers/etnaviv/etnaviv_query_acc_occlusion.c | 5 +++-- src/gallium/drivers/etnaviv/etnaviv_rs.c | 5 +++-- 7 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c index 3ccfc6747b3..e7ac9f1398a 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c +++ b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c @@ -39,6 +39,7 @@ #include "pipe/p_defines.h" #include "pipe/p_state.h" +#include "util/compiler.h" #include "util/u_blitter.h" #include "util/u_inlines.h" #include "util/u_memory.h" @@ -78,13 +79,13 @@ etna_clear_blit_pack_rgba(enum pipe_format format, const union pipe_color_union switch (util_format_get_blocksize(format)) { case 1: uc.ui[0] = uc.ui[0] << 8 | (uc.ui[0] & 0xff); - /* fallthrough */ + FALLTHROUGH; case 2: uc.ui[0] = uc.ui[0] << 16 | (uc.ui[0] & 0xffff); - /* fallthrough */ + FALLTHROUGH; case 4: uc.ui[1] = uc.ui[0]; - /* fallthrough */ + FALLTHROUGH; default: return (uint64_t) uc.ui[1] << 32 | uc.ui[0]; } diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c index 391cc9a44a2..ad3ef0878d0 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.c @@ -41,6 +41,7 @@ #include "compiler/nir/nir_builder.h" #include "tgsi/tgsi_strings.h" +#include "util/compiler.h" #include "util/half_float.h" static bool @@ -852,7 +853,7 @@ lower_alu(struct etna_compile *c, nir_alu_instr *alu) need_mov = vec_dest_has_swizzle(alu, &nir_instr_as_intrinsic(instr)->dest.ssa); break; } - /* fallthrough */ + FALLTHROUGH; default: need_mov = true; } diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h index 2ad004d85e0..a44710704ae 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir.h @@ -30,6 +30,7 @@ #include "compiler/nir/nir.h" #include "etnaviv_asm.h" #include "etnaviv_compiler.h" +#include "util/compiler.h" struct etna_compile { nir_shader *nir; @@ -144,7 +145,7 @@ real_dest(nir_dest *dest, unsigned *swiz, unsigned *mask) nir_instr_as_alu(p_instr)->op == nir_op_mov) { break; } - /* fallthrough */ + FALLTHROUGH; default: can_bypass_src = false; break; diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c index c10b9a95b70..dbbc9d5a0d1 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c +++ b/src/gallium/drivers/etnaviv/etnaviv_compiler_nir_emit.c @@ -25,6 +25,7 @@ */ #include "etnaviv_compiler_nir.h" +#include "util/compiler.h" /* to map nir srcs should to etna_inst srcs */ enum { @@ -146,7 +147,7 @@ etna_emit_alu(struct etna_compile *c, nir_op op, struct etna_inst_dst dst, case nir_op_fcos: if (c->specs->has_new_transcendentals) inst.tex.amode = 1; - /* fall through */ + FALLTHROUGH; case nir_op_frsq: case nir_op_frcp: case nir_op_fexp2: diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.c b/src/gallium/drivers/etnaviv/etnaviv_format.c index 598e61b5d5d..f95b8b5deac 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_format.c +++ b/src/gallium/drivers/etnaviv/etnaviv_format.c @@ -31,6 +31,7 @@ #include "hw/state_3d.xml.h" #include "pipe/p_defines.h" +#include "util/compiler.h" /* Specifies the table of all the formats and their features. Also supplies * the helpers that look up various data in those tables. @@ -277,7 +278,7 @@ texture_use_int_filter(const struct pipe_sampler_view *sv, case PIPE_TEXTURE_2D_ARRAY: if (tex_desc) break; - /* fallthrough */ + FALLTHROUGH; case PIPE_TEXTURE_3D: return false; default: diff --git a/src/gallium/drivers/etnaviv/etnaviv_query_acc_occlusion.c b/src/gallium/drivers/etnaviv/etnaviv_query_acc_occlusion.c index 1094053afa4..8c3d5c25331 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_query_acc_occlusion.c +++ b/src/gallium/drivers/etnaviv/etnaviv_query_acc_occlusion.c @@ -26,6 +26,7 @@ * Christian Gmeiner <[email protected]> */ +#include "util/compiler.h" #include "util/u_inlines.h" #include "util/u_memory.h" @@ -47,9 +48,9 @@ occlusion_supports(unsigned query_type) { switch (query_type) { case PIPE_QUERY_OCCLUSION_COUNTER: - /* fallthrough */ + FALLTHROUGH; case PIPE_QUERY_OCCLUSION_PREDICATE: - /* fallthrough */ + FALLTHROUGH; case PIPE_QUERY_OCCLUSION_PREDICATE_CONSERVATIVE: return true; default: diff --git a/src/gallium/drivers/etnaviv/etnaviv_rs.c b/src/gallium/drivers/etnaviv/etnaviv_rs.c index 85387d5b7b8..c47c229a7a6 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_rs.c +++ b/src/gallium/drivers/etnaviv/etnaviv_rs.c @@ -39,6 +39,7 @@ #include "pipe/p_defines.h" #include "pipe/p_state.h" +#include "util/compiler.h" #include "util/u_blitter.h" #include "util/u_inlines.h" #include "util/u_memory.h" @@ -516,14 +517,14 @@ etna_compute_tileoffset(const struct pipe_box *box, enum pipe_format format, break; case ETNA_LAYOUT_MULTI_TILED: y >>= 1; - /* fall-through */ + FALLTHROUGH; case ETNA_LAYOUT_TILED: assert(!(x & 0x03) && !(y & 0x03)); offset = (y & ~0x03) * stride + blocksize * ((x & ~0x03) << 2); break; case ETNA_LAYOUT_MULTI_SUPERTILED: y >>= 1; - /* fall-through */ + FALLTHROUGH; case ETNA_LAYOUT_SUPER_TILED: assert(!(x & 0x3f) && !(y & 0x3f)); offset = (y & ~0x3f) * stride + blocksize * ((x & ~0x3f) << 6); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
