[Mesa-dev] [PATCH 1/3] mesa: make update_fbo_texture() non-static

[Ian Romanick]

On 12/15/2011 04:46 PM, Brian Paul wrote:

Nice refactor.  For the series,

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

> We'll call this from the mipmap generation code.
> ---
>   src/mesa/main/teximage.c |   11 ++++++-----
>   src/mesa/main/teximage.h |    4 ++++
>   2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 8a002b6..eccc0fd 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -2205,9 +2205,10 @@ check_rtt_cb(GLuint key, void *data, void *userData)
>    * in size or format since that effects FBO completeness.
>    * Any FBOs rendering into the texture must be re-validated.
>    */
> -static void
> -update_fbo_texture(struct gl_context *ctx, struct gl_texture_object *texObj,
> -                   GLuint face, GLuint level)
> +void
> +_mesa_update_fbo_texture(struct gl_context *ctx,
> +                         struct gl_texture_object *texObj,
> +                         GLuint face, GLuint level)
>   {
>      /* Only check this texture if it's been marked as RenderToTexture */
>      if (texObj->_RenderToTexture) {
> @@ -2502,7 +2503,7 @@ teximage(struct gl_context *ctx, GLuint dims,
>
>                  check_gen_mipmap(ctx, target, texObj, level);
>
> -               update_fbo_texture(ctx, texObj, face, level);
> +               _mesa_update_fbo_texture(ctx, texObj, face, level);
>
>                  /* state update */
>                  texObj->_Complete = GL_FALSE;
> @@ -2844,7 +2845,7 @@ copyteximage(struct gl_context *ctx, GLuint dims,
>
>               check_gen_mipmap(ctx, target, texObj, level);
>
> -            update_fbo_texture(ctx, texObj, face, level);
> +            _mesa_update_fbo_texture(ctx, texObj, face, level);
>
>               /* state update */
>               texObj->_Complete = GL_FALSE;
> diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
> index 9cc7d5a..d756646 100644
> --- a/src/mesa/main/teximage.h
> +++ b/src/mesa/main/teximage.h
> @@ -80,6 +80,10 @@ _mesa_choose_texture_format(struct gl_context *ctx,
>                               GLenum target, GLint level,
>                               GLenum internalFormat, GLenum format, GLenum type);
>
> +extern void
> +_mesa_update_fbo_texture(struct gl_context *ctx,
> +                         struct gl_texture_object *texObj,
> +                         GLuint face, GLuint level);
>
>   extern void
>   _mesa_clear_texture_image(struct gl_context *ctx,