kdrive: Xv code uses shared screen private instead of kdrive-specific private
When doing the devPrivate API conversion, I missed this as there was also a local private key which wasn't ever used. Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
ab07e2b8ed
commit
6b306f4338
|
@ -105,8 +105,7 @@ static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);
|
||||||
|
|
||||||
static DevPrivateKeyRec KdXVWindowKeyRec;
|
static DevPrivateKeyRec KdXVWindowKeyRec;
|
||||||
#define KdXVWindowKey (&KdXVWindowKeyRec)
|
#define KdXVWindowKey (&KdXVWindowKeyRec)
|
||||||
static DevPrivateKeyRec KdXvScreenKeyRec;
|
static DevPrivateKey KdXvScreenKey;
|
||||||
#define KdXvScreenKey (&KdXvScreenKeyRec)
|
|
||||||
static unsigned long KdXVGeneration = 0;
|
static unsigned long KdXVGeneration = 0;
|
||||||
static unsigned long PortResource = 0;
|
static unsigned long PortResource = 0;
|
||||||
|
|
||||||
|
@ -202,9 +201,6 @@ KdXVScreenInit(
|
||||||
if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0))
|
if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (!dixRegisterPrivateKey(&KdXVScreenKeyRec, PRIVATE_SCREEN, 0))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;
|
if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;
|
||||||
|
|
||||||
KdXvScreenKey = (*XvGetScreenKeyProc)();
|
KdXvScreenKey = (*XvGetScreenKeyProc)();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user