diff options
| author | Mihai Moldovan <ïonic@ionic.de> | 2016-07-20 02:41:03 +0000 |
|---|---|---|
| committer | Mihai Moldovan <ïonic@ionic.de> | 2017-03-03 11:19:53 +0000 |
| commit | 1a7fc41c2c011c05c3dc0cd8eb4ade98a2186217 (patch) | |
| tree | 4ef67ea7e5747a52258b9be253b94fbf6c0ad3df /nx-X11/programs/Xserver/hw/nxagent/NXrender.c | |
| parent | d5a222b656659e6ab68cd05e96f663360e96b75e (diff) | |
| download | nx-libs-1a7fc41c2c011c05c3dc0cd8eb4ade98a2186217.tar.gz nx-libs-1a7fc41c2c011c05c3dc0cd8eb4ade98a2186217.tar.bz2 nx-libs-1a7fc41c2c011c05c3dc0cd8eb4ade98a2186217.zip | |
misc nx-X11/programs/Xserver/{hw/nxagent,miext,render}/: move code around so that we can drop nx-X11/programs/Xserver/render/miglyph.c (and by extension nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c.)
This is essentially a bastardized cross/backport of these X.Org commits - based
on our current architecture:
commit 4b14c9a9cd2033d3839c4ba364d41ab4c4b198ab
Author: Eric Anholt <eric@anholt.net>
Date: Fri Oct 19 16:34:54 2007 -0700
Replace calls to Glyphs screen hook with CompositeGlyphs and remove dead code.
Not all of the DDX/miext Glyphs hook implementations have been removed, but
they should be.
and
commit 2251572062b2c25643671b8d5070de1c3f7ae976
Author: Aaron Plattner <aplattner@nvidia.com>
Date: Fri Oct 26 15:13:50 2007 -0700
Restore the CompositeGlyphs -> ps->Glyphs -> miGlyphs callchain to allow acceleration architectures to wrap above miGlyphs.
Conflicts:
nx-X11/programs/Xserver/render/miglyph.c
nx-X11/programs/Xserver/render/mipict.h
nx-X11/programs/Xserver/render/picture.c
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/NXrender.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXrender.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c index 36aa3323e..25e162445 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXrender.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXrender.c @@ -72,11 +72,11 @@ #endif /* - * From NXmiglyph.c. + * From NXglyph.c. */ extern -void miGlyphExtents(int nlist, GlyphListPtr list, +void GlyphExtents(int nlist, GlyphListPtr list, GlyphPtr *glyphs, BoxPtr extents); /* @@ -1104,7 +1104,7 @@ ProcRenderCompositeGlyphs (ClientPtr client) nxagentGlyphsExtents = (BoxPtr) malloc(sizeof(BoxRec)); - miGlyphExtents(nlist, listsBase, glyphsBase, nxagentGlyphsExtents); + GlyphExtents(nlist, listsBase, glyphsBase, nxagentGlyphsExtents); nxagentGlyphs(stuff -> op, pSrc, |