summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/util/u_format_tests.h6
-rw-r--r--src/gallium/tests/unit/u_format_test.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_format_tests.h b/src/gallium/auxiliary/util/u_format_tests.h
index f59563f..d5f0b34 100644
--- a/src/gallium/auxiliary/util/u_format_tests.h
+++ b/src/gallium/auxiliary/util/u_format_tests.h
@@ -34,9 +34,9 @@
#include "pipe/p_format.h"
-#define UTIL_FORMAT_MAX_PACKED_BYTES 16
-#define UTIL_FORMAT_MAX_UNPACKED_WIDTH 4
-#define UTIL_FORMAT_MAX_UNPACKED_HEIGHT 4
+#define UTIL_FORMAT_MAX_PACKED_BYTES 32 // R64G64B64A64_FLOAT
+#define UTIL_FORMAT_MAX_UNPACKED_WIDTH 12 // ASTC 12x12
+#define UTIL_FORMAT_MAX_UNPACKED_HEIGHT 12
/**
diff --git a/src/gallium/tests/unit/u_format_test.c b/src/gallium/tests/unit/u_format_test.c
index 2d89e7e..3145d13 100644
--- a/src/gallium/tests/unit/u_format_test.c
+++ b/src/gallium/tests/unit/u_format_test.c
@@ -693,6 +693,10 @@ 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;