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:
55a3c35
)
st/mesa: fix the default case in st_format_datatype()
author
Brian Paul
<brianp@vmware.com>
Mon, 21 Feb 2011 23:46:02 +0000
(16:46 -0700)
committer
Brian Paul
<brianp@vmware.com>
Mon, 21 Feb 2011 23:58:42 +0000
(16:58 -0700)
Part of the fix for piglit fbo-clear-formats
NOTE: This is a candidate for the 7.9 and 7.10 branches.
src/mesa/state_tracker/st_format.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_format.c
b/src/mesa/state_tracker/st_format.c
index
a532e08
..
3f9c322
100644
(file)
--- a/
src/mesa/state_tracker/st_format.c
+++ b/
src/mesa/state_tracker/st_format.c
@@
-113,12
+113,9
@@
st_format_datatype(enum pipe_format format)
return GL_UNSIGNED_SHORT;
}
else {
- /*
compressed format?
*/
-
assert(0)
;
+ /*
probably a compressed format, unsupported anyway
*/
+
return GL_NONE
;
}
-
- assert(0);
- return GL_NONE;
}