diff options
| author | Eric Anholt <eric@anholt.net> | 2011-04-15 17:50:41 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-04-18 11:19:53 -0700 |
| commit | 641dd899bd485c194c20a871633797a47e4f912d (patch) | |
| tree | 057f0e007f961d3735a20c1c04342909b797ebb1 /src/mesa | |
| parent | cd3568c329cff16333455fa2228a7c27b261cf05 (diff) | |
| download | external_mesa3d-641dd899bd485c194c20a871633797a47e4f912d.zip external_mesa3d-641dd899bd485c194c20a871633797a47e4f912d.tar.gz external_mesa3d-641dd899bd485c194c20a871633797a47e4f912d.tar.bz2 | |
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 <brianp@vmware.com>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/swrast/s_readpix.c | 5 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 5c8d7e9..cca7ec0 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -191,7 +191,10 @@ fast_read_rgba_pixels( struct gl_context *ctx, if (!rb) return GL_FALSE; - ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB || + ASSERT(rb->_BaseFormat == GL_RGBA || + rb->_BaseFormat == GL_RGB || + rb->_BaseFormat == GL_RG || + rb->_BaseFormat == GL_RED || rb->_BaseFormat == GL_ALPHA); /* clipping should have already been done */ diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index 9cfecc9..b0f8e49 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) { |