frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-12 12:23:50 +01:00 committed by Marge Bot
parent 06685cabde
commit 10a8031865
6 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/modes/xf86Crtc.h
View File

@ -339,8 +339,8 @@ struct _xf86Crtc {
*/ */
PictTransform crtc_to_framebuffer; PictTransform crtc_to_framebuffer;
/* framebuffer_to_crtc was removed in ABI 2 */ /* framebuffer_to_crtc was removed in ABI 2 */
struct pict_f_transform f_crtc_to_framebuffer; /* ABI 2 */ struct pixman_f_transform f_crtc_to_framebuffer; /* ABI 2 */
struct pict_f_transform f_framebuffer_to_crtc; /* ABI 2 */ struct pixman_f_transform f_framebuffer_to_crtc; /* ABI 2 */
PictFilterPtr filter; /* ABI 2 */ PictFilterPtr filter; /* ABI 2 */
xFixed *params; /* ABI 2 */ xFixed *params; /* ABI 2 */
int nparams; /* ABI 2 */ int nparams; /* ABI 2 */

4
hw/xfree86/modes/xf86RandR12.c
View File

@ -294,7 +294,7 @@ xf86ComputeCrtcPan(Bool transform_in_use,
double r[3]; double r[3];
double q[2], u[2], t[2], v[2], w[2], p[2]; double q[2], u[2], t[2], v[2], w[2], p[2];
double f; double f;
struct pict_f_vector d; struct pixman_f_vector d;
int i; int i;
/* Get the un-normalized crtc coordinates again */ /* Get the un-normalized crtc coordinates again */
@ -368,7 +368,7 @@ xf86RandR13Pan(xf86CrtcPtr crtc, int x, int y)
(crtc->panningTrackingArea.y2 <= crtc->panningTrackingArea.y1 || (crtc->panningTrackingArea.y2 <= crtc->panningTrackingArea.y1 ||
(y >= crtc->panningTrackingArea.y1 && (y >= crtc->panningTrackingArea.y1 &&
y < crtc->panningTrackingArea.y2))) { 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 * Pre-clip the mouse position to the panning area so that we don't

4
hw/xfree86/modes/xf86Rotate.c
View File

@ -309,7 +309,7 @@ xf86RotateCloseScreen(ScreenPtr screen)
} }
static Bool 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; ScrnInfoPtr pScrn = crtc->scrn;
BoxRec b; BoxRec b;
@ -350,7 +350,7 @@ xf86CrtcRotate(xf86CrtcPtr crtc)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
ScreenPtr pScreen = xf86ScrnToScreen(pScrn); ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
PictTransform crtc_to_fb; 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; xFixed *new_params = NULL;
int new_nparams = 0; int new_nparams = 0;
PictFilterPtr new_filter = NULL; PictFilterPtr new_filter = NULL;

8
randr/randrstr.h
View File

@ -123,8 +123,8 @@ struct _rrCrtc {
RRTransformRec client_pending_transform; RRTransformRec client_pending_transform;
RRTransformRec client_current_transform; RRTransformRec client_current_transform;
PictTransform transform; PictTransform transform;
struct pict_f_transform f_transform; struct pixman_f_transform f_transform;
struct pict_f_transform f_inverse; struct pixman_f_transform f_inverse;
PixmapPtr scanout_pixmap; PixmapPtr scanout_pixmap;
PixmapPtr scanout_pixmap_back; PixmapPtr scanout_pixmap_back;
@ -706,8 +706,8 @@ extern _X_EXPORT void
extern _X_EXPORT int extern _X_EXPORT int
RRCrtcTransformSet(RRCrtcPtr crtc, RRCrtcTransformSet(RRCrtcPtr crtc,
PictTransformPtr transform, PictTransformPtr transform,
struct pict_f_transform *f_transform, struct pixman_f_transform *f_transform,
struct pict_f_transform *f_inverse, struct pixman_f_transform *f_inverse,
char *filter, int filter_len, xFixed * params, int nparams); char *filter, int filter_len, xFixed * params, int nparams);
/* /*

8
randr/rrtransform.h
View File

@ -30,8 +30,8 @@ typedef struct _rrTransform RRTransformRec, *RRTransformPtr;
struct _rrTransform { struct _rrTransform {
PictTransform transform; PictTransform transform;
struct pict_f_transform f_transform; struct pixman_f_transform f_transform;
struct pict_f_transform f_inverse; struct pixman_f_transform f_inverse;
PictFilterPtr filter; PictFilterPtr filter;
xFixed *params; xFixed *params;
int nparams; int nparams;
@ -73,7 +73,7 @@ RRTransformCompute(int x,
Rotation rotation, Rotation rotation,
RRTransformPtr rr_transform, RRTransformPtr rr_transform,
PictTransformPtr transform, PictTransformPtr transform,
struct pict_f_transform *f_transform, struct pixman_f_transform *f_transform,
struct pict_f_transform *f_inverse); struct pixman_f_transform *f_inverse);
#endif /* _RRTRANSFORM_H_ */ #endif /* _RRTRANSFORM_H_ */

3
render/picturestr.h
View File

@ -56,9 +56,6 @@ typedef struct _PictFormat {
typedef struct pixman_vector PictVector, *PictVectorPtr; typedef struct pixman_vector PictVector, *PictVectorPtr;
typedef struct pixman_transform PictTransform, *PictTransformPtr; 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 PICT_GRADIENT_STOPTABLE_SIZE 1024
#define SourcePictTypeSolidFill 0 #define SourcePictTypeSolidFill 0
#define SourcePictTypeLinear 1 #define SourcePictTypeLinear 1