[PATCH] gallium: different definition of resource_resolve function

[Christoph Bumiller]

---
 src/gallium/include/pipe/p_context.h |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index 9376cdd..e038e12 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -266,16 +266,19 @@ struct pipe_context {
                                 const struct pipe_box *src_box);
 
    /**
-    * Resolve a multisampled resource into a non-multisampled one,
-    * or vice versa (in the latter case, values are just replicated).
+    * Resolve a multisampled resource into a non-multisampled one.
+    * The multisampled resource cannot have mipmaps.
     * Source and destination must have the same format.
     * Mask can be either PIPE_MASK_RGBA, Z, S or ZS.
-    * The mipmap level of the multisampled resource will be 0.
+    * The auxiliary resource (separate sample data) may be NULL.
     */
    void (*resource_resolve)(struct pipe_context *pipe, unsigned mask,
-                            struct pipe_resource *dst, unsigned dst_level,
-                            unsigned dstx, unsigned dsty, unsigned dst_layer,
-                            struct pipe_resource *src, unsigned src_level,
+                            struct pipe_resource *dst,
+                            unsigned dst_level,
+                            unsigned dstx, unsigned dsty, unsigned dstz,
+                            struct pipe_resource *aux,
+                            unsigned aux_level, unsigned aux_layer,
+                            struct pipe_resource *src,
                             const struct pipe_box *src_box, boolean yflip);
 
    /*@}*/
-- 
1.7.2.2


--------------030402070608040706010902--