[Mesa-stable] [PATCH V2] mesa: Turn target_can_be_compressed() in to a utility function

[Jason Ekstrand]

Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>


On Wed, Jul 30, 2014 at 6:28 PM, Anuj Phogat <anuj.phogat at gmail.com> wrote:

> V2:  Declare the function in teximage.h
>
> Cc: <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
> ---
>  src/mesa/main/teximage.c | 12 ++++++------
>  src/mesa/main/teximage.h |  3 +++
>  2 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index a069594..6532e5b 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -1769,9 +1769,9 @@ compressedteximage_only_format(const struct
> gl_context *ctx, GLenum format)
>   * Helper function to determine whether a target and specific compression
>   * format are supported.
>   */
> -static GLboolean
> -target_can_be_compressed(const struct gl_context *ctx, GLenum target,
> -                         GLenum intFormat)
> +GLboolean
> +_mesa_target_can_be_compressed(const struct gl_context *ctx, GLenum
> target,
> +                               GLenum intFormat)
>  {
>     (void) intFormat;  /* not used yet */
>
> @@ -2193,7 +2193,7 @@ texture_error_check( struct gl_context *ctx,
>
>     /* additional checks for compressed textures */
>     if (_mesa_is_compressed_format(ctx, internalFormat)) {
> -      if (!target_can_be_compressed(ctx, target, internalFormat)) {
> +      if (!_mesa_target_can_be_compressed(ctx, target, internalFormat)) {
>           _mesa_error(ctx, GL_INVALID_ENUM,
>                       "glTexImage%dD(target can't be compressed)",
> dimensions);
>           return GL_TRUE;
> @@ -2279,7 +2279,7 @@ compressed_texture_error_check(struct gl_context
> *ctx, GLint dimensions,
>     GLenum error = GL_NO_ERROR;
>     char *reason = ""; /* no error */
>
> -   if (!target_can_be_compressed(ctx, target, internalFormat)) {
> +   if (!_mesa_target_can_be_compressed(ctx, target, internalFormat)) {
>        reason = "target";
>        error = GL_INVALID_ENUM;
>        goto error;
> @@ -2720,7 +2720,7 @@ copytexture_error_check( struct gl_context *ctx,
> GLuint dimensions,
>     }
>
>     if (_mesa_is_compressed_format(ctx, internalFormat)) {
> -      if (!target_can_be_compressed(ctx, target, internalFormat)) {
> +      if (!_mesa_target_can_be_compressed(ctx, target, internalFormat)) {
>           _mesa_error(ctx, GL_INVALID_ENUM,
>                       "glCopyTexImage%dD(target)", dimensions);
>           return GL_TRUE;
> diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
> index dd1504b..b66a55b 100644
> --- a/src/mesa/main/teximage.h
> +++ b/src/mesa/main/teximage.h
> @@ -123,6 +123,9 @@ _mesa_test_proxy_teximage(struct gl_context *ctx,
> GLenum target, GLint level,
>                            mesa_format format,
>                            GLint width, GLint height, GLint depth, GLint
> border);
>
> +extern GLboolean
> +_mesa_target_can_be_compressed(const struct gl_context *ctx, GLenum
> target,
> +                               GLenum intFormat);
>
>  extern GLuint
>  _mesa_tex_target_to_face(GLenum target);
> --
> 1.9.3
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20140731/fa7e2077/attachment-0001.html>