xserver: Branch 'master' - 21 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jul 26 23:56:19 UTC 2024
Xext/xvdisp.c | 2
Xext/xvdix.h | 88 -------------------------------------
Xext/xvdix_priv.h | 91 +++++++++++++++++++++++++++++++++++++++
Xext/xvmain.c | 47 ++++++++++++--------
Xext/xvmc.c | 5 +-
hw/kdrive/src/kxv.c | 11 ++--
hw/xfree86/common/xf86xv.c | 14 +++---
hw/xfree86/common/xf86xvmc.c | 10 ++--
hw/xwayland/xwayland-glamor-xv.c | 5 +-
os/utils.c | 3 -
10 files changed, 147 insertions(+), 129 deletions(-)
New commits:
commit ed9c48a0301015a6ab2f762c14e2dbafca107f14
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:59:42 2024 +0200
xv: unexport XvPortNotifyRec
Not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 8633dead9..e2646bbfb 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -70,11 +70,7 @@ typedef struct {
ClientPtr client;
} XvGrabRec, *XvGrabPtr;
-typedef struct _XvPortNotifyRec {
- struct _XvPortNotifyRec *next;
- ClientPtr client;
- unsigned long id;
-} XvPortNotifyRec, *XvPortNotifyPtr;
+typedef struct _XvPortNotifyRec *XvPortNotifyPtr;
typedef struct {
int id;
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 62fd47843..f304dbc73 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -31,6 +31,12 @@ typedef struct {
CloseScreenProcPtr CloseScreen;
} XvScreenRec, *XvScreenPtr;
+typedef struct _XvPortNotifyRec {
+ struct _XvPortNotifyRec *next;
+ ClientPtr client;
+ unsigned long id;
+} XvPortNotifyRec, *XvPortNotifyPtr;
+
extern int XvReqCode;
extern int XvErrorBase;
commit 58a2fb8b6fe8d1d9cd5f42911abbf23f8a22c060
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:55:46 2024 +0200
xv: unexport XvScreenRec and XvScreenPtr
Not used by any drivers, so no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 2d5c85f40..8633dead9 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -173,15 +173,6 @@ typedef struct _XvPortRec {
DevUnion devPriv;
} XvPortRec, *XvPortPtr;
-typedef struct {
- int version, revision;
- int nAdaptors;
- XvAdaptorPtr pAdaptors;
- DestroyWindowProcPtr DestroyWindow;
- DestroyPixmapProcPtr DestroyPixmap;
- CloseScreenProcPtr CloseScreen;
-} XvScreenRec, *XvScreenPtr;
-
extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 7ea9e3795..62fd47843 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -22,6 +22,15 @@
#define _XvBadPort (XvBadPort+XvErrorBase)
+typedef struct {
+ int version, revision;
+ int nAdaptors;
+ XvAdaptorPtr pAdaptors;
+ DestroyWindowProcPtr DestroyWindow;
+ DestroyPixmapProcPtr DestroyPixmap;
+ CloseScreenProcPtr CloseScreen;
+} XvScreenRec, *XvScreenPtr;
+
extern int XvReqCode;
extern int XvErrorBase;
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index c67418bf4..747085dbe 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -25,21 +25,21 @@
* the sale, use or other dealings in this Software without prior written
* authorization from the copyright holder(s) and author(s).
*/
-
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
+
+#include "Xext/xvdix_priv.h"
+
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "resource.h"
#include "dixstruct.h"
-
#include "xf86xvpriv.h"
#include "xf86xvmc.h"
commit a952b93d0d75a0c44c0f3f9110c6d3b93d3ae889
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:51:11 2024 +0200
xv: unexport XvdiGrabPort() and XvdiUngrabPort()
Not used by any drivers, so no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 8a97e00e8..2d5c85f40 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -186,6 +186,4 @@ extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
-extern _X_EXPORT int XvdiUngrabPort(ClientPtr, XvPortPtr, Time);
#endif /* XVDIX_H */
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 4cf84a60a..7ea9e3795 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -70,4 +70,7 @@ int XvdiStopVideo(ClientPtr client, XvPortPtr pPort, DrawablePtr pDraw);
int XvdiMatchPort(XvPortPtr pPort, DrawablePtr pDraw);
+int XvdiGrabPort(ClientPtr client, XvPortPtr pPort, Time ctime, int *p_result);
+int XvdiUngrabPort(ClientPtr client, XvPortPtr pPort, Time ctime);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit 27a2245da7dba5293312b0ce4f56f8a367cba286
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:47:12 2024 +0200
xv: unexport XvdiMatchPort()
Not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 009167a68..8a97e00e8 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -186,7 +186,6 @@ extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);
extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
extern _X_EXPORT int XvdiUngrabPort(ClientPtr, XvPortPtr, Time);
#endif /* XVDIX_H */
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 544185d81..4cf84a60a 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -68,4 +68,6 @@ int XvdiGetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute,
int XvdiStopVideo(ClientPtr client, XvPortPtr pPort, DrawablePtr pDraw);
+int XvdiMatchPort(XvPortPtr pPort, DrawablePtr pDraw);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit 043a9c7b03ffdfe775558d157f2384508cfce683
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:39:53 2024 +0200
xv: unexport XvdiStopVideo()
Not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index a526dbad6..009167a68 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -186,7 +186,6 @@ extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);
extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
extern _X_EXPORT int XvdiUngrabPort(ClientPtr, XvPortPtr, Time);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 5a30575e3..544185d81 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -66,4 +66,6 @@ int XvdiSetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute,
int XvdiGetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute,
INT32 *p_value);
+int XvdiStopVideo(ClientPtr client, XvPortPtr pPort, DrawablePtr pDraw);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit 79189b9e11a7871f5430b50e013e110cdad3c499
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:36:03 2024 +0200
xv: unexport XvdiSetPortAttribute() and XvdiGetPortAttribute()
Not used by any drivers, so no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 50563a639..a526dbad6 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -186,8 +186,6 @@ extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
-extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);
extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);
extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 2b4da58c2..5a30575e3 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -61,4 +61,9 @@ int XvdiGetStill(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
CARD16 vid_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
CARD16 drw_h);
+int XvdiSetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute,
+ INT32 value);
+int XvdiGetPortAttribute(ClientPtr client, XvPortPtr pPort, Atom attribute,
+ INT32 *p_value);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit bb287bb7c6dcbfe24f8ff85977b5dc07ff5be01e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:32:27 2024 +0200
xv: unexport XvdiGet*()
Not used by any drivers, so no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index f3153de06..50563a639 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -186,12 +186,6 @@ extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);
extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 0709f59e8..2b4da58c2 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -52,4 +52,13 @@ int XvdiPutImage(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
CARD16 drw_h, XvImagePtr image, unsigned char *data,
Bool sync, CARD16 width, CARD16 height);
+int XvdiGetVideo(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+ GCPtr pGC, INT16 vid_x, INT16 vid_y, CARD16 vid_w,
+ CARD16 vid_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+ CARD16 drw_h);
+int XvdiGetStill(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+ GCPtr pGC, INT16 vid_x, INT16 vid_y, CARD16 vid_w,
+ CARD16 vid_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+ CARD16 drw_h);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit 6b884b89c5f8312e9439b9615acd165e0b3451ac
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:25:31 2024 +0200
xv: unexport XvdiPut*()
Not used by any drivers, so no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 2eb034ce4..f3153de06 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -186,23 +186,12 @@ extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16);
extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16,
- XvImagePtr, unsigned char *, Bool,
- CARD16, CARD16);
extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);
extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 3ee5c59f7..0709f59e8 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -38,4 +38,18 @@ void XvFillColorKey(DrawablePtr pDraw, CARD32 key, RegionPtr region);
int XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff);
int XvdiSelectPortNotify(ClientPtr client, XvPortPtr pPort, BOOL onoff);
+int XvdiPutVideo(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+ GCPtr pGC, INT16 vid_x, INT16 vid_y, CARD16 vid_w,
+ CARD16 wid_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+ CARD16 drw_h);
+int XvdiPutStill(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+ GCPtr pGC, INT16 vid_x, INT16 vid_y, CARD16 vid_w,
+ CARD16 vid_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+ CARD16 drw_h);
+int XvdiPutImage(ClientPtr client, DrawablePtr pDraw, XvPortPtr pPort,
+ GCPtr pGC, INT16 src_x, INT16 src_y, CARD16 src_w,
+ CARD16 src_h, INT16 drw_x, INT16 drw_y, CARD16 drw_w,
+ CARD16 drw_h, XvImagePtr image, unsigned char *data,
+ Bool sync, CARD16 width, CARD16 height);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit 12ffbdccc2402947a1cc5d9ae76544e93b9ca038
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:13:12 2024 +0200
xv: unexport notify control functions
Not used by any drivers, so no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 52eb7b262..2eb034ce4 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -203,8 +203,6 @@ extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
XvImagePtr, unsigned char *, Bool,
CARD16, CARD16);
-extern _X_EXPORT int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);
-extern _X_EXPORT int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);
extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *);
extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 8ad5f6dd4..3ee5c59f7 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -35,4 +35,7 @@ void XvFreeAdaptor(XvAdaptorPtr pAdaptor);
void XvFillColorKey(DrawablePtr pDraw, CARD32 key, RegionPtr region);
+int XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff);
+int XvdiSelectPortNotify(ClientPtr client, XvPortPtr pPort, BOOL onoff);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit 00f00e5d42e380850662701a4fa4065fa875d573
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:10:45 2024 +0200
xv: make XvdiSendPortNotify() static
Not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index af826942f..52eb7b262 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -185,7 +185,6 @@ typedef struct {
extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 83b3d90db..34b6f1df5 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -482,7 +482,7 @@ XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason)
}
-int
+static int
XvdiSendPortNotify(XvPortPtr pPort, Atom attribute, INT32 value)
{
XvPortNotifyPtr pn;
commit 68ea5f855c5d5f7615e4dcb5cf14a6a0799795de
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 17:05:19 2024 +0200
xv: unexport XvFillColorKey()
Not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index c4d151e00..af826942f 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -185,8 +185,6 @@ typedef struct {
extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern void _X_EXPORT XvFillColorKey(DrawablePtr pDraw, CARD32 key,
- RegionPtr region);
extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 532a02623..8ad5f6dd4 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -6,6 +6,8 @@
#include <X11/Xdefs.h>
+#include "include/pixmap.h"
+#include "include/regionstr.h"
#include "Xext/xvdix.h"
#define VALIDATE_XV_PORT(portID, pPort, mode)\
@@ -31,4 +33,6 @@ int SProcXvDispatch(ClientPtr);
void XvFreeAdaptor(XvAdaptorPtr pAdaptor);
+void XvFillColorKey(DrawablePtr pDraw, CARD32 key, RegionPtr region);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit 01de53c81537325ebb42af2fd04b5d4942ec9979
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 16:58:13 2024 +0200
xv: unexport XvFreeAdaptor()
Not used by any drivers, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 579713934..c4d151e00 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -185,7 +185,6 @@ typedef struct {
extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT void XvFreeAdaptor(XvAdaptorPtr pAdaptor);
extern void _X_EXPORT XvFillColorKey(DrawablePtr pDraw, CARD32 key,
RegionPtr region);
extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index d66c8716d..532a02623 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -29,4 +29,6 @@ extern RESTYPE XvRTPort;
int ProcXvDispatch(ClientPtr);
int SProcXvDispatch(ClientPtr);
+void XvFreeAdaptor(XvAdaptorPtr pAdaptor);
+
#endif /* _XORG_XVDIX_PRIV_H */
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index cb04f48cc..9e284203e 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -38,8 +38,13 @@ of the copyright holder.
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
-#include "kdrive.h"
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "Xext/xvdix_priv.h"
+
+#include "kdrive.h"
#include "scrnintstr.h"
#include "regionstr.h"
#include "windowstr.h"
@@ -49,10 +54,6 @@ of the copyright holder.
#include "resource.h"
#include "gcstruct.h"
#include "dixstruct.h"
-
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
-
#include "kxv.h"
#include "fourcc.h"
diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
index 8a8c5939d..35eab722c 100644
--- a/hw/xfree86/common/xf86xv.c
+++ b/hw/xfree86/common/xf86xv.c
@@ -32,12 +32,16 @@
#include <xorg-config.h>
#endif
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "Xext/xvdix_priv.h"
+
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-
-#include <X11/X.h>
-#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "regionstr.h"
#include "windowstr.h"
@@ -47,11 +51,7 @@
#include "resource.h"
#include "gcstruct.h"
#include "dixstruct.h"
-
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
#include "xvdix.h"
-
#include "xf86xvpriv.h"
/* XvAdaptorRec fields */
diff --git a/hw/xwayland/xwayland-glamor-xv.c b/hw/xwayland/xwayland-glamor-xv.c
index 68bae5737..d0aaa02c7 100644
--- a/hw/xwayland/xwayland-glamor-xv.c
+++ b/hw/xwayland/xwayland-glamor-xv.c
@@ -32,10 +32,11 @@
#include <xwayland-config.h>
-#include "glamor_priv.h"
-
#include <X11/extensions/Xv.h>
+#include "Xext/xvdix_priv.h"
+
+#include "glamor_priv.h"
#include "xwayland-glamor.h"
#define NUM_FORMATS 3
commit f3c3b78907050e97a4a17f83f8e5496cdccc7b38
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 16:46:21 2024 +0200
xv: unexport dispatch functions
These aren't supposed to be called by drivers, no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index a6f35c4c4..579713934 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -182,9 +182,6 @@ typedef struct {
CloseScreenProcPtr CloseScreen;
} XvScreenRec, *XvScreenPtr;
-extern _X_EXPORT int ProcXvDispatch(ClientPtr);
-extern _X_EXPORT int SProcXvDispatch(ClientPtr);
-
extern _X_EXPORT int XvScreenInit(ScreenPtr);
extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
extern _X_EXPORT unsigned long XvGetRTPort(void);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index aaf2edd6e..d66c8716d 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -25,4 +25,8 @@ extern int XvErrorBase;
extern RESTYPE XvRTPort;
+/* dispatch functions */
+int ProcXvDispatch(ClientPtr);
+int SProcXvDispatch(ClientPtr);
+
#endif /* _XORG_XVDIX_PRIV_H */
commit d746a43a67260add8b7297e4874ad1cbe3e0dbde
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 14:18:55 2024 +0200
xv: unexport remaining public variables
These variabls aren't used by any driver, no need to keep them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 52953baa2..a6f35c4c4 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -55,11 +55,6 @@ SOFTWARE.
#include "scrnintstr.h"
#include <X11/extensions/Xvproto.h>
-extern _X_EXPORT int XvReqCode;
-extern _X_EXPORT int XvErrorBase;
-
-extern _X_EXPORT RESTYPE XvRTPort;
-
typedef struct {
int numerator;
int denominator;
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 763405947..aaf2edd6e 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -20,4 +20,9 @@
#define _XvBadPort (XvBadPort+XvErrorBase)
+extern int XvReqCode;
+extern int XvErrorBase;
+
+extern RESTYPE XvRTPort;
+
#endif /* _XORG_XVDIX_PRIV_H */
commit d53b5550c1086b8b4885758b67ff705d6c0aa6d6
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 14:17:29 2024 +0200
xv: unexport VALIDATE_XV_PORT and _XvBadPort macros
These are only used inside xv extension code, so no need to keep
them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index eb80561b7..64a5a1bf6 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -33,6 +33,7 @@ SOFTWARE.
#include <X11/extensions/Xvproto.h>
#include "dix/dix_priv.h"
+#include "Xext/xvdix_priv.h"
#include "misc.h"
#include "scrnintstr.h"
@@ -42,7 +43,6 @@ SOFTWARE.
#include "dixstruct.h"
#include "resource.h"
#include "opaque.h"
-#include "xvdix.h"
#ifdef MITSHM
#include <X11/extensions/shmproto.h>
#include "shmint.h"
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 3740514a7..52953baa2 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -178,14 +178,6 @@ typedef struct _XvPortRec {
DevUnion devPriv;
} XvPortRec, *XvPortPtr;
-#define VALIDATE_XV_PORT(portID, pPort, mode)\
- {\
- int rc = dixLookupResourceByType((void **)&(pPort), portID,\
- XvRTPort, client, mode);\
- if (rc != Success)\
- return rc;\
- }
-
typedef struct {
int version, revision;
int nAdaptors;
@@ -195,10 +187,6 @@ typedef struct {
CloseScreenProcPtr CloseScreen;
} XvScreenRec, *XvScreenPtr;
-/* Errors */
-
-#define _XvBadPort (XvBadPort+XvErrorBase)
-
extern _X_EXPORT int ProcXvDispatch(ClientPtr);
extern _X_EXPORT int SProcXvDispatch(ClientPtr);
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
new file mode 100644
index 000000000..763405947
--- /dev/null
+++ b/Xext/xvdix_priv.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ */
+#ifndef _XORG_XVDIX_PRIV_H
+
+#include <X11/Xdefs.h>
+
+#include "Xext/xvdix.h"
+
+#define VALIDATE_XV_PORT(portID, pPort, mode)\
+ {\
+ int rc = dixLookupResourceByType((void **)&(pPort), portID,\
+ XvRTPort, client, mode);\
+ if (rc != Success)\
+ return rc;\
+ }
+
+/* Errors */
+
+#define _XvBadPort (XvBadPort+XvErrorBase)
+
+#endif /* _XORG_XVDIX_PRIV_H */
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index b80329027..83b3d90db 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -78,9 +78,13 @@ SOFTWARE.
#endif
#include <string.h>
-
#include <X11/X.h>
#include <X11/Xproto.h>
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
+
+#include "Xext/xvdix_priv.h"
+
#include "misc.h"
#include "os.h"
#include "scrnintstr.h"
@@ -94,10 +98,6 @@ SOFTWARE.
#include "opaque.h"
#include "input.h"
-#include <X11/extensions/Xv.h>
-#include <X11/extensions/Xvproto.h>
-#include "xvdix.h"
-
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 04023772d..22856af56 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -4,9 +4,11 @@
#endif
#include <string.h>
-
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "Xext/xvdix_priv.h"
+
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
@@ -16,7 +18,6 @@
#include "extinit_priv.h"
#include "servermd.h"
#include <X11/Xfuncproto.h>
-#include "xvdix.h"
#include <X11/extensions/XvMC.h>
#include <X11/extensions/Xvproto.h>
#include <X11/extensions/XvMCproto.h>
commit 9bb6d8b1693824cca2ca973172d0f1ca1adc1428
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 13:53:04 2024 +0200
xv: unexport internal variables and make them static
These variables are only used by xvmain.c (no drivers using them),
so make them static.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 136df87bb..3740514a7 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -55,20 +55,10 @@ SOFTWARE.
#include "scrnintstr.h"
#include <X11/extensions/Xvproto.h>
-extern _X_EXPORT unsigned long XvExtensionGeneration;
-extern _X_EXPORT unsigned long XvScreenGeneration;
-extern _X_EXPORT unsigned long XvResourceGeneration;
-
extern _X_EXPORT int XvReqCode;
-extern _X_EXPORT int XvEventBase;
extern _X_EXPORT int XvErrorBase;
extern _X_EXPORT RESTYPE XvRTPort;
-extern _X_EXPORT RESTYPE XvRTEncoding;
-extern _X_EXPORT RESTYPE XvRTGrab;
-extern _X_EXPORT RESTYPE XvRTVideoNotify;
-extern _X_EXPORT RESTYPE XvRTVideoNotifyList;
-extern _X_EXPORT RESTYPE XvRTPortNotify;
typedef struct {
int numerator;
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 13c716329..b80329027 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -122,20 +122,20 @@ static DevPrivateKeyRec XvScreenKeyRec;
Bool noXvExtension = FALSE;
#define XvScreenKey (&XvScreenKeyRec)
-unsigned long XvExtensionGeneration = 0;
-unsigned long XvScreenGeneration = 0;
-unsigned long XvResourceGeneration = 0;
+static unsigned long XvExtensionGeneration = 0;
+static unsigned long XvScreenGeneration = 0;
+static unsigned long XvResourceGeneration = 0;
int XvReqCode;
-int XvEventBase;
+static int XvEventBase;
int XvErrorBase;
RESTYPE XvRTPort;
-RESTYPE XvRTEncoding;
-RESTYPE XvRTGrab;
-RESTYPE XvRTVideoNotify;
-RESTYPE XvRTVideoNotifyList;
-RESTYPE XvRTPortNotify;
+static RESTYPE XvRTEncoding;
+static RESTYPE XvRTGrab;
+static RESTYPE XvRTVideoNotify;
+static RESTYPE XvRTVideoNotifyList;
+static RESTYPE XvRTPortNotify;
/* EXTERNAL */
commit 354f42b25c3ec5d409f78d8c7a682eef9237d7be
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 18:37:59 2024 +0200
xv: move XvVideoNotifyRec into xvmain.c
This struct is only used in xvmain.c, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index ee09b3dde..136df87bb 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -85,13 +85,6 @@ typedef struct {
ClientPtr client;
} XvGrabRec, *XvGrabPtr;
-typedef struct _XvVideoNotifyRec {
- struct _XvVideoNotifyRec *next;
- ClientPtr client;
- unsigned long id;
- unsigned long mask;
-} XvVideoNotifyRec, *XvVideoNotifyPtr;
-
typedef struct _XvPortNotifyRec {
struct _XvPortNotifyRec *next;
ClientPtr client;
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 22baec49f..13c716329 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -110,6 +110,13 @@ SOFTWARE.
#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
((pScreen)->field = wrapper)
+typedef struct _XvVideoNotifyRec {
+ struct _XvVideoNotifyRec *next;
+ ClientPtr client;
+ unsigned long id;
+ unsigned long mask;
+} XvVideoNotifyRec, *XvVideoNotifyPtr;
+
static DevPrivateKeyRec XvScreenKeyRec;
Bool noXvExtension = FALSE;
commit 4d0b5833da43542dce109ba3a6e8301f8e04f9c6
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 14:22:27 2024 +0200
xv: move SCREEN_(PROLOGUE|EPILOGUE) into xvmain.c
These macros are only used in xvmain.c, so no need to keep
them exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index bfd1c1aa3..ee09b3dde 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -212,12 +212,6 @@ typedef struct {
CloseScreenProcPtr CloseScreen;
} XvScreenRec, *XvScreenPtr;
-#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
- dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
-
-#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
- ((pScreen)->field = wrapper)
-
/* Errors */
#define _XvBadPort (XvBadPort+XvErrorBase)
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 6c254fdd0..22baec49f 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -104,6 +104,12 @@ SOFTWARE.
#endif
#include "xvdisp.h"
+#define SCREEN_PROLOGUE(pScreen, field) ((pScreen)->field = ((XvScreenPtr) \
+ dixLookupPrivate(&(pScreen)->devPrivates, XvScreenKey))->field)
+
+#define SCREEN_EPILOGUE(pScreen, field, wrapper)\
+ ((pScreen)->field = wrapper)
+
static DevPrivateKeyRec XvScreenKeyRec;
Bool noXvExtension = FALSE;
commit d7e481f200646ab63e2f368896c7be48b4782004
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 14:25:03 2024 +0200
xv: drop unused macro _XvBadEncoding
Couldn't find a trace where it actually had been used, so there doesn't
seem to be any reason while still keeping it around.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 621a1e3a3..bfd1c1aa3 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -221,7 +221,6 @@ typedef struct {
/* Errors */
#define _XvBadPort (XvBadPort+XvErrorBase)
-#define _XvBadEncoding (XvBadEncoding+XvErrorBase)
extern _X_EXPORT int ProcXvDispatch(ClientPtr);
extern _X_EXPORT int SProcXvDispatch(ClientPtr);
commit 6b445819dd5a6cc7424533e854dbdf8b9c35040f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 14:14:14 2024 +0200
xv: drop unused define GLOBAL
This symbol isn't used anywhere, for at least 20 years now,
so no need to define it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 5cc3a6487..6c254fdd0 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -94,8 +94,6 @@ SOFTWARE.
#include "opaque.h"
#include "input.h"
-#define GLOBAL
-
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvproto.h>
#include "xvdix.h"
commit 8e32cec2048165f9d56d323d7c12ee6547d99b6e
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Tue Apr 30 13:25:27 2024 +0200
xv: move noXvExtension to xvmain.c
It's more appropriate having those kind of flags in the corresponding
extension.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1512>
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 937f2893b..5cc3a6487 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -108,6 +108,8 @@ SOFTWARE.
static DevPrivateKeyRec XvScreenKeyRec;
+Bool noXvExtension = FALSE;
+
#define XvScreenKey (&XvScreenKeyRec)
unsigned long XvExtensionGeneration = 0;
unsigned long XvScreenGeneration = 0;
diff --git a/os/utils.c b/os/utils.c
index ebd3ece60..6879e334d 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -173,9 +173,6 @@ Bool noXFixesExtension = FALSE;
/* Xinerama is disabled by default unless enabled via +xinerama */
Bool noPanoramiXExtension = TRUE;
#endif
-#ifdef XV
-Bool noXvExtension = FALSE;
-#endif
#ifdef DRI2
Bool noDRI2Extension = FALSE;
#endif
More information about the xorg-commit
mailing list