Module: Mesa Branch: master Commit: 0cade4ea2b114238206055eb256d0eb000bdfac9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0cade4ea2b114238206055eb256d0eb000bdfac9
Author: Ilia Mirkin <imir...@alum.mit.edu> Date: Thu Feb 19 01:38:58 2015 -0500 st/mesa: don't die for ETC2 formats when no driver support Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu> --- src/mesa/state_tracker/st_format.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 9a91d71..7868bb5 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -921,6 +921,9 @@ test_format_conversion(struct st_context *st) if (i == PIPE_FORMAT_ETC1_RGB8 && !st->has_etc1) continue; + if (_mesa_is_format_etc2(mf) && !st->has_etc2) + continue; + if (mf != MESA_FORMAT_NONE) { enum pipe_format pf = st_mesa_format_to_pipe_format(st, mf); assert(pf == i); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit