casa-mp-base

From 3475655620bc51071f0ba9cbc30b39587d9b0b44 Mon Sep 17 00:00:00 2001

From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

Date: Sat, 31 May 2014 13:14:20 -0700

Subject: [PATCH 5005/5005] fb: Revert fb changes that broke XQuartz

​

    http://bugs.freedesktop.org/show_bug.cgi?id=26124

​

Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"

Revert "fb: Fix origin of source picture in fbGlyphs"

Revert "fb: Publish fbGlyphs and fbUnrealizeGlyph"

​

This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.

This reverts commit 983e30361f49a67252d0b5d82630e70724d69dbf.

This reverts commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157.

---

 fb/fb.h       |   3 --

 fb/fbpict.c   | 149 +---------------------------------------------------------

 fb/fbpict.h   |  11 +----

 fb/fbscreen.c |   1 -

 4 files changed, 2 insertions(+), 162 deletions(-)

​

diff --git a/fb/fb.h b/fb/fb.h

index 256a1ee..8e87498 100644

--- a/fb/fb.h

+++ b/fb/fb.h

@@ -952,9 +952,6 @@

 extern _X_EXPORT Bool

  fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);

-extern _X_EXPORT void

-fbDestroyGlyphCache(void);

-

 /*

  * fbpixmap.c

  */

diff --git a/fb/fbpict.c b/fb/fbpict.c

index be8274b..66dd633 100644

--- a/fb/fbpict.c

+++ b/fb/fbpict.c

@@ -65,152 +65,6 @@ fbComposite(CARD8 op,

     free_pixman_pict(pDst, dest);

 }

-static pixman_glyph_cache_t *glyphCache;

-

-void

-fbDestroyGlyphCache(void)

-{

-    if (glyphCache)

-    {

-   pixman_glyph_cache_destroy (glyphCache);

-   glyphCache = NULL;

-    }

-}

-

-static void

-fbUnrealizeGlyph(ScreenPtr pScreen,

-        GlyphPtr pGlyph)

-{

-    if (glyphCache)

-   pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);

-}

-