diff options
author | Marcin Slusarz <[email protected]> | 2011-12-02 22:02:51 +0100 |
---|---|---|
committer | Marcin Slusarz <[email protected]> | 2011-12-13 21:06:29 +0100 |
commit | 10e931219f0619c01456dd13fea65b8c21f3b87b (patch) | |
tree | 8da9e29e0a91bc829cd370d8f933f72033f8e4e4 /src/gallium/drivers/nvc0 | |
parent | 642d11da207e9becfa26a9e038db1c7520ec2aee (diff) |
nouveau: get rid of winsys object
Its only purpose was to destroy itself.
Diffstat (limited to 'src/gallium/drivers/nvc0')
-rw-r--r-- | src/gallium/drivers/nvc0/nvc0_context.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/nvc0_screen.c | 3 | ||||
-rw-r--r-- | src/gallium/drivers/nvc0/nvc0_screen.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_context.c b/src/gallium/drivers/nvc0/nvc0_context.c index 2927a0905bd..1bb90a38725 100644 --- a/src/gallium/drivers/nvc0/nvc0_context.c +++ b/src/gallium/drivers/nvc0/nvc0_context.c @@ -110,7 +110,6 @@ nvc0_default_flush_notify(struct nouveau_channel *chan) struct pipe_context * nvc0_create(struct pipe_screen *pscreen, void *priv) { - struct pipe_winsys *pipe_winsys = pscreen->winsys; struct nvc0_screen *screen = nvc0_screen(pscreen); struct nvc0_context *nvc0; struct pipe_context *pipe; @@ -126,7 +125,6 @@ nvc0_create(struct pipe_screen *pscreen, void *priv) nvc0->base.push_data = nvc0_m2mf_push_linear; nvc0->base.push_cb = nvc0_cb_push; - pipe->winsys = pipe_winsys; pipe->screen = pscreen; pipe->priv = priv; diff --git a/src/gallium/drivers/nvc0/nvc0_screen.c b/src/gallium/drivers/nvc0/nvc0_screen.c index 79c3e36b8f9..190737e224b 100644 --- a/src/gallium/drivers/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nvc0/nvc0_screen.c @@ -367,7 +367,7 @@ nvc0_screen_fence_update(struct pipe_screen *pscreen) } while(0) struct pipe_screen * -nvc0_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) +nvc0_screen_create(struct nouveau_device *dev) { struct nvc0_screen *screen; struct nouveau_channel *chan; @@ -390,7 +390,6 @@ nvc0_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) chan = screen->base.channel; chan->user_private = screen; - pscreen->winsys = ws; pscreen->destroy = nvc0_screen_destroy; pscreen->context_create = nvc0_create; pscreen->is_format_supported = nvc0_screen_is_format_supported; diff --git a/src/gallium/drivers/nvc0/nvc0_screen.h b/src/gallium/drivers/nvc0/nvc0_screen.h index 98a94c65c5b..be42970ca39 100644 --- a/src/gallium/drivers/nvc0/nvc0_screen.h +++ b/src/gallium/drivers/nvc0/nvc0_screen.h @@ -23,7 +23,6 @@ struct nvc0_blitctx; struct nvc0_screen { struct nouveau_screen base; - struct nouveau_winsys *nvws; struct nvc0_context *cur_ctx; |