frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EXA: If the driver can't composite to an a8 mask, try an argb mask for glyphs. 

Signed-off-by: Michel Dänzer <daenzer@vmware.com>
This commit is contained in:
Michel Dänzer 2009-04-09 09:36:41 +02:00
parent 682d7b5569
commit 346e71525f
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
exa/exa_glyphs.c
View File

@ -713,6 +713,7 @@ exaGlyphs (CARD8 op,
if (maskFormat) if (maskFormat)
{ {
ExaScreenPriv(pScreen);
GCPtr pGC; GCPtr pGC;
xRectangle rect; xRectangle rect;
@ -739,10 +740,38 @@ exaGlyphs (CARD8 op,
pMask = CreatePicture (0, &pMaskPixmap->drawable, pMask = CreatePicture (0, &pMaskPixmap->drawable,
maskFormat, CPComponentAlpha, &component_alpha, maskFormat, CPComponentAlpha, &component_alpha,
serverClient, &error); serverClient, &error);
if (!pMask) if (!pMask ||
(!component_alpha && pExaScr->info->CheckComposite &&
!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)))
{ {
PictFormatPtr argbFormat;
(*pScreen->DestroyPixmap) (pMaskPixmap); (*pScreen->DestroyPixmap) (pMaskPixmap);
return;
if (!pMask)
return;
/* The driver can't seem to composite to a8, let's try argb (but
* without component-alpha) */
FreePicture ((pointer) pMask, (XID) 0);
argbFormat = PictureMatchFormat (pScreen, 32, PICT_a8r8g8b8);
if (argbFormat)
maskFormat = argbFormat;
pMaskPixmap = (*pScreen->CreatePixmap) (pScreen, width, height,
maskFormat->depth,
CREATE_PIXMAP_USAGE_SCRATCH);
if (!pMaskPixmap)
return;
pMask = CreatePicture (0, &pMaskPixmap->drawable, maskFormat, 0, 0,
serverClient, &error);
if (!pMask) {
(*pScreen->DestroyPixmap) (pMaskPixmap);
return;
}
} }
pGC = GetScratchGC (pMaskPixmap->drawable.depth, pScreen); pGC = GetScratchGC (pMaskPixmap->drawable.depth, pScreen);
ValidateGC (&pMaskPixmap->drawable, pGC); ValidateGC (&pMaskPixmap->drawable, pGC);