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_screen.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_screen.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_screen.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/nv40/nv40_screen.c b/src/gallium/drivers/nv40/nv40_screen.c index dbcc33d8d9..9c49e2b6ec 100644 --- a/src/gallium/drivers/nv40/nv40_screen.c +++ b/src/gallium/drivers/nv40/nv40_screen.c @@ -264,23 +264,23 @@ nv40_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) /* Static curie initialisation */ so = so_new(16, 25, 0); - so_method(so, screen->curie, NV40TCL_DMA_NOTIFY, 1); + so_method(so, screen->curie, NV34TCL_DMA_NOTIFY, 1); so_data (so, screen->sync->handle); - so_method(so, screen->curie, NV40TCL_DMA_TEXTURE0, 2); + so_method(so, screen->curie, NV34TCL_DMA_TEXTURE0, 2); so_data (so, chan->vram->handle); so_data (so, chan->gart->handle); - so_method(so, screen->curie, NV40TCL_DMA_COLOR1, 1); + so_method(so, screen->curie, NV34TCL_DMA_COLOR1, 1); so_data (so, chan->vram->handle); - so_method(so, screen->curie, NV40TCL_DMA_COLOR0, 2); + so_method(so, screen->curie, NV34TCL_DMA_COLOR0, 2); so_data (so, chan->vram->handle); so_data (so, chan->vram->handle); - so_method(so, screen->curie, NV40TCL_DMA_VTXBUF0, 2); + so_method(so, screen->curie, NV34TCL_DMA_VTXBUF0, 2); so_data (so, chan->vram->handle); so_data (so, chan->gart->handle); - so_method(so, screen->curie, NV40TCL_DMA_FENCE, 2); + so_method(so, screen->curie, NV34TCL_DMA_FENCE, 2); so_data (so, 0); so_data (so, screen->query->handle); - so_method(so, screen->curie, NV40TCL_DMA_UNK01AC, 2); + so_method(so, screen->curie, NV34TCL_DMA_IN_MEMORY7, 2); so_data (so, chan->vram->handle); so_data (so, chan->vram->handle); so_method(so, screen->curie, NV40TCL_DMA_COLOR2, 2); |