From a5f71f084e9f32e947a04da69edb7aae96d61697 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 14 Apr 2015 09:42:35 +0200 Subject: NXAGENT_UPGRADE code cleanup: NX agent contains/ed two build trees. An old one (probably pre-3.x.y) and a "newer" one. The "newer" code tree used to become enabled by setting NXUpgradeAgentServer in nx-X11/config/cf/host.def to YES. As building the NXUpgradeAgentServer has been the default for years now, we drop all code that does not get used at build time for NXUpgradeAgentServer == YES (i.e., the code that belongs to the pre-3.x.y phase of NX agent). --- nx-X11/programs/Xserver/hw/nxagent/Render.c | 60 ----------------------------- 1 file changed, 60 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Render.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Render.c b/nx-X11/programs/Xserver/hw/nxagent/Render.c index c7f82633c..ca9959e81 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Render.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Render.c @@ -101,10 +101,6 @@ int nxagentRenderVersionMinor; int nxagentPicturePrivateIndex = 0; -#ifndef NXAGENT_UPGRADE -static int picturePrivateCount = 0; -#endif - static int nxagentNumFormats = 0; static XRenderPictFormat nxagentArrayFormats[MAX_FORMATS]; @@ -2066,62 +2062,6 @@ void nxagentTriFan(CARD8 op, PicturePtr pSrc, PicturePtr pDst, #endif } -#ifndef NXAGENT_UPGRADE - -/* -FIXME: In the 3.0.0 port these functions have been moved - to Picture.c. We can remove them when the port is - is complete. -*/ -int AllocatePicturePrivateIndex() -{ - return picturePrivateCount++; -} - -Bool AllocatePicturePrivate(register ScreenPtr pScreen, int index2, unsigned amount) -{ - unsigned oldamount; - - PictureScreenPtr ps = GetPictureScreen(pScreen); - - /* - * Round up the size for proper alignment. - */ - - amount = ((amount + (sizeof(long) - 1)) / sizeof(long)) * sizeof(long); - - if (index2 >= ps -> PicturePrivateLen) - { - unsigned *nsizes = (unsigned *) xrealloc(ps -> PicturePrivateSizes, - (index2 + 1) * sizeof(unsigned)); - if (nsizes == 0) - { - return 0; - } - - while (ps -> PicturePrivateLen <= index2) - { - nsizes[ps -> PicturePrivateLen++] = 0; - - ps -> totalPictureSize += sizeof(DevUnion); - } - - ps -> PicturePrivateSizes = nsizes; - } - - oldamount = ps -> PicturePrivateSizes[index2]; - - if (amount > oldamount) - { - ps -> PicturePrivateSizes[index2] = amount; - - ps -> totalPictureSize += (amount - oldamount); - } - - return 1; -} -#endif - void nxagentQueryFormats() { XRenderInfo *xri; -- cgit v1.2.3