summaryrefslogtreecommitdiff
path: root/lib/mesa/src
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2020-02-20 02:55:47 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2020-02-20 02:55:47 +0000
commit5e1d64624d9a0dde11c5626fac49da6ad6295fb0 (patch)
treec735b7f5acdb088a8bad6aee022ecaa155942059 /lib/mesa/src
parent8fec4e164d92abf4b268efac73ab677cf68fb9db (diff)
use futexes in Mesa on archs with atomics
tested by matthieu@ naddy@ and myself
Diffstat (limited to 'lib/mesa/src')
-rw-r--r--lib/mesa/src/util/simple_mtx.h4
-rw-r--r--lib/mesa/src/util/u_queue.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/mesa/src/util/simple_mtx.h b/lib/mesa/src/util/simple_mtx.h
index cfb82ba56..1f55fc516 100644
--- a/lib/mesa/src/util/simple_mtx.h
+++ b/lib/mesa/src/util/simple_mtx.h
@@ -28,7 +28,7 @@
#include "c11/threads.h"
-#if defined(__GNUC__) && defined(HAVE_LINUX_FUTEX_H)
+#if defined(__GNUC__) && defined(USE_FUTEX)
/* mtx_t - Fast, simple mutex
*
@@ -61,7 +61,7 @@ typedef struct {
#define _SIMPLE_MTX_INITIALIZER_NP { 0 }
static inline void
-simple_mtx_init(simple_mtx_t *mtx, MAYBE_UNUSED int type)
+simple_mtx_init(simple_mtx_t *mtx, ASSERTED int type)
{
assert(type == mtx_plain);
diff --git a/lib/mesa/src/util/u_queue.h b/lib/mesa/src/util/u_queue.h
index 2d269099c..a24647ea9 100644
--- a/lib/mesa/src/util/u_queue.h
+++ b/lib/mesa/src/util/u_queue.h
@@ -50,7 +50,7 @@ extern "C" {
#define UTIL_QUEUE_INIT_RESIZE_IF_FULL (1 << 1)
#define UTIL_QUEUE_INIT_SET_FULL_THREAD_AFFINITY (1 << 2)
-#if defined(__GNUC__) && defined(HAVE_LINUX_FUTEX_H)
+#if defined(__GNUC__) && defined(USE_FUTEX)
#define UTIL_QUEUE_FENCE_FUTEX
#else
#define UTIL_QUEUE_FENCE_STANDARD