diff options
| author | Marek Olšák <[email protected]> | 2012-10-12 06:04:01 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-10-12 15:23:27 +0200 |
| commit | 7997b3c97c898c8467afff98458b9a9e52173092 (patch) | |
| tree | bcfc1b203300301ad57dda5c59fa2968ee372e99 /src/gallium/auxiliary/util | |
| parent | 1b921acd5fa84a498857afcf6c2a404028cf0fb7 (diff) | |
r600g: implement MSAA resolving for 8-bit and 16-bit integer formats
by changing the format to NORM.
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 5 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 4ad7a6be4eb..1072a0e9a74 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -1704,7 +1704,8 @@ void util_blitter_custom_resolve_color(struct blitter_context *blitter, struct pipe_resource *src, unsigned src_layer, unsigned sample_mask, - void *custom_blend) + void *custom_blend, + enum pipe_format format) { struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter; struct pipe_context *pipe = ctx->base.pipe; @@ -1724,7 +1725,7 @@ void util_blitter_custom_resolve_color(struct blitter_context *blitter, pipe->set_sample_mask(pipe, sample_mask); memset(&surf_tmpl, 0, sizeof(surf_tmpl)); - surf_tmpl.format = dst->format; + surf_tmpl.format = format; surf_tmpl.u.tex.level = dst_level; surf_tmpl.u.tex.first_layer = dst_layer; surf_tmpl.u.tex.last_layer = dst_layer; diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h index 40636c61619..4f7146701b1 100644 --- a/src/gallium/auxiliary/util/u_blitter.h +++ b/src/gallium/auxiliary/util/u_blitter.h @@ -344,7 +344,8 @@ void util_blitter_custom_resolve_color(struct blitter_context *blitter, struct pipe_resource *src, unsigned src_layer, unsigned sampled_mask, - void *custom_blend); + void *custom_blend, + enum pipe_format format); /* The functions below should be used to save currently bound constant state * objects inside a driver. The objects are automatically restored at the end |