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

2005-06-04 22:09:27 +00:00
parent d96dd3cd49
commit df5e2b934b
3 changed files with 3 additions and 3 deletions
--- 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 */
--- 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
--- 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