KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallium/u_blitter: remove useless parameter from blitter_default_dst_texture 

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2012-12-19 22:25:22 +01:00
parent 8fdece2896
commit 23f76f558e
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gallium/auxiliary/util/u_blitter.c
View File

@ -1056,14 +1056,13 @@ void util_blitter_custom_clear_depth(struct blitter_context *blitter,
void util_blitter_default_dst_texture(struct pipe_surface *dst_templ,
struct pipe_resource *dst,
unsigned dstlevel,
unsigned dstz,
const struct pipe_box *srcbox)
unsigned dstz)
{
memset(dst_templ, 0, sizeof(*dst_templ));
dst_templ->format = util_format_linear(dst->format);
dst_templ->u.tex.level = dstlevel;
dst_templ->u.tex.first_layer = dstz;
dst_templ->u.tex.last_layer = dstz + srcbox->depth - 1;
dst_templ->u.tex.last_layer = dstz;
}
void util_blitter_default_src_texture(struct pipe_sampler_view *src_templ,
@ -1181,7 +1180,7 @@ void util_blitter_copy_texture(struct blitter_context *blitter,
assert(src->target < PIPE_MAX_TEXTURE_TYPES);
/* Initialize the surface. */
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz, srcbox);
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
dst_view = pipe->create_surface(pipe, dst, &dst_templ);
/* Initialize the sampler view. */
@ -1419,7 +1418,7 @@ util_blitter_blit(struct blitter_context *blitter,
/* Initialize the surface. */
util_blitter_default_dst_texture(&dst_templ, dst, info->dst.level,
info->dst.box.z, &info->src.box);
info->dst.box.z);
dst_templ.format = info->dst.format;
dst_view = pipe->create_surface(pipe, dst, &dst_templ);

3
src/gallium/auxiliary/util/u_blitter.h
View File

@ -255,8 +255,7 @@ void util_blitter_blit(struct blitter_context *blitter,
void util_blitter_default_dst_texture(struct pipe_surface *dst_templ,
struct pipe_resource *dst,
unsigned dstlevel,
unsigned dstz,
const struct pipe_box *srcbox);
unsigned dstz);
/**
* Helper function to initialize a view for copy_texture_view.

2
src/gallium/drivers/r300/r300_blit.c
View File

@ -482,7 +482,7 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
* on hardware. E.g. depth-stencil surfaces are copied as RGBA
* colorbuffers. */
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz, src_box);
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
util_blitter_default_src_texture(&src_templ, src, src_level);
layout = util_format_description(dst_templ.format)->layout;

2
src/gallium/drivers/r600/r600_blit.c
View File

@ -569,7 +569,7 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
src_widthFL = rsrc->surface.level[src_level].npix_x;
src_heightFL = rsrc->surface.level[src_level].npix_y;
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz, src_box);
util_blitter_default_dst_texture(&dst_templ, dst, dst_level, dstz);
util_blitter_default_src_texture(&src_templ, src, src_level);
if (util_format_is_compressed(src->format)) {