Mesa (master): nv50: fix occlusion queries
Ben Skeggs
darktama at kemper.freedesktop.org
Thu Feb 19 23:51:30 UTC 2009
Module: Mesa
Branch: master
Commit: 5ea8068f242411604cfb80e0ce21d8f6f2641046
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ea8068f242411604cfb80e0ce21d8f6f2641046
Author: Ben Skeggs <bskeggs at redhat.com>
Date: Fri Feb 20 09:38:06 2009 +1000
nv50: fix occlusion queries
Left behind from some gallium changes a while back..
---
src/gallium/drivers/nv50/nv50_query.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/gallium/drivers/nv50/nv50_query.c b/src/gallium/drivers/nv50/nv50_query.c
index 20745ce..7c8831a 100644
--- a/src/gallium/drivers/nv50/nv50_query.c
+++ b/src/gallium/drivers/nv50/nv50_query.c
@@ -90,11 +90,12 @@ nv50_query_end(struct pipe_context *pipe, struct pipe_query *pq)
struct nouveau_channel *chan = nv50->screen->nvws->channel;
struct nouveau_grobj *tesla = nv50->screen->tesla;
struct nv50_query *q = nv50_query(pq);
+ struct nouveau_bo *bo = nv50->screen->nvws->get_bo(q->buffer);
WAIT_RING (chan, 5);
BEGIN_RING(chan, tesla, 0x1b00, 4);
- OUT_RELOCh(chan, q->buffer, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
- OUT_RELOCl(chan, q->buffer, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+ OUT_RELOCh(chan, bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
+ OUT_RELOCl(chan, bo, 0, NOUVEAU_BO_VRAM | NOUVEAU_BO_WR);
OUT_RING (chan, 0x00000000);
OUT_RING (chan, 0x0100f002);
FIRE_RING (chan);
More information about the mesa-commit
mailing list