From: Laura Ekstrand Date: Mon, 20 Apr 2015 15:21:20 +0000 (+0200) Subject: main: Fix an error generated by FramebufferTexture X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=69bdc9dcb8e5d3648e8d96029d5988b8971de8dc;p=mesa.git main: Fix an error generated by FramebufferTexture gl*FramebufferTexture should generate GL_INVALID_VALUE when the texture doesn't exist. [Fredrik: Split this change out from the next commit] Signed-off-by: Fredrik Höglund Reviewed-by: Fredrik Höglund Reviewed-by: Adam Jackson Cc: "10.4 10.5" --- diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 20a4e86007c..09dbf338a51 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -2654,10 +2654,19 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, } } else { - /* can't render to a non-existant texture */ - _mesa_error(ctx, GL_INVALID_OPERATION, - "glFramebufferTexture%s(non existant texture)", - caller); + /* Can't render to a non-existent texture object. + * + * The OpenGL 4.5 core spec (02.02.2015) in Section 9.2 Binding and + * Managing Framebuffer Objects specifies a different error + * depending upon the calling function (PDF pages 325-328). + * *FramebufferTexture (where layered = GL_TRUE) throws invalid + * value, while the other commands throw invalid operation (where + * layered = GL_FALSE). + */ + const GLenum error = layered ? GL_INVALID_VALUE : + GL_INVALID_OPERATION; + _mesa_error(ctx, error, + "%s(non-existent texture %u)", caller, texture); return; }