diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 21:32:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 21:32:55 +0100 |
| commit | 3dd4b6420f686b0147d5b8136268cc63196e253b (patch) | |
| tree | 2c81c3f7503dbcfb5b64fd95b40bb1c2204598ef /xorg-server/glamor/glamor_xv.c | |
| parent | 321c01267ae1c446f1bd22b642567fcafa016c02 (diff) | |
| download | vcxsrv-3dd4b6420f686b0147d5b8136268cc63196e253b.tar.gz vcxsrv-3dd4b6420f686b0147d5b8136268cc63196e253b.tar.bz2 vcxsrv-3dd4b6420f686b0147d5b8136268cc63196e253b.zip | |
fontconfig mesa xserver git update 9 Mar 2014
xserver commit 1c61d38528a573caadee2468ee59ea558c822e09
fontconfig commit f8ccf379eb1092592ae0b65deb563c5491f69de9
mesa commit 897f40f25d21af678b1b67c1a68c4a6722d19983
Diffstat (limited to 'xorg-server/glamor/glamor_xv.c')
| -rw-r--r-- | xorg-server/glamor/glamor_xv.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/xorg-server/glamor/glamor_xv.c b/xorg-server/glamor/glamor_xv.c index dc39476b5..fb9045747 100644 --- a/xorg-server/glamor/glamor_xv.c +++ b/xorg-server/glamor/glamor_xv.c @@ -32,10 +32,14 @@ * Xv acceleration implementation */ -#include "glamor_priv.h" +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif -#ifdef GLAMOR_XV #include "xf86xv.h" +#define GLAMOR_FOR_XORG +#include "glamor_priv.h" + #include <X11/extensions/Xv.h> #include "fourcc.h" /* Reference color space transform data */ @@ -430,7 +434,7 @@ glamor_xv_put_image(ScrnInfoPtr pScrn, Bool sync, RegionPtr clipBoxes, void *data, DrawablePtr pDrawable) { - ScreenPtr screen = xf86ScrnToScreen(pScrn); + ScreenPtr screen = pDrawable->pScreen; glamor_port_private *port_priv = (glamor_port_private *) data; INT32 x1, x2, y1, y2; int srcPitch, srcPitch2; @@ -614,12 +618,3 @@ glamor_xv_init(ScreenPtr screen, int num_texture_ports) } return adapt; } -#else -#if 0 -XF86VideoAdaptorPtr -glamor_xv_init(ScreenPtr screen, int num_texture_ports) -{ - return NULL; -} -#endif -#endif |