summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-03-05 12:32:02 +1100
committerTimothy Arceri <[email protected]>2017-03-07 08:48:16 +1100
commitacdcaf9be4695ccdc4a589a3416591dd316e876c (patch)
tree7c7e1e3f0c1e7509141ed3c54571ebf847321f53 /src/gallium/state_trackers
parent2efddc63ee864ab917e444b68a7c2dcf520d451e (diff)
gallium/util: remove pipe_static_mutex()
This was made unnecessary with fd33a6bcd7f12. Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
-rw-r--r--src/gallium/state_trackers/glx/xlib/xm_api.c2
-rw-r--r--src/gallium/state_trackers/nine/nine_lock.c2
-rw-r--r--src/gallium/state_trackers/omx/entrypoint.c2
-rw-r--r--src/gallium/state_trackers/vdpau/htab.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 8d1b36056ee..9297b689050 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -189,7 +189,7 @@ xmesa_close_display(Display *display)
static XMesaDisplay
xmesa_init_display( Display *display )
{
- pipe_static_mutex(init_mutex);
+ static mtx_t init_mutex = _MTX_INITIALIZER_NP;
XMesaDisplay xmdpy;
XMesaExtDisplayInfo *info;
diff --git a/src/gallium/state_trackers/nine/nine_lock.c b/src/gallium/state_trackers/nine/nine_lock.c
index 1136dad4942..5b535591769 100644
--- a/src/gallium/state_trackers/nine/nine_lock.c
+++ b/src/gallium/state_trackers/nine/nine_lock.c
@@ -48,7 +48,7 @@
#include "os/os_thread.h"
/* Global mutex as described by MSDN */
-pipe_static_mutex(d3dlock_global);
+static mtx_t d3dlock_global = _MTX_INITIALIZER_NP;
void
NineLockGlobalMutex()
diff --git a/src/gallium/state_trackers/omx/entrypoint.c b/src/gallium/state_trackers/omx/entrypoint.c
index afcbd974e76..c12eb207ea8 100644
--- a/src/gallium/state_trackers/omx/entrypoint.c
+++ b/src/gallium/state_trackers/omx/entrypoint.c
@@ -45,7 +45,7 @@
#include "vid_dec.h"
#include "vid_enc.h"
-pipe_static_mutex(omx_lock);
+static mtx_t omx_lock = _MTX_INITIALIZER_NP;
static Display *omx_display = NULL;
static struct vl_screen *omx_screen = NULL;
static unsigned omx_usecount = 0;
diff --git a/src/gallium/state_trackers/vdpau/htab.c b/src/gallium/state_trackers/vdpau/htab.c
index 1d7b3fffab2..277ea0cfc01 100644
--- a/src/gallium/state_trackers/vdpau/htab.c
+++ b/src/gallium/state_trackers/vdpau/htab.c
@@ -30,7 +30,7 @@
#include "vdpau_private.h"
static struct handle_table *htab = NULL;
-pipe_static_mutex(htab_lock);
+static mtx_t htab_lock = _MTX_INITIALIZER_NP;
boolean vlCreateHTAB(void)
{