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

xfree86: xvmc: use CloseScreen hook 

Wrapping ScreenRec's function pointers is problematic for many reasons,
so use the new screen close notify hook instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-04-29 16:47:10 +02:00
parent 743c35c562
commit 0bfea99672
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,6 +36,9 @@
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "dix/screen_hooks_priv.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "resource.h" #include "resource.h"
#include "dixstruct.h" #include "dixstruct.h"
@ -44,7 +47,6 @@
#include "xf86xvmc.h" #include "xf86xvmc.h"
typedef struct { typedef struct {
CloseScreenProcPtr CloseScreen;
int num_adaptors; int num_adaptors;
XF86MCAdaptorPtr *adaptors; XF86MCAdaptorPtr *adaptors;
XvMCAdaptorPtr dixinfo; XvMCAdaptorPtr dixinfo;
@ -129,17 +131,18 @@ xf86XvMCDestroySubpicture(XvMCSubpicturePtr pSubpicture)
pSubpicture); pSubpicture);
} }
static Bool static void xf86XvMCCloseScreen(CallbackListPtr *pcbl,
xf86XvMCCloseScreen(ScreenPtr pScreen) ScreenPtr pScreen, void *unused)
{ {
xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pScreen); dixScreenUnhookClose(pScreen, xf86XvMCCloseScreen);
pScreen->CloseScreen = pScreenPriv->CloseScreen; xf86XvMCScreenPtr pScreenPriv = XF86XVMC_GET_PRIVATE(pScreen);
if (!pScreenPriv)
return;
free(pScreenPriv->dixinfo); free(pScreenPriv->dixinfo);
free(pScreenPriv); free(pScreenPriv);
dixSetPrivate(&pScreen->devPrivates, XF86XvMCScreenKey, NULL);
return (*pScreen->CloseScreen) (pScreen);
} }
Bool Bool
@ -169,9 +172,7 @@ xf86XvMCScreenInit(ScreenPtr pScreen,
} }
dixSetPrivate(&pScreen->devPrivates, XF86XvMCScreenKey, pScreenPriv); dixSetPrivate(&pScreen->devPrivates, XF86XvMCScreenKey, pScreenPriv);
dixScreenHookClose(pScreen, xf86XvMCCloseScreen);
pScreenPriv->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = xf86XvMCCloseScreen;
pScreenPriv->num_adaptors = num_adaptors; pScreenPriv->num_adaptors = num_adaptors;
pScreenPriv->adaptors = adaptors; pScreenPriv->adaptors = adaptors;

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

@ -43,7 +43,6 @@ typedef struct {
Bool (*EnterVT) (ScrnInfoPtr); Bool (*EnterVT) (ScrnInfoPtr);
void (*LeaveVT) (ScrnInfoPtr); void (*LeaveVT) (ScrnInfoPtr);
xf86ModeSetProc *ModeSet; xf86ModeSetProc *ModeSet;
CloseScreenProcPtr CloseScreen;
} XF86XVScreenRec, *XF86XVScreenPtr; } XF86XVScreenRec, *XF86XVScreenPtr;
typedef struct { typedef struct {