u_format_test: Ignore S3TC errors.

This prevents spurious failures when libtxc-dxtn-s2tc is installed.

Note: lp_test_format doesn't need any change since we were already
ignoring S3TC failures there.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Rhys Kidd <rhyskidd@gmail.com>

diff --git a/src/gallium/tests/unit/u_format_test.c b/src/gallium/tests/unit/u_format_test.c
index 3145d13616c071977db323a91f1fca07daa0126b..69d6c7dd3a225ec90f3109a3a8d3e1a98b25f3fc 100644 (file)
--- a/src/gallium/tests/unit/u_format_test.c
+++ b/src/gallium/tests/unit/u_format_test.c
@@ -220,6 +220,11 @@ test_format_fetch_rgba_float(const struct util_format_description *format_desc,
       }
    }
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+      success = TRUE;
+   }
+
    if (!success) {
       print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, " obtained\n");
       print_unpacked_rgba_doubl(format_desc, "        ", test->unpacked, " expected\n");
@@ -252,6 +257,11 @@ test_format_unpack_rgba_float(const struct util_format_description *format_desc,
       }
    }
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+      success = TRUE;
+   }
+
    if (!success) {
       print_unpacked_rgba_float(format_desc, "FAILED: ", unpacked, " obtained\n");
       print_unpacked_rgba_doubl(format_desc, "        ", test->unpacked, " expected\n");
@@ -302,6 +312,11 @@ test_format_pack_rgba_float(const struct util_format_description *format_desc,
    if (util_is_double_nan(test->unpacked[0][0][0]))
       success = TRUE;
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+      success = TRUE;
+   }
+
    if (!success) {
       print_packed(format_desc, "FAILED: ", packed, " obtained\n");
       print_packed(format_desc, "        ", test->packed, " expected\n");
@@ -365,6 +380,11 @@ test_format_unpack_rgba_8unorm(const struct util_format_description *format_desc
    if (util_is_double_nan(test->unpacked[0][0][0]))
       success = TRUE;
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+      success = TRUE;
+   }
+
    if (!success) {
       print_unpacked_rgba_8unorm(format_desc, "FAILED: ", unpacked, " obtained\n");
       print_unpacked_rgba_8unorm(format_desc, "        ", expected, " expected\n");
@@ -422,6 +442,11 @@ test_format_pack_rgba_8unorm(const struct util_format_description *format_desc,
    if ((test->unpacked[0][0][0] * 255.0) != (int)(test->unpacked[0][0][0] * 255.0))
       success = TRUE;
 
+   /* Ignore S3TC errors */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+      success = TRUE;
+   }
+
    if (!success) {
       print_packed(format_desc, "FAILED: ", packed, " obtained\n");
       print_packed(format_desc, "        ", test->packed, " expected\n");