Module: Mesa Branch: staging/20.0 Commit: 2e745e0ed350b55e8e26dc0e9bf4423f0c3c7fda URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e745e0ed350b55e8e26dc0e9bf4423f0c3c7fda
Author: Erik Faye-Lund <[email protected]> Date: Tue Mar 24 11:04:39 2020 +0100 rbug: do not return void-value Returning a void-value is nonsensical, and in this case it seems like a mistake. This eliminates a warning when building on MSVC. Fixes: fb04e5da97d ("gallium: add pipe_screen::finalize_nir") Reviewed-by: Brian Paul <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4297> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4297> (cherry picked from commit 8c30b9d9878b14098d01a4bae5d51f1392e3baff) --- .pick_status.json | 2 +- src/gallium/auxiliary/driver_rbug/rbug_screen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0481653bed9..a397a511fde 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -229,7 +229,7 @@ "description": "rbug: do not return void-value", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "fb04e5da97d904ab1dc7e0182bcba77071bbe340" }, diff --git a/src/gallium/auxiliary/driver_rbug/rbug_screen.c b/src/gallium/auxiliary/driver_rbug/rbug_screen.c index 86286cf9f29..ed6a3da83f9 100644 --- a/src/gallium/auxiliary/driver_rbug/rbug_screen.c +++ b/src/gallium/auxiliary/driver_rbug/rbug_screen.c @@ -375,7 +375,7 @@ rbug_screen_finalize_nir(struct pipe_screen *_screen, void *nir, bool optimize) { struct pipe_screen *screen = rbug_screen(_screen)->screen; - return screen->finalize_nir(screen, nir, optimize); + screen->finalize_nir(screen, nir, optimize); } bool _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
