gallium: fix glaring bugs in last commit

diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index 50736f06b32edf873aa38d7614c84971cab95b9d..030683f60f11ed7e7b15b71897082896ddc9929f 100644 (file)
--- 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 c38548105cabcecbd9c03057b8b217c15307d156..6ce8ba953a7d4231b110dac3423091cfe700d2a1 100644 (file)
--- 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);