Rework the GL_READ_BUFFER, GL_DRAW_BUFFER state repairs that Roland previously did.

Basically, in update_framebuffer() (which should be called after an FBO is bound
with MakeCurrent or BindFramebuffer) we check if the FBO is a window-system FBO.
If it is, update the FBO's GL_READ/DRAW_BUFFER state according to the context state.
Old code still in place but disabled with #if 0 / #endif.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index 208e7af2b93..e7228a6da6b 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  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"),
@@ -56,8 +56,13 @@ extern void
 _mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
                   const GLbitfield *destMask);
 
+extern void
+_mesa_readbuffer(GLcontext *ctx, GLenum buffer, GLint bufferIndex);
+
+#if 0
 extern GLboolean
 _mesa_readbuffer_update_fields(GLcontext *ctx, GLenum buffer);
+#endif
 
 extern void GLAPIENTRY
 _mesa_ReadBuffer( GLenum mode );