Mesa (mesa_7_7_branch): nv50: add missing parentheses in nv50_query_result( )
Brian Paul
brianp at kemper.freedesktop.org
Wed Jan 6 16:48:15 UTC 2010
Module: Mesa
Branch: mesa_7_7_branch
Commit: 2b4acd26b1680eda9622205bbc1879da30d085bc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2b4acd26b1680eda9622205bbc1879da30d085bc
Author: Roel Kluin <roel.kluin at gmail.com>
Date: Wed Jan 6 08:07:00 2010 -0800
nv50: add missing parentheses in nv50_query_result()
NOUVEAU_BO_RD is defined (1 << 2), and `|' has higher precedence than `?'
so the second argument of nouveau_bo_map was always 0.
Signed-off-by: Roel Kluin <roel.kluin at gmail.com>
Signed-off-by: Brian Paul <brianp at vmware.com>
---
src/gallium/drivers/nv50/nv50_query.c | 2 +-
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 5305c93..f605c47 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];
More information about the mesa-commit
mailing list