summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-04-05 19:58:10 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-04-05 19:58:10 +0000
commitf08f233d6f0d78bb5f5b27e97351754329845149 (patch)
tree4dfab632b5e5d0dc5d9457519b0591c59a005d33 /src
parent59ebe1ff771f4d004be7663845bf35f311582b77 (diff)
Remove the code that checks for duplicated framebuffer attachments (which
generated the error GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT). This was removed in version 117 of the GL_EXT_framebuffer_object spec.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/fbobject.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index d3d2f84401..cec3838161 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5
+ * Version: 6.5.1
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
@@ -524,26 +524,6 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
}
}
- /* Check if any renderbuffer is attached more than once.
- * Note that there's one exception: a GL_DEPTH_STENCIL renderbuffer can be
- * bound to both the stencil and depth attachment points at the same time.
- */
- for (i = 0; i < BUFFER_COUNT - 1; i++) {
- struct gl_renderbuffer *rb_i = fb->Attachment[i].Renderbuffer;
- if (rb_i) {
- GLint j;
- for (j = i + 1; j < BUFFER_COUNT; j++) {
- struct gl_renderbuffer *rb_j = fb->Attachment[j].Renderbuffer;
- if (rb_i == rb_j && rb_i->_BaseFormat != GL_DEPTH_STENCIL_EXT) {
- fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT;
- fbo_incomplete("multiply bound renderbuffer", -1);
- return;
- }
- }
- }
- }
-
-
if (numImages == 0) {
fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT;
fbo_incomplete("no attachments", -1);