projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
meson: fix debug build on Android
[mesa.git]
/
src
/
gallium
/
auxiliary
/
pipebuffer
/
pb_buffer_fenced.c
diff --git
a/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
b/src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
index b8b448340db6b3fb4a30e0deb5a590c7f8010b2f..cae875200208371b6ac37d8029600f3ed55ca019 100644
(file)
--- a/
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
+++ b/
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
@@
-139,7
+139,7
@@
struct fenced_buffer
* A bitmask of PB_USAGE_CPU/GPU_READ/WRITE describing the current
* buffer usage.
*/
* A bitmask of PB_USAGE_CPU/GPU_READ/WRITE describing the current
* buffer usage.
*/
-
unsigned
flags;
+
enum pb_usage_flags
flags;
unsigned mapcount;
unsigned mapcount;
@@
-250,7
+250,7
@@
fenced_buffer_destroy_locked(struct fenced_manager *fenced_mgr,
assert(!fenced_buf->fence);
assert(fenced_buf->head.prev);
assert(fenced_buf->head.next);
assert(!fenced_buf->fence);
assert(fenced_buf->head.prev);
assert(fenced_buf->head.next);
-
LIST_DEL
(&fenced_buf->head);
+
list_del
(&fenced_buf->head);
assert(fenced_mgr->num_unfenced);
--fenced_mgr->num_unfenced;
assert(fenced_mgr->num_unfenced);
--fenced_mgr->num_unfenced;
@@
-276,10
+276,10
@@
fenced_buffer_add_locked(struct fenced_manager *fenced_mgr,
p_atomic_inc(&fenced_buf->base.reference.count);
p_atomic_inc(&fenced_buf->base.reference.count);
-
LIST_DEL
(&fenced_buf->head);
+
list_del
(&fenced_buf->head);
assert(fenced_mgr->num_unfenced);
--fenced_mgr->num_unfenced;
assert(fenced_mgr->num_unfenced);
--fenced_mgr->num_unfenced;
-
LIST_ADDTAIL
(&fenced_buf->head, &fenced_mgr->fenced);
+
list_addtail
(&fenced_buf->head, &fenced_mgr->fenced);
++fenced_mgr->num_fenced;
}
++fenced_mgr->num_fenced;
}
@@
-305,11
+305,11
@@
fenced_buffer_remove_locked(struct fenced_manager *fenced_mgr,
assert(fenced_buf->head.prev);
assert(fenced_buf->head.next);
assert(fenced_buf->head.prev);
assert(fenced_buf->head.next);
-
LIST_DEL
(&fenced_buf->head);
+
list_del
(&fenced_buf->head);
assert(fenced_mgr->num_fenced);
--fenced_mgr->num_fenced;
assert(fenced_mgr->num_fenced);
--fenced_mgr->num_fenced;
-
LIST_ADDTAIL
(&fenced_buf->head, &fenced_mgr->unfenced);
+
list_addtail
(&fenced_buf->head, &fenced_mgr->unfenced);
++fenced_mgr->num_unfenced;
if (p_atomic_dec_zero(&fenced_buf->base.reference.count)) {
++fenced_mgr->num_unfenced;
if (p_atomic_dec_zero(&fenced_buf->base.reference.count)) {
@@
-348,7
+348,7
@@
fenced_buffer_finish_locked(struct fenced_manager *fenced_mgr,
ops->fence_reference(ops, &fence, fenced_buf->fence);
ops->fence_reference(ops, &fence, fenced_buf->fence);
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
finished = ops->fence_finish(ops, fenced_buf->fence, 0);
finished = ops->fence_finish(ops, fenced_buf->fence, 0);
@@
-656,13
+656,13
@@
fenced_buffer_destroy(struct pb_buffer *buf)
fenced_buffer_destroy_locked(fenced_mgr, fenced_buf);
fenced_buffer_destroy_locked(fenced_mgr, fenced_buf);
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
}
static void *
fenced_buffer_map(struct pb_buffer *buf,
}
static void *
fenced_buffer_map(struct pb_buffer *buf,
-
unsigned
flags, void *flush_ctx)
+
enum pb_usage_flags
flags, void *flush_ctx)
{
struct fenced_buffer *fenced_buf = fenced_buffer(buf);
struct fenced_manager *fenced_mgr = fenced_buf->mgr;
{
struct fenced_buffer *fenced_buf = fenced_buffer(buf);
struct fenced_manager *fenced_mgr = fenced_buf->mgr;
@@
-709,7
+709,7
@@
fenced_buffer_map(struct pb_buffer *buf,
}
done:
}
done:
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
return map;
}
return map;
}
@@
-732,14
+732,14
@@
fenced_buffer_unmap(struct pb_buffer *buf)
fenced_buf->flags &= ~PB_USAGE_CPU_READ_WRITE;
}
fenced_buf->flags &= ~PB_USAGE_CPU_READ_WRITE;
}
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
}
static enum pipe_error
fenced_buffer_validate(struct pb_buffer *buf,
struct pb_validate *vl,
}
static enum pipe_error
fenced_buffer_validate(struct pb_buffer *buf,
struct pb_validate *vl,
-
unsigned
flags)
+
enum pb_usage_flags
flags)
{
struct fenced_buffer *fenced_buf = fenced_buffer(buf);
struct fenced_manager *fenced_mgr = fenced_buf->mgr;
{
struct fenced_buffer *fenced_buf = fenced_buffer(buf);
struct fenced_manager *fenced_mgr = fenced_buf->mgr;
@@
-802,7
+802,7
@@
fenced_buffer_validate(struct pb_buffer *buf,
fenced_buf->validation_flags |= flags;
done:
fenced_buf->validation_flags |= flags;
done:
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
return ret;
}
return ret;
}
@@
-826,7
+826,7
@@
fenced_buffer_fence(struct pb_buffer *buf,
assert(fenced_buf->validation_flags);
if (fenced_buf->fence) {
assert(fenced_buf->validation_flags);
if (fenced_buf->fence) {
-
MAYBE_UNUS
ED boolean destroyed = fenced_buffer_remove_locked(fenced_mgr, fenced_buf);
+
ASSERT
ED boolean destroyed = fenced_buffer_remove_locked(fenced_mgr, fenced_buf);
assert(!destroyed);
}
if (fence) {
assert(!destroyed);
}
if (fence) {
@@
-841,7
+841,7
@@
fenced_buffer_fence(struct pb_buffer *buf,
fenced_buf->validation_flags = 0;
}
fenced_buf->validation_flags = 0;
}
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
}
}
@@
-868,7
+868,7
@@
fenced_buffer_get_base_buffer(struct pb_buffer *buf,
*offset = 0;
}
*offset = 0;
}
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
}
}
@@
-939,14
+939,14
@@
fenced_bufmgr_create_buffer(struct pb_manager *mgr,
assert(fenced_buf->buffer || fenced_buf->data);
assert(fenced_buf->buffer || fenced_buf->data);
-
LIST_ADDTAIL
(&fenced_buf->head, &fenced_mgr->unfenced);
+
list_addtail
(&fenced_buf->head, &fenced_mgr->unfenced);
++fenced_mgr->num_unfenced;
++fenced_mgr->num_unfenced;
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
return &fenced_buf->base;
no_storage:
return &fenced_buf->base;
no_storage:
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
FREE(fenced_buf);
no_buffer:
return NULL;
FREE(fenced_buf);
no_buffer:
return NULL;
@@
-961,7
+961,7
@@
fenced_bufmgr_flush(struct pb_manager *mgr)
mtx_lock(&fenced_mgr->mutex);
while (fenced_manager_check_signalled_locked(fenced_mgr, TRUE))
;
mtx_lock(&fenced_mgr->mutex);
while (fenced_manager_check_signalled_locked(fenced_mgr, TRUE))
;
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
assert(fenced_mgr->provider->flush);
if (fenced_mgr->provider->flush)
assert(fenced_mgr->provider->flush);
if (fenced_mgr->provider->flush)
@@
-978,7
+978,7
@@
fenced_bufmgr_destroy(struct pb_manager *mgr)
/* Wait on outstanding fences. */
while (fenced_mgr->num_fenced) {
/* Wait on outstanding fences. */
while (fenced_mgr->num_fenced) {
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
sched_yield();
#endif
#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS)
sched_yield();
#endif
@@
-991,7
+991,7
@@
fenced_bufmgr_destroy(struct pb_manager *mgr)
/* assert(!fenced_mgr->num_unfenced); */
#endif
/* assert(!fenced_mgr->num_unfenced); */
#endif
-
pipe_mutex_unlock(
fenced_mgr->mutex);
+
mtx_unlock(&
fenced_mgr->mutex);
mtx_destroy(&fenced_mgr->mutex);
if (fenced_mgr->provider)
mtx_destroy(&fenced_mgr->mutex);
if (fenced_mgr->provider)
@@
-1027,10
+1027,10
@@
fenced_bufmgr_create(struct pb_manager *provider,
fenced_mgr->max_buffer_size = max_buffer_size;
fenced_mgr->max_cpu_total_size = max_cpu_total_size;
fenced_mgr->max_buffer_size = max_buffer_size;
fenced_mgr->max_cpu_total_size = max_cpu_total_size;
-
LIST_INITHEAD
(&fenced_mgr->fenced);
+
list_inithead
(&fenced_mgr->fenced);
fenced_mgr->num_fenced = 0;
fenced_mgr->num_fenced = 0;
-
LIST_INITHEAD
(&fenced_mgr->unfenced);
+
list_inithead
(&fenced_mgr->unfenced);
fenced_mgr->num_unfenced = 0;
(void) mtx_init(&fenced_mgr->mutex, mtx_plain);
fenced_mgr->num_unfenced = 0;
(void) mtx_init(&fenced_mgr->mutex, mtx_plain);