summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Davy <davyaxel0@gmail.com>2021-04-15 21:59:18 +0200
committerEric Engestrom <eric@engestrom.ch>2021-04-18 22:13:25 +0200
commit269da9f4265301d5bb3c4f4e45b9509da3497eab (patch)
tree6bc1d4923fd4aa892193f57e6c78a4e8c61d81b3
parenta51a51b408b79e1d11a7662bace305e786b4b396 (diff)
st/nine: Fix compilation error on non-x86 platforms
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 <davyaxel0@gmail.com> Reviewed-by: Timur Kristóf <timur.kristof@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10263> (cherry picked from commit 5613984fd944a150d48e6a582daaeb8b2dde7e32)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/frontends/nine/device9.c3
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");
}