icd: add common utility functions
diff --git a/icd/intel/intel.h b/icd/intel/intel.h
index 10743a0..5c70a2f 100644
--- a/icd/intel/intel.h
+++ b/icd/intel/intel.h
@@ -34,31 +34,11 @@
#include <xglDbg.h>
#include "icd.h"
+#include "icd-utils.h"
#define INTEL_API_VERSION XGL_MAKE_VERSION(0, 22, 0)
#define INTEL_DRIVER_VERSION 0
#define INTEL_GEN(gen) ((int) ((gen) * 100))
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-
-/**
- * Return true if val is power of two, or zero.
- */
-static inline bool u_is_pow2(unsigned int val)
-{
- return ((val & (val - 1)) == 0);
-}
-
-static inline unsigned int u_align(unsigned int val, unsigned alignment)
-{
- assert(alignment && u_is_pow2(alignment));
- return (val + alignment - 1) & ~(alignment - 1);
-}
-
-static inline unsigned int u_minify(unsigned int val, unsigned level)
-{
- return (val >> level) ? val >> level : 1;
-}
-
#endif /* INTEL_H */