Update to xserver 1.20.5. Tested by jsg@

7 files changed, 96 insertions, 158 deletions

diff --git a/xserver/render/Makefile.in b/xserver/render/Makefile.in
index a6aecd6d2..d76403f4b 100644
--- a/xserver/render/Makefile.in
+++ b/xserver/render/Makefile.in
@@ -69,7 +69,7 @@ CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
 	$(top_builddir)/include/xorg-config.h \
 	$(top_builddir)/include/xkb-config.h \
 	$(top_builddir)/include/xwin-config.h \
-	$(top_builddir)/include/kdrive-config.h \
+	$(top_builddir)/include/xwayland-config.h \
 	$(top_builddir)/include/version-config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -340,6 +340,7 @@ RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
 RELEASE_DATE = @RELEASE_DATE@
+SCANNER_ARG = @SCANNER_ARG@
 SDK_REQUIRED_MODULES = @SDK_REQUIRED_MODULES@
 SED = @SED@
 SELINUX_CFLAGS = @SELINUX_CFLAGS@
@@ -358,15 +359,18 @@ SYSCONFDIR = @SYSCONFDIR@
 SYSTEMD_DAEMON_CFLAGS = @SYSTEMD_DAEMON_CFLAGS@
 SYSTEMD_DAEMON_LIBS = @SYSTEMD_DAEMON_LIBS@
 TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@
-TSLIB_CFLAGS = @TSLIB_CFLAGS@
-TSLIB_LIBS = @TSLIB_LIBS@
 UDEV_CFLAGS = @UDEV_CFLAGS@
 UDEV_LIBS = @UDEV_LIBS@
 UTILS_SYS_LIBS = @UTILS_SYS_LIBS@
 VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
 VERSION = @VERSION@
+WAYLAND_EGLSTREAM_CFLAGS = @WAYLAND_EGLSTREAM_CFLAGS@
+WAYLAND_EGLSTREAM_DATADIR = @WAYLAND_EGLSTREAM_DATADIR@
+WAYLAND_EGLSTREAM_LIBS = @WAYLAND_EGLSTREAM_LIBS@
 WAYLAND_PROTOCOLS_DATADIR = @WAYLAND_PROTOCOLS_DATADIR@
 WAYLAND_SCANNER = @WAYLAND_SCANNER@
+WAYLAND_SCANNER_CFLAGS = @WAYLAND_SCANNER_CFLAGS@
+WAYLAND_SCANNER_LIBS = @WAYLAND_SCANNER_LIBS@
 WINDOWSDRI_CFLAGS = @WINDOWSDRI_CFLAGS@
 WINDOWSDRI_LIBS = @WINDOWSDRI_LIBS@
 WINDOWSWM_CFLAGS = @WINDOWSWM_CFLAGS@
@@ -374,6 +378,8 @@ WINDOWSWM_LIBS = @WINDOWSWM_LIBS@
 WINDRES = @WINDRES@
 X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
 X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
+XCONFIGDIR = @XCONFIGDIR@
+XCONFIGFILE = @XCONFIGFILE@
 XDMCP_CFLAGS = @XDMCP_CFLAGS@
 XDMCP_LIBS = @XDMCP_LIBS@
 XDMXCONFIG_DEP_CFLAGS = @XDMXCONFIG_DEP_CFLAGS@
@@ -445,8 +451,6 @@ XWIN_SERVER_NAME = @XWIN_SERVER_NAME@
 XWIN_SYS_LIBS = @XWIN_SYS_LIBS@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
-__XCONFIGDIR__ = @__XCONFIGDIR__@
-__XCONFIGFILE__ = @__XCONFIGFILE__@
 abi_ansic = @abi_ansic@
 abi_extension = @abi_extension@
 abi_videodrv = @abi_videodrv@
diff --git a/xserver/render/animcur.c b/xserver/render/animcur.c
index e585a8f23..ef27bda27 100644
--- a/xserver/render/animcur.c
+++ b/xserver/render/animcur.c
@@ -133,7 +133,7 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
     ScreenPtr pScreen = dev->spriteInfo->anim.pScreen;
     AnimCurScreenPtr as = GetAnimCurScreen(pScreen);
 
-    AnimCurPtr ac = GetAnimCur(dev->spriteInfo->anim.pCursor);
+    AnimCurPtr ac = GetAnimCur(dev->spriteInfo->sprite->current);
     int elt = (dev->spriteInfo->anim.elt + 1) % ac->nelt;
     DisplayCursorProcPtr DisplayCursor = pScreen->DisplayCursor;
 
@@ -147,7 +147,7 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
     pScreen->DisplayCursor = DisplayCursor;
 
     dev->spriteInfo->anim.elt = elt;
-    dev->spriteInfo->anim.time = now + ac->elts[elt].delay;
+    dev->spriteInfo->anim.pCursor = ac->elts[elt].pCursor;
 
     return ac->elts[elt].delay;
 }
@@ -155,7 +155,8 @@ AnimCurTimerNotify(OsTimerPtr timer, CARD32 now, void *arg)
 static void
 AnimCurCancelTimer(DeviceIntPtr pDev)
 {
-    CursorPtr cur = pDev->spriteInfo->anim.pCursor;
+    CursorPtr cur = pDev->spriteInfo->sprite ?
+                    pDev->spriteInfo->sprite->current : NULL;
 
     if (IsAnimCur(cur))
         TimerCancel(GetAnimCur(cur)->timer);
@@ -172,7 +173,7 @@ AnimCurDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 
     Unwrap(as, pScreen, DisplayCursor);
     if (IsAnimCur(pCursor)) {
-        if (pCursor != pDev->spriteInfo->anim.pCursor) {
+        if (pCursor != pDev->spriteInfo->sprite->current) {
             AnimCurPtr ac = GetAnimCur(pCursor);
 
             AnimCurCancelTimer(pDev);
@@ -181,8 +182,6 @@ AnimCurDisplayCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCursor)
 
             if (ret) {
                 pDev->spriteInfo->anim.elt = 0;
-                pDev->spriteInfo->anim.time =
-                    GetTimeInMillis() + ac->elts[0].delay;
                 pDev->spriteInfo->anim.pCursor = pCursor;
                 pDev->spriteInfo->anim.pScreen = pScreen;
 
@@ -302,7 +301,7 @@ AnimCursorCreate(CursorPtr *cursors, CARD32 *deltas, int ncursor,
                  CursorPtr *ppCursor, ClientPtr client, XID cid)
 {
     CursorPtr pCursor;
-    int rc, i;
+    int rc = BadAlloc, i;
     AnimCurPtr ac;
 
     for (i = 0; i < screenInfo.numScreens; i++)
@@ -317,7 +316,7 @@ AnimCursorCreate(CursorPtr *cursors, CARD32 *deltas, int ncursor,
                                  sizeof(AnimCurRec) +
                                  ncursor * sizeof(AnimCurElt), 1);
     if (!pCursor)
-        return BadAlloc;
+        return rc;
     dixInitPrivates(pCursor, pCursor + 1, PRIVATE_CURSOR);
     pCursor->bits = &animCursorBits;
     pCursor->refcnt = 1;
@@ -336,8 +335,10 @@ AnimCursorCreate(CursorPtr *cursors, CARD32 *deltas, int ncursor,
     ac->timer = TimerSet(NULL, 0, 0, AnimCurTimerNotify, NULL);
 
     /* security creation/labeling check */
-    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, pCursor,
-                  RT_NONE, NULL, DixCreateAccess);
+    if (ac->timer)
+        rc = XaceHook(XACE_RESOURCE_ACCESS, client, cid, RT_CURSOR, pCursor,
+                      RT_NONE, NULL, DixCreateAccess);
+
     if (rc != Success) {
         TimerFree(ac->timer);
         dixFiniPrivates(pCursor, PRIVATE_CURSOR);
diff --git a/xserver/render/glyph.c b/xserver/render/glyph.c
index ea865af58..f3ed9cf4c 100644
--- a/xserver/render/glyph.c
+++ b/xserver/render/glyph.c
@@ -78,7 +78,7 @@ static GlyphHashSetRec glyphHashSets[] = {
     {536870912, 590559793, 590559791}
 };
 
-#define NGLYPHHASHSETS	(sizeof(glyphHashSets)/sizeof(glyphHashSets[0]))
+#define NGLYPHHASHSETS	ARRAY_SIZE(glyphHashSets)
 
 static GlyphHashRec globalGlyphs[GlyphFormatNum];
 
diff --git a/xserver/render/mirect.c b/xserver/render/mirect.c
index a36d1d6e3..65f8d5efd 100644
--- a/xserver/render/mirect.c
+++ b/xserver/render/mirect.c
@@ -91,8 +91,6 @@ miCompositeRects(CARD8 op,
                  PicturePtr pDst,
                  xRenderColor * color, int nRect, xRectangle *rects)
 {
-    ScreenPtr pScreen = pDst->pDrawable->pScreen;
-
     if (color->alpha == 0xffff) {
         if (op == PictOpOver)
             op = PictOpSrc;
@@ -108,61 +106,18 @@ miCompositeRects(CARD8 op,
                          pDst->alphaOrigin.x, pDst->alphaOrigin.y);
     }
     else {
-        PictFormatPtr rgbaFormat;
-        PixmapPtr pPixmap;
-        PicturePtr pSrc;
-        xRectangle one;
         int error;
-        Pixel pixel;
-        GCPtr pGC;
-        ChangeGCVal gcvals[2];
-        XID tmpval[1];
-
-        rgbaFormat = PictureMatchFormat(pScreen, 32, PICT_a8r8g8b8);
-        if (!rgbaFormat)
-            goto bail1;
-
-        pPixmap = (*pScreen->CreatePixmap) (pScreen, 1, 1, rgbaFormat->depth,
-                                            CREATE_PIXMAP_USAGE_SCRATCH);
-        if (!pPixmap)
-            goto bail2;
-
-        miRenderColorToPixel(rgbaFormat, color, &pixel);
+        PicturePtr pSrc = CreateSolidPicture(0, color, &error);
 
-        pGC = GetScratchGC(rgbaFormat->depth, pScreen);
-        if (!pGC)
-            goto bail3;
-        gcvals[0].val = GXcopy;
-        gcvals[1].val = pixel;
+        if (pSrc) {
+            while (nRect--) {
+                CompositePicture(op, pSrc, 0, pDst, 0, 0, 0, 0,
+                                 rects->x, rects->y,
+                                 rects->width, rects->height);
+                rects++;
+            }
 
-        ChangeGC(NullClient, pGC, GCFunction | GCForeground, gcvals);
-        ValidateGC(&pPixmap->drawable, pGC);
-        one.x = 0;
-        one.y = 0;
-        one.width = 1;
-        one.height = 1;
-        (*pGC->ops->PolyFillRect) (&pPixmap->drawable, pGC, 1, &one);
-
-        tmpval[0] = xTrue;
-        pSrc = CreatePicture(0, &pPixmap->drawable, rgbaFormat,
-                             CPRepeat, tmpval, serverClient, &error);
-
-        if (!pSrc)
-            goto bail4;
-
-        while (nRect--) {
-            CompositePicture(op, pSrc, 0, pDst, 0, 0, 0, 0,
-                             rects->x, rects->y, rects->width, rects->height);
-            rects++;
+            FreePicture((void *) pSrc, 0);
         }
-
-        FreePicture((void *) pSrc, 0);
- bail4:
-        FreeScratchGC(pGC);
- bail3:
-        (*pScreen->DestroyPixmap) (pPixmap);
- bail2:
- bail1:
-        ;
     }
 }
diff --git a/xserver/render/picture.c b/xserver/render/picture.c
index 9e4036e7d..a53f3b560 100644
--- a/xserver/render/picture.c
+++ b/xserver/render/picture.c
@@ -148,17 +148,17 @@ typedef struct _formatInit {
     CARD8 depth;
 } FormatInitRec, *FormatInitPtr;
 
-static int
-addFormat(FormatInitRec formats[256], int nformat, CARD32 format, CARD8 depth)
+static void
+addFormat(FormatInitRec formats[256], int *nformat, CARD32 format, CARD8 depth)
 {
     int n;
 
-    for (n = 0; n < nformat; n++)
+    for (n = 0; n < *nformat; n++)
         if (formats[n].format == format && formats[n].depth == depth)
-            return nformat;
-    formats[nformat].format = format;
-    formats[nformat].depth = depth;
-    return ++nformat;
+            return;
+    formats[*nformat].format = format;
+    formats[*nformat].depth = depth;
+    ++*nformat;
 }
 
 #define Mask(n) ((1 << (n)) - 1)
@@ -166,7 +166,7 @@ addFormat(FormatInitRec formats[256], int nformat, CARD32 format, CARD8 depth)
 static PictFormatPtr
 PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
 {
-    int nformats, f;
+    int nformats = 0, f;
     PictFormatPtr pFormats;
     FormatInitRec formats[1024];
     CARD32 format;
@@ -239,18 +239,18 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
             }
             if (type != PICT_TYPE_OTHER) {
                 format = PICT_FORMAT(bpp, type, 0, r, g, b);
-                nformats = addFormat(formats, nformats, format, depth);
+                addFormat(formats, &nformats, format, depth);
             }
             break;
         case StaticColor:
         case PseudoColor:
             format = PICT_VISFORMAT(bpp, PICT_TYPE_COLOR, v);
-            nformats = addFormat(formats, nformats, format, depth);
+            addFormat(formats, &nformats, format, depth);
             break;
         case StaticGray:
         case GrayScale:
             format = PICT_VISFORMAT(bpp, PICT_TYPE_GRAY, v);
-            nformats = addFormat(formats, nformats, format, depth);
+            addFormat(formats, &nformats, format, depth);
             break;
         }
     }
@@ -265,58 +265,34 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
         case 16:
             /* depth 12 formats */
             if (pDepth->depth >= 12) {
-                nformats = addFormat(formats, nformats,
-                                     PICT_x4r4g4b4, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_x4b4g4r4, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x4r4g4b4, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x4b4g4r4, pDepth->depth);
             }
             /* depth 15 formats */
             if (pDepth->depth >= 15) {
-                nformats = addFormat(formats, nformats,
-                                     PICT_x1r5g5b5, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_x1b5g5r5, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x1r5g5b5, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x1b5g5r5, pDepth->depth);
             }
             /* depth 16 formats */
             if (pDepth->depth >= 16) {
-                nformats = addFormat(formats, nformats,
-                                     PICT_a1r5g5b5, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_a1b5g5r5, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_r5g6b5, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_b5g6r5, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_a4r4g4b4, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_a4b4g4r4, pDepth->depth);
-            }
-            break;
-        case 24:
-            if (pDepth->depth >= 24) {
-                nformats = addFormat(formats, nformats,
-                                     PICT_r8g8b8, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_b8g8r8, pDepth->depth);
+                addFormat(formats, &nformats, PICT_a1r5g5b5, pDepth->depth);
+                addFormat(formats, &nformats, PICT_a1b5g5r5, pDepth->depth);
+                addFormat(formats, &nformats, PICT_r5g6b5, pDepth->depth);
+                addFormat(formats, &nformats, PICT_b5g6r5, pDepth->depth);
+                addFormat(formats, &nformats, PICT_a4r4g4b4, pDepth->depth);
+                addFormat(formats, &nformats, PICT_a4b4g4r4, pDepth->depth);
             }
             break;
         case 32:
             if (pDepth->depth >= 24) {
-                nformats = addFormat(formats, nformats,
-                                     PICT_x8r8g8b8, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_x8b8g8r8, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x8r8g8b8, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x8b8g8r8, pDepth->depth);
             }
             if (pDepth->depth >= 30) {
-                nformats = addFormat(formats, nformats,
-                                     PICT_a2r10g10b10, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_x2r10g10b10, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_a2b10g10r10, pDepth->depth);
-                nformats = addFormat(formats, nformats,
-                                     PICT_x2b10g10r10, pDepth->depth);
+                addFormat(formats, &nformats, PICT_a2r10g10b10, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x2r10g10b10, pDepth->depth);
+                addFormat(formats, &nformats, PICT_a2b10g10r10, pDepth->depth);
+                addFormat(formats, &nformats, PICT_x2b10g10r10, pDepth->depth);
             }
             break;
         }
@@ -899,6 +875,7 @@ CreateSolidPicture(Picture pid, xRenderColor * color, int *error)
     }
     pPicture->pSourcePict->type = SourcePictTypeSolidFill;
     pPicture->pSourcePict->solidFill.color = xRenderColorToCard32(*color);
+    memcpy(&pPicture->pSourcePict->solidFill.fullcolor, color, sizeof(*color));
     return pPicture;
 }
 
diff --git a/xserver/render/picturestr.h b/xserver/render/picturestr.h
index 33baef9bf..dd25a272d 100644
--- a/xserver/render/picturestr.h
+++ b/xserver/render/picturestr.h
@@ -68,6 +68,7 @@ typedef struct pixman_transform PictTransform, *PictTransformPtr;
 typedef struct _PictSolidFill {
     unsigned int type;
     CARD32 color;
+    xRenderColor fullcolor;
 } PictSolidFill, *PictSolidFillPtr;
 
 typedef struct _PictGradientStop {
diff --git a/xserver/render/render.c b/xserver/render/render.c
index 3a41e331e..7d94bd5ff 100644
--- a/xserver/render/render.c
+++ b/xserver/render/render.c
@@ -1985,7 +1985,7 @@ ProcRenderDispatch(ClientPtr client)
         return BadRequest;
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryVersion(ClientPtr client)
 {
     REQUEST(xRenderQueryVersionReq);
@@ -1996,7 +1996,7 @@ SProcRenderQueryVersion(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryPictFormats(ClientPtr client)
 {
     REQUEST(xRenderQueryPictFormatsReq);
@@ -2005,7 +2005,7 @@ SProcRenderQueryPictFormats(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryPictIndexValues(ClientPtr client)
 {
     REQUEST(xRenderQueryPictIndexValuesReq);
@@ -2015,13 +2015,13 @@ SProcRenderQueryPictIndexValues(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryDithers(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderCreatePicture(ClientPtr client)
 {
     REQUEST(xRenderCreatePictureReq);
@@ -2035,7 +2035,7 @@ SProcRenderCreatePicture(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderChangePicture(ClientPtr client)
 {
     REQUEST(xRenderChangePictureReq);
@@ -2047,7 +2047,7 @@ SProcRenderChangePicture(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderSetPictureClipRectangles(ClientPtr client)
 {
     REQUEST(xRenderSetPictureClipRectanglesReq);
@@ -2060,7 +2060,7 @@ SProcRenderSetPictureClipRectangles(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderFreePicture(ClientPtr client)
 {
     REQUEST(xRenderFreePictureReq);
@@ -2070,7 +2070,7 @@ SProcRenderFreePicture(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderComposite(ClientPtr client)
 {
     REQUEST(xRenderCompositeReq);
@@ -2090,13 +2090,13 @@ SProcRenderComposite(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderScale(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderTrapezoids(ClientPtr client)
 {
     REQUEST(xRenderTrapezoidsReq);
@@ -2112,7 +2112,7 @@ SProcRenderTrapezoids(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderTriangles(ClientPtr client)
 {
     REQUEST(xRenderTrianglesReq);
@@ -2128,7 +2128,7 @@ SProcRenderTriangles(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderTriStrip(ClientPtr client)
 {
     REQUEST(xRenderTriStripReq);
@@ -2144,7 +2144,7 @@ SProcRenderTriStrip(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderTriFan(ClientPtr client)
 {
     REQUEST(xRenderTriFanReq);
@@ -2160,25 +2160,25 @@ SProcRenderTriFan(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderColorTrapezoids(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderColorTriangles(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderTransform(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateGlyphSet(ClientPtr client)
 {
     REQUEST(xRenderCreateGlyphSetReq);
@@ -2189,7 +2189,7 @@ SProcRenderCreateGlyphSet(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderReferenceGlyphSet(ClientPtr client)
 {
     REQUEST(xRenderReferenceGlyphSetReq);
@@ -2200,7 +2200,7 @@ SProcRenderReferenceGlyphSet(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderFreeGlyphSet(ClientPtr client)
 {
     REQUEST(xRenderFreeGlyphSetReq);
@@ -2210,7 +2210,7 @@ SProcRenderFreeGlyphSet(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderAddGlyphs(ClientPtr client)
 {
     register int i;
@@ -2244,13 +2244,13 @@ SProcRenderAddGlyphs(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderAddGlyphsFromPicture(ClientPtr client)
 {
     return BadImplementation;
 }
 
-static int
+static int _X_COLD
 SProcRenderFreeGlyphs(ClientPtr client)
 {
     REQUEST(xRenderFreeGlyphsReq);
@@ -2261,7 +2261,7 @@ SProcRenderFreeGlyphs(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCompositeGlyphs(ClientPtr client)
 {
     xGlyphElt *elt;
@@ -2333,7 +2333,7 @@ SProcRenderCompositeGlyphs(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderFillRectangles(ClientPtr client)
 {
     REQUEST(xRenderFillRectanglesReq);
@@ -2349,7 +2349,7 @@ SProcRenderFillRectangles(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateCursor(ClientPtr client)
 {
     REQUEST(xRenderCreateCursorReq);
@@ -2363,7 +2363,7 @@ SProcRenderCreateCursor(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderSetPictureTransform(ClientPtr client)
 {
     REQUEST(xRenderSetPictureTransformReq);
@@ -2383,7 +2383,7 @@ SProcRenderSetPictureTransform(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderQueryFilters(ClientPtr client)
 {
     REQUEST(xRenderQueryFiltersReq);
@@ -2394,7 +2394,7 @@ SProcRenderQueryFilters(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderSetPictureFilter(ClientPtr client)
 {
     REQUEST(xRenderSetPictureFilterReq);
@@ -2406,7 +2406,7 @@ SProcRenderSetPictureFilter(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateAnimCursor(ClientPtr client)
 {
     REQUEST(xRenderCreateAnimCursorReq);
@@ -2418,7 +2418,7 @@ SProcRenderCreateAnimCursor(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderAddTraps(ClientPtr client)
 {
     REQUEST(xRenderAddTrapsReq);
@@ -2432,7 +2432,7 @@ SProcRenderAddTraps(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateSolidFill(ClientPtr client)
 {
     REQUEST(xRenderCreateSolidFillReq);
@@ -2447,7 +2447,7 @@ SProcRenderCreateSolidFill(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static void
+static void _X_COLD
 swapStops(void *stuff, int num)
 {
     int i;
@@ -2466,7 +2466,7 @@ swapStops(void *stuff, int num)
     }
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateLinearGradient(ClientPtr client)
 {
     int len;
@@ -2493,7 +2493,7 @@ SProcRenderCreateLinearGradient(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateRadialGradient(ClientPtr client)
 {
     int len;
@@ -2522,7 +2522,7 @@ SProcRenderCreateRadialGradient(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderCreateConicalGradient(ClientPtr client)
 {
     int len;
@@ -2548,7 +2548,7 @@ SProcRenderCreateConicalGradient(ClientPtr client)
     return (*ProcRenderVector[stuff->renderReqType]) (client);
 }
 
-static int
+static int _X_COLD
 SProcRenderDispatch(ClientPtr client)
 {
     REQUEST(xReq);