fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-26 00:40:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "dix: unexport AddScreen() and AddGPUScreen()"

Browse source 
This reverts commit 27b83c4cd0.
This commit is contained in:
kohnish 2025-11-21 20:50:59 +01:00
parent b3d6c23120
commit b7af42d3c2
10 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dix/colormap_priv.h
View file

@ -8,7 +8,6 @@
#include <X11/Xdefs.h>
#include <X11/Xproto.h>
#include "dix/screenint_priv.h"
#include "include/colormap.h"
#include "include/dix.h"
#include "include/window.h"

1
dix/dispatch.c
View file

@ -111,7 +111,6 @@ Equipment Corporation.
#include "dix/input_priv.h"
#include "dix/gc_priv.h"
#include "dix/registry_priv.h"
#include "dix/screenint_priv.h"
#include "include/resource.h"
#include "os/auth.h"
#include "os/client_priv.h"

26
dix/screenint_priv.h
View file

@ -1,26 +0,0 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
* Copyright © 1987, 1998 The Open Group
*/
#ifndef _XSERVER_DIX_SCREENINT_PRIV_H
#define _XSERVER_DIX_SCREENINT_PRIV_H
#include <X11/Xdefs.h>
#include "screenint.h"
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);
void AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
void DetachUnboundGPU(ScreenPtr unbound);
void AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
void DetachOffloadGPU(ScreenPtr slave);
#endif /* _XSERVER_DIX_SCREENINT_PRIV_H */

1
hw/vfb/InitOutput.c
View file

@ -38,7 +38,6 @@ from The Open Group.
#include "dix/colormap_priv.h"
#include "dix/dix_priv.h"
#include "dix/screenint_priv.h"
#include "os/osdep.h"
#include "scrnintstr.h"

2
hw/xfree86/common/xf86Init.c
View file

@ -54,9 +54,9 @@
#include "config/dbus-core.h"
#include "config/hotplug_priv.h"
#include "dix/input_priv.h"
#include "dix/screenint_priv.h"
#include "os/osdep.h"
#include "input.h"
#include "servermd.h"
#include "windowstr.h"
#include "scrnintstr.h"

1
hw/xfree86/common/xf86platformBus.c
View file

@ -38,7 +38,6 @@
#include <unistd.h>
#include "config/hotplug_priv.h"
#include "dix/screenint_priv.h"
#include "os.h"
#include "systemd-logind.h"

1
hw/xfree86/modes/xf86RandR12.c
View file

@ -27,7 +27,6 @@
#include <X11/extensions/render.h>
#include "dix/input_priv.h"
#include "dix/screenint_priv.h"
#include "xf86.h"
#include "os.h"

1
hw/xnest/Init.c
View file

@ -20,7 +20,6 @@ is" without express or implied warranty.
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/libxfont2.h>
#include "dix/screenint_priv.h"
#include "os/osdep.h"
#include "screenint.h"

16
include/screenint.h
View file

@ -56,6 +56,22 @@ typedef struct _Screen *ScreenPtr;
extern _X_EXPORT void AttachOutputGPU(ScreenPtr pScreen, ScreenPtr newScreen);
extern _X_EXPORT void DetachOutputGPU(ScreenPtr output);
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
AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr newScreen);
extern _X_EXPORT void
DetachUnboundGPU(ScreenPtr unbound);
extern _X_EXPORT void
AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr newScreen);
extern _X_EXPORT void
DetachOffloadGPU(ScreenPtr slave);
typedef struct _ColormapRec *ColormapPtr;

1
mi/mipointer_priv.h
View file

@ -7,7 +7,6 @@
#include <X11/Xdefs.h>
#include "dix/screenint_priv.h"
#include "mi/mipointer.h"
void miPointerSetScreen(DeviceIntPtr pDev, int screen_num, int x, int y);