[cairo] [PATCH 43/71] drm/intel: consolidated INTEL_GLYPH_CACHE_* with GLYPH_CACHE_*

[Enrico Weigelt, metux IT consult]

These symbols are redundant, therefore drop them.

Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt at gr13.net>
---
 src/drm/cairo-drm-intel-private.h |  5 -----
 src/drm/cairo-drm-intel.c         | 11 ++++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/drm/cairo-drm-intel-private.h b/src/drm/cairo-drm-intel-private.h
index 570494c59..138e0909e 100644
--- a/src/drm/cairo-drm-intel-private.h
+++ b/src/drm/cairo-drm-intel-private.h
@@ -47,11 +47,6 @@
 
 #define INTEL_BO_CACHE_BUCKETS 12 /* cache surfaces up to 16 MiB */
 
-#define INTEL_GLYPH_CACHE_WIDTH 1024
-#define INTEL_GLYPH_CACHE_HEIGHT 1024
-#define INTEL_GLYPH_CACHE_MIN_SIZE 1
-#define INTEL_GLYPH_CACHE_MAX_SIZE 128
-
 typedef struct _intel_bo {
     cairo_drm_bo_t base;
 
diff --git a/src/drm/cairo-drm-intel.c b/src/drm/cairo-drm-intel.c
index 1bf522bb9..27e214c6e 100644
--- a/src/drm/cairo-drm-intel.c
+++ b/src/drm/cairo-drm-intel.c
@@ -948,15 +948,16 @@ intel_get_glyph_cache (intel_device_t *device,
 
     if (unlikely (cache->buffer.bo == NULL)) {
 	status = intel_buffer_cache_init (cache, device, format,
-					 INTEL_GLYPH_CACHE_WIDTH,
-					 INTEL_GLYPH_CACHE_HEIGHT);
+					 GLYPH_CACHE_WIDTH,
+					 GLYPH_CACHE_HEIGHT);
 	if (unlikely (status))
 	    return status;
 
 	_cairo_rtree_init (&cache->rtree,
-			   INTEL_GLYPH_CACHE_WIDTH,
-			   INTEL_GLYPH_CACHE_HEIGHT,
-			   0, sizeof (intel_glyph_t));
+			   GLYPH_CACHE_WIDTH,
+			   GLYPH_CACHE_HEIGHT,
+			   GLYPH_CACHE_MIN_SIZE,
+			   sizeof (intel_glyph_t));
     }
 
     *out = cache;
-- 
2.11.0.rc0.7.gbe5a750