Merge branch 'softpipe-opt'

[mesa.git] / src / gallium / drivers / nv10 / nv10_surface.c

diff --git a/src/gallium/drivers/nv10/nv10_surface.c b/src/gallium/drivers/nv10/nv10_surface.c
index be44c7bed509ed80d298ac3277dfbfe1073655f1..5b52246a9caa4bd41df50fef03e09555c1ecb230 100644 (file)
--- a/src/gallium/drivers/nv10/nv10_surface.c
+++ b/src/gallium/drivers/nv10/nv10_surface.c
@@ -28,21 +28,20 @@
 
 #include "nv10_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/p_winsys.h"
+#include "pipe/internal/p_winsys_screen.h"
 #include "pipe/p_inlines.h"
 #include "util/u_tile.h"
 
 static void
-nv10_surface_copy(struct pipe_context *pipe, boolean do_flip,
+nv10_surface_copy(struct pipe_context *pipe,
                  struct pipe_surface *dest, unsigned destx, unsigned desty,
                  struct pipe_surface *src, unsigned srcx, unsigned srcy,
                  unsigned width, unsigned height)
 {
        struct nv10_context *nv10 = nv10_context(pipe);
-       struct nouveau_winsys *nvws = nv10->nvws;
+       struct nv04_surface_2d *eng2d = nv10->screen->eng2d;
 
-       nvws->surface_copy(nvws, dest, destx, desty, src, srcx, srcy,
-                          width, height);
+       eng2d->copy(eng2d, dest, destx, desty, src, srcx, srcy, width, height);
 }
 
 static void
@@ -51,9 +50,9 @@ nv10_surface_fill(struct pipe_context *pipe, struct pipe_surface *dest,
                  unsigned height, unsigned value)
 {
        struct nv10_context *nv10 = nv10_context(pipe);
-       struct nouveau_winsys *nvws = nv10->nvws;
+       struct nv04_surface_2d *eng2d = nv10->screen->eng2d;
 
-       nvws->surface_fill(nvws, dest, destx, desty, width, height, value);
+       eng2d->fill(eng2d, dest, destx, desty, width, height, value);
 }
 
 void