KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmpipe: wait for queries being finished when asked for it or before deletion 

This fixes bug #28757, though does not yet address the issue that fences aren't
always emitted.
This commit is contained in:
Roland Scheidegger 2010-07-05 17:17:50 +02:00
parent a3b0aaf26f
commit 3ed0a099c7
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/gallium/drivers/llvmpipe/lp_query.c
View File

@ -48,7 +48,7 @@ static struct llvmpipe_query *llvmpipe_query( struct pipe_query *p )
static struct pipe_query * static struct pipe_query *
llvmpipe_create_query(struct pipe_context *pipe, llvmpipe_create_query(struct pipe_context *pipe,
unsigned type) unsigned type)
{ {
struct llvmpipe_query *pq; struct llvmpipe_query *pq;
@ -67,6 +67,16 @@ static void
llvmpipe_destroy_query(struct pipe_context *pipe, struct pipe_query *q) llvmpipe_destroy_query(struct pipe_context *pipe, struct pipe_query *q)
{ {
struct llvmpipe_query *pq = llvmpipe_query(q); struct llvmpipe_query *pq = llvmpipe_query(q);
/* query might still be in process if we never waited for the result */
if (!pq->done) {
struct pipe_fence_handle *fence = NULL;
llvmpipe_flush(pipe, 0, &fence);
if (fence) {
pipe->screen->fence_finish(pipe->screen, fence, 0);
pipe->screen->fence_reference(pipe->screen, &fence, NULL);
}
}
pipe_mutex_destroy(pq->mutex); pipe_mutex_destroy(pq->mutex);
FREE(pq); FREE(pq);
} }
@ -74,16 +84,26 @@ llvmpipe_destroy_query(struct pipe_context *pipe, struct pipe_query *q)
static boolean static boolean
llvmpipe_get_query_result(struct pipe_context *pipe, llvmpipe_get_query_result(struct pipe_context *pipe,
struct pipe_query *q, struct pipe_query *q,
boolean wait, boolean wait,
void *vresult) void *vresult)
{ {
struct llvmpipe_context *llvmpipe = llvmpipe_context( pipe );
struct llvmpipe_query *pq = llvmpipe_query(q); struct llvmpipe_query *pq = llvmpipe_query(q);
uint64_t *result = (uint64_t *)vresult; uint64_t *result = (uint64_t *)vresult;
if (!pq->done) { if (!pq->done) {
lp_setup_flush(llvmpipe->setup, 0); if (wait) {
struct pipe_fence_handle *fence = NULL;
llvmpipe_flush(pipe, 0, &fence);
if (fence) {
pipe->screen->fence_finish(pipe->screen, fence, 0);
pipe->screen->fence_reference(pipe->screen, &fence, NULL);
}
}
/* this is a bit inconsequent but should be ok */
else {
llvmpipe_flush(pipe, 0, NULL);
}
} }
if (pq->done) { if (pq->done) {