Mesa (master): nv50: support non-blocking query_result()
Ben Skeggs
darktama at kemper.freedesktop.org
Wed Jul 29 01:26:59 UTC 2009
Module: Mesa
Branch: master
Commit: 693f900b163f89952ed9b4c30d093f8ead461657
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=693f900b163f89952ed9b4c30d093f8ead461657
Author: Ben Skeggs <bskeggs at redhat.com>
Date: Wed Jul 29 11:19:52 2009 +1000
nv50: support non-blocking query_result()
---
src/gallium/drivers/nv50/nv50_query.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 940e043..c354e10 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -107,13 +107,13 @@ nv50_query_result(struct pipe_context *pipe, struct pipe_query *pq,
boolean wait, uint64_t *result)
{
struct nv50_query *q = nv50_query(pq);
-
- /*XXX: Want to be able to return FALSE here instead of blocking
- * until the result is available..
- */
+ int ret;
if (!q->ready) {
- nouveau_bo_map(q->bo, NOUVEAU_BO_RD);
+ ret = nouveau_bo_map(q->bo, NOUVEAU_BO_RD |
+ wait ? 0 : NOUVEAU_BO_NOWAIT);
+ if (ret)
+ return false;
q->result = ((uint32_t *)q->bo->map)[1];
q->ready = TRUE;
nouveau_bo_unmap(q->bo);
More information about the mesa-commit
mailing list