OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e4b7d9e
)
nv50: add missing parentheses in nv50_query_result()
author
Roel Kluin
<roel.kluin@gmail.com>
Wed, 6 Jan 2010 16:07:00 +0000
(08:07 -0800)
committer
Brian Paul
<brianp@vmware.com>
Wed, 6 Jan 2010 16:46:53 +0000
(09:46 -0700)
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@gmail.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
src/gallium/drivers/nv50/nv50_query.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/nv50/nv50_query.c
b/src/gallium/drivers/nv50/nv50_query.c
index
5305c93
..
f605c47
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];