diff options
| author | Luca Barbieri <luca@luca-barbieri.com> | 2010-02-20 17:43:31 +0100 |
|---|---|---|
| committer | Younes Manton <younes.m@gmail.com> | 2010-03-15 00:03:00 -0400 |
| commit | 5f71414fc941f0d390c03633f1a53534807cfca6 (patch) | |
| tree | dc1f940a240882f8a575444814732ccc33efcd04 /src/gallium/drivers/nv40/nv40_query.c | |
| parent | 883aa5974bcf31f19294cb40b0c4df43bb550820 (diff) | |
nv40: use NV34TCL_ constants where available
It was decided to just use the NV34TCL_ constants for constants
common between nv30 and nv40, and deprecate the NV40TCL_ versions.
This patch changes the nv40 driver to use NV34TCL_ constants for
common functionality.
This reduces differences between nv30 and nv40 to ease further
unification.
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_query.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_query.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c index 8ed4a67dd0..45c5468537 100644 --- a/src/gallium/drivers/nv40/nv40_query.c +++ b/src/gallium/drivers/nv40/nv40_query.c @@ -60,9 +60,9 @@ nv40_query_begin(struct pipe_context *pipe, struct pipe_query *pq) assert(0); nouveau_notifier_reset(nv40->screen->query, q->object->start); - BEGIN_RING(chan, curie, NV40TCL_QUERY_RESET, 1); + BEGIN_RING(chan, curie, NV34TCL_QUERY_RESET, 1); OUT_RING (chan, 1); - BEGIN_RING(chan, curie, NV40TCL_QUERY_UNK17CC, 1); + BEGIN_RING(chan, curie, NV34TCL_QUERY_UNK17CC, 1); OUT_RING (chan, 1); q->ready = FALSE; @@ -77,9 +77,9 @@ nv40_query_end(struct pipe_context *pipe, struct pipe_query *pq) struct nouveau_channel *chan = screen->base.channel; struct nouveau_grobj *curie = screen->curie; - BEGIN_RING(chan, curie, NV40TCL_QUERY_GET, 1); - OUT_RING (chan, (0x01 << NV40TCL_QUERY_GET_UNK24_SHIFT) | - ((q->object->start * 32) << NV40TCL_QUERY_GET_OFFSET_SHIFT)); + BEGIN_RING(chan, curie, NV34TCL_QUERY_GET, 1); + OUT_RING (chan, (0x01 << NV34TCL_QUERY_GET_UNK24_SHIFT) | + ((q->object->start * 32) << NV34TCL_QUERY_GET_OFFSET_SHIFT)); FIRE_RING(chan); } |