projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4066386
)
gallium/radeon: fix PIPE_QUERY_GPU_FINISHED
author
Marek Olšák
<marek.olsak@amd.com>
Sat, 7 Nov 2015 18:31:55 +0000
(19:31 +0100)
committer
Marek Olšák
<marek.olsak@amd.com>
Fri, 13 Nov 2015 18:54:40 +0000
(19:54 +0100)
Broken by the addition of r600_multi_fence
in
3b37155a68acc351cba86a1fa142bd0de2192d4c
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89014
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
src/gallium/drivers/radeon/r600_query.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/radeon/r600_query.c
b/src/gallium/drivers/radeon/r600_query.c
index 9a5402583f4702ee33b9f45dca60e6e3e29091fe..2bb5732262fb2a431e26e993ac05dccf4e311fac 100644
(file)
--- a/
src/gallium/drivers/radeon/r600_query.c
+++ b/
src/gallium/drivers/radeon/r600_query.c
@@
-532,7
+532,7
@@
static void r600_end_query(struct pipe_context *ctx, struct pipe_query *query)
case PIPE_QUERY_TIMESTAMP_DISJOINT:
return;
case PIPE_QUERY_GPU_FINISHED:
-
rctx->rings.gfx.flush(rctx, RADEON_FLUSH_ASYNC, &rquery->fence
);
+
ctx->flush(ctx, &rquery->fence, 0
);
return;
case R600_QUERY_DRAW_CALLS:
rquery->end_result = rctx->num_draw_calls;