summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2011-04-13 10:50:56 -0700
committerEric Anholt <[email protected]>2011-04-17 10:26:09 -0700
commit14eedf3028422e98ac05713a3e3c37e6c9b4cf37 (patch)
treec0991c00ba5c64058ac94db11b648d8c157524ec
parent9dacbe222641443af000a82161922a5ade206340 (diff)
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 <[email protected]>
-rw-r--r--src/mesa/main/pack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index 02154585aca..4bb0a90045e 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 ||