summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2006-04-23 15:28:54 +0000
committerBrian Paul <[email protected]>2006-04-23 15:28:54 +0000
commit263fff44b45e3ef0bb8ef19ebb8475a4662778de (patch)
treeb3b50338253d58ac9b9d9ac46c53675ead792eb7
parent44a22a2c28ca0f7eb04fb18ef2a7077b4d31e20f (diff)
updated assertion
-rw-r--r--src/mesa/main/renderbuffer.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index aa14bf8634a..a357bf334d9 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -2029,12 +2029,16 @@ _mesa_add_renderbuffer(struct gl_framebuffer *fb,
{
assert(fb);
assert(rb);
-#if 00
- /* there should be no previous renderbuffer on this attachment point! */
- assert(fb->Attachment[bufferName].Renderbuffer == NULL);
-#endif
assert(bufferName < BUFFER_COUNT);
+ /* There should be no previous renderbuffer on this attachment point,
+ * with the exception of depth/stencil since the same renderbuffer may
+ * be used for both.
+ */
+ assert(bufferName == BUFFER_DEPTH ||
+ bufferName == BUFFER_STENCIL ||
+ fb->Attachment[bufferName].Renderbuffer == NULL);
+
/* winsys vs. user-created buffer cross check */
if (fb->Name) {
assert(rb->Name);