Mesa (gallium-msaa): gallium: fix glaring bugs in last commit

[Roland Scheidegger]

Module: Mesa
Branch: gallium-msaa
Commit: 9a966b93c03aecac8eb72e6133aa9a2f2c7673f3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a966b93c03aecac8eb72e6133aa9a2f2c7673f3

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Tue Apr 27 16:25:50 2010 +0200

gallium: fix glaring bugs in last commit

---

 src/gallium/auxiliary/cso_cache/cso_context.c |    2 +-
 src/gallium/include/pipe/p_context.h          |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 50736f0..030683f 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -98,7 +98,7 @@ struct cso_context {
    struct pipe_framebuffer_state fb, fb_saved;
    struct pipe_viewport_state vp, vp_saved;
    struct pipe_blend_color blend_color;
-   unsigned sample_mask sample_mask;
+   unsigned sample_mask;
    struct pipe_stencil_ref stencil_ref, stencil_ref_saved;
 };
 
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h
index c385481..6ce8ba9 100644
--- a/src/gallium/include/pipe/p_context.h
+++ b/src/gallium/include/pipe/p_context.h
@@ -265,8 +265,7 @@ struct pipe_context {
    void (*resource_fill_region)(struct pipe_context *pipe,
                                 struct pipe_resource *dst,
                                 struct pipe_subresource subdst,
-                                struct pipe_box *dstbox,
-                                unsigned srcx, unsigned srcy, unsigned srcz,
+                                unsigned dstx, unsigned dsty, unsigned dstz,
                                 unsigned width, unsigned height,
                                 unsigned value);