cell: adapt to interface changes

not even compile tested but fairly trivial

2 files changed, 8 insertions, 16 deletions

diff --git a/src/gallium/drivers/cell/ppu/cell_screen.c b/src/gallium/drivers/cell/ppu/cell_screen.c
index b4fd8d7235..9bb3abfc9d 100644
--- a/src/gallium/drivers/cell/ppu/cell_screen.c
+++ b/src/gallium/drivers/cell/ppu/cell_screen.c
@@ -132,13 +132,17 @@ cell_get_paramf(struct pipe_screen *screen, int param)
 
 static boolean
 cell_is_format_supported( struct pipe_screen *screen,
-                          enum pipe_format format, 
+                          enum pipe_format format,
                           enum pipe_texture_target target,
-                          unsigned tex_usage, 
+                          unsigned sample_count,
+                          unsigned tex_usage,
                           unsigned geom_flags )
 {
    struct sw_winsys *winsys = cell_screen(screen)->winsys;
 
+   if (sample_count > 1)
+      return FALSE;
+
    if (tex_usage & (PIPE_BIND_DISPLAY_TARGET |
                     PIPE_BIND_SCANOUT |
                     PIPE_BIND_SHARED)) {
diff --git a/src/gallium/drivers/cell/ppu/cell_surface.c b/src/gallium/drivers/cell/ppu/cell_surface.c
index 6696a4591c..8000eee88a 100644
--- a/src/gallium/drivers/cell/ppu/cell_surface.c
+++ b/src/gallium/drivers/cell/ppu/cell_surface.c
@@ -30,21 +30,9 @@
 #include "cell_surface.h"
 
 
-static void
-cell_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)
-{
-   util_surface_copy(pipe, FALSE,
-                     dest, destx, desty,
-                     src, srcx, srcy,
-                     width, height);
-}
-
 void
 cell_init_surface_functions(struct cell_context *cell)
 {
-   cell->pipe.surface_copy = cell_surface_copy;
-   cell->pipe.surface_fill = util_surface_fill;
+   cell->pipe.resource_copy_region = util_resource_copy_region;
+   cell->pipe.resource_fill_region = util_resource_fill_region;
 }