Remove last remnants of pre-renderbuffer code.

1 files changed, 2 insertions, 26 deletions

diff --git a/src/mesa/swrast/s_imaging.c b/src/mesa/swrast/s_imaging.c
index 5c79a7ba95e..43e955c6a72 100644
--- a/src/mesa/swrast/s_imaging.c
+++ b/src/mesa/swrast/s_imaging.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -46,9 +46,6 @@ _swrast_CopyColorTable( GLcontext *ctx,
       return;
    }
 
-   /* Select buffer to read from */
-   _swrast_use_read_buffer(ctx);
-
    if (width > MAX_WIDTH)
       width = MAX_WIDTH;
 
@@ -56,9 +53,6 @@ _swrast_CopyColorTable( GLcontext *ctx,
    _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer,
                            width, x, y, data );
 
-   /* Restore reading from draw buffer (the default) */
-   _swrast_use_draw_buffer(ctx);
-
    /* save PBO binding */
    bufferSave = ctx->Unpack.BufferObj;
    ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
@@ -82,9 +76,6 @@ _swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
       return;
    }
 
-   /* Select buffer to read from */
-   _swrast_use_read_buffer(ctx);
-
    if (width > MAX_WIDTH)
       width = MAX_WIDTH;
 
@@ -92,9 +83,6 @@ _swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
    _swrast_read_rgba_span( ctx, ctx->ReadBuffer->_ColorReadBuffer,
                            width, x, y, data );
 
-   /* Restore reading from draw buffer (the default) */
-   _swrast_use_draw_buffer(ctx);
-
    /* save PBO binding */
    bufferSave = ctx->Unpack.BufferObj;
    ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
@@ -120,9 +108,6 @@ _swrast_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
       return;
    }
 
-   /* Select buffer to read from */
-   _swrast_use_read_buffer(ctx);
-
    RENDER_START( swrast, ctx );
 
    /* read the data from framebuffer */
@@ -131,9 +116,6 @@ _swrast_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
    
    RENDER_FINISH( swrast, ctx );
 
-   /* Restore reading from draw buffer (the default) */
-   _swrast_use_draw_buffer(ctx);
-
    /* save PBO binding */
    bufferSave = ctx->Unpack.BufferObj;
    ctx->Unpack.BufferObj = ctx->Array.NullBufferObj;
@@ -163,9 +145,6 @@ _swrast_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
       return;
    }
 
-   /* Select buffer to read from */
-   _swrast_use_read_buffer(ctx);
-
    RENDER_START(swrast,ctx);
    
    /* read pixels from framebuffer */
@@ -176,9 +155,6 @@ _swrast_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
 
    RENDER_FINISH(swrast,ctx);
 
-   /* Restore reading from draw buffer (the default) */
-   _swrast_use_draw_buffer(ctx);
-
    /*
     * HACK: save & restore context state so we can store this as a
     * convolution filter via the GL api.  Doesn't call any callbacks