Merge branch '7.8'

[mesa.git] / src / gallium / drivers / cell / ppu / cell_context.c

diff --git a/src/gallium/drivers/cell/ppu/cell_context.c b/src/gallium/drivers/cell/ppu/cell_context.c
index ebb7a7acc446bd6d3d1f627c12d4c483c13feca9..afcea616d5934c8743c578742184865566d11aa5 100644 (file)
--- a/src/gallium/drivers/cell/ppu/cell_context.c
+++ b/src/gallium/drivers/cell/ppu/cell_context.c
@@ -36,7 +36,6 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_format.h"
 #include "util/u_memory.h"
-#include "pipe/internal/p_winsys_screen.h"
 #include "pipe/p_screen.h"
 
 #include "draw/draw_context.h"
@@ -124,7 +123,7 @@ cell_is_buffer_referenced( struct pipe_context *pipe,
 
 struct pipe_context *
 cell_create_context(struct pipe_screen *screen,
-                    struct cell_winsys *cws)
+                    void *priv )
 {
    struct cell_context *cell;
    uint i;
@@ -136,9 +135,10 @@ cell_create_context(struct pipe_screen *screen,
 
    memset(cell, 0, sizeof(*cell));
 
-   cell->winsys = cws;
-   cell->pipe.winsys = screen->winsys;
+   cell->winsys = NULL;                /* XXX: fixme - get this from screen? */
+   cell->pipe.winsys = NULL;
    cell->pipe.screen = screen;
+   cell->pipe.priv = priv;
    cell->pipe.destroy = cell_destroy_context;
 
    cell->pipe.clear = cell_clear;