util: Split the pack/unpack functions out of the format desc.

[mesa.git] / src / gallium / tests / unit / translate_test.c

diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c
index 8e96b7b7b6270fd2b9f359642adbb2e2afdfa5ee..49a9c968300222d7e55492859fa5aa1ad9f671e2 100644 (file)
--- a/src/gallium/tests/unit/translate_test.c
+++ b/src/gallium/tests/unit/translate_test.c
@@ -172,12 +172,14 @@ int main(int argc, char** argv)
    for (output_format = 1; output_format < PIPE_FORMAT_COUNT; ++output_format)
    {
       const struct util_format_description* output_format_desc = util_format_description(output_format);
+      const struct util_format_pack_description* output_format_pack = util_format_pack_description(output_format);
+      const struct util_format_unpack_description* output_format_unpack = util_format_unpack_description(output_format);
       unsigned output_format_size;
       unsigned output_normalized = 0;
 
       if (!output_format_desc
-            || !output_format_desc->fetch_rgba_float
-            || !output_format_desc->pack_rgba_float
+            || !output_format_unpack->fetch_rgba_float
+            || !output_format_pack->pack_rgba_float
             || output_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
             || output_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
             || !translate_is_output_format_supported(output_format))
@@ -194,6 +196,8 @@ int main(int argc, char** argv)
       for (input_format = 1; input_format < PIPE_FORMAT_COUNT; ++input_format)
       {
          const struct util_format_description* input_format_desc = util_format_description(input_format);
+      const struct util_format_pack_description* input_format_pack = util_format_pack_description(input_format);
+      const struct util_format_unpack_description* input_format_unpack = util_format_unpack_description(input_format);
          unsigned input_format_size;
          struct translate* translate[2];
          unsigned fail = 0;
@@ -202,8 +206,8 @@ int main(int argc, char** argv)
          boolean input_is_float = FALSE;
 
          if (!input_format_desc
-               || !input_format_desc->fetch_rgba_float
-               || !input_format_desc->pack_rgba_float
+               || !input_format_unpack->fetch_rgba_float
+               || !input_format_pack->pack_rgba_float
                || input_format_desc->colorspace != UTIL_FORMAT_COLORSPACE_RGB
                || input_format_desc->layout != UTIL_FORMAT_LAYOUT_PLAIN
                || !translate_is_output_format_supported(input_format))
@@ -273,8 +277,8 @@ int main(int argc, char** argv)
          {
             float a[4];
             float b[4];
-            input_format_desc->fetch_rgba_float(a, buffer[2] + i * input_format_size, 0, 0);
-            input_format_desc->fetch_rgba_float(b, buffer[4] + i * input_format_size, 0, 0);
+            input_format_unpack->fetch_rgba_float(a, buffer[2] + i * input_format_size, 0, 0);
+            input_format_unpack->fetch_rgba_float(b, buffer[4] + i * input_format_size, 0, 0);
 
             for (j = 0; j < count; ++j)
             {