From 9a966b93c03aecac8eb72e6133aa9a2f2c7673f3 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Tue, 27 Apr 2010 16:25:50 +0200 Subject: [PATCH] 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 50736f06b32..030683f60f1 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 c38548105ca..6ce8ba953a7 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); -- 2.30.2