Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1

[mesa.git] / src / mesa / pipe / nv50 / nv50_surface.c

diff --git a/src/mesa/pipe/nv50/nv50_surface.c b/src/mesa/pipe/nv50/nv50_surface.c
index 44e6728b2640ecf9d9818e617db2877afaeebc87..cfb370da77e0172ffc071062b70dbf595c024471 100644 (file)
--- a/src/mesa/pipe/nv50/nv50_surface.c
+++ b/src/mesa/pipe/nv50/nv50_surface.c
@@ -42,19 +42,6 @@ nv50_get_tex_surface(struct pipe_context *pipe,
        return NULL;
 }
 
-static void
-nv50_surface_data(struct pipe_context *pipe, struct pipe_surface *dest,
-                 unsigned destx, unsigned desty, const void *src,
-                 unsigned src_stride, unsigned srcx, unsigned srcy,
-                 unsigned width, unsigned height)
-{
-       struct nv50_context *nv50 = (struct nv50_context *)pipe;
-       struct nouveau_winsys *nvws = nv50->nvws;
-
-       nvws->surface_data(nvws, dest, destx, desty, src, src_stride,
-                          srcx, srcy, width, height);
-}
-
 static void
 nv50_surface_copy(struct pipe_context *pipe, struct pipe_surface *dest,
                  unsigned destx, unsigned desty, struct pipe_surface *src,
@@ -82,11 +69,6 @@ void
 nv50_init_surface_functions(struct nv50_context *nv50)
 {
    nv50->pipe.get_tex_surface = nv50_get_tex_surface;
-   nv50->pipe.get_tile = pipe_get_tile_raw;
-   nv50->pipe.put_tile = pipe_put_tile_raw;
-   nv50->pipe.get_tile_rgba = pipe_get_tile_rgba;
-   nv50->pipe.put_tile_rgba = pipe_put_tile_rgba;
-   nv50->pipe.surface_data = nv50_surface_data;
    nv50->pipe.surface_copy = nv50_surface_copy;
    nv50->pipe.surface_fill = nv50_surface_fill;
 }