From: Roland Scheidegger <sroland@vmware.com>
Date: Mon, 17 May 2010 19:23:46 +0000 (+0200)
Subject: softpipe: adapt to interface changes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6c32670706e8ed3855ff2187f0eadee43b5b8742;p=mesa.git

softpipe: adapt to interface changes
---

diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 8bb0294238a..ad59ee90936 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -145,8 +145,9 @@ softpipe_get_paramf(struct pipe_screen *screen, int param)
  */
 static boolean
 softpipe_is_format_supported( struct pipe_screen *screen,
-                              enum pipe_format format, 
+                              enum pipe_format format,
                               enum pipe_texture_target target,
+                              unsigned sample_count,
                               unsigned bind,
                               unsigned geom_flags )
 {
@@ -162,6 +163,9 @@ softpipe_is_format_supported( struct pipe_screen *screen,
    if (!format_desc)
       return FALSE;
 
+   if (sample_count > 1)
+      return FALSE;
+
    if (bind & (PIPE_BIND_DISPLAY_TARGET |
                PIPE_BIND_SCANOUT |
                PIPE_BIND_SHARED)) {
diff --git a/src/gallium/drivers/softpipe/sp_surface.c b/src/gallium/drivers/softpipe/sp_surface.c
index 32cab06004f..0296c26ad26 100644
--- a/src/gallium/drivers/softpipe/sp_surface.c
+++ b/src/gallium/drivers/softpipe/sp_surface.c
@@ -29,22 +29,9 @@
 #include "sp_context.h"
 #include "sp_surface.h"
 
-
-static void
-sp_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
 sp_init_surface_functions(struct softpipe_context *sp)
 {
-   sp->pipe.surface_copy = sp_surface_copy;
-   sp->pipe.surface_fill = util_surface_fill;
+   sp->pipe.resource_copy_region = util_resource_copy_region;
+   sp->pipe.resource_fill_region = util_resource_fill_region;
 }