From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Thu, 19 Feb 2015 06:38:58 +0000 (-0500)
Subject: st/mesa: don't die for ETC2 formats when no driver support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0cade4ea2b114238206055eb256d0eb000bdfac9;p=mesa.git

st/mesa: don't die for ETC2 formats when no driver support

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
---

diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c
index 9a91d715b07..7868bb501ea 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);