Module: Mesa Branch: staging/21.1 Commit: 3d3bb8800aea0c32588eac7ac8a6ec72ef650934 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3d3bb8800aea0c32588eac7ac8a6ec72ef650934
Author: Abel García Dorta <[email protected]> Date: Fri May 14 22:41:50 2021 +0100 i915g: fix implicit fallthrough Closes: #4777 Fixes: 4e861ac4a1f ("i915g: Add more optimizations") Fixes: f34fd58ec92 ("i915g: implement unfenced relocs for textures using tiling bits") Fixes: beaf039f972 ("i915g: cleanup static state calculation, part 1") Reviewed-by: Emma Anholt <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10811> (cherry picked from commit 3e74bbf631f06aa8d58dc7a9aa87165521e6cef8) --- .pick_status.json | 2 +- src/gallium/drivers/i915/i915_fpc_optimize.c | 6 ++++++ src/gallium/drivers/i915/i915_state_sampler.c | 2 ++ src/gallium/drivers/i915/i915_state_static.c | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 6b0adc4b35f..d0bbb95e22e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -130,7 +130,7 @@ "description": "i915g: fix implicit fallthrough", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "4e861ac4a1f1bdbd28f66e3f15eb45aa45a47bad" }, diff --git a/src/gallium/drivers/i915/i915_fpc_optimize.c b/src/gallium/drivers/i915/i915_fpc_optimize.c index 76ef20d84c3..fc71b2824fe 100644 --- a/src/gallium/drivers/i915/i915_fpc_optimize.c +++ b/src/gallium/drivers/i915/i915_fpc_optimize.c @@ -146,10 +146,13 @@ static unsigned mask_for_unswizzled(int num_components) { case 4: mask |= TGSI_WRITEMASK_W; + FALLTHROUGH; case 3: mask |= TGSI_WRITEMASK_Z; + FALLTHROUGH; case 2: mask |= TGSI_WRITEMASK_Y; + FALLTHROUGH; case 1: mask |= TGSI_WRITEMASK_X; } @@ -340,12 +343,15 @@ static void liveness_analysis(struct i915_optimize_context *ctx, case 3: src_reg = ¤t->FullInstruction.Src[2]; liveness_mark_read(ctx, src_reg, i); + FALLTHROUGH; case 2: src_reg = ¤t->FullInstruction.Src[1]; liveness_mark_read(ctx, src_reg, i); + FALLTHROUGH; case 1: src_reg = ¤t->FullInstruction.Src[0]; liveness_mark_read(ctx, src_reg, i); + FALLTHROUGH; case 0: break; default: diff --git a/src/gallium/drivers/i915/i915_state_sampler.c b/src/gallium/drivers/i915/i915_state_sampler.c index 66a5778717a..534bab32cdb 100644 --- a/src/gallium/drivers/i915/i915_state_sampler.c +++ b/src/gallium/drivers/i915/i915_state_sampler.c @@ -286,8 +286,10 @@ ms3_tiling_bits(enum i915_winsys_buffer_tile tiling) switch (tiling) { case I915_TILE_Y: tiling_bits |= MS3_TILE_WALK_Y; + FALLTHROUGH; case I915_TILE_X: tiling_bits |= MS3_TILED_SURFACE; + FALLTHROUGH; case I915_TILE_NONE: break; } diff --git a/src/gallium/drivers/i915/i915_state_static.c b/src/gallium/drivers/i915/i915_state_static.c index 88b418b1ac3..1d8e211c962 100644 --- a/src/gallium/drivers/i915/i915_state_static.c +++ b/src/gallium/drivers/i915/i915_state_static.c @@ -83,8 +83,10 @@ buf_3d_tiling_bits(enum i915_winsys_buffer_tile tiling) switch (tiling) { case I915_TILE_Y: tiling_bits |= BUF_3D_TILE_WALK_Y; + FALLTHROUGH; case I915_TILE_X: tiling_bits |= BUF_3D_TILED_SURFACE; + FALLTHROUGH; case I915_TILE_NONE: break; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
