From 641dd899bd485c194c20a871633797a47e4f912d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 15 Apr 2011 17:50:41 -0700 Subject: swrast: Don't assert against glReadPixels of GL_RED and GL_RG. Everything appears to already be in place for this. Fixes aborts in: ARB_texture_rg/fbo-alphatest-formats-float ARB_texture_rg/fbo-blending-formats-float. Reviewed-by: Brian Paul --- src/mesa/swrast/s_span.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/mesa/swrast/s_span.c') diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 9cfecc9e3a4..b0f8e490432 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1348,7 +1348,10 @@ _swrast_read_rgba_span( struct gl_context *ctx, struct gl_renderbuffer *rb, ASSERT(rb); ASSERT(rb->GetRow); - ASSERT(rb->_BaseFormat == GL_RGB || rb->_BaseFormat == GL_RGBA || + ASSERT(rb->_BaseFormat == GL_RGBA || + rb->_BaseFormat == GL_RGB || + rb->_BaseFormat == GL_RG || + rb->_BaseFormat == GL_RED || rb->_BaseFormat == GL_ALPHA); if (rb->DataType == dstType) { -- cgit v1.2.3