4 files changed, 2 insertions, 11 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index de2bae9cb0..6fddbd116e 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -317,8 +317,4 @@
 #define MAX_CLIPPED_VERTICES ((2 * (6 + MAX_CLIP_PLANES))+1)
 
 
-/* XXX everything marked with OLD_RENDERBUFFER will be going away... */
-#define OLD_RENDERBUFFER 1
-
-
 #endif /* CONFIG_H */
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 271790c1ca..0c620f7908 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -462,7 +462,6 @@ get_renderbuffer(struct gl_framebuffer *fb, GLuint bufferBit)
  * Update state related to the current draw/read framebuffers.
  * Specifically, update these framebuffer fields:
  *    _ColorDrawBuffers
- *    _ColorDrawBit
  *    _NumColorDrawBuffers
  *    _ColorReadBuffer
  * If the current framebuffer is user-created, make sure it's complete.
@@ -495,7 +494,6 @@ _mesa_update_framebuffer(GLcontext *ctx)
             struct gl_renderbuffer *rb = get_renderbuffer(fb, bufferBit);
             if (rb) {
                fb->_ColorDrawBuffers[output][count] = rb;
-               fb->_ColorDrawBit[output][count] = bufferBit;
                count++;
             }
             else {
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index c02b64dd05..0206af937d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2211,11 +2211,6 @@ struct gl_framebuffer
    struct gl_renderbuffer *_ColorDrawBuffers[MAX_DRAW_BUFFERS][4];
    struct gl_renderbuffer *_ColorReadBuffer;
 
-#if OLD_RENDERBUFFER
-   /* XXX THIS IS TEMPORARY */
-   GLuint _ColorDrawBit[MAX_DRAW_BUFFERS][4];
-#endif
-
    /** Delete this framebuffer */
    void (*Delete)(struct gl_framebuffer *fb);
 };
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 7d21a8e358..480906533f 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1845,8 +1845,10 @@ _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);
 
    /* winsys vs. user-created buffer cross check */