diff options
| author | Brian Paul <[email protected]> | 2010-12-03 08:23:31 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-12-03 08:24:51 -0700 |
| commit | 20cf1851d82d6135b92c20323266156eb6ad5ffe (patch) | |
| tree | 2f665b8a800be45171f92dbd671c9cc004a85c85 | |
| parent | 14746b1d4fc7ae30b557dacc819b81756df2f72f (diff) | |
mesa: fix GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME query
Return 0 instead of generating an error.
See http://bugs.freedesktop.org/show_bug.cgi?id=30993
Note that piglit fbo-getframebufferattachmentparameter-01 still does
not pass. But Mesa behaves the same as the NVIDIA driver in this case.
Perhaps the test is incorrect.
NOTE: This is a candidate for the 7.9 branch.
| -rw-r--r-- | src/mesa/main/fbobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index 7c3357043fa..560a2f68bea 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -2024,8 +2024,8 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, *params = att->Texture->Name; } else { - _mesa_error(ctx, GL_INVALID_ENUM, - "glGetFramebufferAttachmentParameterivEXT(pname)"); + assert(att->Type == GL_NONE); + *params = 0; } return; case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT: |