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)