set OLD_RENDERBUFFER=0, need to clean up a few more things before totally removing...

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 456f8ce76a9155b4a6235f8652e0111dd4130165..476ed63aadcbc40c19afe50a7d207999b983bdd8 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -324,7 +324,7 @@
 
 /* XXX these are temporary */
 #define NEW_RENDERBUFFER 1
-#define OLD_RENDERBUFFER 1
+#define OLD_RENDERBUFFER 0
 
 
 #endif /* CONFIG_H */

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f6732699b77c5790af8eb800affc3c9d1f1735f4..62a8c76aa1478d1b8656b43061e644d9af2e3491 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2183,7 +2183,7 @@ struct gl_framebuffer
    struct gl_renderbuffer *_ColorDrawBuffers[MAX_DRAW_BUFFERS][4];
    struct gl_renderbuffer *_ColorReadBuffer;
 
-#if OLD_RENDERBUFFER
+#if OLD_RENDERBUFFER || NEW_RENDERBUFFER
    /* XXX THIS IS TEMPORARY */
    GLuint _ColorDrawBit[MAX_DRAW_BUFFERS][4];
 #endif

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index bc207af64a9a2091404a8316127dbe3c71eb2eaa..bb16a8938b65d6d651ae47e201576e20edfea21d 100644 (file)
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -987,7 +987,7 @@ _swrast_write_index_span( GLcontext *ctx, struct sw_span *span)
       }
    }
 
-#if OLD_RENDERBUFFER
+#if OLD_RENDERBUFFER || NEW_RENDERBUFFER
    /* restore default dest buffer */
    _swrast_use_draw_buffer(ctx);
 #endif