util/macros: Move DIV_ROUND_UP to util/macros.h

Move DIV_ROUND_UP to a shared location accessible everywhere

Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Axel Davy <axel.davy@ens.fr>

diff --git a/src/gallium/drivers/svga/include/svga3d_surfacedefs.h b/src/gallium/drivers/svga/include/svga3d_surfacedefs.h
index 8763cdf319e1cf4148fdb1d900260061065755d6..e32d19458a6cc1376acdc3589a3eee663f8da682 100644 (file)
--- a/src/gallium/drivers/svga/include/svga3d_surfacedefs.h
+++ b/src/gallium/drivers/svga/include/svga3d_surfacedefs.h
@@ -35,8 +35,6 @@
 #define ARRAY_SIZE(A) (sizeof(A) / sizeof(A[0]))
 #endif
 
-#define DIV_ROUND_UP(x, y)  (((x) + (y) - 1) / (y))
-
 #define max_t(type, x, y)  ((x) > (y) ? (x) : (y))
 
 /*

diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 3344ec84169f438d8690646d859692e1d6f4c9d7..0608650aeb4844f2b0b6cde706de88f31a8f461e 100644 (file)
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -31,6 +31,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
+#include "util/macros.h"
 #include "util/u_math.h"
 #include "imports.h"
 
@@ -800,10 +801,6 @@ DIFFERENT_SIGNS(GLfloat x, GLfloat y)
 }
 
 
-/** Compute ceiling of integer quotient of A divided by B. */
-#define DIV_ROUND_UP( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
-
-
 /** casts to silence warnings with some compilers */
 #define ENUM_TO_INT(E)     ((GLint)(E))
 #define ENUM_TO_FLOAT(E)   ((GLfloat)(GLint)(E))

diff --git a/src/util/macros.h b/src/util/macros.h
index 6c7bda7ae018e4d752ce1b6b897bd895d60a4f3f..3b708ed6aa2afc09b6cb69ee2858359e78ddbca2 100644 (file)
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -182,5 +182,7 @@ do {                       \
 #define UNUSED
 #endif
 
+/** Compute ceiling of integer quotient of A divided by B. */
+#define DIV_ROUND_UP( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
 
 #endif /* UTIL_MACROS_H */