diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-05-13 12:16:35 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-05-13 12:16:35 +1000 |
| commit | 1ef08564d2a201a422db772a6bb23d1129888304 (patch) | |
| tree | 3fec32e8a0c907394f7766fd197fe5cc9008876a /src/gallium/drivers/nv40/nv40_screen.c | |
| parent | 2f80d4d2a705835b272cf2274ea578fe5bbe1919 (diff) | |
nouveau: remove chipset fields in all nv pipe driver context/screen structs.
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_screen.c')
| -rw-r--r-- | src/gallium/drivers/nv40/nv40_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv40/nv40_screen.c b/src/gallium/drivers/nv40/nv40_screen.c index 7f68539a85..1bf0931e4d 100644 --- a/src/gallium/drivers/nv40/nv40_screen.c +++ b/src/gallium/drivers/nv40/nv40_screen.c @@ -12,9 +12,10 @@ static const char * nv40_screen_get_name(struct pipe_screen *pscreen) { struct nv40_screen *screen = nv40_screen(pscreen); + struct nouveau_device *dev = screen->nvws->channel->device; static char buffer[128]; - snprintf(buffer, sizeof(buffer), "NV%02X", screen->chipset); + snprintf(buffer, sizeof(buffer), "NV%02X", dev->chipset); return buffer; } @@ -149,17 +150,16 @@ nv40_screen_destroy(struct pipe_screen *pscreen) } struct pipe_screen * -nv40_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws, - unsigned chipset) +nv40_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws) { struct nv40_screen *screen = CALLOC_STRUCT(nv40_screen); struct nouveau_stateobj *so; unsigned curie_class; + unsigned chipset = nvws->channel->device; int ret; if (!screen) return NULL; - screen->chipset = chipset; screen->nvws = nvws; /* 3D object */ |