util: Share a single function pointer for the 4-byte rgba unpack function.

[mesa.git] / src / util / tests / format / u_format_test.c

diff --git a/src/util/tests/format/u_format_test.c b/src/util/tests/format/u_format_test.c
index 69e3b5aebfde8e790becd164a90e5164c9a9f952..a6f1d608c848a69331bb71c8fb5cd8cb0d851874 100644 (file)
--- a/src/util/tests/format/u_format_test.c
+++ b/src/util/tests/format/u_format_test.c
@@ -235,16 +235,16 @@ test_format_fetch_rgba_float(const struct util_format_description *format_desc,
 
 
 static boolean
-test_format_unpack_rgba_float(const struct util_format_description *format_desc,
-                              const struct util_format_test_case *test)
+test_format_unpack_rgba(const struct util_format_description *format_desc,
+                        const struct util_format_test_case *test)
 {
    float unpacked[UTIL_FORMAT_MAX_UNPACKED_HEIGHT][UTIL_FORMAT_MAX_UNPACKED_WIDTH][4] = { { { 0 } } };
    unsigned i, j, k;
    boolean success;
 
-   format_desc->unpack_rgba_float(&unpacked[0][0][0], sizeof unpacked[0],
-                             test->packed, 0,
-                             format_desc->block.width, format_desc->block.height);
+   format_desc->unpack_rgba(&unpacked[0][0][0], sizeof unpacked[0],
+                            test->packed, 0,
+                            format_desc->block.width, format_desc->block.height);
 
    success = TRUE;
    for (i = 0; i < format_desc->block.height; ++i) {
@@ -359,6 +359,9 @@ test_format_unpack_rgba_8unorm(const struct util_format_description *format_desc
    unsigned i, j, k;
    boolean success;
 
+   if (util_format_is_pure_integer(format_desc->format))
+      return FALSE;
+
    format_desc->unpack_rgba_8unorm(&unpacked[0][0][0], sizeof unpacked[0],
                               test->packed, 0,
                               format_desc->block.width, format_desc->block.height);
@@ -788,7 +791,7 @@ test_all(void)
 
       TEST_ONE_FUNC(fetch_rgba_float);
       TEST_ONE_FUNC(pack_rgba_float);
-      TEST_ONE_FUNC(unpack_rgba_float);
+      TEST_ONE_FUNC(unpack_rgba);
       TEST_ONE_FUNC(pack_rgba_8unorm);
       TEST_ONE_FUNC(unpack_rgba_8unorm);