diff options
author | marha <marha@users.sourceforge.net> | 2013-02-13 09:18:19 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-02-13 09:18:19 +0100 |
commit | ad7d3734fae59b63a1afe2d8e11411ac32a40f30 (patch) | |
tree | 80af4bcc936f46b31ba17a71905f20deeca066f5 /mesalib/src/mesa/state_tracker/st_format.c | |
parent | c4583f59d8460f05ee211c2f8ed6208addfe3087 (diff) | |
parent | 8add148a4cf71b8bdab05a6b7e14824b5062da5e (diff) | |
download | vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.tar.gz vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.tar.bz2 vcxsrv-ad7d3734fae59b63a1afe2d8e11411ac32a40f30.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver git update 13 Feb 2013
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_format.c')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c index 5b6e74d50..02969b995 100644 --- a/mesalib/src/mesa/state_tracker/st_format.c +++ b/mesalib/src/mesa/state_tracker/st_format.c @@ -390,7 +390,6 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat) return PIPE_FORMAT_R32G32B32X32_SINT; default: - assert(0); return PIPE_FORMAT_NONE; } } |