From 5d92ee4081a23a6b4d1f9ba2a98985f539f99312 Mon Sep 17 00:00:00 2001 From: Tomas Carnecky Date: Tue, 10 Jul 2012 02:03:08 +0100 Subject: Xv: Remove excessive module-induced indirection Xv used to call XvScreenInit and co. through function pointers, as XvScreenInit may have been sitting on the other side of a module boundary from xf86XvScreenInit. Why this was so is a mystery, but make it not so any more. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Acked-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard --- Xext/xvdix.h | 4 ---- Xext/xvmain.c | 12 ------------ Xext/xvmc.c | 6 ------ 3 files changed, 22 deletions(-) (limited to 'Xext') diff --git a/Xext/xvdix.h b/Xext/xvdix.h index fc8eb0f35..9c6160c3b 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -70,10 +70,6 @@ extern _X_EXPORT RESTYPE XvRTVideoNotify; extern _X_EXPORT RESTYPE XvRTVideoNotifyList; extern _X_EXPORT RESTYPE XvRTPortNotify; -extern DevPrivateKey (*XvGetScreenKeyProc)(void); -extern unsigned long (*XvGetRTPortProc)(void); -extern int (*XvScreenInitProc)(ScreenPtr); - typedef struct { int numerator; int denominator; diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 77c4156de..c2860b86a 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -194,18 +194,6 @@ XvExtensionInit(void) } } -DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL; -unsigned long (*XvGetRTPortProc)(void) = NULL; -int (*XvScreenInitProc)(ScreenPtr) = NULL; - -void -XvRegister(void) -{ - XvScreenInitProc = XvScreenInit; - XvGetScreenKeyProc = XvGetScreenKey; - XvGetRTPortProc = XvGetRTPort; -} - static Bool CreateResourceTypes(void) { diff --git a/Xext/xvmc.c b/Xext/xvmc.c index 910adf48b..ad7956bad 100644 --- a/Xext/xvmc.c +++ b/Xext/xvmc.c @@ -764,12 +764,6 @@ XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt) return Success; } -void -XvMCRegister(void) -{ - XvMCScreenInitProc = XvMCScreenInit; -} - XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id) { -- cgit v1.2.3