summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-06-04 22:09:27 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-06-04 22:09:27 +0000
commitdf5e2b934bc18cd17ac512e6746df64019014a7d (patch)
treef03917a11c28d9c98a54548e9a058984307e8639
parentd96dd3cd49658669833c8110b2f2e8938fe6a544 (diff)
set OLD_RENDERBUFFER=0, need to clean up a few more things before totally removing that
-rw-r--r--src/mesa/main/config.h2
-rw-r--r--src/mesa/main/mtypes.h2
-rw-r--r--src/mesa/swrast/s_span.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 456f8ce76a..476ed63aad 100644
--- 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 f6732699b7..62a8c76aa1 100644
--- 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 bc207af64a..bb16a8938b 100644
--- 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