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

xv: Drop the ddQueryAdaptors() interface. 

The core was passing pointers to pxvs's nAdaptors and pAdaptors, and
the two hardware implementations were copying pxvs's nAdaptors and
pAdaptors into those pointers.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-04-04 13:12:34 +01:00
parent cb42805c66
commit a146c6d421
4 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/xvdisp.c
View File

@ -356,8 +356,6 @@ ProcXvQueryAdaptors(ClientPtr client)
return Success; return Success;
} }
(*pxvs->ddQueryAdaptors) (pScreen, &pxvs->pAdaptors, &pxvs->nAdaptors);
rep = (xvQueryAdaptorsReply) { rep = (xvQueryAdaptorsReply) {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,

1
Xext/xvdix.h
View File

@ -214,7 +214,6 @@ typedef struct {
DestroyPixmapProcPtr DestroyPixmap; DestroyPixmapProcPtr DestroyPixmap;
CloseScreenProcPtr CloseScreen; CloseScreenProcPtr CloseScreen;
Bool (*ddCloseScreen) (ScreenPtr); Bool (*ddCloseScreen) (ScreenPtr);
int (*ddQueryAdaptors) (ScreenPtr, XvAdaptorPtr *, int *);
DevUnion devPriv; DevUnion devPriv;
} XvScreenRec, *XvScreenPtr; } XvScreenRec, *XvScreenPtr;

18
hw/kdrive/src/kxv.c
View File

@ -59,7 +59,6 @@ of the copyright holder.
/* XvScreenRec fields */ /* XvScreenRec fields */
static Bool KdXVCloseScreen(ScreenPtr); static Bool KdXVCloseScreen(ScreenPtr);
static int KdXVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *);
/* XvAdaptorRec fields */ /* XvAdaptorRec fields */
@ -153,11 +152,10 @@ KdXVScreenInit(ScreenPtr pScreen, KdVideoAdaptorPtr adaptors, int num)
pxvs = GET_XV_SCREEN(pScreen); pxvs = GET_XV_SCREEN(pScreen);
/* Anyone initializing the Xv layer must provide these two. /* Anyone initializing the Xv layer must provide this.
The Xv di layer calls them without even checking if they exist! */ The Xv di layer calls it without even checking if it exists! */
pxvs->ddCloseScreen = KdXVCloseScreen; pxvs->ddCloseScreen = KdXVCloseScreen;
pxvs->ddQueryAdaptors = KdXVQueryAdaptors;
/* The Xv di layer provides us with a private hook so that we don't /* The Xv di layer provides us with a private hook so that we don't
have to allocate our own screen private. They also provide have to allocate our own screen private. They also provide
@ -1007,18 +1005,6 @@ KdXVCloseScreen(ScreenPtr pScreen)
return TRUE; return TRUE;
} }
static int
KdXVQueryAdaptors(ScreenPtr pScreen,
XvAdaptorPtr * p_pAdaptors, int *p_nAdaptors)
{
XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
*p_nAdaptors = pxvs->nAdaptors;
*p_pAdaptors = pxvs->pAdaptors;
return Success;
}
static Bool static Bool
KdXVRunning(ScreenPtr pScreen) KdXVRunning(ScreenPtr pScreen)
{ {

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

@ -57,7 +57,6 @@
/* XvScreenRec fields */ /* XvScreenRec fields */
static Bool xf86XVCloseScreen(ScreenPtr); static Bool xf86XVCloseScreen(ScreenPtr);
static int xf86XVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *);
/* XvAdaptorRec fields */ /* XvAdaptorRec fields */
@ -249,11 +248,10 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num)
pxvs = GET_XV_SCREEN(pScreen); pxvs = GET_XV_SCREEN(pScreen);
/* Anyone initializing the Xv layer must provide these two. /* Anyone initializing the Xv layer must provide this.
The Xv di layer calls them without even checking if they exist! */ The Xv di layer calls it without even checking if it exists! */
pxvs->ddCloseScreen = xf86XVCloseScreen; pxvs->ddCloseScreen = xf86XVCloseScreen;
pxvs->ddQueryAdaptors = xf86XVQueryAdaptors;
/* The Xv di layer provides us with a private hook so that we don't /* The Xv di layer provides us with a private hook so that we don't
have to allocate our own screen private. They also provide have to allocate our own screen private. They also provide
@ -1185,18 +1183,6 @@ xf86XVCloseScreen(ScreenPtr pScreen)
return TRUE; return TRUE;
} }
static int
xf86XVQueryAdaptors(ScreenPtr pScreen,
XvAdaptorPtr * p_pAdaptors, int *p_nAdaptors)
{
XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);
*p_nAdaptors = pxvs->nAdaptors;
*p_pAdaptors = pxvs->pAdaptors;
return Success;
}
/**** ScrnInfoRec fields ****/ /**** ScrnInfoRec fields ****/
static Bool static Bool