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

i965g: adapt to interface changes
---

diff --git a/src/gallium/drivers/i965/brw_resource.c b/src/gallium/drivers/i965/brw_resource.c
index d601f42dd16..3b9854be588 100644
--- a/src/gallium/drivers/i965/brw_resource.c
+++ b/src/gallium/drivers/i965/brw_resource.c
@@ -1,4 +1,5 @@
 #include "util/u_debug.h"
+#include "util/u_surface.h"
 
 #include "brw_resource.h"
 #include "brw_context.h"
@@ -37,6 +38,8 @@ brw_init_resource_functions(struct brw_context *brw )
    brw->base.transfer_unmap = u_transfer_unmap_vtbl;
    brw->base.transfer_destroy = u_transfer_destroy_vtbl;
    brw->base.transfer_inline_write = u_transfer_inline_write_vtbl;
+   brw->base.resource_copy_region = util_resource_copy_region;
+   brw->base.resource_fill_region = util_resource_fill_region;
 }
 
 void
diff --git a/src/gallium/drivers/i965/brw_resource.h b/src/gallium/drivers/i965/brw_resource.h
index 3390c270d42..78defb37b2a 100644
--- a/src/gallium/drivers/i965/brw_resource.h
+++ b/src/gallium/drivers/i965/brw_resource.h
@@ -124,7 +124,8 @@ boolean
 brw_is_format_supported( struct pipe_screen *screen,
 			 enum pipe_format format,
 			 enum pipe_texture_target target,
-			 unsigned tex_usage, 
+			 unsigned sample_count,
+			 unsigned tex_usage,
 			 unsigned geom_flags );
 */
 
diff --git a/src/gallium/drivers/i965/brw_resource_texture.c b/src/gallium/drivers/i965/brw_resource_texture.c
index 07537fe44ef..4fbb0c2484d 100644
--- a/src/gallium/drivers/i965/brw_resource_texture.c
+++ b/src/gallium/drivers/i965/brw_resource_texture.c
@@ -594,7 +594,8 @@ fail:
 boolean brw_is_format_supported( struct pipe_screen *screen,
 				 enum pipe_format format,
 				 enum pipe_texture_target target,
-				 unsigned tex_usage, 
+				 unsigned sample_count,
+				 unsigned tex_usage,
 				 unsigned geom_flags )
 {
    return translate_tex_format(format) != BRW_SURFACEFORMAT_INVALID;
diff --git a/src/gallium/drivers/i965/brw_screen.c b/src/gallium/drivers/i965/brw_screen.c
index 0a7151bde44..172e222c057 100644
--- a/src/gallium/drivers/i965/brw_screen.c
+++ b/src/gallium/drivers/i965/brw_screen.c
@@ -218,9 +218,10 @@ brw_get_paramf(struct pipe_screen *screen, int param)
 
 static boolean
 brw_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)
 {
    static const enum pipe_format tex_supported[] = {
@@ -276,6 +277,9 @@ brw_is_format_supported(struct pipe_screen *screen,
    const enum pipe_format *list;
    uint i;
 
+   if (sample_count > 1)
+      return FALSE;
+
    if (tex_usage & PIPE_BIND_DEPTH_STENCIL)
       list = depth_supported;
    else if (tex_usage & PIPE_BIND_RENDER_TARGET)