Mesa (master): swrast: update renderbuffer format assertion

Brian Paul brianp at kemper.freedesktop.org
Sun Oct 23 10:09:59 PDT 2011


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

Author: Brian Paul <brianp at vmware.com>
Date:   Sun Oct 23 10:44:47 2011 -0600

swrast: update renderbuffer format assertion

Failed when exercising i965 swrast fallback rendering.

---

 src/mesa/swrast/s_span.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index e517c9a..4124e44 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1251,7 +1251,10 @@ _swrast_write_rgba_span( struct gl_context *ctx, SWspan *span)
                       4 * span->end * sizeof(GLchan));
             }
 
-            ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB ||
+            ASSERT(rb->_BaseFormat == GL_RGBA ||
+                   rb->_BaseFormat == GL_RGB ||
+                   rb->_BaseFormat == GL_RED ||
+                   rb->_BaseFormat == GL_RG ||
 		   rb->_BaseFormat == GL_ALPHA);
 
             if (ctx->Color.ColorLogicOpEnabled) {



More information about the mesa-commit mailing list