fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

osmesa: Replace default case FALLTHROUGH annotation by following return

Browse source 
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10220>
(cherry picked from commit bf480cc9c2)
This commit is contained in:
Michel Dänzer 2021-04-15 10:44:33 +02:00 • committed by Eric Engestrom
parent 4432c2c1c3
commit b61c8d620a
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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
},

3
src/gallium/frontends/osmesa/osmesa.c
View file

@ -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;
}