Mesa (master): llvmpipe: don' t test for unsupported formats in lp_test_format

[Roland Scheidegger]

Module: Mesa
Branch: master
Commit: 97eed8dcb9e66b3ebeca55bfc429d200556583de
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=97eed8dcb9e66b3ebeca55bfc429d200556583de

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Tue Nov 24 17:52:37 2015 +0100

llvmpipe: don't test for unsupported formats in lp_test_format

Removing the fake format helpers (1c7d0a6aa4f5cb38af7e281e1e5437cd1a20f781)
caused this to fail. These formats were never supported, but previously
they would have asserted in the generated jit functions (which, due to lack
of test cases for these formats, were never called) whereas we now assert when
trying to build the jit function. So, skip them completely.

This fixes https://bugs.freedesktop.org/show_bug.cgi?id=93092

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

---

 src/gallium/drivers/llvmpipe/lp_test_format.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c
index 0640a21..3f2ed84 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_format.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_format.c
@@ -382,6 +382,18 @@ test_all(unsigned verbose, FILE *fp)
          continue;
       }
 
+      /* only have util fetch func for etc1 */
+      if (format_desc->layout == UTIL_FORMAT_LAYOUT_ETC &&
+          format != PIPE_FORMAT_ETC1_RGB8) {
+         continue;
+      }
+
+      /* missing fetch funcs */
+      if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC ||
+          format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) {
+         continue;
+      }
+
       if (!test_one(verbose, fp, format_desc)) {
            success = FALSE;
       }