import Mesa 11.0.6

1 files changed, 0 insertions, 29 deletions

diff --git a/lib/mesa/src/gallium/tests/unit/u_format_test.c b/lib/mesa/src/gallium/tests/unit/u_format_test.c
index 69d6c7dd3..2d89e7ed4 100644
--- a/lib/mesa/src/gallium/tests/unit/u_format_test.c
+++ b/lib/mesa/src/gallium/tests/unit/u_format_test.c
@@ -220,11 +220,6 @@ 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");
@@ -257,11 +252,6 @@ 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");
@@ -312,11 +302,6 @@ 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");
@@ -380,11 +365,6 @@ 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");
@@ -442,11 +422,6 @@ 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");
@@ -718,10 +693,6 @@ test_all(void)
          continue;
       }
 
-      assert(format_desc->block.bits   <= UTIL_FORMAT_MAX_PACKED_BYTES * 8);
-      assert(format_desc->block.height <= UTIL_FORMAT_MAX_UNPACKED_HEIGHT);
-      assert(format_desc->block.width  <= UTIL_FORMAT_MAX_UNPACKED_WIDTH);
-
       if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC &&
           !util_format_s3tc_enabled) {
          continue;