diff options
| author | Ben Skeggs <[email protected]> | 2009-06-05 10:28:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2009-06-05 14:37:03 +1000 |
| commit | 80e9e1ee8172d1e5a81d702681897dddd9d815f1 (patch) | |
| tree | 8104fc6523428a52598f026f566bab7e29939309 /src/gallium/drivers/nv04/nv04_screen.c | |
| parent | 1b207d9bb81ae3385e5658a81c71fbf2fe15c18f (diff) | |
nouveau: move channel creation into pipe drivers
Diffstat (limited to 'src/gallium/drivers/nv04/nv04_screen.c')
| -rw-r--r-- | src/gallium/drivers/nv04/nv04_screen.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/nv04/nv04_screen.c b/src/gallium/drivers/nv04/nv04_screen.c index 98e2dafcd8a..4bbedfb4d69 100644 --- a/src/gallium/drivers/nv04/nv04_screen.c +++ b/src/gallium/drivers/nv04/nv04_screen.c @@ -122,10 +122,9 @@ nv04_surface_buffer(struct pipe_surface *surf) } struct pipe_screen * -nv04_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws) +nv04_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) { struct nv04_screen *screen = CALLOC_STRUCT(nv04_screen); - struct nouveau_device *dev = nvws->channel->device; struct nouveau_channel *chan; struct pipe_screen *pscreen; unsigned fahrenheit_class = 0, sub3d_class = 0; @@ -140,9 +139,7 @@ nv04_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws) nv04_screen_destroy(pscreen); return NULL; } - screen->base.channel = chan = nvws->channel; - - screen->nvws = nvws; + chan = screen->base.channel; pscreen->winsys = ws; pscreen->destroy = nv04_screen_destroy; @@ -188,7 +185,7 @@ nv04_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *nvws) BIND_RING(chan, screen->context_surfaces_3d, 6); /* 2D engine setup */ - screen->eng2d = nv04_surface_2d_init(nvws); + screen->eng2d = nv04_surface_2d_init(&screen->base); screen->eng2d->buf = nv04_surface_buffer; /* Notifier for sync purposes */ |