Mesa (master): swrast: Add LUMINANCE, INTENSITY, LUMINANCE_ALPHA to span asserts.

Eric Anholt anholt at kemper.freedesktop.org
Wed Apr 20 10:51:23 PDT 2011


Module: Mesa
Branch: master
Commit: a45b757f788d3a59a446fe2596065ec5f0d5eac2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a45b757f788d3a59a446fe2596065ec5f0d5eac2

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Apr 18 09:32:06 2011 -0700

swrast: Add LUMINANCE, INTENSITY, LUMINANCE_ALPHA to span asserts.

Fixes ARB_texture_float/fbo-alphatest-formats.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/swrast/s_readpix.c |    3 +++
 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 5604c2e..a201a63 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 b0f8e49..f0524e0 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) {



More information about the mesa-commit mailing list