render: drop obsolete macros pict_f_transform and pict_f_vector

Over 1.5 decades ago, pixmap handling was moved to using pixman library,
but there's still a bit fallout from that left. Cleaning it up now.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1287>

6 files changed, 14 insertions, 17 deletions

diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index e9db8e3e5..46f2211b4 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -339,8 +339,8 @@ struct _xf86Crtc {
      */
     PictTransform crtc_to_framebuffer;
     /* framebuffer_to_crtc was removed in ABI 2 */
-    struct pict_f_transform f_crtc_to_framebuffer;      /* ABI 2 */
-    struct pict_f_transform f_framebuffer_to_crtc;      /* ABI 2 */
+    struct pixman_f_transform f_crtc_to_framebuffer;      /* ABI 2 */
+    struct pixman_f_transform f_framebuffer_to_crtc;      /* ABI 2 */
     PictFilterPtr filter;       /* ABI 2 */
     xFixed *params;             /* ABI 2 */
     int nparams;                /* ABI 2 */
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index e17ee5282..ad66a9145 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -294,7 +294,7 @@ xf86ComputeCrtcPan(Bool transform_in_use,
         double r[3];
         double q[2], u[2], t[2], v[2], w[2], p[2];
         double f;
-        struct pict_f_vector d;
+        struct pixman_f_vector d;
         int i;
 
         /* Get the un-normalized crtc coordinates again */
@@ -368,7 +368,7 @@ xf86RandR13Pan(xf86CrtcPtr crtc, int x, int y)
         (crtc->panningTrackingArea.y2 <= crtc->panningTrackingArea.y1 ||
          (y >= crtc->panningTrackingArea.y1 &&
           y < crtc->panningTrackingArea.y2))) {
-        struct pict_f_vector c;
+        struct pixman_f_vector c;
 
         /*
          * Pre-clip the mouse position to the panning area so that we don't
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c
index 944a01b1c..68213ab49 100644
--- a/hw/xfree86/modes/xf86Rotate.c
+++ b/hw/xfree86/modes/xf86Rotate.c
@@ -309,7 +309,7 @@ xf86RotateCloseScreen(ScreenPtr screen)
 }
 
 static Bool
-xf86CrtcFitsScreen(xf86CrtcPtr crtc, struct pict_f_transform *crtc_to_fb)
+xf86CrtcFitsScreen(xf86CrtcPtr crtc, struct pixman_f_transform *crtc_to_fb)
 {
     ScrnInfoPtr pScrn = crtc->scrn;
     BoxRec b;
@@ -350,7 +350,7 @@ xf86CrtcRotate(xf86CrtcPtr crtc)
     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
     ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
     PictTransform crtc_to_fb;
-    struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;
+    struct pixman_f_transform f_crtc_to_fb, f_fb_to_crtc;
     xFixed *new_params = NULL;
     int new_nparams = 0;
     PictFilterPtr new_filter = NULL;
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 32d1a0ad9..fa2203502 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -123,8 +123,8 @@ struct _rrCrtc {
     RRTransformRec client_pending_transform;
     RRTransformRec client_current_transform;
     PictTransform transform;
-    struct pict_f_transform f_transform;
-    struct pict_f_transform f_inverse;
+    struct pixman_f_transform f_transform;
+    struct pixman_f_transform f_inverse;
 
     PixmapPtr scanout_pixmap;
     PixmapPtr scanout_pixmap_back;
@@ -706,8 +706,8 @@ extern _X_EXPORT void
 extern _X_EXPORT int
 RRCrtcTransformSet(RRCrtcPtr crtc,
                    PictTransformPtr transform,
-                   struct pict_f_transform *f_transform,
-                   struct pict_f_transform *f_inverse,
+                   struct pixman_f_transform *f_transform,
+                   struct pixman_f_transform *f_inverse,
                    char *filter, int filter_len, xFixed * params, int nparams);
 
 /*
diff --git a/randr/rrtransform.h b/randr/rrtransform.h
index f811d2b3d..5b0dcbd58 100644
--- a/randr/rrtransform.h
+++ b/randr/rrtransform.h
@@ -30,8 +30,8 @@ typedef struct _rrTransform RRTransformRec, *RRTransformPtr;
 
 struct _rrTransform {
     PictTransform transform;
-    struct pict_f_transform f_transform;
-    struct pict_f_transform f_inverse;
+    struct pixman_f_transform f_transform;
+    struct pixman_f_transform f_inverse;
     PictFilterPtr filter;
     xFixed *params;
     int nparams;
@@ -73,7 +73,7 @@ RRTransformCompute(int x,
                    Rotation rotation,
                    RRTransformPtr rr_transform,
                    PictTransformPtr transform,
-                   struct pict_f_transform *f_transform,
-                   struct pict_f_transform *f_inverse);
+                   struct pixman_f_transform *f_transform,
+                   struct pixman_f_transform *f_inverse);
 
 #endif                          /* _RRTRANSFORM_H_ */
diff --git a/render/picturestr.h b/render/picturestr.h
index dd25a272d..a5d981e0d 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -56,9 +56,6 @@ typedef struct _PictFormat {
 typedef struct pixman_vector PictVector, *PictVectorPtr;
 typedef struct pixman_transform PictTransform, *PictTransformPtr;
 
-#define pict_f_vector pixman_f_vector
-#define pict_f_transform pixman_f_transform
-
 #define PICT_GRADIENT_STOPTABLE_SIZE 1024
 #define SourcePictTypeSolidFill 0
 #define SourcePictTypeLinear 1