diff options
Diffstat (limited to 'src')
22 files changed, 21 insertions, 24 deletions
diff --git a/src/gallium/auxiliary/hud/hud_cpufreq.c b/src/gallium/auxiliary/hud/hud_cpufreq.c index 78754b28a9..41e5827c66 100644 --- a/src/gallium/auxiliary/hud/hud_cpufreq.c +++ b/src/gallium/auxiliary/hud/hud_cpufreq.c @@ -62,7 +62,7 @@ struct cpufreq_info static int gcpufreq_count = 0; static struct list_head gcpufreq_list; -pipe_static_mutex(gcpufreq_mutex); +static mtx_t gcpufreq_mutex = _MTX_INITIALIZER_NP; static struct cpufreq_info * find_cfi_by_index(int cpu_index, int mode) diff --git a/src/gallium/auxiliary/hud/hud_diskstat.c b/src/gallium/auxiliary/hud/hud_diskstat.c index af6e62d9da..fb64e3d906 100644 --- a/src/gallium/auxiliary/hud/hud_diskstat.c +++ b/src/gallium/auxiliary/hud/hud_diskstat.c @@ -82,7 +82,7 @@ struct diskstat_info */ static int gdiskstat_count = 0; static struct list_head gdiskstat_list; -pipe_static_mutex(gdiskstat_mutex); +static mtx_t gdiskstat_mutex = _MTX_INITIALIZER_NP; static struct diskstat_info * find_dsi_by_name(const char *n, int mode) diff --git a/src/gallium/auxiliary/hud/hud_nic.c b/src/gallium/auxiliary/hud/hud_nic.c index 634add162b..2fbeaa51d9 100644 --- a/src/gallium/auxiliary/hud/hud_nic.c +++ b/src/gallium/auxiliary/hud/hud_nic.c @@ -67,7 +67,7 @@ struct nic_info */ static int gnic_count = 0; static struct list_head gnic_list; -pipe_static_mutex(gnic_mutex); +static mtx_t gnic_mutex = _MTX_INITIALIZER_NP; static struct nic_info * find_nic_by_name(const char *n, int mode) diff --git a/src/gallium/auxiliary/hud/hud_sensors_temp.c b/src/gallium/auxiliary/hud/hud_sensors_temp.c index 11b8a4cd51..4d723cc4ff 100644 --- a/src/gallium/auxiliary/hud/hud_sensors_temp.c +++ b/src/gallium/auxiliary/hud/hud_sensors_temp.c @@ -50,7 +50,7 @@ */ static int gsensors_temp_count = 0; static struct list_head gsensors_temp_list; -pipe_static_mutex(gsensor_temp_mutex); +static mtx_t gsensor_temp_mutex = _MTX_INITIALIZER_NP; struct sensors_temp_info { diff --git a/src/gallium/auxiliary/os/os_thread.h b/src/gallium/auxiliary/os/os_thread.h index af350b878a..a6a9fea1f7 100644 --- a/src/gallium/auxiliary/os/os_thread.h +++ b/src/gallium/auxiliary/os/os_thread.h @@ -108,9 +108,6 @@ static inline int pipe_thread_is_self( pipe_thread thread ) return 0; } -#define pipe_static_mutex(mutex) \ - static mtx_t mutex = _MTX_INITIALIZER_NP - #define pipe_mutex_init(mutex) \ (void) mtx_init(&(mutex), mtx_plain) diff --git a/src/gallium/auxiliary/rtasm/rtasm_execmem.c b/src/gallium/auxiliary/rtasm/rtasm_execmem.c index f7e605e956..a60d52174a 100644 --- a/src/gallium/auxiliary/rtasm/rtasm_execmem.c +++ b/src/gallium/auxiliary/rtasm/rtasm_execmem.c @@ -63,7 +63,7 @@ #define EXEC_HEAP_SIZE (10*1024*1024) -pipe_static_mutex(exec_mutex); +static mtx_t exec_mutex = _MTX_INITIALIZER_NP; static struct mem_block *exec_heap = NULL; static unsigned char *exec_mem = NULL; diff --git a/src/gallium/auxiliary/util/u_debug_flush.c b/src/gallium/auxiliary/util/u_debug_flush.c index 6a8a91d313..d12520501e 100644 --- a/src/gallium/auxiliary/util/u_debug_flush.c +++ b/src/gallium/auxiliary/util/u_debug_flush.c @@ -77,7 +77,7 @@ struct debug_flush_ctx { struct list_head head; }; -pipe_static_mutex(list_mutex); +static mtx_t list_mutex = _MTX_INITIALIZER_NP; static struct list_head ctx_list = {&ctx_list, &ctx_list}; static struct debug_stack_frame * diff --git a/src/gallium/auxiliary/util/u_debug_memory.c b/src/gallium/auxiliary/util/u_debug_memory.c index f1cc8eb1b7..2f7031d6df 100644 --- a/src/gallium/auxiliary/util/u_debug_memory.c +++ b/src/gallium/auxiliary/util/u_debug_memory.c @@ -87,7 +87,7 @@ struct debug_memory_footer static struct list_head list = { &list, &list }; -pipe_static_mutex(list_mutex); +static mtx_t list_mutex = _MTX_INITIALIZER_NP; static unsigned long last_no = 0; diff --git a/src/gallium/auxiliary/util/u_debug_refcnt.c b/src/gallium/auxiliary/util/u_debug_refcnt.c index 0a4786442f..eda95bbfff 100644 --- a/src/gallium/auxiliary/util/u_debug_refcnt.c +++ b/src/gallium/auxiliary/util/u_debug_refcnt.c @@ -52,7 +52,7 @@ static FILE *stream; /* TODO: maybe move this serial machinery to a stand-alone module and * expose it? */ -pipe_static_mutex(serials_mutex); +static mtx_t serials_mutex = _MTX_INITIALIZER_NP; static struct util_hash_table *serials_hash; static unsigned serials_last; diff --git a/src/gallium/auxiliary/util/u_debug_symbol.c b/src/gallium/auxiliary/util/u_debug_symbol.c index 10efdd593e..cfd354a6fe 100644 --- a/src/gallium/auxiliary/util/u_debug_symbol.c +++ b/src/gallium/auxiliary/util/u_debug_symbol.c @@ -271,7 +271,7 @@ debug_symbol_print(const void *addr) } struct util_hash_table* symbols_hash; -pipe_static_mutex(symbols_mutex); +static mtx_t symbols_mutex = _MTX_INITIALIZER_NP; static unsigned hash_ptr(void* p) { diff --git a/src/gallium/auxiliary/util/u_queue.c b/src/gallium/auxiliary/util/u_queue.c index c84e0ad684..ca637ad922 100644 --- a/src/gallium/auxiliary/util/u_queue.c +++ b/src/gallium/auxiliary/util/u_queue.c @@ -40,7 +40,7 @@ static void util_queue_killall_and_wait(struct util_queue *queue); static once_flag atexit_once_flag = ONCE_FLAG_INIT; static struct list_head queue_list; -pipe_static_mutex(exit_mutex); +static mtx_t exit_mutex = _MTX_INITIALIZER_NP; static void atexit_handler(void) diff --git a/src/gallium/drivers/trace/tr_dump.c b/src/gallium/drivers/trace/tr_dump.c index 112a69e29c..b052e2a573 100644 --- a/src/gallium/drivers/trace/tr_dump.c +++ b/src/gallium/drivers/trace/tr_dump.c @@ -59,7 +59,7 @@ static boolean close_stream = FALSE; static FILE *stream = NULL; -pipe_static_mutex(call_mutex); +static mtx_t call_mutex = _MTX_INITIALIZER_NP; static long unsigned call_no = 0; static boolean dumping = FALSE; diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 8d1b36056e..9297b68905 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 1136dad494..5b53559176 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 afcbd974e7..c12eb207ea 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 1d7b3fffab..277ea0cfc0 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) { diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c index 4a4e06cc3d..e16e13d9c2 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c @@ -64,7 +64,7 @@ #endif static struct util_hash_table *dev_tab = NULL; -pipe_static_mutex(dev_tab_mutex); +static mtx_t dev_tab_mutex = _MTX_INITIALIZER_NP; static unsigned cik_get_num_tile_pipes(struct amdgpu_gpu_info *info) { diff --git a/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c b/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c index 3b34c300ad..141191f3d9 100644 --- a/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c +++ b/src/gallium/winsys/etnaviv/drm/etnaviv_drm_winsys.c @@ -69,7 +69,7 @@ screen_create(struct renderonly *ro) static struct util_hash_table *etna_tab = NULL; -pipe_static_mutex(etna_screen_mutex); +static mtx_t etna_screen_mutex = _MTX_INITIALIZER_NP; static void etna_drm_screen_destroy(struct pipe_screen *pscreen) diff --git a/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c b/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c index e4785f83d9..9ccbce14a2 100644 --- a/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c +++ b/src/gallium/winsys/freedreno/drm/freedreno_drm_winsys.c @@ -42,7 +42,7 @@ static struct util_hash_table *fd_tab = NULL; -pipe_static_mutex(fd_screen_mutex); +static mtx_t fd_screen_mutex = _MTX_INITIALIZER_NP; static void fd_drm_screen_destroy(struct pipe_screen *pscreen) diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c index cc9dfa7f76..f7b1e5ec62 100644 --- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c +++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c @@ -19,7 +19,7 @@ static struct util_hash_table *fd_tab = NULL; -pipe_static_mutex(nouveau_screen_mutex); +static mtx_t nouveau_screen_mutex = _MTX_INITIALIZER_NP; bool nouveau_drm_screen_unref(struct nouveau_screen *screen) { diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c index 6c6d920d03..2726237329 100644 --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c @@ -47,7 +47,7 @@ #include <radeon_surface.h> static struct util_hash_table *fd_tab = NULL; -pipe_static_mutex(fd_tab_mutex); +static mtx_t fd_tab_mutex = _MTX_INITIALIZER_NP; /* Enable/disable feature access for one command stream. * If enable == true, return true on success. diff --git a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c index 86e0470e68..73538730f5 100644 --- a/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c +++ b/src/gallium/winsys/virgl/drm/virgl_drm_winsys.c @@ -806,7 +806,7 @@ virgl_drm_winsys_create(int drmFD) } static struct util_hash_table *fd_tab = NULL; -pipe_static_mutex(virgl_screen_mutex); +static mtx_t virgl_screen_mutex = _MTX_INITIALIZER_NP; static void virgl_drm_screen_destroy(struct pipe_screen *pscreen) |