[Mesa-dev] [PATCH 04/14] gallium/u_blitter: remove useless parameter from blitter_default_dst_texture

[Marek Olšák]

---
 src/gallium/auxiliary/util/u_blitter.c |    9 ++++-----
 src/gallium/auxiliary/util/u_blitter.h |    3 +--
 src/gallium/drivers/r300/r300_blit.c   |    2 +-
 src/gallium/drivers/r600/r600_blit.c   |    2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c
index 7c7e062..b6eca3e 100644
--- a/src/gallium/auxiliary/util/u_blitter.c
+++ b/src/gallium/auxiliary/util/u_blitter.c
@@ -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);
 
diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h
index 0b5e4aa..162f436 100644
--- a/src/gallium/auxiliary/util/u_blitter.h
+++ b/src/gallium/auxiliary/util/u_blitter.h
@@ -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.
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index b4df3f2..70b81e6 100644
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -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;
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 219d940..7672b1c 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -536,7 +536,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)) {
-- 
1.7.10.4