restore call to SetBuffer() in clear_color_buffers(), only temporary

diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c
index cf469f8c62616b474612dbc7e5448c42f082cf2c..d2a8572e1c3cb0d4d7de304c1ed5028a132aed68 100644 (file)
--- a/src/mesa/swrast/s_buffers.c
+++ b/src/mesa/swrast/s_buffers.c
@@ -233,6 +233,7 @@ clear_ci_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
 static void
 clear_color_buffers(GLcontext *ctx)
 {
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
    GLboolean masking;
    GLuint i;
 
@@ -259,6 +260,11 @@ clear_color_buffers(GLcontext *ctx)
 
    for (i = 0; i < ctx->DrawBuffer->_NumColorDrawBuffers[0]; i++) {
       struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][i];
+#if OLD_RENDERBUFFER /* this is obsolete code */
+      swrast->Driver.SetBuffer(ctx, ctx->DrawBuffer,
+                               ctx->DrawBuffer->_ColorDrawBit[0][i]);
+#endif
+
       if (ctx->Visual.rgbMode) {
          if (masking) {
             clear_rgba_buffer_with_masking(ctx, rb);
@@ -320,13 +326,6 @@ _swrast_Clear(GLcontext *ctx, GLbitfield mask,
    if (mask) {
       if (mask & ctx->DrawBuffer->_ColorDrawBufferMask[0]) {
          clear_color_buffers(ctx);
-         /* clear software-based alpha buffer(s) */
-#if OLD_RENDERBUFFER && 0
-         if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
-             && ctx->Color.ColorMask[ACOMP]) {
-            _swrast_clear_alpha_buffers( ctx );
-         }
-#endif
       }
       if (mask & BUFFER_BIT_DEPTH) {
          struct gl_renderbuffer *rb