aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Render.c
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-16 18:03:18 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-16 18:03:18 +0200
commitcfc0202b42ad307391202ca776937b28ea7d2b03 (patch)
tree03acc5d7d7bb0d35152bfc597eb788b938f09647 /nx-X11/programs/Xserver/hw/nxagent/Render.c
parentfad840cfe558601a8ec02414f1235824bc9f3168 (diff)
parenta5f71f084e9f32e947a04da69edb7aae96d61697 (diff)
downloadnx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.tar.gz
nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.tar.bz2
nx-libs-cfc0202b42ad307391202ca776937b28ea7d2b03.zip
Merge branch 'sunweaver-pr/nxupgradeagent-cleanup' into arctica-3.6.x
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Render.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Render.c60
1 files changed, 0 insertions, 60 deletions
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;