Merge branch 'mesa_7_6_branch'

[mesa.git] / src / gallium / winsys / g3dvl / xsp_winsys.c

diff --git a/src/gallium/winsys/g3dvl/xsp_winsys.c b/src/gallium/winsys/g3dvl/xsp_winsys.c
index 5b9fdb5c1f8a784ee43d01afcf1dc90e9dac6d0d..37d60ce5406224280606dcafe0235202cbe8aa50 100644 (file)
--- a/src/gallium/winsys/g3dvl/xsp_winsys.c
+++ b/src/gallium/winsys/g3dvl/xsp_winsys.c
@@ -105,6 +105,7 @@ static struct pipe_buffer* xsp_surface_buffer_create
        unsigned height,
        enum pipe_format format,
        unsigned usage,
+       unsigned tex_usage,
        unsigned *stride
 )
 {
@@ -261,7 +262,7 @@ struct pipe_context* create_pipe_context(Display *display, int screen)
        }
 
        sp_screen = softpipe_create_screen((struct pipe_winsys*)xsp_winsys);
-       sp_pipe = softpipe_create(sp_screen, (struct pipe_winsys*)xsp_winsys, NULL);
+       sp_pipe = softpipe_create(sp_screen);
 
        xsp_context = calloc(1, sizeof(struct xsp_context));
        xsp_context->display = display;