[Mesa-dev] [PATCH v2 2/2] mesa: use same is_color_attachment trick to discern error cases

[Nicolai Hähnle]

On 26.01.2017 06:47, Ilia Mirkin wrote:
> All the other calls to retrieve the attachment have been covered except
> this one - return the proper error for attachment points that are valid
> enums but out of bound for the driver.
>
> Fixes GL45-CTS.geometry_shader.layered_fbo.fb_texture_invalid_attachment
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

> ---
>
> v1 -> v2: no changes. also no change in Intel CI.
>
>  src/mesa/main/fbobject.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
> index 6e86248..04d1daf 100644
> --- a/src/mesa/main/fbobject.c
> +++ b/src/mesa/main/fbobject.c
> @@ -3156,6 +3156,7 @@ _mesa_framebuffer_texture(struct gl_context *ctx, struct gl_framebuffer *fb,
>                            const char *caller)
>  {
>     struct gl_renderbuffer_attachment *att;
> +   bool is_color_attachment;
>
>     /* The window-system framebuffer object is immutable */
>     if (_mesa_is_winsys_fbo(fb)) {
> @@ -3165,10 +3166,17 @@ _mesa_framebuffer_texture(struct gl_context *ctx, struct gl_framebuffer *fb,
>     }
>
>     /* Not a hash lookup, so we can afford to get the attachment here. */
> -   att = get_attachment(ctx, fb, attachment, NULL);
> +   att = get_attachment(ctx, fb, attachment, &is_color_attachment);
>     if (att == NULL) {
> -      _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid attachment %s)", caller,
> -                  _mesa_enum_to_string(attachment));
> +      if (is_color_attachment) {
> +         _mesa_error(ctx, GL_INVALID_OPERATION,
> +                     "%s(invalid color attachment %s)", caller,
> +                     _mesa_enum_to_string(attachment));
> +      } else {
> +         _mesa_error(ctx, GL_INVALID_ENUM,
> +                     "%s(invalid attachment %s)", caller,
> +                     _mesa_enum_to_string(attachment));
> +      }
>        return;
>     }
>
>