Mesa (master): gallium/tests/trivial: updates for transfer functions changes
Andreas Boll
ab at kemper.freedesktop.org
Tue Nov 27 18:02:03 UTC 2012
Module: Mesa
Branch: master
Commit: f65741721bcd7064e428ae2c47811fba150b1480
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f65741721bcd7064e428ae2c47811fba150b1480
Author: Andreas Boll <andreas.boll.dev at gmail.com>
Date: Wed Nov 21 17:52:07 2012 +0100
gallium/tests/trivial: updates for transfer functions changes
Fixes build error with configure option --enable-gallium-tests
introduced in 369e46888904c6d379b8b477d9242cff1608e30e
Compile tested only.
Reviewed-by: Marek Olšák <maraeo at gmail.com>
---
src/gallium/tests/trivial/compute.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/gallium/tests/trivial/compute.c b/src/gallium/tests/trivial/compute.c
index 1812090..a6ebc7c 100644
--- a/src/gallium/tests/trivial/compute.c
+++ b/src/gallium/tests/trivial/compute.c
@@ -201,13 +201,11 @@ static void init_tex(struct context *ctx, int slot,
*tex = ctx->screen->resource_create(ctx->screen, &ttex);
assert(*tex);
- xfer = pipe->get_transfer(pipe, *tex, 0, PIPE_TRANSFER_WRITE,
+ map = pipe->transfer_map(pipe, *tex, 0, PIPE_TRANSFER_WRITE,
&(struct pipe_box) { .width = w,
.height = h,
- .depth = 1 });
+ .depth = 1 }, &xfer);
assert(xfer);
-
- map = pipe->transfer_map(pipe, xfer);
assert(map);
for (y = 0; y < ny; ++y) {
@@ -217,7 +215,6 @@ static void init_tex(struct context *ctx, int slot,
}
pipe->transfer_unmap(pipe, xfer);
- pipe->transfer_destroy(pipe, xfer);
ctx->tex_rw[slot] = rw;
}
@@ -246,13 +243,11 @@ static void check_tex(struct context *ctx, int slot,
if (!check)
check = default_check;
- xfer = pipe->get_transfer(pipe, tex, 0, PIPE_TRANSFER_READ,
+ map = pipe->transfer_map(pipe, tex, 0, PIPE_TRANSFER_READ,
&(struct pipe_box) { .width = tex->width0,
.height = tex->height0,
- .depth = 1 });
+ .depth = 1 }, &xfer);
assert(xfer);
-
- map = pipe->transfer_map(pipe, xfer);
assert(map);
for (y = 0; y < ny; ++y) {
@@ -285,7 +280,6 @@ static void check_tex(struct context *ctx, int slot,
}
pipe->transfer_unmap(pipe, xfer);
- pipe->transfer_destroy(pipe, xfer);
if (err)
printf("(%d, %d): \x1b[31mFAIL\x1b[0m (%d)\n", x, y, err);
More information about the mesa-commit
mailing list