diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-06-16 14:43:52 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-07-03 13:49:27 +0100 |
| commit | 46c0862d205eefa985e36a74391ca392640cb898 (patch) | |
| tree | bc3ef8a78a91718aadcd2600182bc0505fa79e91 /src/vmwarevideo.c | |
| parent | 50c01998c7800bc02fd6656cc14efa715bf63e08 (diff) | |
vmware: drop infoFromScreen inline in favour of new interface
This also should fix the build regression introduced with the fix
for this macro.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/vmwarevideo.c')
| -rw-r--r-- | src/vmwarevideo.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c index 71f21fe..745c71f 100644 --- a/src/vmwarevideo.c +++ b/src/vmwarevideo.c @@ -39,6 +39,7 @@ #endif #include "vmware.h" +#include "vmware_common.h" #include "xf86xv.h" #include "fourcc.h" #include "svga_escape.h" @@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE) Bool vmwareVideoInit(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = infoFromScreen(pScreen); + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL; XF86VideoAdaptorPtr newAdaptor = NULL; int numAdaptors; @@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen) void vmwareVideoEnd(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = infoFromScreen(pScreen); + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); VMWAREPtr pVMWARE = VMWAREPTR(pScrn); VMWAREVideoPtr pVid; int i; |