Module: Mesa Branch: gallium-screen-context Commit: 009598122adf5cad42bf9af067eccaf8e89e1233 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=009598122adf5cad42bf9af067eccaf8e89e1233
Author: Christoph Bumiller <[email protected]> Date: Mon Feb 8 11:03:26 2010 +0000 nouveau: fix gallium-screen-context branch fallout --- src/gallium/drivers/nouveau/nouveau_winsys.h | 9 --------- src/gallium/drivers/nv30/nv30_screen.h | 2 ++ src/gallium/drivers/nv40/nv40_context.h | 2 +- src/gallium/drivers/nv40/nv40_screen.h | 2 ++ src/gallium/drivers/nv50/nv50_context.h | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index 4c5d2f8..af9ddd5 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -29,19 +29,10 @@ extern struct pipe_screen * nv30_screen_create(struct pipe_winsys *ws, struct nouveau_device *); -extern struct pipe_context * -nv30_create(struct pipe_screen *, unsigned pctx_id); - extern struct pipe_screen * nv40_screen_create(struct pipe_winsys *ws, struct nouveau_device *); -extern struct pipe_context * -nv40_create(struct pipe_screen *, unsigned pctx_id); - extern struct pipe_screen * nv50_screen_create(struct pipe_winsys *ws, struct nouveau_device *); -extern struct pipe_context * -nv50_create(struct pipe_screen *, unsigned pctx_id); - #endif diff --git a/src/gallium/drivers/nv30/nv30_screen.h b/src/gallium/drivers/nv30/nv30_screen.h index b1ac939..8591cd3 100644 --- a/src/gallium/drivers/nv30/nv30_screen.h +++ b/src/gallium/drivers/nv30/nv30_screen.h @@ -10,6 +10,8 @@ struct nv30_screen { struct nouveau_winsys *nvws; + struct nv30_context *cur_ctx; + /* HW graphics objects */ struct nv04_surface_2d *eng2d; struct nouveau_grobj *rankine; diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h index 71936c2..958a48f 100644 --- a/src/gallium/drivers/nv40/nv40_context.h +++ b/src/gallium/drivers/nv40/nv40_context.h @@ -231,6 +231,6 @@ extern void nv40_clear(struct pipe_context *pipe, unsigned buffers, /* nv40_context.c */ struct pipe_context * -nv40_create(struct pipe_screen *pscreen, void *priv) +nv40_create(struct pipe_screen *pscreen, void *priv); #endif diff --git a/src/gallium/drivers/nv40/nv40_screen.h b/src/gallium/drivers/nv40/nv40_screen.h index 9de98b2..9437aa0 100644 --- a/src/gallium/drivers/nv40/nv40_screen.h +++ b/src/gallium/drivers/nv40/nv40_screen.h @@ -9,6 +9,8 @@ struct nv40_screen { struct nouveau_winsys *nvws; + struct nv40_context *cur_ctx; + /* HW graphics objects */ struct nv04_surface_2d *eng2d; struct nouveau_grobj *curie; diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h index f2b3172..14cef4c 100644 --- a/src/gallium/drivers/nv50/nv50_context.h +++ b/src/gallium/drivers/nv50/nv50_context.h @@ -251,6 +251,6 @@ nv50_upload_sifc(struct nv50_context *nv50, /* nv50_context.c */ struct pipe_context * -nv50_create(struct pipe_screen *pscreen, void *priv) +nv50_create(struct pipe_screen *pscreen, void *priv); #endif _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
