projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
nv50
/
nv50_query.c
diff --git
a/src/gallium/drivers/nv50/nv50_query.c
b/src/gallium/drivers/nv50/nv50_query.c
index 5d9e18218ae8cd976c364a5bdcf2755efc5a0f90..5a4ab3508b85a3c5ab44f371b8a4aeb63c683491 100644
(file)
--- a/
src/gallium/drivers/nv50/nv50_query.c
+++ b/
src/gallium/drivers/nv50/nv50_query.c
@@
-111,7
+111,7
@@
nv50_query_result(struct pipe_context *pipe, struct pipe_query *pq,
if (!q->ready) {
ret = nouveau_bo_map(q->bo, NOUVEAU_BO_RD |
-
wait ? 0 : NOUVEAU_BO_NOWAIT
);
+
(wait ? 0 : NOUVEAU_BO_NOWAIT)
);
if (ret)
return false;
q->result = ((uint32_t *)q->bo->map)[1];