summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-02-21 16:46:02 -0700
committerBrian Paul <brianp@vmware.com>2011-02-21 16:58:42 -0700
commitc966c6980c2a4a1e50b238f7607a9ce111f6c0b4 (patch)
tree7af87a4f64df31a1cb1ea4f6c3815fdeeb0c60e1
parent55a3c352432d1c7b22e445d041f9cb1990ca28d5 (diff)
st/mesa: fix the default case in st_format_datatype()
Part of the fix for piglit fbo-clear-formats NOTE: This is a candidate for the 7.9 and 7.10 branches.
-rw-r--r--src/mesa/state_tracker/st_format.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index a532e089c0a..3f9c322d9a1 100644
--- 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;
}