Overhaul of glRead/DrawBuffer() code. Now, swrast->Driver.SetBuffer()

indicates the read AND draw color buffer for all software rasterization.
Lots of related clean-ups.  See RELNOTES-4.1 for details.

1 files changed, 18 insertions, 5 deletions

diff --git a/src/mesa/swrast/swrast.h b/src/mesa/swrast/swrast.h
index f36031cfb4a..a33e97ec017 100644
--- a/src/mesa/swrast/swrast.h
+++ b/src/mesa/swrast/swrast.h
@@ -1,4 +1,4 @@
-/* $Id: swrast.h,v 1.24 2002/04/19 14:05:50 brianp Exp $ */
+/* $Id: swrast.h,v 1.25 2002/07/09 01:22:52 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -204,6 +204,12 @@ struct swrast_device_driver;
 extern void
 _swrast_alloc_buffers( GLframebuffer *buffer );
 
+extern void
+_swrast_use_read_buffer( GLcontext *ctx );
+
+extern void
+_swrast_use_draw_buffer( GLcontext *ctx );
+
 extern GLboolean
 _swrast_CreateContext( GLcontext *ctx );
 
@@ -254,6 +260,10 @@ _swrast_Accum( GLcontext *ctx, GLenum op,
 	       GLint width, GLint height );
 
 
+extern void
+_swrast_DrawBuffer( GLcontext *ctx, GLenum mode );
+
+
 /* Reset the stipple counter
  */
 extern void
@@ -363,11 +373,14 @@ _swrast_copy_texsubimage3d(GLcontext *ctx,
  */
 struct swrast_device_driver {
 
-   void (*SetReadBuffer)( GLcontext *ctx, GLframebuffer *colorBuffer,
-                          GLenum buffer );
+   void (*SetBuffer)( GLcontext *ctx, GLframebuffer *buffer,
+                      GLenum colorBuffer );
    /*
-    * Specifies the current buffer for span/pixel reading.
-    * colorBuffer will be one of:
+    * Specifies the current buffer for span/pixel writing/reading.
+    * buffer indicates which window to write to / read from.  Normally,
+    * this'll be the buffer currently bound to the context, but it doesn't
+    * have to be!
+    * colorBuffer indicates which color buffer, one of:
     *    GL_FRONT_LEFT - this buffer always exists
     *    GL_BACK_LEFT - when double buffering
     *    GL_FRONT_RIGHT - when using stereo