summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/ddebug/dd_pipe.h2
-rw-r--r--src/gallium/drivers/freedreno/freedreno_screen.h2
-rw-r--r--src/gallium/drivers/llvmpipe/lp_fence.h2
-rw-r--r--src/gallium/drivers/llvmpipe/lp_scene.h2
-rw-r--r--src/gallium/drivers/llvmpipe/lp_screen.h2
-rw-r--r--src/gallium/drivers/nouveau/nv50/nv50_surface.c2
-rw-r--r--src/gallium/drivers/nouveau/nvc0/nvc0_surface.c2
-rw-r--r--src/gallium/drivers/r300/r300_screen.h2
-rw-r--r--src/gallium/drivers/radeon/r600_pipe_common.h4
-rw-r--r--src/gallium/drivers/radeonsi/si_pipe.h4
-rw-r--r--src/gallium/drivers/radeonsi/si_shader.h2
-rw-r--r--src/gallium/drivers/rbug/rbug_context.h6
-rw-r--r--src/gallium/drivers/rbug/rbug_screen.h2
-rw-r--r--src/gallium/drivers/svga/svga_screen.h4
-rw-r--r--src/gallium/drivers/svga/svga_screen_cache.h2
-rw-r--r--src/gallium/drivers/vc4/vc4_screen.h4
16 files changed, 22 insertions, 22 deletions
diff --git a/src/gallium/drivers/ddebug/dd_pipe.h b/src/gallium/drivers/ddebug/dd_pipe.h
index 08cd1e3b9f1..dc7c325885d 100644
--- a/src/gallium/drivers/ddebug/dd_pipe.h
+++ b/src/gallium/drivers/ddebug/dd_pipe.h
@@ -235,7 +235,7 @@ struct dd_context
* the thread dumps the record of the oldest unsignalled fence.
*/
pipe_thread thread;
- pipe_mutex mutex;
+ mtx_t mutex;
int kill_thread;
struct pipe_resource *fence;
struct pipe_transfer *fence_transfer;
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.h b/src/gallium/drivers/freedreno/freedreno_screen.h
index 087b07e0b09..f2b1d8cea76 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.h
+++ b/src/gallium/drivers/freedreno/freedreno_screen.h
@@ -44,7 +44,7 @@ struct fd_bo;
struct fd_screen {
struct pipe_screen base;
- pipe_mutex lock;
+ mtx_t lock;
/* it would be tempting to use pipe_reference here, but that
* really doesn't work well if it isn't the first member of
diff --git a/src/gallium/drivers/llvmpipe/lp_fence.h b/src/gallium/drivers/llvmpipe/lp_fence.h
index d7f0c153ec8..4fc0801a6f0 100644
--- a/src/gallium/drivers/llvmpipe/lp_fence.h
+++ b/src/gallium/drivers/llvmpipe/lp_fence.h
@@ -43,7 +43,7 @@ struct lp_fence
struct pipe_reference reference;
unsigned id;
- pipe_mutex mutex;
+ mtx_t mutex;
pipe_condvar signalled;
boolean issued;
diff --git a/src/gallium/drivers/llvmpipe/lp_scene.h b/src/gallium/drivers/llvmpipe/lp_scene.h
index b1464bb54c4..da29057f1ef 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene.h
+++ b/src/gallium/drivers/llvmpipe/lp_scene.h
@@ -174,7 +174,7 @@ struct lp_scene {
unsigned tiles_x, tiles_y;
int curr_x, curr_y; /**< for iterating over bins */
- pipe_mutex mutex;
+ mtx_t mutex;
struct cmd_bin tile[TILES_X][TILES_Y];
struct data_block_list data;
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.h b/src/gallium/drivers/llvmpipe/lp_screen.h
index 00bf20c8c5f..da702ad7753 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.h
+++ b/src/gallium/drivers/llvmpipe/lp_screen.h
@@ -56,7 +56,7 @@ struct llvmpipe_screen
unsigned timestamp;
struct lp_rasterizer *rast;
- pipe_mutex rast_mutex;
+ mtx_t rast_mutex;
};
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
index f5fa9d6cada..01bf14ba730 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
@@ -821,7 +821,7 @@ struct nv50_blitter
struct nv50_tsc_entry sampler[2]; /* nearest, bilinear */
- pipe_mutex mutex;
+ mtx_t mutex;
};
struct nv50_blitctx
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
index d567d828948..96b2b5fa906 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
@@ -772,7 +772,7 @@ struct nvc0_blitter
struct nv50_tsc_entry sampler[2]; /* nearest, bilinear */
- pipe_mutex mutex;
+ mtx_t mutex;
struct nvc0_screen *screen;
};
diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 4b783af959d..952dc341ab7 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -48,7 +48,7 @@ struct r300_screen {
/* The MSAA texture with CMASK access; */
struct pipe_resource *cmask_resource;
- pipe_mutex cmask_mutex;
+ mtx_t cmask_mutex;
};
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 55d2d0bd5ff..726dbb30fcd 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -381,7 +381,7 @@ struct r600_common_screen {
/* Auxiliary context. Mainly used to initialize resources.
* It must be locked prior to using and flushed before unlocking. */
struct pipe_context *aux_context;
- pipe_mutex aux_context_lock;
+ mtx_t aux_context_lock;
/* This must be in the screen, because UE4 uses one context for
* compilation and another one for rendering.
@@ -394,7 +394,7 @@ struct r600_common_screen {
unsigned num_shader_cache_hits;
/* GPU load thread. */
- pipe_mutex gpu_load_mutex;
+ mtx_t gpu_load_mutex;
pipe_thread gpu_load_thread;
union r600_mmio_counters mmio_counters;
volatile unsigned gpu_load_stop_thread; /* bool */
diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index ec7cf30ef7e..617ec2054c8 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -84,7 +84,7 @@ struct si_screen {
bool use_monolithic_shaders;
bool record_llvm_ir;
- pipe_mutex shader_parts_mutex;
+ mtx_t shader_parts_mutex;
struct si_shader_part *vs_prologs;
struct si_shader_part *vs_epilogs;
struct si_shader_part *tcs_epilogs;
@@ -104,7 +104,7 @@ struct si_screen {
* - GS and CS aren't cached, but it's certainly possible to cache
* those as well.
*/
- pipe_mutex shader_cache_mutex;
+ mtx_t shader_cache_mutex;
struct hash_table *shader_cache;
/* Shader compiler queue for multithreaded compilation. */
diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index c38e7f560b6..17ffc5d8c78 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -278,7 +278,7 @@ struct si_shader_selector {
struct util_queue_fence ready;
struct si_compiler_ctx_state compiler_ctx_state;
- pipe_mutex mutex;
+ mtx_t mutex;
struct si_shader *first_variant; /* immutable after the first variant */
struct si_shader *last_variant; /* mutable */
diff --git a/src/gallium/drivers/rbug/rbug_context.h b/src/gallium/drivers/rbug/rbug_context.h
index e99f6edc523..6f11fa46b5d 100644
--- a/src/gallium/drivers/rbug/rbug_context.h
+++ b/src/gallium/drivers/rbug/rbug_context.h
@@ -42,7 +42,7 @@ struct rbug_context {
struct rbug_list list;
/* call locking */
- pipe_mutex call_mutex;
+ mtx_t call_mutex;
/* current state */
struct {
@@ -58,7 +58,7 @@ struct rbug_context {
} curr;
/* draw locking */
- pipe_mutex draw_mutex;
+ mtx_t draw_mutex;
pipe_condvar draw_cond;
unsigned draw_num_rules;
int draw_blocker;
@@ -74,7 +74,7 @@ struct rbug_context {
} draw_rule;
/* list of state objects */
- pipe_mutex list_mutex;
+ mtx_t list_mutex;
unsigned num_shaders;
struct rbug_list shaders;
};
diff --git a/src/gallium/drivers/rbug/rbug_screen.h b/src/gallium/drivers/rbug/rbug_screen.h
index fd92374beda..67e28762b70 100644
--- a/src/gallium/drivers/rbug/rbug_screen.h
+++ b/src/gallium/drivers/rbug/rbug_screen.h
@@ -49,7 +49,7 @@ struct rbug_screen
/* remote debugger */
struct rbug_rbug *rbug;
- pipe_mutex list_mutex;
+ mtx_t list_mutex;
int num_contexts;
int num_resources;
int num_surfaces;
diff --git a/src/gallium/drivers/svga/svga_screen.h b/src/gallium/drivers/svga/svga_screen.h
index 6cafeba1480..68834a69e2e 100644
--- a/src/gallium/drivers/svga/svga_screen.h
+++ b/src/gallium/drivers/svga/svga_screen.h
@@ -66,9 +66,9 @@ struct svga_screen
} debug;
unsigned texture_timestamp;
- pipe_mutex tex_mutex;
+ mtx_t tex_mutex;
- pipe_mutex swc_mutex; /* Used for buffer uploads */
+ mtx_t swc_mutex; /* Used for buffer uploads */
/* which formats to translate depth formats into */
struct {
diff --git a/src/gallium/drivers/svga/svga_screen_cache.h b/src/gallium/drivers/svga/svga_screen_cache.h
index 619603a8238..2ade1025fca 100644
--- a/src/gallium/drivers/svga/svga_screen_cache.h
+++ b/src/gallium/drivers/svga/svga_screen_cache.h
@@ -105,7 +105,7 @@ struct svga_host_surface_cache_entry
*/
struct svga_host_surface_cache
{
- pipe_mutex mutex;
+ mtx_t mutex;
/* Unused buffers are put in buckets to speed up lookups */
struct list_head bucket[SVGA_HOST_SURFACE_CACHE_BUCKETS];
diff --git a/src/gallium/drivers/vc4/vc4_screen.h b/src/gallium/drivers/vc4/vc4_screen.h
index 1f91ad37f88..54751ff0b0d 100644
--- a/src/gallium/drivers/vc4/vc4_screen.h
+++ b/src/gallium/drivers/vc4/vc4_screen.h
@@ -77,14 +77,14 @@ struct vc4_screen {
struct list_head *size_list;
uint32_t size_list_size;
- pipe_mutex lock;
+ mtx_t lock;
uint32_t bo_size;
uint32_t bo_count;
} bo_cache;
struct util_hash_table *bo_handles;
- pipe_mutex bo_handles_mutex;
+ mtx_t bo_handles_mutex;
uint32_t bo_size;
uint32_t bo_count;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 01:54:32 +0000