diff options
| author | Eric Anholt <eric@anholt.net> | 2011-04-18 09:32:06 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2011-04-20 10:35:41 -0700 |
| commit | a45b757f788d3a59a446fe2596065ec5f0d5eac2 (patch) | |
| tree | ab213785d17b6efd1b0fb5e03e499ae7947dca53 | |
| parent | abee17057f52a1b83ab5d7897bc9299e452b5953 (diff) | |
swrast: Add LUMINANCE, INTENSITY, LUMINANCE_ALPHA to span asserts.
Fixes ARB_texture_float/fbo-alphatest-formats.
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/mesa/swrast/s_readpix.c | 3 | ||||
| -rw-r--r-- | src/mesa/swrast/s_span.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c index 5604c2e937e..a201a631c90 100644 --- a/src/mesa/swrast/s_readpix.c +++ b/src/mesa/swrast/s_readpix.c @@ -195,6 +195,9 @@ fast_read_rgba_pixels( struct gl_context *ctx, rb->_BaseFormat == GL_RGB || rb->_BaseFormat == GL_RG || rb->_BaseFormat == GL_RED || + rb->_BaseFormat == GL_LUMINANCE || + rb->_BaseFormat == GL_INTENSITY || + rb->_BaseFormat == GL_LUMINANCE_ALPHA || 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 b0f8e490432..f0524e0610e 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -1352,6 +1352,9 @@ _swrast_read_rgba_span( struct gl_context *ctx, struct gl_renderbuffer *rb, rb->_BaseFormat == GL_RGB || rb->_BaseFormat == GL_RG || rb->_BaseFormat == GL_RED || + rb->_BaseFormat == GL_LUMINANCE || + rb->_BaseFormat == GL_INTENSITY || + rb->_BaseFormat == GL_LUMINANCE_ALPHA || rb->_BaseFormat == GL_ALPHA); if (rb->DataType == dstType) { |