summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2014-03-20 18:09:59 +0000
committerRussell King <rmk@arm.linux.org.uk>2014-03-20 18:09:59 +0000
commitace9bb8babfd9898010249e96eb89a8d974c33ee (patch)
tree6b214a8da1bfcbe9f3482dcde496e17dfcbda7ce
parent13adefefe68d459f3133debe7a029412d5c09697 (diff)
downloadxf86-video-armada-ace9bb8babfd9898010249e96eb89a8d974c33ee.tar.gz
Use compat-api.h for glyphs
We are duplicating this logic in vivante_unaccel_render.c - remove this and use the compat-api.h provided version. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--src/vivante_unaccel_render.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/vivante_unaccel_render.c b/src/vivante_unaccel_render.c
index 42aaa4a..ad4d5cf 100644
--- a/src/vivante_unaccel_render.c
+++ b/src/vivante_unaccel_render.c
@@ -11,6 +11,7 @@
#include "config.h"
#endif
+#include "compat-api.h"
#include "fb.h"
#include "fbpict.h"
#include "mipict.h"
@@ -79,10 +80,6 @@ static void GlyphExtents(int nlist, GlyphListPtr list, GlyphPtr *glyphs,
}
#define NeedsComponent(f) (PICT_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0)
-#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-#endif
void vivante_unaccel_Glyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,