From a45e1d6cc6f2a5f31ed737294351cfa251caa030 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 5 May 2012 09:38:28 +0100 Subject: render: add GetGlyphPicture accessor. This is a new API to stop the drivers directly looking up the glyph pictures in a global array. It provides a define GLYPH_HAS_GLYPH_PICTURE_ACCESSOR for drivers to work in a compat way. Reviewed-by: Aaron Plattner Reviewed-by: Keith Packard Signed-off-by: Dave Airlie --- render/glyph.c | 10 ++++++++++ render/glyphstr.h | 6 ++++++ 2 files changed, 16 insertions(+) (limited to 'render') diff --git a/render/glyph.c b/render/glyph.c index a143e9eb5..a9dddaf57 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -684,3 +684,13 @@ miGlyphs(CARD8 op, (*pScreen->DestroyPixmap) (pMaskPixmap); } } + +PicturePtr GetGlyphPicture(GlyphPtr glyph, ScreenPtr pScreen) +{ + return GlyphPicture(glyph)[pScreen->myNum]; +} + +void SetGlyphPicture(GlyphPtr glyph, ScreenPtr pScreen, PicturePtr picture) +{ + GlyphPicture(glyph)[pScreen->myNum] = picture; +} diff --git a/render/glyphstr.h b/render/glyphstr.h index cbc4751f0..7d178be01 100644 --- a/render/glyphstr.h +++ b/render/glyphstr.h @@ -133,4 +133,10 @@ extern _X_EXPORT GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format); extern _X_EXPORT int FreeGlyphSet(pointer value, XID gid); +#define GLYPH_HAS_GLYPH_PICTURE_ACCESSOR 1 /* used for api compat */ +extern _X_EXPORT PicturePtr + GetGlyphPicture(GlyphPtr glyph, ScreenPtr pScreen); +extern _X_EXPORT void + SetGlyphPicture(GlyphPtr glyph, ScreenPtr pScreen, PicturePtr picture); + #endif /* _GLYPHSTR_H_ */ -- cgit v1.2.3