diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /xorg-server/glamor/glamor_xv.c | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
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 |