diff options
Diffstat (limited to 'src/gallium/tests/graw')
| -rw-r--r-- | src/gallium/tests/graw/fs-test.c | 16 | ||||
| -rw-r--r-- | src/gallium/tests/graw/graw_util.h | 16 | ||||
| -rw-r--r-- | src/gallium/tests/graw/gs-test.c | 45 | ||||
| -rw-r--r-- | src/gallium/tests/graw/quad-sample.c | 16 | ||||
| -rw-r--r-- | src/gallium/tests/graw/vs-test.c | 28 |
5 files changed, 49 insertions, 72 deletions
diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c index bd5259afe46..b23769259ec 100644 --- a/src/gallium/tests/graw/fs-test.c +++ b/src/gallium/tests/graw/fs-test.c @@ -311,14 +311,14 @@ static void init_tex( void ) u_box_2d(0,0,SIZE,SIZE, &box); - ctx->transfer_inline_write(ctx, - samptex, - 0, - PIPE_TRANSFER_WRITE, - &box, - tex2d, - sizeof tex2d[0], - sizeof tex2d); + ctx->texture_subdata(ctx, + samptex, + 0, + PIPE_TRANSFER_WRITE, + &box, + tex2d, + sizeof tex2d[0], + sizeof tex2d); /* Possibly read back & compare against original data: */ diff --git a/src/gallium/tests/graw/graw_util.h b/src/gallium/tests/graw/graw_util.h index 5d72bb9d4a7..f6033855aa0 100644 --- a/src/gallium/tests/graw/graw_util.h +++ b/src/gallium/tests/graw/graw_util.h @@ -242,14 +242,14 @@ graw_util_create_tex2d(const struct graw_info *info, u_box_2d(0, 0, width, height, &box); - info->ctx->transfer_inline_write(info->ctx, - tex, - 0, - PIPE_TRANSFER_WRITE, - &box, - data, - row_stride, - image_bytes); + info->ctx->texture_subdata(info->ctx, + tex, + 0, + PIPE_TRANSFER_WRITE, + &box, + data, + row_stride, + image_bytes); /* Possibly read back & compare against original data: */ diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c index c680b62eaaa..00fb59161a8 100644 --- a/src/gallium/tests/graw/gs-test.c +++ b/src/gallium/tests/graw/gs-test.c @@ -149,7 +149,6 @@ static float constants2[] = static void init_fs_constbuf( void ) { struct pipe_resource templat; - struct pipe_box box; templat.target = PIPE_BUFFER; templat.format = PIPE_FORMAT_R8_UNORM; @@ -169,34 +168,18 @@ static void init_fs_constbuf( void ) exit(4); { - u_box_2d(0,0,sizeof(constants1),1, &box); - - ctx->transfer_inline_write(ctx, - constbuf1, - 0, - PIPE_TRANSFER_WRITE, - &box, - constants1, - sizeof constants1, - sizeof constants1); - + ctx->buffer_subdata(ctx, constbuf1, + PIPE_TRANSFER_WRITE, + 0, sizeof(constants1), constants1); pipe_set_constant_buffer(ctx, PIPE_SHADER_GEOMETRY, 0, constbuf1); } { - u_box_2d(0,0,sizeof(constants2),1, &box); - - ctx->transfer_inline_write(ctx, - constbuf2, - 0, - PIPE_TRANSFER_WRITE, - &box, - constants2, - sizeof constants2, - sizeof constants2); - + ctx->buffer_subdata(ctx, constbuf2, + PIPE_TRANSFER_WRITE, + 0, sizeof(constants2), constants2); pipe_set_constant_buffer(ctx, PIPE_SHADER_GEOMETRY, 1, @@ -418,14 +401,14 @@ static void init_tex( void ) u_box_2d(0,0,SIZE,SIZE, &box); - ctx->transfer_inline_write(ctx, - samptex, - 0, - PIPE_TRANSFER_WRITE, - &box, - tex2d, - sizeof tex2d[0], - sizeof tex2d); + ctx->texture_subdata(ctx, + samptex, + 0, + PIPE_TRANSFER_WRITE, + &box, + tex2d, + sizeof tex2d[0], + sizeof tex2d); /* Possibly read back & compare against original data: */ diff --git a/src/gallium/tests/graw/quad-sample.c b/src/gallium/tests/graw/quad-sample.c index 97f241ff844..d1bee359261 100644 --- a/src/gallium/tests/graw/quad-sample.c +++ b/src/gallium/tests/graw/quad-sample.c @@ -226,14 +226,14 @@ static void init_tex( void ) u_box_2d(0,0,SIZE,SIZE, &box); - ctx->transfer_inline_write(ctx, - samptex, - 0, - PIPE_TRANSFER_WRITE, - &box, - tex2d, - sizeof tex2d[0], - sizeof tex2d); + ctx->texture_subdata(ctx, + samptex, + 0, + PIPE_TRANSFER_WRITE, + &box, + tex2d, + sizeof tex2d[0], + sizeof tex2d); /* Possibly read back & compare against original data: */ diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c index 3a55131669b..48f06f461d8 100644 --- a/src/gallium/tests/graw/vs-test.c +++ b/src/gallium/tests/graw/vs-test.c @@ -100,15 +100,9 @@ static void init_fs_constbuf( void ) u_box_2d(0,0,sizeof(constants),1, &box); - ctx->transfer_inline_write(ctx, - constbuf, - 0, - PIPE_TRANSFER_WRITE, - &box, - constants, - sizeof constants, - sizeof constants); - + ctx->buffer_subdata(ctx, constbuf, + PIPE_TRANSFER_WRITE, + 0, sizeof(constants), constants); pipe_set_constant_buffer(ctx, PIPE_SHADER_VERTEX, 0, @@ -305,14 +299,14 @@ static void init_tex( void ) u_box_2d(0,0,SIZE,SIZE, &box); - ctx->transfer_inline_write(ctx, - samptex, - 0, - PIPE_TRANSFER_WRITE, - &box, - tex2d, - sizeof tex2d[0], - sizeof tex2d); + ctx->texture_subdata(ctx, + samptex, + 0, + PIPE_TRANSFER_WRITE, + &box, + tex2d, + sizeof tex2d[0], + sizeof tex2d); /* Possibly read back & compare against original data: */ |