summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2012-12-19 23:06:51 +0100
committerMarek Olšák <[email protected]>2013-01-04 14:05:43 +0100
commitccfcf3287326b924d745d7915b0cb471f4c8e24e (patch)
tree3c55f7fd5d55df05cf165291fd5c6450c3eaa9dc /src/gallium/drivers/r600
parent23f76f558eac7f59ead6d49325c7edb4a010c0c5 (diff)
gallium/u_blitter: unify some parameters into a dstbox parameter in blit_generic
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600')
-rw-r--r--src/gallium/drivers/r600/r600_blit.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index b4e9136416c..b348aa728b0 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -544,7 +544,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
struct pipe_surface *dst_view, dst_templ;
struct pipe_sampler_view src_templ, *src_view;
unsigned dst_width, dst_height, src_width0, src_height0, src_widthFL, src_heightFL;
- struct pipe_box sbox;
+ struct pipe_box sbox, dstbox;
bool copy_all_samples;
/* Handle buffers first. */
@@ -647,10 +647,12 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
copy_all_samples = rctx->screen->msaa_texture_support != MSAA_TEXTURE_SAMPLE_ZERO;
+ u_box_3d(dstx, dsty, dstz, abs(src_box->width), abs(src_box->height),
+ abs(src_box->depth), &dstbox);
+
/* Copy. */
r600_blitter_begin(ctx, R600_COPY_TEXTURE);
- util_blitter_blit_generic(rctx->blitter, dst_view, dstx, dsty,
- abs(src_box->width), abs(src_box->height),
+ util_blitter_blit_generic(rctx->blitter, dst_view, &dstbox,
src_view, src_box, src_width0, src_height0,
PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL,
copy_all_samples);