[Mesa3d-dev] [PATCH] nv50: add missing parentheses in nv50_query_result()

2010-01-06 Thread Roel Kluin
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.kl...@gmail.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 5d9e182..5a4ab35 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];

--
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
___
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev


Re: [Mesa3d-dev] [PATCH] nv50: add missing parentheses in nv50_query_result()

2010-01-06 Thread Brian Paul
Roel Kluin wrote:
 NOUVEAU_BO_RD is defined (1  2), and `|' has higher precedence than `?'
 so the second argument of nouveau_bo_map was always 0.

Applied to 7.7 branch.  Thanks.

-Brian


--
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
___
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev