xf86-video-vmware: Changes to 'master'

[Thomas Hellstrom]

 src/Makefile.am              |    2 +-
 src/vmware.c                 |    5 ++---
 src/vmware.h                 |    8 ++++----
 src/vmware_bootstrap.c       |   35 ++++++++++-------------------------
 vmwgfx/vmwgfx_ctrl.c         |   40 ++++++++++++++++++++--------------------
 vmwgfx/vmwgfx_driver.c       |    1 -
 vmwgfx/vmwgfx_driver.h       |    9 +++++++++
 vmwgfx/vmwgfx_xa_composite.c |   20 ++++++++++----------
 8 files changed, 56 insertions(+), 64 deletions(-)

New commits:
commit ecf6c5b1081e70ec64132a8188c8cc15945c2290
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Thu Feb 2 10:24:26 2012 +0100

    vmware: Kill warnings on Xserver 1.12
    
    Compile-tested on servers 1.0 through 1.12.
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>

commit 3e18d43c7f8ab5dcb94ac285a687eaaa1a578250
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Wed Feb 1 17:30:52 2012 +0100

    vmwgfx: Kill a deprecation warning on server 1.12
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>

commit bfb286bea967c26426aebda2a581f35da0d86884
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Wed Feb 1 17:25:19 2012 +0100

    vmwgfx: Fix up swap[sl] for server 1.12
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>

commit 8ff19c2b2f288d6851b444dbda39544980837b73
Author: Thomas Hellstrom <thellstrom at vmware.com>
Date:   Wed Feb 1 16:59:13 2012 +0100

    vmwgfx: Avoid including a library header and use pixman for type conversion
    
    The PictTransform type is a typedef of a pixman type.
    
    Signed-off-by: Thomas Hellstrom <thellstrom at vmware.com>