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

Fix missing ';' in cw.c and unwrap the render wrapper properly.

This commit is contained in:
Eric Anholt 2004-08-06 00:31:28 +00:00
parent ae1580c494
commit e847bcda08
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
miext/cw/cw.c
View File

@ -685,7 +685,7 @@ miInitializeCompositeWrapper(ScreenPtr pScreen)
#ifdef RENDER #ifdef RENDER
if (GetPictureScreen (pScreen)) if (GetPictureScreen (pScreen))
cwInitializeRender(pScreen) cwInitializeRender(pScreen);
#endif #endif
} }
@ -707,10 +707,8 @@ cwCloseScreen (int i, ScreenPtr pScreen)
pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder; pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder;
#ifdef RENDER #ifdef RENDER
if (ps) { if (ps)
ps->Composite = pScreenPriv->Composite; cwFiniRender(pScreen);
ps->Glyphs = pScreenPriv->Glyphs;
}
#endif #endif
xfree((pointer)pScreenPriv); xfree((pointer)pScreenPriv);

3
miext/cw/cw.h
View File

@ -137,6 +137,9 @@ cwGetBackingDrawable(DrawablePtr pDrawable, int *x_off, int *y_off);
void void
cwInitializeRender (ScreenPtr pScreen); cwInitializeRender (ScreenPtr pScreen);
void
cwFiniRender (ScreenPtr pScreen);
/* cw.c */ /* cw.c */
void void
miInitializeCompositeWrapper(ScreenPtr pScreen); miInitializeCompositeWrapper(ScreenPtr pScreen);

18
miext/cw/cw_render.c
View File

@ -455,4 +455,22 @@ cwInitializeRender (ScreenPtr pScreen)
cwPsWrap(TriFan, cwTriFan); cwPsWrap(TriFan, cwTriFan);
} }
void
cwFiniRender (ScreenPtr pScreen)
{
cwPsDecl (pScreen);
cwPsUnwrap(CreatePicture);
cwPsUnwrap(DestroyPicture);
cwPsUnwrap(ChangePicture);
cwPsUnwrap(ValidatePicture);
cwPsUnwrap(Composite);
cwPsUnwrap(Glyphs);
cwPsUnwrap(CompositeRects);
cwPsUnwrap(Trapezoids);
cwPsUnwrap(Triangles);
cwPsUnwrap(TriStrip);
cwPsUnwrap(TriFan);
}
#endif /* RENDER */ #endif /* RENDER */