summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2006-09-25 16:11:14 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2006-09-25 16:11:14 +0000
commit607c474f2d3f6e9c1228d3f9e91b9c0ec1877d85 (patch)
tree7224fa86d9d285548dea6b5391a78ef495e3899f
parent2f54146c1fe7842bfd09227ff9e77e7eed4b9025 (diff)
Import Brian's FBO bugfix from trunk.
-rw-r--r--src/mesa/main/attrib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 1f292de3c7a..ef970ad9eb6 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -276,6 +276,8 @@ _mesa_PushAttrib(GLbitfield mask)
struct gl_pixel_attrib *attr;
attr = MALLOC_STRUCT( gl_pixel_attrib );
MEMCPY( attr, &ctx->Pixel, sizeof(struct gl_pixel_attrib) );
+ /* push the Read FBO's ReadBuffer state, not ctx->Pixel.ReadBuffer */
+ attr->ReadBuffer = ctx->ReadBuffer->ColorReadBuffer;
newnode = new_attrib_node( GL_PIXEL_MODE_BIT );
newnode->data = attr;
newnode->next = head;