diff options
| author | Marek Olšák <[email protected]> | 2012-07-27 21:27:14 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-08-04 13:53:07 +0200 |
| commit | 8aaf6972d128551dd720b3e3525806d39aad6f53 (patch) | |
| tree | 7a577612558b86b80689dada8b0582d333cfcb85 | |
| parent | 67a3e5bc32fe359b54121355295e6a19a24b44eb (diff) | |
gallium/u_blitter: minor cleanup
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.c | 12 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_blitter.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index b79ade6e026..c5dc515432f 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -934,10 +934,10 @@ void util_blitter_default_src_texture(struct pipe_sampler_view *src_templ, void util_blitter_copy_texture(struct blitter_context *blitter, struct pipe_resource *dst, - unsigned dstlevel, + unsigned dst_level, unsigned dstx, unsigned dsty, unsigned dstz, struct pipe_resource *src, - unsigned srclevel, + unsigned src_level, const struct pipe_box *srcbox, boolean ignore_stencil) { @@ -976,18 +976,18 @@ void util_blitter_copy_texture(struct blitter_context *blitter, !screen->is_format_supported(screen, src->format, src->target, src->nr_samples, PIPE_BIND_SAMPLER_VIEW)) { blitter_set_running_flag(ctx); - util_resource_copy_region(pipe, dst, dstlevel, dstx, dsty, dstz, - src, srclevel, srcbox); + util_resource_copy_region(pipe, dst, dst_level, dstx, dsty, dstz, + src, src_level, srcbox); blitter_unset_running_flag(ctx); return; } /* Initialize the surface. */ - util_blitter_default_dst_texture(&dst_templ, dst, dstlevel, dstz, srcbox); + util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz, srcbox); dst_view = pipe->create_surface(pipe, dst, &dst_templ); /* Initialize the sampler view. */ - util_blitter_default_src_texture(&src_templ, src, srclevel); + util_blitter_default_src_texture(&src_templ, src, src_level); src_view = pipe->create_sampler_view(pipe, src, &src_templ); /* Copy. */ diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h index 8d6be78e2da..2632f3ad0dc 100644 --- a/src/gallium/auxiliary/util/u_blitter.h +++ b/src/gallium/auxiliary/util/u_blitter.h @@ -187,10 +187,10 @@ void util_blitter_clear_depth_custom(struct blitter_context *blitter, */ void util_blitter_copy_texture(struct blitter_context *blitter, struct pipe_resource *dst, - unsigned dstlevel, + unsigned dst_level, unsigned dstx, unsigned dsty, unsigned dstz, struct pipe_resource *src, - unsigned srclevel, + unsigned src_level, const struct pipe_box *srcbox, boolean ignore_stencil); |