diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-04 13:12:34 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-08-06 20:12:20 -0700 |
| commit | a146c6d4212ed199002e40419b4aa22da8f49e3a (patch) | |
| tree | ba155e9ebc5e1bad533f4758ea06ae7a2b62a07e /hw | |
| parent | cb42805c6675bbb9f0b37609fe2ffecc07f46290 (diff) | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kdrive/src/kxv.c | 18 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86xv.c | 18 |
2 files changed, 4 insertions, 32 deletions
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 5aae8f754..0896c8170 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -59,7 +59,6 @@ of the copyright holder. /* XvScreenRec fields */ static Bool KdXVCloseScreen(ScreenPtr); -static int KdXVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *); /* XvAdaptorRec fields */ @@ -153,11 +152,10 @@ KdXVScreenInit(ScreenPtr pScreen, KdVideoAdaptorPtr adaptors, int num) pxvs = GET_XV_SCREEN(pScreen); - /* Anyone initializing the Xv layer must provide these two. - The Xv di layer calls them without even checking if they exist! */ + /* Anyone initializing the Xv layer must provide this. + The Xv di layer calls it without even checking if it exists! */ pxvs->ddCloseScreen = KdXVCloseScreen; - pxvs->ddQueryAdaptors = KdXVQueryAdaptors; /* 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 @@ -1007,18 +1005,6 @@ KdXVCloseScreen(ScreenPtr pScreen) 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 KdXVRunning(ScreenPtr pScreen) { diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index ae20b58a4..35dd664e9 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -57,7 +57,6 @@ /* XvScreenRec fields */ static Bool xf86XVCloseScreen(ScreenPtr); -static int xf86XVQueryAdaptors(ScreenPtr, XvAdaptorPtr *, int *); /* XvAdaptorRec fields */ @@ -249,11 +248,10 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num) pxvs = GET_XV_SCREEN(pScreen); - /* Anyone initializing the Xv layer must provide these two. - The Xv di layer calls them without even checking if they exist! */ + /* Anyone initializing the Xv layer must provide this. + The Xv di layer calls it without even checking if it exists! */ pxvs->ddCloseScreen = xf86XVCloseScreen; - pxvs->ddQueryAdaptors = xf86XVQueryAdaptors; /* 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 @@ -1185,18 +1183,6 @@ xf86XVCloseScreen(ScreenPtr pScreen) 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 ****/ static Bool |