diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-03-09 15:23:02 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-05-16 19:59:25 +0100 |
| commit | d90b4ecd3214b1eb94da8db07d570d8c5dc1ec33 (patch) | |
| tree | 31b6922e6e626e9e60cb37326293100bc6ef5f80 /src/i830_video.c | |
| parent | fe37e7907b9446659cfa1d086a7be2d2efbc7f70 (diff) | |
XvMC: init driver in one function call
No point splitting this up. Gets rid of two #ifdef INTEL_XVMC blocks
in i830_video.c.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
(cherry picked from commit 411cdcb6fcb60085191cf712aba1e0977f145256)
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Diffstat (limited to 'src/i830_video.c')
| -rw-r--r-- | src/i830_video.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/i830_video.c b/src/i830_video.c index 14f06605..c07c1b91 100644 --- a/src/i830_video.c +++ b/src/i830_video.c @@ -551,9 +551,6 @@ void I830InitVideo(ScreenPtr screen) XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL; XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL; int num_adaptors; -#ifdef INTEL_XVMC - Bool xvmc_status = FALSE; -#endif num_adaptors = xf86XVListGenericAdaptors(scrn, &adaptors); /* Give our adaptor list enough space for the overlay and/or texture video @@ -610,11 +607,6 @@ void I830InitVideo(ScreenPtr screen) if (overlayAdaptor && !intel->XvPreferOverlay) adaptors[num_adaptors++] = overlayAdaptor; -#ifdef INTEL_XVMC - if (intel_xvmc_probe(scrn)) - xvmc_status = TRUE; -#endif - if (num_adaptors) { xf86XVScreenInit(screen, adaptors, num_adaptors); } else { @@ -624,8 +616,8 @@ void I830InitVideo(ScreenPtr screen) } #ifdef INTEL_XVMC - if (xvmc_status && texturedAdaptor) - intel_xvmc_screen_init(screen); + if (texturedAdaptor) + intel_xvmc_adaptor_init(screen); #endif xfree(adaptors); } |