diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-04-09 20:43:19 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-04-10 12:17:29 +0100 |
| commit | 092e30de8a3476ab99446264edaf9b250a41736b (patch) | |
| tree | b7604b8eadeca4fa7e4f821c27b278dd7c824a7b /src/sna/sna_video.c | |
| parent | 540802595fee7f8b2c73e74c2b44e9a21f6471ae (diff) | |
sna/xvmc: Wrap each output adaptor
Each of the overlay, sprite and textured video can support XvMC
passthrough, so we need to setup an XvMC adaptor for each of our Xv
adaptors.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_video.c')
| -rw-r--r-- | src/sna/sna_video.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/sna/sna_video.c b/src/sna/sna_video.c index a0eb0f4e..6d067c76 100644 --- a/src/sna/sna_video.c +++ b/src/sna/sna_video.c @@ -66,11 +66,8 @@ #define _SNA_XVMC_SERVER_ #include "sna_video_hwmc.h" #else -static inline bool sna_video_xvmc_setup(struct sna *sna, - ScreenPtr ptr, - XF86VideoAdaptorPtr target) +static inline void sna_video_xvmc_setup(struct sna *sna, ScreenPtr ptr) { - return false; } #endif @@ -574,9 +571,8 @@ void sna_video_init(struct sna *sna, ScreenPtr screen) adaptors[num_adaptors++] = overlay; if (num_adaptors) { - Bool ok = xf86XVScreenInit(screen, adaptors, num_adaptors); - if (ok && textured) - sna_video_xvmc_setup(sna, screen, textured); + if (xf86XVScreenInit(screen, adaptors, num_adaptors)) + sna_video_xvmc_setup(sna, screen); } else xf86DrvMsg(sna->scrn->scrnIndex, X_WARNING, "Disabling Xv because no adaptors could be initialized.\n"); |