radeonsi: use u_box_origin_2d helper function

[ Cherry-picked from r600g commit b278aba42310e8fa30f2408b9dcd58dbb4901724 ]

NOTE: This is a candidate for the 9.1 branch.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/src/gallium/drivers/radeonsi/r600_texture.c b/src/gallium/drivers/radeonsi/r600_texture.c
index e8d9932..d546554 100644 (file)
--- a/src/gallium/drivers/radeonsi/r600_texture.c
+++ b/src/gallium/drivers/radeonsi/r600_texture.c
@@ -55,11 +55,8 @@ static void r600_copy_from_staging_texture(struct pipe_context *ctx, struct r600
        struct pipe_resource *texture = transfer->resource;
        struct pipe_box sbox;
 
-       sbox.x = sbox.y = sbox.z = 0;
-       sbox.width = transfer->box.width;
-       sbox.height = transfer->box.height;
-       /* XXX that might be wrong */
-       sbox.depth = 1;
+       u_box_origin_2d(transfer->box.width, transfer->box.height, &sbox);
+
        ctx->resource_copy_region(ctx, texture, transfer->level,
                                  transfer->box.x, transfer->box.y, transfer->box.z,
                                  rtransfer->staging,