From b61c8d620a346e25719b1ca42603655eb5d49227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 15 Apr 2021 10:44:33 +0200 Subject: [PATCH] osmesa: Replace default case FALLTHROUGH annotation by following return MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids warning about the annotation with GCC 10: ../src/gallium/frontends/osmesa/osmesa.c: In function ‘osmesa_choose_format’: ../src/util/compiler.h:84:21: warning: attribute ‘fallthrough’ not preceding a case label or default label 84 | #define FALLTHROUGH __attribute__((fallthrough)) | ^~~~~~~~~~~~~ ../src/gallium/frontends/osmesa/osmesa.c:316:7: note: in expansion of macro ‘FALLTHROUGH’ 316 | FALLTHROUGH; | ^~~~~~~~~~~ Part-of: (cherry picked from commit bf480cc9c28b0c3f488eea2fac08996a74be2e1a) --- .pick_status.json | 2 +- src/gallium/frontends/osmesa/osmesa.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d977ea6e7f5..5c0f2455350 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -37858,7 +37858,7 @@ "description": "osmesa: Replace default case FALLTHROUGH annotation by following return", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/frontends/osmesa/osmesa.c b/src/gallium/frontends/osmesa/osmesa.c index c1b69e339da..1682a30c3d7 100644 --- a/src/gallium/frontends/osmesa/osmesa.c +++ b/src/gallium/frontends/osmesa/osmesa.c @@ -313,9 +313,8 @@ osmesa_choose_format(GLenum format, GLenum type) return PIPE_FORMAT_NONE; return PIPE_FORMAT_B5G6R5_UNORM; default: - FALLTHROUGH; + return PIPE_FORMAT_NONE; } - return PIPE_FORMAT_NONE; }