summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv50
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-01-08 08:21:12 -0700
committerBrian Paul <brianp@vmware.com>2010-01-08 08:21:12 -0700
commitfd70841121475d7aad98812d6bf9c9c67567b89a (patch)
tree13f7eef837abc0151dc663a2b6fed04d7f2cc578 /src/gallium/drivers/nv50
parenta1de400e8de06a80ab140bb0fa950e990607572d (diff)
parent674c76310fe93dd3d7a15af0f72bb9f04351d09f (diff)
Merge branch 'mesa_7_7_branch'
Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
Diffstat (limited to 'src/gallium/drivers/nv50')
-rw-r--r--src/gallium/drivers/nv50/nv50_query.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 5d9e18218a..5a4ab3508b 100644
--- 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];