Mesa (master): mesa: return GL_FRAMEBUFFER_DEFAULT as FBO attachment type

Brian Paul brianp at kemper.freedesktop.org
Fri Dec 3 15:36:09 UTC 2010


Module: Mesa
Branch: master
Commit: 6d13ec7dc082aea9a8ce04dd8e045e77e5921d8a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d13ec7dc082aea9a8ce04dd8e045e77e5921d8a

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Dec  3 08:30:41 2010 -0700

mesa: return GL_FRAMEBUFFER_DEFAULT as FBO attachment type

If querying the default/window-system FBO's attachment type, return
GL_FRAMEBUFFER_DEFAULT (per the GL_ARB_framebuffer_object spec).

See http://bugs.freedesktop.org/show_bug.cgi?id=31947

NOTE: This is a candidate for the 7.9 branch.

---

 src/mesa/main/fbobject.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 560a2f6..47ac630 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2014,7 +2014,7 @@ _mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
 
    switch (pname) {
    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT:
-      *params = att->Type;
+      *params = buffer->Name == 0 ? GL_FRAMEBUFFER_DEFAULT : att->Type;
       return;
    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
       if (att->Type == GL_RENDERBUFFER_EXT) {




More information about the mesa-commit mailing list