From f77d06fb28fb23b8acaf6a70ff236b040f81a8a2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 6 Sep 2017 11:33:15 +0100 Subject: [PATCH] gallium/tests: use ARRAY_SIZE macro MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák --- src/gallium/tests/graw/fs-fragcoord.c | 4 +++- src/gallium/tests/graw/fs-frontface.c | 4 +++- src/gallium/tests/graw/fs-write-z.c | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gallium/tests/graw/fs-fragcoord.c b/src/gallium/tests/graw/fs-fragcoord.c index cf7642c7822..9afea0caa0b 100644 --- a/src/gallium/tests/graw/fs-fragcoord.c +++ b/src/gallium/tests/graw/fs-fragcoord.c @@ -7,6 +7,8 @@ #include "graw_util.h" +#include "util/macros.h" + static int width = 300; static int height = 300; @@ -44,7 +46,7 @@ static struct vertex vertices[] = } }; -#define NUM_VERTS (sizeof(vertices) / sizeof(vertices[0])) +#define NUM_VERTS ARRAY_SIZE(vertices) static void diff --git a/src/gallium/tests/graw/fs-frontface.c b/src/gallium/tests/graw/fs-frontface.c index 32a13cb9e2b..3ad89f6b646 100644 --- a/src/gallium/tests/graw/fs-frontface.c +++ b/src/gallium/tests/graw/fs-frontface.c @@ -5,6 +5,8 @@ #include "graw_util.h" +#include "util/macros.h" + static int width = 300; static int height = 300; @@ -65,7 +67,7 @@ static struct vertex vertices[] = }, }; -#define NUM_VERTS (sizeof(vertices) / sizeof(vertices[0])) +#define NUM_VERTS ARRAY_SIZE(vertices) diff --git a/src/gallium/tests/graw/fs-write-z.c b/src/gallium/tests/graw/fs-write-z.c index 12267ed820d..196c67bc368 100644 --- a/src/gallium/tests/graw/fs-write-z.c +++ b/src/gallium/tests/graw/fs-write-z.c @@ -7,6 +7,8 @@ #include "graw_util.h" +#include "util/macros.h" + static int width = 300; static int height = 300; @@ -69,7 +71,7 @@ static struct vertex vertices[] = }, }; -#define NUM_VERTS (sizeof(vertices) / sizeof(vertices[0])) +#define NUM_VERTS ARRAY_SIZE(vertices) -- 2.30.2