From 9c6577cfcc9fa81d2da71b794f3695f95df2e5e6 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Tue, 9 Sep 2025 11:41:32 +0200
Subject: [PATCH] render: drop obsolete SProc*()'s

Several of the SProcRender*() functions aren't actually needed, because
they're doing exactly the same as their ProcRender*() counterparts.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 render/render.c | 64 ++++++-------------------------------------------
 1 file changed, 7 insertions(+), 57 deletions(-)

diff --git a/render/render.c b/render/render.c
index 87489f9883..2b42aa798c 100644
--- a/render/render.c
+++ b/render/render.c
@@ -96,27 +96,20 @@ static int ProcRenderCreateConicalGradient(ClientPtr pClient);
 static int ProcRenderDispatch(ClientPtr pClient);
 
 static int SProcRenderQueryVersion(ClientPtr pClient);
-static int SProcRenderQueryPictFormats(ClientPtr pClient);
 static int SProcRenderQueryPictIndexValues(ClientPtr pClient);
-static int SProcRenderQueryDithers(ClientPtr pClient);
 static int SProcRenderCreatePicture(ClientPtr pClient);
 static int SProcRenderChangePicture(ClientPtr pClient);
 static int SProcRenderSetPictureClipRectangles(ClientPtr pClient);
 static int SProcRenderFreePicture(ClientPtr pClient);
 static int SProcRenderComposite(ClientPtr pClient);
-static int SProcRenderScale(ClientPtr pClient);
 static int SProcRenderTrapezoids(ClientPtr pClient);
 static int SProcRenderTriangles(ClientPtr pClient);
 static int SProcRenderTriStrip(ClientPtr pClient);
 static int SProcRenderTriFan(ClientPtr pClient);
-static int SProcRenderColorTrapezoids(ClientPtr pClient);
-static int SProcRenderColorTriangles(ClientPtr pClient);
-static int SProcRenderTransform(ClientPtr pClient);
 static int SProcRenderCreateGlyphSet(ClientPtr pClient);
 static int SProcRenderReferenceGlyphSet(ClientPtr pClient);
 static int SProcRenderFreeGlyphSet(ClientPtr pClient);
 static int SProcRenderAddGlyphs(ClientPtr pClient);
-static int SProcRenderAddGlyphsFromPicture(ClientPtr pClient);
 static int SProcRenderFreeGlyphs(ClientPtr pClient);
 static int SProcRenderCompositeGlyphs(ClientPtr pClient);
 static int SProcRenderFillRectangles(ClientPtr pClient);
@@ -173,27 +166,27 @@ ProcRenderQueryVersion,
 
 int (*SProcRenderVector[RenderNumberRequests]) (ClientPtr) = {
 SProcRenderQueryVersion,
-        SProcRenderQueryPictFormats,
+        ProcRenderQueryPictFormats,
         SProcRenderQueryPictIndexValues,
-        SProcRenderQueryDithers,
+        ProcRenderQueryDithers,
         SProcRenderCreatePicture,
         SProcRenderChangePicture,
         SProcRenderSetPictureClipRectangles,
         SProcRenderFreePicture,
         SProcRenderComposite,
-        SProcRenderScale,
+        ProcRenderScale,
         SProcRenderTrapezoids,
         SProcRenderTriangles,
         SProcRenderTriStrip,
         SProcRenderTriFan,
-        SProcRenderColorTrapezoids,
-        SProcRenderColorTriangles,
-        SProcRenderTransform,
+        ProcRenderColorTrapezoids,
+        ProcRenderColorTriangles,
+        ProcRenderTransform,
         SProcRenderCreateGlyphSet,
         SProcRenderReferenceGlyphSet,
         SProcRenderFreeGlyphSet,
         SProcRenderAddGlyphs,
-        SProcRenderAddGlyphsFromPicture,
+        ProcRenderAddGlyphsFromPicture,
         SProcRenderFreeGlyphs,
         SProcRenderCompositeGlyphs,
         SProcRenderCompositeGlyphs,
@@ -1976,13 +1969,6 @@ SProcRenderQueryVersion(ClientPtr client)
     return ProcRenderQueryVersion(client);
 }
 
-static int _X_COLD
-SProcRenderQueryPictFormats(ClientPtr client)
-{
-    REQUEST_SIZE_MATCH(xRenderQueryPictFormatsReq);
-    return ProcRenderQueryPictFormats(client);
-}
-
 static int _X_COLD
 SProcRenderQueryPictIndexValues(ClientPtr client)
 {
@@ -1992,12 +1978,6 @@ SProcRenderQueryPictIndexValues(ClientPtr client)
     return ProcRenderQueryPictIndexValues(client);
 }
 
-static int _X_COLD
-SProcRenderQueryDithers(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int _X_COLD
 SProcRenderCreatePicture(ClientPtr client)
 {
@@ -2062,12 +2042,6 @@ SProcRenderComposite(ClientPtr client)
     return ProcRenderComposite(client);
 }
 
-static int _X_COLD
-SProcRenderScale(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int _X_COLD
 SProcRenderTrapezoids(ClientPtr client)
 {
@@ -2128,24 +2102,6 @@ SProcRenderTriFan(ClientPtr client)
     return ProcRenderTriFan(client);
 }
 
-static int _X_COLD
-SProcRenderColorTrapezoids(ClientPtr client)
-{
-    return BadImplementation;
-}
-
-static int _X_COLD
-SProcRenderColorTriangles(ClientPtr client)
-{
-    return BadImplementation;
-}
-
-static int _X_COLD
-SProcRenderTransform(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int _X_COLD
 SProcRenderCreateGlyphSet(ClientPtr client)
 {
@@ -2208,12 +2164,6 @@ SProcRenderAddGlyphs(ClientPtr client)
     return ProcRenderAddGlyphs(client);
 }
 
-static int _X_COLD
-SProcRenderAddGlyphsFromPicture(ClientPtr client)
-{
-    return BadImplementation;
-}
-
 static int _X_COLD
 SProcRenderFreeGlyphs(ClientPtr client)
 {