diff options
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/ddebug/dd_context.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/freedreno/freedreno_screen.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_fence.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_scene.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_screen.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_surface.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/rbug/rbug_context.c | 6 | ||||
-rw-r--r-- | src/gallium/drivers/rbug/rbug_screen.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/svga/svga_screen.c | 4 | ||||
-rw-r--r-- | src/gallium/drivers/svga/svga_screen_cache.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/vc4/vc4_screen.c | 2 |
16 files changed, 21 insertions, 21 deletions
diff --git a/src/gallium/drivers/ddebug/dd_context.c b/src/gallium/drivers/ddebug/dd_context.c index ba47b734bba..1ce4a3b576e 100644 --- a/src/gallium/drivers/ddebug/dd_context.c +++ b/src/gallium/drivers/ddebug/dd_context.c @@ -870,7 +870,7 @@ dd_context_create(struct dd_screen *dscreen, struct pipe_context *pipe) *dctx->mapped_fence = 0; - pipe_mutex_init(dctx->mutex); + (void) mtx_init(&dctx->mutex, mtx_plain); dctx->thread = pipe_thread_create(dd_thread_pipelined_hang_detect, dctx); if (!dctx->thread) { pipe_mutex_destroy(dctx->mutex); diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index e667187d34c..3f43b8d9d86 100644 --- a/src/gallium/drivers/freedreno/freedreno_screen.c +++ b/src/gallium/drivers/freedreno/freedreno_screen.c @@ -705,7 +705,7 @@ fd_screen_create(struct fd_device *dev) fd_bc_init(&screen->batch_cache); - pipe_mutex_init(screen->lock); + (void) mtx_init(&screen->lock, mtx_plain); pscreen->destroy = fd_screen_destroy; pscreen->get_param = fd_screen_get_param; diff --git a/src/gallium/drivers/llvmpipe/lp_fence.c b/src/gallium/drivers/llvmpipe/lp_fence.c index 115589f8705..04c148395e3 100644 --- a/src/gallium/drivers/llvmpipe/lp_fence.c +++ b/src/gallium/drivers/llvmpipe/lp_fence.c @@ -52,7 +52,7 @@ lp_fence_create(unsigned rank) pipe_reference_init(&fence->reference, 1); - pipe_mutex_init(fence->mutex); + (void) mtx_init(&fence->mutex, mtx_plain); cnd_init(&fence->signalled); fence->id = fence_id++; diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c index 223be931e05..0d619eff3ff 100644 --- a/src/gallium/drivers/llvmpipe/lp_scene.c +++ b/src/gallium/drivers/llvmpipe/lp_scene.c @@ -62,7 +62,7 @@ lp_scene_create( struct pipe_context *pipe ) scene->data.head = CALLOC_STRUCT(data_block); - pipe_mutex_init(scene->mutex); + (void) mtx_init(&scene->mutex, mtx_plain); #ifdef DEBUG /* Do some scene limit sanity checks here */ diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 1c94b6e4921..f5f7e7178da 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -668,7 +668,7 @@ llvmpipe_create_screen(struct sw_winsys *winsys) FREE(screen); return NULL; } - pipe_mutex_init(screen->rast_mutex); + (void) mtx_init(&screen->rast_mutex, mtx_plain); util_format_s3tc_init(); diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c index 01bf14ba730..5635e9fe557 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c @@ -1755,7 +1755,7 @@ nv50_blitter_create(struct nv50_screen *screen) return false; } - pipe_mutex_init(screen->blitter->mutex); + (void) mtx_init(&screen->blitter->mutex, mtx_plain); nv50_blitter_make_vp(screen->blitter); nv50_blitter_make_sampler(screen->blitter); diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c index 96b2b5fa906..5720937c090 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c @@ -1664,7 +1664,7 @@ nvc0_blitter_create(struct nvc0_screen *screen) } screen->blitter->screen = screen; - pipe_mutex_init(screen->blitter->mutex); + (void) mtx_init(&screen->blitter->mutex, mtx_plain); nvc0_blitter_make_vp(screen->blitter); nvc0_blitter_make_sampler(screen->blitter); diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 903502d407e..392b0bb6a8a 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -751,7 +751,7 @@ struct pipe_screen* r300_screen_create(struct radeon_winsys *rws) slab_create_parent(&r300screen->pool_transfers, sizeof(struct pipe_transfer), 64); util_format_s3tc_init(); - pipe_mutex_init(r300screen->cmask_mutex); + (void) mtx_init(&r300screen->cmask_mutex, mtx_plain); return &r300screen->screen; } diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index 26d07750f9f..96b95ab09b6 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -1311,8 +1311,8 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen, } util_format_s3tc_init(); - pipe_mutex_init(rscreen->aux_context_lock); - pipe_mutex_init(rscreen->gpu_load_mutex); + (void) mtx_init(&rscreen->aux_context_lock, mtx_plain); + (void) mtx_init(&rscreen->gpu_load_mutex, mtx_plain); if (rscreen->debug_flags & DBG_INFO) { printf("pci_id = 0x%x\n", rscreen->info.pci_id); diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index d04abb6d203..723975aa01c 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -826,7 +826,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) sscreen->b.has_cp_dma = true; sscreen->b.has_streamout = true; - pipe_mutex_init(sscreen->shader_parts_mutex); + (void) mtx_init(&sscreen->shader_parts_mutex, mtx_plain); sscreen->use_monolithic_shaders = (sscreen->b.debug_flags & DBG_MONOLITHIC_SHADERS) != 0; diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index a82e38e872d..20410cebdae 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -299,7 +299,7 @@ static void si_destroy_shader_cache_entry(struct hash_entry *entry) bool si_init_shader_cache(struct si_screen *sscreen) { - pipe_mutex_init(sscreen->shader_cache_mutex); + (void) mtx_init(&sscreen->shader_cache_mutex, mtx_plain); sscreen->shader_cache = _mesa_hash_table_create(NULL, si_shader_cache_key_hash, @@ -1764,7 +1764,7 @@ static void *si_create_shader_selector(struct pipe_context *ctx, sel->db_shader_control |= S_02880C_Z_ORDER(V_02880C_EARLY_Z_THEN_LATE_Z); } - pipe_mutex_init(sel->mutex); + (void) mtx_init(&sel->mutex, mtx_plain); util_queue_fence_init(&sel->ready); if ((sctx->b.debug.debug_message && !sctx->b.debug.async) || diff --git a/src/gallium/drivers/rbug/rbug_context.c b/src/gallium/drivers/rbug/rbug_context.c index e34278e64ff..4723c49d124 100644 --- a/src/gallium/drivers/rbug/rbug_context.c +++ b/src/gallium/drivers/rbug/rbug_context.c @@ -1203,10 +1203,10 @@ rbug_context_create(struct pipe_screen *_screen, struct pipe_context *pipe) if (!rb_pipe) return NULL; - pipe_mutex_init(rb_pipe->draw_mutex); + (void) mtx_init(&rb_pipe->draw_mutex, mtx_plain); cnd_init(&rb_pipe->draw_cond); - pipe_mutex_init(rb_pipe->call_mutex); - pipe_mutex_init(rb_pipe->list_mutex); + (void) mtx_init(&rb_pipe->call_mutex, mtx_plain); + (void) mtx_init(&rb_pipe->list_mutex, mtx_plain); make_empty_list(&rb_pipe->shaders); rb_pipe->base.screen = _screen; diff --git a/src/gallium/drivers/rbug/rbug_screen.c b/src/gallium/drivers/rbug/rbug_screen.c index 3ed90908ceb..7505dd750a5 100644 --- a/src/gallium/drivers/rbug/rbug_screen.c +++ b/src/gallium/drivers/rbug/rbug_screen.c @@ -279,7 +279,7 @@ rbug_screen_create(struct pipe_screen *screen) if (!rb_screen) return screen; - pipe_mutex_init(rb_screen->list_mutex); + (void) mtx_init(&rb_screen->list_mutex, mtx_plain); make_empty_list(&rb_screen->contexts); make_empty_list(&rb_screen->resources); make_empty_list(&rb_screen->surfaces); diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index 90f8e2b2fc9..479b6fc522f 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -1104,8 +1104,8 @@ svga_screen_create(struct svga_winsys_screen *sws) debug_printf("svga: msaa samples mask: 0x%x\n", svgascreen->ms_samples); } - pipe_mutex_init(svgascreen->tex_mutex); - pipe_mutex_init(svgascreen->swc_mutex); + (void) mtx_init(&svgascreen->tex_mutex, mtx_plain); + (void) mtx_init(&svgascreen->swc_mutex, mtx_plain); svga_screen_cache_init(svgascreen); diff --git a/src/gallium/drivers/svga/svga_screen_cache.c b/src/gallium/drivers/svga/svga_screen_cache.c index 27c3fbc540e..514fc00afa4 100644 --- a/src/gallium/drivers/svga/svga_screen_cache.c +++ b/src/gallium/drivers/svga/svga_screen_cache.c @@ -408,7 +408,7 @@ svga_screen_cache_init(struct svga_screen *svgascreen) assert(cache->total_size == 0); - pipe_mutex_init(cache->mutex); + (void) mtx_init(&cache->mutex, mtx_plain); for (i = 0; i < SVGA_HOST_SURFACE_CACHE_BUCKETS; ++i) LIST_INITHEAD(&cache->bucket[i]); diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c index 31ab0db99a2..2a12ef8ba64 100644 --- a/src/gallium/drivers/vc4/vc4_screen.c +++ b/src/gallium/drivers/vc4/vc4_screen.c @@ -610,7 +610,7 @@ vc4_screen_create(int fd) screen->fd = fd; list_inithead(&screen->bo_cache.time_list); - pipe_mutex_init(screen->bo_handles_mutex); + (void) mtx_init(&screen->bo_handles_mutex, mtx_plain); screen->bo_handles = util_hash_table_create(handle_hash, handle_compare); screen->has_control_flow = |