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

xfree86: drop XF86XvScreenKey field 

Not used by any drivers anymore, so no need to keep it around any longer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-04-30 16:56:25 +02:00
parent 14c785aa6f
commit 2ad1d1d6cb
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/common/xf86xv.c
View File

@ -107,15 +107,13 @@ static DevPrivateKeyRec XF86XVWindowKeyRec;
#define XF86XVWindowKey (&XF86XVWindowKeyRec) #define XF86XVWindowKey (&XF86XVWindowKeyRec)
/* dixmain.c XvScreenPtr screen private */
DevPrivateKey XF86XvScreenKey;
/** xf86xv.c XF86XVScreenPtr screen private */ /** xf86xv.c XF86XVScreenPtr screen private */
static DevPrivateKeyRec XF86XVScreenPrivateKey; static DevPrivateKeyRec XF86XVScreenPrivateKey;
static unsigned long PortResource = 0; static unsigned long PortResource = 0;
#define GET_XV_SCREEN(pScreen) \ #define GET_XV_SCREEN(pScreen) \
((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XF86XvScreenKey)) ((XvScreenPtr)dixLookupPrivate(&(pScreen)->devPrivates, XvGetScreenKey()))
#define GET_XF86XV_SCREEN(pScreen) \ #define GET_XF86XV_SCREEN(pScreen) \
((XF86XVScreenPtr)(dixGetPrivate(&pScreen->devPrivates, &XF86XVScreenPrivateKey))) ((XF86XVScreenPtr)(dixGetPrivate(&pScreen->devPrivates, &XF86XVScreenPrivateKey)))
@ -241,8 +239,6 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num)
if (!dixRegisterPrivateKey(&XF86XVScreenPrivateKey, PRIVATE_SCREEN, 0)) if (!dixRegisterPrivateKey(&XF86XVScreenPrivateKey, PRIVATE_SCREEN, 0))
return FALSE; return FALSE;
XF86XvScreenKey = XvGetScreenKey();
PortResource = XvGetRTPort(); PortResource = XvGetRTPort();
ScreenPriv = malloc(sizeof(XF86XVScreenRec)); ScreenPriv = malloc(sizeof(XF86XVScreenRec));

3
hw/xfree86/common/xf86xvmc.c
View File

@ -148,8 +148,7 @@ xf86XvMCScreenInit(ScreenPtr pScreen,
{ {
XvMCAdaptorPtr pAdapt; XvMCAdaptorPtr pAdapt;
xf86XvMCScreenPtr pScreenPriv; xf86XvMCScreenPtr pScreenPriv;
XvScreenPtr pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates, XvScreenPtr pxvs = dixLookupPrivate(&pScreen->devPrivates, XvGetScreenKey());
XF86XvScreenKey);
int i, j; int i, j;
if (noXvExtension) if (noXvExtension)

2
hw/xfree86/common/xf86xvpriv.h
View File

@ -34,8 +34,6 @@
/*** These are DDX layer privates ***/ /*** These are DDX layer privates ***/
extern _X_EXPORT DevPrivateKey XF86XvScreenKey;
typedef struct { typedef struct {
DestroyWindowProcPtr DestroyWindow; DestroyWindowProcPtr DestroyWindow;
ClipNotifyProcPtr ClipNotify; ClipNotifyProcPtr ClipNotify;