OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9dacbe2
)
mesa: Fix _mesa_unpack_dudv_span_byte assertion.
author
Eric Anholt
<eric@anholt.net>
Wed, 13 Apr 2011 17:50:56 +0000
(10:50 -0700)
committer
Eric Anholt
<eric@anholt.net>
Sun, 17 Apr 2011 17:26:09 +0000
(10:26 -0700)
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@vmware.com>
src/mesa/main/pack.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/pack.c
b/src/mesa/main/pack.c
index
0215458
..
4bb0a90
100644
(file)
--- 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 ||