[Mesa-dev] [PATCH v2 21/23] mesa: make _mesa_texture_sub_image() static

[Timothy Arceri]

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

On 06/06/17 07:44, Samuel Pitoiset wrote:
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---
>   src/mesa/main/teximage.c | 40 ++++++++++++++++++++--------------------
>   1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 9285a96b68..b262e75b9d 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -3186,15 +3186,15 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
>    * Helper that implements the glTexSubImage1/2/3D()
>    * and glTextureSubImage1/2/3D() functions.
>    */
> -void
> -_mesa_texture_sub_image(struct gl_context *ctx, GLuint dims,
> -                        struct gl_texture_object *texObj,
> -                        struct gl_texture_image *texImage,
> -                        GLenum target, GLint level,
> -                        GLint xoffset, GLint yoffset, GLint zoffset,
> -                        GLsizei width, GLsizei height, GLsizei depth,
> -                        GLenum format, GLenum type, const GLvoid *pixels,
> -                        bool dsa)
> +static void
> +texture_sub_image(struct gl_context *ctx, GLuint dims,
> +                  struct gl_texture_object *texObj,
> +                  struct gl_texture_image *texImage,
> +                  GLenum target, GLint level,
> +                  GLint xoffset, GLint yoffset, GLint zoffset,
> +                  GLsizei width, GLsizei height, GLsizei depth,
> +                  GLenum format, GLenum type, const GLvoid *pixels,
> +                  bool dsa)
>   {
>      FLUSH_VERTICES(ctx, 0);
>   
> @@ -3276,9 +3276,9 @@ texsubimage_err(struct gl_context *ctx, GLuint dims, GLenum target, GLint level,
>                     _mesa_enum_to_string(format),
>                     _mesa_enum_to_string(type), pixels);
>   
> -   _mesa_texture_sub_image(ctx, dims, texObj, texImage, target, level,
> -                           xoffset, yoffset, zoffset, width, height, depth,
> -                           format, type, pixels, false);
> +   texture_sub_image(ctx, dims, texObj, texImage, target, level,
> +                     xoffset, yoffset, zoffset, width, height, depth,
> +                     format, type, pixels, false);
>   }
>   
>   
> @@ -3376,10 +3376,10 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
>            texImage = texObj->Image[i][level];
>            assert(texImage);
>   
> -         _mesa_texture_sub_image(ctx, 3, texObj, texImage, texObj->Target,
> -                                 level, xoffset, yoffset, 0,
> -                                 width, height, 1, format,
> -                                 type, pixels, true);
> +         texture_sub_image(ctx, 3, texObj, texImage, texObj->Target,
> +                           level, xoffset, yoffset, 0,
> +                           width, height, 1, format,
> +                           type, pixels, true);
>            pixels = (GLubyte *) pixels + imageStride;
>         }
>      }
> @@ -3387,10 +3387,10 @@ texturesubimage(struct gl_context *ctx, GLuint dims,
>         texImage = _mesa_select_tex_image(texObj, texObj->Target, level);
>         assert(texImage);
>   
> -      _mesa_texture_sub_image(ctx, dims, texObj, texImage, texObj->Target,
> -                              level, xoffset, yoffset, zoffset,
> -                              width, height, depth, format,
> -                              type, pixels, true);
> +      texture_sub_image(ctx, dims, texObj, texImage, texObj->Target,
> +                        level, xoffset, yoffset, zoffset,
> +                        width, height, depth, format,
> +                        type, pixels, true);
>      }
>   }
>   
>