From 269da9f4265301d5bb3c4f4e45b9509da3497eab Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Thu, 15 Apr 2021 21:59:18 +0200 Subject: [PATCH] st/nine: Fix compilation error on non-x86 platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The unused variable was improperly declared. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4647 Fixes: d9e79bfe4f ("st/nine: Disable fpu exceptions during init") Signed-off-by: Axel Davy Reviewed-by: Timur Kristóf Part-of: (cherry picked from commit 5613984fd944a150d48e6a582daaeb8b2dde7e32) --- .pick_status.json | 2 +- src/gallium/frontends/nine/device9.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index bc8927e2283..0eeaa23a534 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -319,7 +319,7 @@ "description": "st/nine: Fix compilation error on non-x86 platforms", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "d9e79bfe4f03eb0412a5535fce2a98c10623f53d" }, diff --git a/src/gallium/frontends/nine/device9.c b/src/gallium/frontends/nine/device9.c index 289c6502ead..ec2e9f4bc71 100644 --- a/src/gallium/frontends/nine/device9.c +++ b/src/gallium/frontends/nine/device9.c @@ -45,6 +45,7 @@ #include "pipe/p_screen.h" #include "pipe/p_context.h" #include "pipe/p_config.h" +#include "util/macros.h" #include "util/u_math.h" #include "util/u_inlines.h" #include "util/u_hash_table.h" @@ -95,7 +96,7 @@ static void nine_setup_fpu(void) WARN_ONCE("FPU setup not supported on non-x86 platforms\n"); } -static void nine_setup_set_fpu(uint16_t) +static void nine_setup_set_fpu(UNUSED uint16_t val) { WARN_ONCE("FPU setup not supported on non-x86 platforms\n"); }