From fe5c7f14187be6066a584e34774d0ad0ce6596f4 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Tue, 12 Jul 2022 15:43:44 +0200 Subject: [PATCH] gallium/tests: Remove format desc null checks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Konstantin Seurer Reviewed-by: Alyssa Rosenzweig Reviewed-by: Marek Olšák Part-of: --- src/gallium/tests/unit/translate_test.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/gallium/tests/unit/translate_test.c b/src/gallium/tests/unit/translate_test.c index 16e55b231ca..215136b423e 100644 --- a/src/gallium/tests/unit/translate_test.c +++ b/src/gallium/tests/unit/translate_test.c @@ -177,12 +177,11 @@ int main(int argc, char** argv) unsigned output_format_size; unsigned output_normalized = 0; - if (!output_format_desc - || !fetch_rgba - || !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)) + if (!fetch_rgba + || !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)) continue; for(i = 0; i < output_format_desc->nr_channels; ++i) @@ -206,12 +205,11 @@ int main(int argc, char** argv) unsigned input_normalized = 0; boolean input_is_float = FALSE; - if (!input_format_desc - || !fetch_rgba - || !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)) + if (!fetch_rgba + || !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)) continue; input_format_size = util_format_get_stride(input_format, 1);