From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Tue, 24 Jan 2017 05:26:29 +0000 (-0500)
Subject: mesa: use same is_color_attachment trick to discern error cases
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62b8f494fac377c88bf2bb0eff67cdf4db37da42;p=mesa.git

mesa: use same is_color_attachment trick to discern error cases

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@alum.mit.edu>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 6934805ce2a..f32f9316751 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -3150,6 +3150,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)) {
@@ -3159,10 +3160,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;
    }