From 70d2d3ef7f8ac98102cd930a3614eb758cfe7661 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Fri, 4 Dec 2015 15:28:11 +1100 Subject: [PATCH] llvmpipe: Make use of ARRAY_SIZE macro MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Edward O'Callaghan Signed-off-by: Marek Olšák --- src/gallium/drivers/llvmpipe/lp_test_blend.c | 6 +++--- src/gallium/drivers/llvmpipe/lp_test_conv.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_test_blend.c b/src/gallium/drivers/llvmpipe/lp_test_blend.c index 37420b02442..7b19174f345 100644 --- a/src/gallium/drivers/llvmpipe/lp_test_blend.c +++ b/src/gallium/drivers/llvmpipe/lp_test_blend.c @@ -625,9 +625,9 @@ const struct lp_type blend_types[] = { }; -const unsigned num_funcs = sizeof(blend_funcs)/sizeof(blend_funcs[0]); -const unsigned num_factors = sizeof(blend_factors)/sizeof(blend_factors[0]); -const unsigned num_types = sizeof(blend_types)/sizeof(blend_types[0]); +const unsigned num_funcs = ARRAY_SIZE(blend_funcs); +const unsigned num_factors = ARRAY_SIZE(blend_factors); +const unsigned num_types = ARRAY_SIZE(blend_types); boolean diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c index 8290da4004b..a30f35c8149 100644 --- a/src/gallium/drivers/llvmpipe/lp_test_conv.c +++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c @@ -382,7 +382,7 @@ const struct lp_type conv_types[] = { }; -const unsigned num_types = sizeof(conv_types)/sizeof(conv_types[0]); +const unsigned num_types = ARRAY_SIZE(conv_types); boolean -- 2.30.2