[Mesa-dev] [PATCH 2/2] mesa: make _mesa_prepare_mipmap_level() static

[Ian Romanick]

I ran these patches and the previous 2 through our CI, and there were no
regressions on Intel platforms.  Both series (with v2 of patch 1 in the
original) are

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Tested-by: Ian Romanick <ian.d.romanick at intel.com>

On 03/29/2016 12:42 PM, Brian Paul wrote:
> No longer called from any other file.
> ---
>  src/mesa/main/mipmap.c | 16 ++++++++--------
>  src/mesa/main/mipmap.h |  7 -------
>  2 files changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
> index cb9afde..5ff53f4 100644
> --- a/src/mesa/main/mipmap.c
> +++ b/src/mesa/main/mipmap.c
> @@ -1810,11 +1810,11 @@ _mesa_next_mipmap_level_size(GLenum target, GLint border,
>   * for mipmap generation.  If not, (re) allocate it.
>   * \return GL_TRUE if successful, GL_FALSE if mipmap generation should stop
>   */
> -GLboolean
> -_mesa_prepare_mipmap_level(struct gl_context *ctx,
> -                           struct gl_texture_object *texObj, GLuint level,
> -                           GLsizei width, GLsizei height, GLsizei depth,
> -                           GLsizei border, GLenum intFormat, mesa_format format)
> +static GLboolean
> +prepare_mipmap_level(struct gl_context *ctx,
> +                     struct gl_texture_object *texObj, GLuint level,
> +                     GLsizei width, GLsizei height, GLsizei depth,
> +                     GLsizei border, GLenum intFormat, mesa_format format)
>  {
>     const GLuint numFaces = _mesa_num_tex_faces(texObj->Target);
>     GLuint face;
> @@ -1902,9 +1902,9 @@ _mesa_prepare_mipmap_levels(struct gl_context *ctx,
>           break;
>        }
>  
> -      if (!_mesa_prepare_mipmap_level(ctx, texObj, level,
> -                                      newWidth, newHeight, newDepth,
> -                                      border, intFormat, texFormat)) {
> +      if (!prepare_mipmap_level(ctx, texObj, level,
> +                                newWidth, newHeight, newDepth,
> +                                border, intFormat, texFormat)) {
>           break;
>        }
>  
> diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h
> index 33913e8..d11c7fa 100644
> --- a/src/mesa/main/mipmap.h
> +++ b/src/mesa/main/mipmap.h
> @@ -40,13 +40,6 @@ _mesa_generate_mipmap_level(GLenum target,
>                              GLubyte **dstData,
>                              GLint dstRowStride);
>  
> -
> -extern GLboolean
> -_mesa_prepare_mipmap_level(struct gl_context *ctx,
> -                           struct gl_texture_object *texObj, GLuint level,
> -                           GLsizei width, GLsizei height, GLsizei depth,
> -                           GLsizei border, GLenum intFormat, mesa_format format);
> -
>  void
>  _mesa_prepare_mipmap_levels(struct gl_context *ctx,
>                              struct gl_texture_object *texObj,
>