[Mesa-dev] [PATCH] mesa: Fix the cause of piglit test fbo-array failure

[Brian Paul]

On 03/12/2012 12:00 PM, Anuj Phogat wrote:
> Handle the special case of glFramebufferTextureLayer() for which we pass
> teximage = 0 internally in framebuffer_texture(). This patch makes failing
> piglit test fbo-array, fbo-depth-array to pass.
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47126
>
> V4: Removed the duplicated code.
> Note: This is a candidate for the stable branches.
>
> Signed-off-by: Anuj Phogat<anuj.phogat at gmail.com>
> ---
>   src/mesa/main/fbobject.c |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
> index 281b1ca..372d16f 100644
> --- a/src/mesa/main/fbobject.c
> +++ b/src/mesa/main/fbobject.c
> @@ -1924,6 +1924,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
>      struct gl_renderbuffer_attachment *att;
>      struct gl_texture_object *texObj = NULL;
>      struct gl_framebuffer *fb;
> +   GLenum maxLevelsTarget;
>
>      ASSERT_OUTSIDE_BEGIN_END(ctx);
>
> @@ -1993,8 +1994,9 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
>            }
>         }
>
> +      maxLevelsTarget = textarget ? textarget : texObj->Target;
>         if ((level<  0) ||
> -          (level>= _mesa_max_texture_levels(ctx, textarget))) {
> +          (level>= _mesa_max_texture_levels(ctx, maxLevelsTarget))) {
>            _mesa_error(ctx, GL_INVALID_VALUE,
>                        "glFramebufferTexture%sEXT(level)", caller);
>            return;

Reviewed-by: Brian Paul <brianp at vmware.com>