xserver: Branch 'master' - 5 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Mar 3 23:28:15 UTC 2024
dix/dispatch.c | 3 +++
dix/screenint_priv.h | 29 +++++++++++++++++++++++++++++
hw/kdrive/src/kdrive.c | 3 +++
hw/vfb/InitOutput.c | 3 +++
hw/xfree86/common/xf86Init.c | 3 +++
hw/xfree86/common/xf86platformBus.c | 3 +++
hw/xfree86/modes/xf86RandR12.c | 2 ++
hw/xnest/Init.c | 3 +++
hw/xwayland/xwayland.c | 3 +++
hw/xwin/InitOutput.c | 2 ++
include/screenint.h | 24 ------------------------
11 files changed, 54 insertions(+), 24 deletions(-)
New commits:
commit 6999bc49d36bee981e262c9f60a1d8683134ffe1
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 14:32:17 2024 +0100
dix: unexport AttachOffloadGPU() and DetachOffloadGPU()
These aren't externally used, thus no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1349>
diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
index 96a4b2936..2d98d9ba9 100644
--- a/dix/screenint_priv.h
+++ b/dix/screenint_priv.h
@@ -23,4 +23,7 @@ void DetachUnboundGPU(ScreenPtr unbound);
void AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
void DetachOutputGPU(ScreenPtr output);
+void AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+void DetachOffloadGPU(ScreenPtr slave);
+
#endif /* _XSERVER_DIX_SCREENINT_PRIV_H */
diff --git a/include/screenint.h b/include/screenint.h
index 8807f1475..e136f31cf 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -53,13 +53,6 @@ typedef struct _PixmapFormat *PixmapFormatPtr;
typedef struct _Visual *VisualPtr;
typedef struct _Depth *DepthPtr;
typedef struct _Screen *ScreenPtr;
-
-extern _X_EXPORT void
-AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-
-extern _X_EXPORT void
-DetachOffloadGPU(ScreenPtr slave);
-
typedef struct _ColormapRec *ColormapPtr;
#endif /* SCREENINT_H */
commit 1277bb7143b8c62842384d5947c35129c31a1e9f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 14:30:30 2024 +0100
dix: unexport AttachOutputGPU() and DetachOutputGPU()
These aren't externally used, thus no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1349>
diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
index a9d31195e..96a4b2936 100644
--- a/dix/screenint_priv.h
+++ b/dix/screenint_priv.h
@@ -20,4 +20,7 @@ void RemoveGPUScreen(ScreenPtr pScreen);
void AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
void DetachUnboundGPU(ScreenPtr unbound);
+void AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+void DetachOutputGPU(ScreenPtr output);
+
#endif /* _XSERVER_DIX_SCREENINT_PRIV_H */
diff --git a/include/screenint.h b/include/screenint.h
index a9311c76f..8807f1475 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -54,12 +54,6 @@ typedef struct _Visual *VisualPtr;
typedef struct _Depth *DepthPtr;
typedef struct _Screen *ScreenPtr;
-extern _X_EXPORT void
-AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-
-extern _X_EXPORT void
-DetachOutputGPU(ScreenPtr output);
-
extern _X_EXPORT void
AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
commit 71b81a7473216b6a72ba12456130b9c43c7872d2
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 14:28:33 2024 +0100
dix: unexport AttachUnboundGPU() and DetachUnboundGPU()
These aren't externally used, thus no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1349>
diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
index 62a9ba6a2..a9d31195e 100644
--- a/dix/screenint_priv.h
+++ b/dix/screenint_priv.h
@@ -17,4 +17,7 @@ int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
void RemoveGPUScreen(ScreenPtr pScreen);
+void AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
+void DetachUnboundGPU(ScreenPtr unbound);
+
#endif /* _XSERVER_DIX_SCREENINT_PRIV_H */
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index ad66a9145..7943c02b8 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -24,6 +24,8 @@
#include <xorg-config.h>
#endif
+#include "dix/screenint_priv.h"
+
#include "xf86.h"
#include "os.h"
#include "globals.h"
diff --git a/include/screenint.h b/include/screenint.h
index f213d311d..a9311c76f 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -54,11 +54,6 @@ typedef struct _Visual *VisualPtr;
typedef struct _Depth *DepthPtr;
typedef struct _Screen *ScreenPtr;
-extern _X_EXPORT void
-AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
-extern _X_EXPORT void
-DetachUnboundGPU(ScreenPtr unbound);
-
extern _X_EXPORT void
AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
commit 55dc4a8bdc5ba828c699dccacd80a1641a1e721d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 14:17:51 2024 +0100
dix: unexport RemoveGPUScreen()
This function isn't used by any modules/drivers, so no need to export it.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1349>
diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
index df8f12214..62a9ba6a2 100644
--- a/dix/screenint_priv.h
+++ b/dix/screenint_priv.h
@@ -15,4 +15,6 @@ typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);
int AddScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
+void RemoveGPUScreen(ScreenPtr pScreen);
+
#endif /* _XSERVER_DIX_SCREENINT_PRIV_H */
diff --git a/include/screenint.h b/include/screenint.h
index 30ad72719..f213d311d 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -54,8 +54,6 @@ typedef struct _Visual *VisualPtr;
typedef struct _Depth *DepthPtr;
typedef struct _Screen *ScreenPtr;
-extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);
-
extern _X_EXPORT void
AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
extern _X_EXPORT void
commit 27b83c4cd0c3dab27101a8e9dd25b7bd6a206f3d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 13:47:23 2024 +0100
dix: unexport AddScreen() and AddGPUScreen()
These aren't used by any drivers/modules, just DDX'es, so no need to export.
Note: tigervnc does use it, but it has it's own DDX, therefore directly
linked in, just like the in-tree DDX'es which doesn't need exporting.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1349>
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 6b5de5688..e88e8de1d 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -106,6 +106,9 @@ Equipment Corporation.
#include "windowstr.h"
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/libxfont2.h>
+
+#include "dix/screenint_priv.h"
+
#include "dixfontstr.h"
#include "dix_priv.h"
#include "gcstruct.h"
diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
new file mode 100644
index 000000000..df8f12214
--- /dev/null
+++ b/dix/screenint_priv.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ * Copyright © 1987, 1998 The Open Group
+ */
+#ifndef _XSERVER_DIX_SCREENINT_PRIV_H
+#define _XSERVER_DIX_SCREENINT_PRIV_H
+
+#include <X11/Xdefs.h>
+
+typedef struct _Screen *ScreenPtr;
+
+typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);
+
+int AddScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
+int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
+
+#endif /* _XSERVER_DIX_SCREENINT_PRIV_H */
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index 8ee41f908..fce08afbc 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -23,6 +23,9 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
+
+#include "dix/screenint_priv.h"
+
#include "kdrive.h"
#include <mivalidate.h>
#include <dixstruct.h>
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index f01901153..9bc23906a 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -37,6 +37,9 @@ from The Open Group.
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xos.h>
+
+#include "dix/screenint_priv.h"
+
#include "scrnintstr.h"
#include "servermd.h"
#define PSZ 8
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index cfa5fbbc8..5a5f1fd0c 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -47,6 +47,9 @@
#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include <X11/Xatom.h>
+
+#include "dix/screenint_priv.h"
+
#include "input.h"
#include "servermd.h"
#include "windowstr.h"
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index b7fdb4dd6..ba6f39984 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -36,6 +36,9 @@
#include <pciaccess.h>
#include <fcntl.h>
#include <unistd.h>
+
+#include "dix/screenint_priv.h"
+
#include "os.h"
#include "hotplug.h"
#include "systemd-logind.h"
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index cd4ee61f9..1f18e335b 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -18,6 +18,9 @@ is" without express or implied warranty.
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/screenint_priv.h"
+
#include "screenint.h"
#include "input.h"
#include "misc.h"
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 56964bbfb..a1914fff6 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -33,6 +33,9 @@
#include <errno.h>
#include <X11/Xatom.h>
+
+#include "dix/screenint_priv.h"
+
#include <selection.h>
#include <micmap.h>
#include <misyncshm.h>
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
index 5ce717b29..9db2a28fa 100644
--- a/hw/xwin/InitOutput.c
+++ b/hw/xwin/InitOutput.c
@@ -56,6 +56,8 @@ typedef WINAPI HRESULT(*SHGETFOLDERPATHPROC) (HWND hwndOwner,
DWORD dwFlags, LPTSTR pszPath);
#endif
+#include "dix/screenint_priv.h"
+
#include "winmonitors.h"
#include "nonsdk_extinit.h"
#include "pseudoramiX/pseudoramiX.h"
diff --git a/include/screenint.h b/include/screenint.h
index 0a4527832..30ad72719 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -54,10 +54,6 @@ typedef struct _Visual *VisualPtr;
typedef struct _Depth *DepthPtr;
typedef struct _Screen *ScreenPtr;
-typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);
-extern _X_EXPORT int AddScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
-extern _X_EXPORT int AddGPUScreen(ScreenInitProcPtr pfnInit, int argc, char **argv);
-
extern _X_EXPORT void RemoveGPUScreen(ScreenPtr pScreen);
extern _X_EXPORT void
More information about the xorg-commit
mailing list