xserver: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Mar 3 22:57:33 UTC 2024
Xext/panoramiX.c | 2 -
exa/exa_glyphs.c | 2 -
fb/fbpict.c | 2 -
glamor/glamor_composite_glyphs.c | 1
hw/xfree86/modes/xf86Crtc.h | 4 +-
hw/xfree86/modes/xf86RandR12.c | 4 +-
hw/xfree86/modes/xf86Rotate.c | 4 +-
miext/damage/damage.c | 1
randr/randrstr.h | 8 ++--
randr/rrtransform.h | 8 ++--
render/animcur.c | 2 -
render/glyph.c | 2 -
render/glyphstr.h | 66 ---------------------------------------
render/glyphstr_priv.h | 63 +++++++++++++++++++++++++++++++++++++
render/picture.c | 3 +
render/picturestr.h | 36 ---------------------
render/picturestr_priv.h | 46 +++++++++++++++++++++++++++
render/render.c | 4 +-
xfixes/region.c | 2 -
19 files changed, 136 insertions(+), 124 deletions(-)
New commits:
commit 368055d3f16f3ca6aec3cbbb27e5548ab7f58e18
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 12 13:30:20 2024 +0100
render: move private definitions out of public glyphstr.h
Public module API headers don't need / shouldn't to contain anything that
isn't part of the API (non-exported functions, etc).
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1287>
diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c
index 192a643cc..6b97a83b1 100644
--- a/exa/exa_glyphs.c
+++ b/exa/exa_glyphs.c
@@ -47,7 +47,7 @@
#include <stdlib.h>
#include "exa_priv.h"
-
+#include "glyphstr_priv.h"
#include "mipict.h"
#if DEBUG_GLYPH_CACHE
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 9797447b4..f985198fb 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -30,7 +30,7 @@
#include <string.h>
#include "fb.h"
-
+#include "glyphstr_priv.h"
#include "picturestr.h"
#include "mipict.h"
#include "fbpict.h"
diff --git a/glamor/glamor_composite_glyphs.c b/glamor/glamor_composite_glyphs.c
index f208504dd..428303091 100644
--- a/glamor/glamor_composite_glyphs.c
+++ b/glamor/glamor_composite_glyphs.c
@@ -25,6 +25,7 @@
#include "glamor_priv.h"
#include "glamor_transform.h"
#include "glamor_transfer.h"
+#include "glyphstr_priv.h"
#include <mipict.h>
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 48e6af673..344d90d34 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -40,6 +40,7 @@
#include "gcstruct.h"
#include "damage.h"
#include "damagestr.h"
+#include "glyphstr_priv.h"
#define wrap(priv, real, mem, func) {\
priv->mem = real->mem; \
diff --git a/render/glyph.c b/render/glyph.c
index f3ed9cf4c..3396df375 100644
--- a/render/glyph.c
+++ b/render/glyph.c
@@ -42,7 +42,7 @@
#include "gcstruct.h"
#include "servermd.h"
#include "picturestr.h"
-#include "glyphstr.h"
+#include "glyphstr_priv.h"
#include "mipict.h"
/*
diff --git a/render/glyphstr.h b/render/glyphstr.h
index 2f51bd244..9f6b1c410 100644
--- a/render/glyphstr.h
+++ b/render/glyphstr.h
@@ -25,12 +25,8 @@
#ifndef _GLYPHSTR_H_
#define _GLYPHSTR_H_
-#include <X11/extensions/renderproto.h>
#include "picture.h"
#include "screenint.h"
-#include "regionstr.h"
-#include "miscstruct.h"
-#include "privates.h"
#define GlyphFormat1 0
#define GlyphFormat4 1
@@ -48,41 +44,6 @@ typedef struct _Glyph {
/* per-screen pixmaps follow */
} GlyphRec, *GlyphPtr;
-#define GlyphPicture(glyph) ((PicturePtr *) ((glyph) + 1))
-
-typedef struct _GlyphRef {
- CARD32 signature;
- GlyphPtr glyph;
-} GlyphRefRec, *GlyphRefPtr;
-
-#define DeletedGlyph ((GlyphPtr) 1)
-
-typedef struct _GlyphHashSet {
- CARD32 entries;
- CARD32 size;
- CARD32 rehash;
-} GlyphHashSetRec, *GlyphHashSetPtr;
-
-typedef struct _GlyphHash {
- GlyphRefPtr table;
- GlyphHashSetPtr hashSet;
- CARD32 tableEntries;
-} GlyphHashRec, *GlyphHashPtr;
-
-typedef struct _GlyphSet {
- CARD32 refcnt;
- int fdepth;
- PictFormatPtr format;
- GlyphHashRec hash;
- PrivateRec *devPrivates;
-} GlyphSetRec, *GlyphSetPtr;
-
-#define GlyphSetGetPrivate(pGlyphSet,k) \
- dixLookupPrivate(&(pGlyphSet)->devPrivates, k)
-
-#define GlyphSetSetPrivate(pGlyphSet,k,ptr) \
- dixSetPrivate(&(pGlyphSet)->devPrivates, k, ptr)
-
typedef struct _GlyphList {
INT16 xOff;
INT16 yOff;
@@ -90,33 +51,6 @@ typedef struct _GlyphList {
PictFormatPtr format;
} GlyphListRec, *GlyphListPtr;
-extern void
- GlyphUninit(ScreenPtr pScreen);
-
-extern GlyphPtr FindGlyphByHash(unsigned char sha1[20], int format);
-
-extern int
-HashGlyph(xGlyphInfo * gi,
- CARD8 *bits, unsigned long size, unsigned char sha1[20]);
-
-extern void
- AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id);
-
-extern Bool
- DeleteGlyph(GlyphSetPtr glyphSet, Glyph id);
-
-extern GlyphPtr FindGlyph(GlyphSetPtr glyphSet, Glyph id);
-
-extern GlyphPtr AllocateGlyph(xGlyphInfo * gi, int format);
-
-extern Bool
- ResizeGlyphSet(GlyphSetPtr glyphSet, CARD32 change);
-
-extern GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format);
-
-extern int
- FreeGlyphSet(void *value, XID gid);
-
#define GLYPH_HAS_GLYPH_PICTURE_ACCESSOR 1 /* used for api compat */
extern _X_EXPORT PicturePtr
GetGlyphPicture(GlyphPtr glyph, ScreenPtr pScreen);
diff --git a/render/glyphstr_priv.h b/render/glyphstr_priv.h
new file mode 100644
index 000000000..90a90fa4f
--- /dev/null
+++ b/render/glyphstr_priv.h
@@ -0,0 +1,63 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ * Copyright © 2000 SuSE, Inc.
+ */
+#ifndef _XSERVER_GLYPHSTR_PRIV_H_
+#define _XSERVER_GLYPHSTR_PRIV_H_
+
+#include <X11/extensions/renderproto.h>
+#include "glyphstr.h"
+#include "picture.h"
+#include "screenint.h"
+#include "regionstr.h"
+#include "miscstruct.h"
+#include "privates.h"
+
+#define GlyphPicture(glyph) ((PicturePtr *) ((glyph) + 1))
+
+typedef struct {
+ CARD32 signature;
+ GlyphPtr glyph;
+} GlyphRefRec, *GlyphRefPtr;
+
+#define DeletedGlyph ((GlyphPtr) 1)
+
+typedef struct {
+ CARD32 entries;
+ CARD32 size;
+ CARD32 rehash;
+} GlyphHashSetRec, *GlyphHashSetPtr;
+
+typedef struct {
+ GlyphRefPtr table;
+ GlyphHashSetPtr hashSet;
+ CARD32 tableEntries;
+} GlyphHashRec, *GlyphHashPtr;
+
+typedef struct {
+ CARD32 refcnt;
+ int fdepth;
+ PictFormatPtr format;
+ GlyphHashRec hash;
+ PrivateRec *devPrivates;
+} GlyphSetRec, *GlyphSetPtr;
+
+#define GlyphSetGetPrivate(pGlyphSet,k) \
+ dixLookupPrivate(&(pGlyphSet)->devPrivates, k)
+
+#define GlyphSetSetPrivate(pGlyphSet,k,ptr) \
+ dixSetPrivate(&(pGlyphSet)->devPrivates, k, ptr)
+
+void GlyphUninit(ScreenPtr pScreen);
+GlyphPtr FindGlyphByHash(unsigned char sha1[20], int format);
+int HashGlyph(xGlyphInfo * gi, CARD8 *bits, unsigned long size, unsigned char sha1[20]);
+void AddGlyph(GlyphSetPtr glyphSet, GlyphPtr glyph, Glyph id);
+Bool DeleteGlyph(GlyphSetPtr glyphSet, Glyph id);
+GlyphPtr FindGlyph(GlyphSetPtr glyphSet, Glyph id);
+GlyphPtr AllocateGlyph(xGlyphInfo * gi, int format);
+Bool ResizeGlyphSet(GlyphSetPtr glyphSet, CARD32 change);
+GlyphSetPtr AllocateGlyphSet(int fdepth, PictFormatPtr format);
+int FreeGlyphSet(void *value, XID gid);
+
+#endif /* _XSERVER_GLYPHSTR_PRIV_H_ */
diff --git a/render/picture.c b/render/picture.c
index 065890cfb..495cc2955 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -40,6 +40,7 @@
#include "gcstruct.h"
#include "servermd.h"
#include "picturestr_priv.h"
+#include "glyphstr_priv.h"
#include "xace.h"
#ifdef PANORAMIX
#include "panoramiXsrv.h"
diff --git a/render/picturestr.h b/render/picturestr.h
index 5ebc3a132..001d37bfa 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -24,6 +24,7 @@
#ifndef _PICTURESTR_H_
#define _PICTURESTR_H_
+#include <X11/extensions/renderproto.h>
#include "scrnintstr.h"
#include "glyphstr.h"
#include "resource.h"
diff --git a/render/render.c b/render/render.c
index 8ae057ce0..29c5055c6 100644
--- a/render/render.c
+++ b/render/render.c
@@ -42,7 +42,7 @@
#include <X11/extensions/render.h>
#include <X11/extensions/renderproto.h>
#include "picturestr_priv.h"
-#include "glyphstr.h"
+#include "glyphstr_priv.h"
#include <X11/Xfuncproto.h>
#include "cursorstr.h"
#include "xace.h"
commit 6ddade2e6a843a4c0081d4a31fa303d1e2464f36
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 12 11:42:39 2024 +0100
render: move private definitions out of picturestr.h
Public module API headers don't need / shouldn't to contain anything that
isn't part of the API (non-exported functions, etc).
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1287>
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index bd9c45b03..ae8489558 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -52,7 +52,7 @@ Equipment Corporation.
#include "globals.h"
#include "servermd.h"
#include "resource.h"
-#include "picturestr.h"
+#include "picturestr_priv.h"
#include "xfixesint.h"
#include "damageextint.h"
#ifdef COMPOSITE
diff --git a/render/animcur.c b/render/animcur.c
index ef27bda27..eb8b817e2 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -43,7 +43,7 @@
#include "cursorstr.h"
#include "dixfontstr.h"
#include "opaque.h"
-#include "picturestr.h"
+#include "picturestr_priv.h"
#include "inputstr.h"
#include "xace.h"
diff --git a/render/picture.c b/render/picture.c
index 2be4b1954..065890cfb 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -39,7 +39,7 @@
#include "dixstruct.h"
#include "gcstruct.h"
#include "servermd.h"
-#include "picturestr.h"
+#include "picturestr_priv.h"
#include "xace.h"
#ifdef PANORAMIX
#include "panoramiXsrv.h"
diff --git a/render/picturestr.h b/render/picturestr.h
index a5d981e0d..5ebc3a132 100644
--- a/render/picturestr.h
+++ b/render/picturestr.h
@@ -56,7 +56,6 @@ typedef struct _PictFormat {
typedef struct pixman_vector PictVector, *PictVectorPtr;
typedef struct pixman_transform PictTransform, *PictTransformPtr;
-#define PICT_GRADIENT_STOPTABLE_SIZE 1024
#define SourcePictTypeSolidFill 0
#define SourcePictTypeLinear 1
#define SourcePictTypeRadial 2
@@ -347,31 +346,12 @@ extern _X_EXPORT DevPrivateKeyRec PictureScreenPrivateKeyRec;
extern _X_EXPORT DevPrivateKeyRec PictureWindowPrivateKeyRec;
#define PictureWindowPrivateKey (&PictureWindowPrivateKeyRec)
-extern RESTYPE PictureType;
-extern RESTYPE PictFormatType;
-extern RESTYPE GlyphSetType;
-
#define GetPictureScreen(s) ((PictureScreenPtr)dixLookupPrivate(&(s)->devPrivates, PictureScreenPrivateKey))
#define GetPictureScreenIfSet(s) (dixPrivateKeyRegistered(PictureScreenPrivateKey) ? GetPictureScreen(s) : NULL)
#define SetPictureScreen(s,p) dixSetPrivate(&(s)->devPrivates, PictureScreenPrivateKey, p)
#define GetPictureWindow(w) ((PicturePtr)dixLookupPrivate(&(w)->devPrivates, PictureWindowPrivateKey))
#define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p)
-#define VERIFY_PICTURE(pPicture, pid, client, mode) {\
- int tmprc = dixLookupResourceByType((void *)&(pPicture), pid,\
- PictureType, client, mode);\
- if (tmprc != Success)\
- return tmprc;\
-}
-
-#define VERIFY_ALPHA(pPicture, pid, client, mode) {\
- if (pid == None) \
- pPicture = 0; \
- else { \
- VERIFY_PICTURE(pPicture, pid, client, mode); \
- } \
-} \
-
extern _X_EXPORT PictFormatPtr
PictureWindowFormat(WindowPtr pWindow);
@@ -505,13 +485,6 @@ CompositeTriFan(CARD8 op,
PictFormatPtr maskFormat,
INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points);
-Bool
- AnimCurInit(ScreenPtr pScreen);
-
-int
-AnimCursorCreate(CursorPtr *cursors, CARD32 *deltas, int ncursor,
- CursorPtr *ppCursor, ClientPtr client, XID cid);
-
extern _X_EXPORT void
AddTraps(PicturePtr pPicture,
INT16 xOff, INT16 yOff, int ntraps, xTrap * traps);
@@ -542,11 +515,6 @@ CreateConicalGradientPicture(Picture pid,
int nStops,
xFixed * stops, xRenderColor * colors, int *error);
-#ifdef PANORAMIX
-extern void PanoramiXRenderInit(void);
-extern void PanoramiXRenderReset(void);
-#endif
-
/*
* matrix.c
*/
diff --git a/render/picturestr_priv.h b/render/picturestr_priv.h
new file mode 100644
index 000000000..b5064a5ac
--- /dev/null
+++ b/render/picturestr_priv.h
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ * Copyright © 2000 SuSE, Inc.
+ */
+#ifndef _XSERVER_PICTURESTR_PRIV_H_
+#define _XSERVER_PICTURESTR_PRIV_H_
+
+#include "picturestr.h"
+#include "scrnintstr.h"
+#include "glyphstr.h"
+#include "resource.h"
+#include "privates.h"
+
+#define PICT_GRADIENT_STOPTABLE_SIZE 1024
+
+extern RESTYPE PictureType;
+extern RESTYPE PictFormatType;
+extern RESTYPE GlyphSetType;
+
+#define VERIFY_PICTURE(pPicture, pid, client, mode) {\
+ int tmprc = dixLookupResourceByType((void *)&(pPicture), pid,\
+ PictureType, client, mode);\
+ if (tmprc != Success)\
+ return tmprc;\
+}
+
+#define VERIFY_ALPHA(pPicture, pid, client, mode) {\
+ if (pid == None) \
+ pPicture = 0; \
+ else { \
+ VERIFY_PICTURE(pPicture, pid, client, mode); \
+ } \
+} \
+
+Bool AnimCurInit(ScreenPtr pScreen);
+
+int AnimCursorCreate(CursorPtr *cursors, CARD32 *deltas, int ncursor,
+ CursorPtr *ppCursor, ClientPtr client, XID cid);
+
+#ifdef PANORAMIX
+void PanoramiXRenderInit(void);
+void PanoramiXRenderReset(void);
+#endif /* PANORAMIX */
+
+#endif /* _XSERVER_PICTURESTR_PRIV_H_ */
diff --git a/render/render.c b/render/render.c
index 456f156d4..8ae057ce0 100644
--- a/render/render.c
+++ b/render/render.c
@@ -41,7 +41,7 @@
#include "servermd.h"
#include <X11/extensions/render.h>
#include <X11/extensions/renderproto.h>
-#include "picturestr.h"
+#include "picturestr_priv.h"
#include "glyphstr.h"
#include <X11/Xfuncproto.h>
#include "cursorstr.h"
diff --git a/xfixes/region.c b/xfixes/region.c
index 7c0a7d2fe..42031faf3 100644
--- a/xfixes/region.c
+++ b/xfixes/region.c
@@ -26,7 +26,7 @@
#include "xfixesint.h"
#include "scrnintstr.h"
-#include <picturestr.h>
+#include "picturestr_priv.h"
#include <regionstr.h>
#include <gcstruct.h>
commit 10a803186567308ceaed5760d092edd508bb157c
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Mon Feb 12 12:23:50 2024 +0100
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 at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1287>
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
More information about the xorg-commit
mailing list