nouveau: implement pipe_screen

Untested on NV3x/NV5x.  Quite possibly broken.

1 files changed, 12 insertions, 4 deletions

diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
index 2ca05d84c6..1d758e29e7 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
@@ -72,23 +72,29 @@ struct pipe_context *
 nouveau_pipe_create(struct nouveau_context *nv)
 {
 	struct nouveau_winsys *nvws = CALLOC_STRUCT(nouveau_winsys);
-	struct pipe_context *(*hw_create)(struct pipe_winsys *,
-					  struct nouveau_winsys *,
-					  unsigned);
+	struct pipe_screen *(*hws_create)(struct pipe_winsys *,
+					  unsigned chipset);
+	struct pipe_context *(*hw_create)(struct pipe_screen *,
+					  struct nouveau_winsys *);
+	struct pipe_winsys *ws;
+	struct pipe_screen *pscreen;
 
 	if (!nvws)
 		return NULL;
 
 	switch (nv->chipset & 0xf0) {
 	case 0x30:
+		hws_create = nv30_screen_create;
 		hw_create = nv30_create;
 		break;
 	case 0x40:
 	case 0x60:
+		hws_create = nv40_screen_create;
 		hw_create = nv40_create;
 		break;
 	case 0x50:
 	case 0x80:
+		hws_create = nv50_screen_create;
 		hw_create = nv50_create;
 		break;
 	default:
@@ -119,6 +125,8 @@ nouveau_pipe_create(struct nouveau_context *nv)
 	nvws->surface_copy	= nouveau_pipe_surface_copy;
 	nvws->surface_fill	= nouveau_pipe_surface_fill;
 
-	return hw_create(nouveau_create_pipe_winsys(nv), nvws, nv->chipset);
+	ws = nouveau_create_pipe_winsys(nv);
+	pscreen = hws_create(ws, nv->chipset);
+	return hw_create(pscreen, nvws);
 }