Use VBOs to render most geometries.

Change-Id: I4360dc4fe5693ab425450c107282b2c22db4dca7
diff --git a/libs/hwui/utils/Compare.h b/libs/hwui/utils/Compare.h
index 754b470..ddb9c0b 100644
--- a/libs/hwui/utils/Compare.h
+++ b/libs/hwui/utils/Compare.h
@@ -21,19 +21,19 @@
 
 #define EPSILON 0.00001f
 
-#define almost(u, v) (fabs((u) - (v)) < EPSILON)
+#define ALMOST_EQUAL(u, v) (fabs((u) - (v)) < EPSILON)
 
 /**
  * Compare floats.
  */
-#define compare(a) \
+#define FLOAT_COMPARE(a) \
     if (a < rhs.a) return true; \
-    if (almost(a, rhs.a))
+    if (ALMOST_EQUAL(a, rhs.a))
 
 /**
  * Compare integers.
  */
-#define compareI(a) \
+#define INT_COMPARE(a) \
     if (a < rhs.a) return true; \
     if (a == rhs.a)