[Mesa-dev] [PATCH 8/9] i915: Silence unused parameter warning in intel_miptree_create_layout

[Anuj Phogat]

On Wed, Sep 9, 2015 at 7:18 PM, Ian Romanick <idr at freedesktop.org> wrote:

> From: Ian Romanick <ian.d.romanick at intel.com>
>
> The for_bo parameter of intel_miptree_create_layout appears to be unused
> since 27eedca when Eric removed some Gen5 code (after the i915 and i965
> drivers parted ways).
>
> intel_mipmap_tree.c: In function 'old_intel_miptree_create_layout':
> intel_mipmap_tree.c:77:35: warning: unused parameter 'for_bo'
> [-Wunused-parameter]
>                              bool for_bo)
>                                    ^
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  src/mesa/drivers/dri/i915/intel_mipmap_tree.c | 14 +++-----------
>  src/mesa/drivers/dri/i915/intel_mipmap_tree.h |  3 +--
>  src/mesa/drivers/dri/i915/intel_tex_image.c   |  3 +--
>  3 files changed, 5 insertions(+), 15 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
> b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
> index 307ad4d..5cbf763 100644
> --- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
> +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c
> @@ -60,11 +60,6 @@ target_to_target(GLenum target)
>     }
>  }
>
> -/**
> - * @param for_bo Indicates that the caller is
> - *        intel_miptree_create_for_bo(). If true, then do not create
> - *        \c stencil_mt.
> - */
>  struct intel_mipmap_tree *
>  intel_miptree_create_layout(struct intel_context *intel,
>                              GLenum target,
> @@ -73,8 +68,7 @@ intel_miptree_create_layout(struct intel_context *intel,
>                              GLuint last_level,
>                              GLuint width0,
>                              GLuint height0,
> -                            GLuint depth0,
> -                            bool for_bo)
> +                            GLuint depth0)
>  {
>     struct intel_mipmap_tree *mt = calloc(sizeof(*mt), 1);
>     if (!mt)
> @@ -181,8 +175,7 @@ intel_miptree_create(struct intel_context *intel,
>
>     mt = intel_miptree_create_layout(intel, target, format,
>                                       first_level, last_level, width0,
> -                                     height0, depth0,
> -                                     false);
> +                                     height0, depth0);
>     /*
>      * pitch == 0 || height == 0  indicates the null texture
>      */
> @@ -262,8 +255,7 @@ intel_miptree_create_for_bo(struct intel_context
> *intel,
>
>     mt = intel_miptree_create_layout(intel, GL_TEXTURE_2D, format,
>                                      0, 0,
> -                                    width, height, 1,
> -                                    true);
> +                                    width, height, 1);
>     if (!mt) {
>        free(region);
>        return mt;
> diff --git a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
> b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
> index aab30ed..2520b30 100644
> --- a/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
> +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h
> @@ -240,8 +240,7 @@ intel_miptree_create_layout(struct intel_context
> *intel,
>                              GLuint last_level,
>                              GLuint width0,
>                              GLuint height0,
> -                            GLuint depth0,
> -                            bool for_bo);
> +                            GLuint depth0);
>
>  struct intel_mipmap_tree *
>  intel_miptree_create_for_bo(struct intel_context *intel,
> diff --git a/src/mesa/drivers/dri/i915/intel_tex_image.c
> b/src/mesa/drivers/dri/i915/intel_tex_image.c
> index 5ab60d1..63ef08b 100644
> --- a/src/mesa/drivers/dri/i915/intel_tex_image.c
> +++ b/src/mesa/drivers/dri/i915/intel_tex_image.c
> @@ -241,8 +241,7 @@ intel_set_texture_image_region(struct gl_context *ctx,
>
>     intel_image->mt = intel_miptree_create_layout(intel, target,
> image->TexFormat,
>                                                   0, 0,
> -                                                 width, height, 1,
> -                                                 true);
> +                                                 width, height, 1);
>     if (intel_image->mt == NULL)
>         return;
>     intel_region_reference(&intel_image->mt->region, region);
> --
> 2.1.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150910/323d142a/attachment.html>