projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swr/rast: remove unused functions
[mesa.git]
/
src
/
gallium
/
drivers
/
llvmpipe
/
lp_scene.c
diff --git
a/src/gallium/drivers/llvmpipe/lp_scene.c
b/src/gallium/drivers/llvmpipe/lp_scene.c
index 2441b3c0d886b402ce191ce28b9c4ec2fb6771ec..dfad9fabb20d35a2ad562525ad48dbf9f851b368 100644
(file)
--- 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);
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 */
#ifdef DEBUG
/* Do some scene limit sanity checks here */
@@
-90,7
+90,7
@@
void
lp_scene_destroy(struct lp_scene *scene)
{
lp_fence_reference(&scene->fence, NULL);
lp_scene_destroy(struct lp_scene *scene)
{
lp_fence_reference(&scene->fence, NULL);
-
pipe_mutex_destroy(
scene->mutex);
+
mtx_destroy(&
scene->mutex);
assert(scene->data.head->next == NULL);
FREE(scene->data.head);
FREE(scene);
assert(scene->data.head->next == NULL);
FREE(scene->data.head);
FREE(scene);
@@
-337,7
+337,7
@@
lp_scene_new_data_block( struct lp_scene *scene )
}
else {
struct data_block *block = MALLOC_STRUCT(data_block);
}
else {
struct data_block *block = MALLOC_STRUCT(data_block);
- if (
block == NULL
)
+ if (
!block
)
return NULL;
scene->scene_size += sizeof *block;
return NULL;
scene->scene_size += sizeof *block;
@@
-484,7
+484,7
@@
lp_scene_bin_iter_next( struct lp_scene *scene , int *x, int *y)
{
struct cmd_bin *bin = NULL;
{
struct cmd_bin *bin = NULL;
-
pipe_mutex_lock(
scene->mutex);
+
mtx_lock(&
scene->mutex);
if (scene->curr_x < 0) {
/* first bin */
if (scene->curr_x < 0) {
/* first bin */
@@
-502,7
+502,7
@@
lp_scene_bin_iter_next( struct lp_scene *scene , int *x, int *y)
end:
/*printf("return bin %p at %d, %d\n", (void *) bin, *bin_x, *bin_y);*/
end:
/*printf("return bin %p at %d, %d\n", (void *) bin, *bin_x, *bin_y);*/
-
pipe_mutex_unlock(
scene->mutex);
+
mtx_unlock(&
scene->mutex);
return bin;
}
return bin;
}