llvmpipe: don't test for unsupported formats in lp_test_format
authorRoland Scheidegger <sroland@vmware.com>
Tue, 24 Nov 2015 16:52:37 +0000 (17:52 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Tue, 24 Nov 2015 17:26:11 +0000 (18:26 +0100)
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@vmware.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
src/gallium/drivers/llvmpipe/lp_test_format.c

index 0640a21..3f2ed84 100644 (file)
@@ -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;
       }