diff options
author | José Fonseca <jfonseca@vmware.com> | 2010-04-03 00:51:19 +0100 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2010-04-03 00:51:19 +0100 |
commit | 47e61426586bb9f9f40950e9c4372e4f12bb9ed6 (patch) | |
tree | 2387c7c4af139a3a151d52c7d177ab7c739a7cca /progs | |
parent | dd194b6932c9b7bbb87b34b501254ec83d82ba49 (diff) | |
download | external_mesa3d-47e61426586bb9f9f40950e9c4372e4f12bb9ed6.zip external_mesa3d-47e61426586bb9f9f40950e9c4372e4f12bb9ed6.tar.gz external_mesa3d-47e61426586bb9f9f40950e9c4372e4f12bb9ed6.tar.bz2 |
util: Revert unsolicited, untested, unreviewed, and broken changes to format support.
Not all is bad, but I'm afraid I'll have to throw the baby with the water
given they are all tied to together.
Diffstat (limited to 'progs')
-rw-r--r-- | progs/gallium/unit/u_format_test.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/progs/gallium/unit/u_format_test.c b/progs/gallium/unit/u_format_test.c index 8dffaf4..53e0284 100644 --- a/progs/gallium/unit/u_format_test.c +++ b/progs/gallium/unit/u_format_test.c @@ -30,8 +30,10 @@ #include <stdio.h> #include <float.h> +#include "util/u_half.h" #include "util/u_format.h" #include "util/u_format_tests.h" +#include "util/u_format_s3tc.h" static boolean @@ -352,8 +354,10 @@ test_one(test_func_t func, const char *suffix) format_desc = util_format_description(test->format); - if (!util_format_is_supported(test->format)) + if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC && + !util_format_s3tc_enabled) { skip = TRUE; + } if (test->format != last_format) { printf("%s util_format_%s_%s ...\n", @@ -400,6 +404,8 @@ int main(int argc, char **argv) { boolean success; + util_format_s3tc_init(); + success = test_all(); return success ? 0 : 1; |