Merge remote branch 'origin/master' into pipe-video

diff --cc configure.ac
index 5d2f9d75d0e661d432efd2142cfcdc932c586f89,b43a9fd1e86abe59fcd740db8c7e9a2b3e037e99..c172c1cbaed169dcac7937c59fd940b8e4afda26
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1315,30 -1424,11 +1424,18 @@@ yes
              PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
              HAVE_ST_XORG="yes"
              ;;
-         es)
-             AC_MSG_WARN([state tracker 'es' has been replaced by --enable-gles-overlay])
- 
-             if test "x$enable_gles_overlay" != xyes; then
-                 if test "x$enable_gles1" != xyes -a "x$enable_gles2" != xyes; then
-                     CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
-                 fi
-                 GLES_OVERLAY=1
-                 EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
-             fi
-           tracker=""
-             ;;
          vega)
-             CORE_DIRS="$CORE_DIRS mapi/vgapi"
-             VG_LIB_DEPS="$VG_LIB_DEPS -lpthread"
-             EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
+             if test "x$enable_openvg" != xyes; then
+                 AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])
+             fi
              ;;
 +        xorg/xvmc)
 +            # Check for libXvMC?
 +            if test "x$enable_gallium_g3dvl" != xyes; then
 +                AC_MSG_ERROR([cannot build XvMC state tracker without --enable-gallium-g3dvl])
 +            fi
 +            HAVE_ST_XVMC="yes"
 +            ;;
          esac
  
        if test -n "$tracker"; then

diff --cc src/gallium/auxiliary/SConscript
Simple merge

diff --cc src/gallium/drivers/nvfx/nvfx_screen.c
Simple merge

diff --cc src/gallium/drivers/r600/r600_pipe.c
Simple merge

diff --cc src/gallium/drivers/softpipe/SConscript
index dea7f885e0def451cbab52bfe416559df94660e1,ea10e8a9f986f5cbb7bd0933aaf1990abf4e3cfa..9b2abdfd7f11caa0e18fdc2b84ef12e86b49c1b3
--- 1/src/gallium/drivers/softpipe/SConscript
--- 2/src/gallium/drivers/softpipe/SConscript
+++ b/src/gallium/drivers/softpipe/SConscript
@@@ -35,7 -35,8 +35,9 @@@ softpipe = env.ConvenienceLibrary
                'sp_tex_tile_cache.c',
                'sp_texture.c',
                'sp_tile_cache.c',
 +              'sp_video_context.c',
        ])
  
+ env.Alias('softpipe', softpipe)
+ 
  Export('softpipe')

diff --cc src/gallium/drivers/softpipe/sp_screen.c
Simple merge