diff options
author | Timothy Arceri <[email protected]> | 2017-03-05 12:12:30 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 08:52:38 +1100 |
commit | ba72554f3e576c1674d52ab16d8d2edff9398b71 (patch) | |
tree | 317c80f33ea1edcf238d3545ff1a6104a7d55fc8 /src/gallium/drivers/r300 | |
parent | be188289e1bf0e259c91a751c405d54bb99bc5d4 (diff) |
gallium/util: replace pipe_mutex_lock() with mtx_lock()
replace pipe_mutex_lock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_lock(\([^)]*\)):mtx_lock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r-- | src/gallium/drivers/r300/r300_blit.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index b5c3ae5ac3b..7d58d4cb3ea 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -328,7 +328,7 @@ static void r300_clear(struct pipe_context* pipe, /* Pair the resource with the CMASK to avoid other resources * accessing it. */ if (!r300->screen->cmask_resource) { - pipe_mutex_lock(r300->screen->cmask_mutex); + mtx_lock(&r300->screen->cmask_mutex); /* Double checking (first unlocked, then locked). */ if (!r300->screen->cmask_resource) { /* Don't reference this, so that the texture can be diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index 929c3fe6c12..b451b9f0a4d 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -1030,7 +1030,7 @@ static void r300_texture_destroy(struct pipe_screen *screen, struct r300_resource* tex = (struct r300_resource*)texture; if (tex->tex.cmask_dwords) { - pipe_mutex_lock(rscreen->cmask_mutex); + mtx_lock(&rscreen->cmask_mutex); if (texture == rscreen->cmask_resource) { rscreen->cmask_resource = NULL; } |