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/nv50 | |
parent | 642d11da207e9becfa26a9e038db1c7520ec2aee (diff) |
nouveau: get rid of winsys object
Its only purpose was to destroy itself.
Diffstat (limited to 'src/gallium/drivers/nv50')
-rw-r--r-- | src/gallium/drivers/nv50/nv50_context.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/nv50_screen.c | 3 | ||||
-rw-r--r-- | src/gallium/drivers/nv50/nv50_screen.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index a48b86474d1..3b0f8f07d1c 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -109,7 +109,6 @@ nv50_destroy(struct pipe_context *pipe) struct pipe_context * nv50_create(struct pipe_screen *pscreen, void *priv) { - struct pipe_winsys *pipe_winsys = pscreen->winsys; struct nv50_screen *screen = nv50_screen(pscreen); struct nv50_context *nv50; struct pipe_context *pipe; @@ -124,7 +123,6 @@ nv50_create(struct pipe_screen *pscreen, void *priv) nv50->base.copy_data = nv50_m2mf_copy_linear; nv50->base.push_data = nv50_sifc_linear_u8; - pipe->winsys = pipe_winsys; pipe->screen = pscreen; pipe->priv = priv; diff --git a/src/gallium/drivers/nv50/nv50_screen.c b/src/gallium/drivers/nv50/nv50_screen.c index 3cd5fdfedf3..f1dec3527d2 100644 --- a/src/gallium/drivers/nv50/nv50_screen.c +++ b/src/gallium/drivers/nv50/nv50_screen.c @@ -298,7 +298,7 @@ nv50_screen_fence_update(struct pipe_screen *pscreen) } while(0) struct pipe_screen * -nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) +nv50_screen_create(struct nouveau_device *dev) { struct nv50_screen *screen; struct nouveau_channel *chan; @@ -323,7 +323,6 @@ nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev) chan = screen->base.channel; chan->user_private = screen; - pscreen->winsys = ws; pscreen->destroy = nv50_screen_destroy; pscreen->context_create = nv50_create; pscreen->is_format_supported = nv50_screen_is_format_supported; diff --git a/src/gallium/drivers/nv50/nv50_screen.h b/src/gallium/drivers/nv50/nv50_screen.h index 315ca80c0d2..cb7e956cd84 100644 --- a/src/gallium/drivers/nv50/nv50_screen.h +++ b/src/gallium/drivers/nv50/nv50_screen.h @@ -25,7 +25,6 @@ struct nv50_blitctx; struct nv50_screen { struct nouveau_screen base; - struct nouveau_winsys *nvws; struct nv50_context *cur_ctx; |