Mesa (master): mesa: Fix _mesa_unpack_dudv_span_byte assertion.

Eric Anholt anholt at kemper.freedesktop.org
Sun Apr 17 10:27:35 PDT 2011


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

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Apr 13 10:50:56 2011 -0700

mesa: Fix _mesa_unpack_dudv_span_byte assertion.

It was accepting only GL_DUDV_ATI and not the specific sized format
GL_DU8DV8_ATI.  Fixes assertion failure at startup in Shadowgrounds.

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

---

 src/mesa/main/pack.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index 0215458..4bb0a90 100644
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -3973,7 +3973,8 @@ _mesa_unpack_dudv_span_byte( struct gl_context *ctx,
                              GLbitfield transferOps )
 {
    ASSERT(dstFormat == GL_DUDV_ATI);
-   ASSERT(srcFormat == GL_DUDV_ATI);
+   ASSERT(srcFormat == GL_DUDV_ATI ||
+	  srcFormat == GL_DU8DV8_ATI);
 
    ASSERT(srcType == GL_UNSIGNED_BYTE ||
           srcType == GL_BYTE ||



More information about the mesa-commit mailing list