[PATCH v2 1/6] sna: stop using obsolete type aliases

[Ville Syrjälä]

On Wed, Feb 21, 2024 at 07:55:45PM +0100, Enrico Weigelt, metux IT consult wrote:
> The Xserver has been moved to using pixman for all matrix operations, back in
> 2008, but left some #define's so drivers still compile.

Reference to the actual commit would help.

> Since 1.5 decades have
> passed now, it's time to fix remaining drivers still using the old name, so
> we can drop these #define's from the Xserver includes.
> 
> Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
> ---
>  src/sna/sna_display.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
> index 15df51f6..3ff3d2fe 100644
> --- a/src/sna/sna_display.c
> +++ b/src/sna/sna_display.c
> @@ -208,7 +208,7 @@ struct sna_crtc {
>  	bool hwcursor;
>  	bool flip_pending;
> 
> -	struct pict_f_transform cursor_to_fb, fb_to_cursor;
> +	struct pixman_f_transform cursor_to_fb, fb_to_cursor;
> 
>  	RegionRec crtc_damage;
>  	uint16_t shadow_bo_width, shadow_bo_height;
> @@ -2376,7 +2376,7 @@ static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)
>  {
>  	RRTransformPtr transform;
>  	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;
>  	unsigned pitch_limit;
>  	BoxRec b;
> 
> @@ -2846,7 +2846,7 @@ affine_is_pixel_exact(const struct pixman_f_transform *t)
>  static void sna_crtc_randr(xf86CrtcPtr crtc)
>  {
>  	struct sna_crtc *sna_crtc = to_sna_crtc(crtc);
> -	struct pict_f_transform f_crtc_to_fb, f_fb_to_crtc;
> +	struct pixman_f_transform f_crtc_to_fb, f_fb_to_crtc;
>  	PictTransform crtc_to_fb;
>  	PictFilterPtr filter;
>  	xFixed *params;
> @@ -6666,7 +6666,7 @@ sna_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
>  		if (crtc->transform_in_use) {
>  			int xhot = sna->cursor.ref->bits->xhot;
>  			int yhot = sna->cursor.ref->bits->yhot;
> -			struct pict_f_vector v, hot;
> +			struct pixman_f_vector v, hot;
> 
>  			v.v[0] = x + xhot + .5;
>  			v.v[1] = y + yhot + .5;
> --
> 2.39.2

-- 
Ville Syrjälä
Intel