diff -Nru libva-1.0.4/aclocal.m4 libva-1.0.1/aclocal.m4
--- libva-1.0.4/aclocal.m4	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/aclocal.m4	2010-02-12 17:47:55.000000000 +0000
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -7986,7 +7986,6 @@
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
@@ -8014,10 +8013,7 @@
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
@@ -8030,6 +8026,7 @@
 		AC_MSG_RESULT([no])
 		PKG_CONFIG=""
 	fi
+		
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -8038,31 +8035,34 @@
 # Check to see whether a particular set of modules exists.  Similar
 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
 #
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
 # --------------------------------------------------------------
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
+  m4_ifval([$2], [$2], [:])
 m4_ifvaln([$3], [else
   $3])dnl
 fi])
 
+
 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
@@ -8104,17 +8104,16 @@
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	m4_default([$4], [AC_MSG_ERROR(
+	ifelse([$4], , [AC_MSG_ERROR(dnl
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -8122,24 +8121,25 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])dnl
-        ])
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
-        ])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	$3
+	ifelse([$3], , :, [$3])
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
diff -Nru libva-1.0.4/Android.mk libva-1.0.1/Android.mk
--- libva-1.0.4/Android.mk	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/Android.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-# Recursive call sub-folder Android.mk
-#
-LOCAL_PATH := $(my-dir)
-
-include $(LOCAL_PATH)/va/Android.mk
diff -Nru libva-1.0.4/config.guess libva-1.0.1/config.guess
--- libva-1.0.4/config.guess	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/config.guess	2010-02-12 17:47:56.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2009-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,9 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -334,9 +333,6 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -811,12 +807,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:*)
+    *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    authenticamd | genuineintel | EM64T)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -858,20 +854,6 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -894,17 +876,6 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -930,18 +901,39 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -950,11 +942,8 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -977,6 +966,58 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1206,16 +1247,6 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff -Nru libva-1.0.4/config.h.in libva-1.0.1/config.h.in
--- libva-1.0.4/config.h.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/config.h.in	2010-02-12 17:47:56.000000000 +0000
@@ -3,12 +3,6 @@
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
-/* Define to 1 if you have the <GL/glx.h> header file. */
-#undef HAVE_GL_GLX_H
-
-/* Define to 1 if you have the <GL/gl.h> header file. */
-#undef HAVE_GL_GL_H
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
diff -Nru libva-1.0.4/config.sub libva-1.0.1/config.sub
--- libva-1.0.4/config.sub	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/config.sub	2010-02-12 17:47:56.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2010-01-22'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,16 +32,13 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -75,9 +72,8 @@
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -153,7 +149,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -288,7 +284,6 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -296,14 +291,13 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
-	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -346,7 +340,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -374,17 +368,15 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
-	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -734,9 +726,6 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
-		basic_machine=microblaze-xilinx
-		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1087,11 +1076,6 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
-        # This must be matched before tile*.
-        tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
 		basic_machine=tile-unknown
 		os=-linux-gnu
@@ -1263,9 +1247,6 @@
         # First match some system type aliases
         # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
-		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1287,8 +1268,8 @@
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1309,7 +1290,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1442,8 +1423,6 @@
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
 	-none)
 		;;
 	*)
diff -Nru libva-1.0.4/configure libva-1.0.1/configure
--- libva-1.0.4/configure	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/configure	2010-02-12 17:47:55.000000000 +0000
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libva 0.31.1.
+# Generated by GNU Autoconf 2.65 for libva 0.31.0.
 #
 # Report bugs to <waldo.bastian@intel.com>.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -319,7 +319,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -359,19 +359,19 @@
 fi # as_fn_arith
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -682,7 +682,7 @@
 exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='libva'
 PACKAGE_TARNAME='libva'
-PACKAGE_VERSION='0.31.1'
-PACKAGE_STRING='libva 0.31.1'
+PACKAGE_VERSION='0.31.0'
+PACKAGE_STRING='libva 0.31.0'
 PACKAGE_BUGREPORT='waldo.bastian@intel.com'
 PACKAGE_URL=''
 
@@ -752,14 +752,6 @@
 pkgconfigdir
 LIBVA_LIBS
 LIBVA_CFLAGS
-USE_GLX_FALSE
-USE_GLX_TRUE
-GL_DEPS_LIBS
-GL_DEPS_CFLAGS
-BUILD_DUMMY_BACKEND_FALSE
-BUILD_DUMMY_BACKEND_TRUE
-UDEV_LIBS
-UDEV_CFLAGS
 BUILD_I965_DRIVER_FALSE
 BUILD_I965_DRIVER_TRUE
 HAVE_GEN4ASM_FALSE
@@ -774,8 +766,6 @@
 XEXT_CFLAGS
 X11_LIBS
 X11_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
 PKG_CONFIG
 CPP
 OTOOL64
@@ -894,9 +884,7 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_glx
 enable_dummy_driver
-enable_dummy_backend
 enable_i965_driver
 with_drivers_path
 enable_static
@@ -918,8 +906,6 @@
 CPPFLAGS
 CPP
 PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
 X11_CFLAGS
 X11_LIBS
 XEXT_CFLAGS
@@ -929,9 +915,7 @@
 DRM_CFLAGS
 DRM_LIBS
 GEN4ASM_CFLAGS
-GEN4ASM_LIBS
-UDEV_CFLAGS
-UDEV_LIBS'
+GEN4ASM_LIBS'
 
 
 # Initialize some variables set by options.
@@ -994,9 +978,8 @@
   fi
 
   case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -1041,7 +1024,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1067,7 +1050,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1271,7 +1254,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1287,7 +1270,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1317,8 +1300,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
@@ -1326,7 +1309,7 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
@@ -1344,13 +1327,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1373,7 +1356,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1387,8 +1370,8 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1403,9 +1386,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1444,11 +1427,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1474,7 +1457,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libva 0.31.1 to adapt to many kinds of systems.
+\`configure' configures libva 0.31.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1488,7 +1471,7 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
+  -q, --quiet, --silent   do not print \`checking...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
@@ -1544,7 +1527,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libva 0.31.1:";;
+     short | recursive ) echo "Configuration of libva 0.31.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1552,9 +1535,7 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-glx            build with OpenGL for X11 support
   --enable-dummy-driver   build dummy video driver
-  --enable-dummy-backend  build dummy libva backend
   --enable-i965-driver    build i965 video driver
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1584,10 +1565,6 @@
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
   X11_CFLAGS  C compiler flags for X11, overriding pkg-config
   X11_LIBS    linker flags for X11, overriding pkg-config
   XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
@@ -1601,8 +1578,6 @@
               C compiler flags for GEN4ASM, overriding pkg-config
   GEN4ASM_LIBS
               linker flags for GEN4ASM, overriding pkg-config
-  UDEV_CFLAGS C compiler flags for UDEV, overriding pkg-config
-  UDEV_LIBS   linker flags for UDEV, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1670,10 +1645,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libva configure 0.31.1
-generated by GNU Autoconf 2.67
+libva configure 0.31.0
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1777,7 +1752,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1820,7 +1795,7 @@
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
+  test $ac_status = 0; } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1886,7 +1861,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1944,103 +1919,12 @@
   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 
 } # ac_fn_c_check_func
-
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_header_compiler=yes
-else
-  ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  ac_header_preproc=yes
-else
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-  yes:no: )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## -------------------------------------- ##
-## Report this to waldo.bastian@intel.com ##
-## -------------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=\$ac_header_compiler"
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-
-} # ac_fn_c_check_header_mongrel
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libva $as_me 0.31.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+It was created by libva $as_me 0.31.0, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -2150,9 +2034,11 @@
   {
     echo
 
-    $as_echo "## ---------------- ##
+    cat <<\_ASBOX
+## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##"
+## ---------------- ##
+_ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2186,9 +2072,11 @@
 )
     echo
 
-    $as_echo "## ----------------- ##
+    cat <<\_ASBOX
+## ----------------- ##
 ## Output variables. ##
-## ----------------- ##"
+## ----------------- ##
+_ASBOX
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2201,9 +2089,11 @@
     echo
 
     if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
+      cat <<\_ASBOX
+## ------------------- ##
 ## File substitutions. ##
-## ------------------- ##"
+## ------------------- ##
+_ASBOX
       echo
       for ac_var in $ac_subst_files
       do
@@ -2217,9 +2107,11 @@
     fi
 
     if test -s confdefs.h; then
-      $as_echo "## ----------- ##
+      cat <<\_ASBOX
+## ----------- ##
 ## confdefs.h. ##
-## ----------- ##"
+## ----------- ##
+_ASBOX
       echo
       cat confdefs.h
       echo
@@ -2274,12 +2166,7 @@
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
@@ -2294,11 +2181,7 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+    . "$ac_site_file"
   fi
 done
 
@@ -2374,7 +2257,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2392,22 +2275,16 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2523,11 +2400,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2549,7 +2426,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" "$LINENO" 5
    fi
 
@@ -2559,7 +2436,7 @@
    # Ok.
    :
 else
-   as_fn_error $? "newly created file is older than distributed files!
+   as_fn_error "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -2797,7 +2674,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2805,7 +2682,7 @@
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -2839,7 +2716,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2855,7 +2732,7 @@
 
 # Define the identity of the package.
  PACKAGE='libva'
- VERSION='0.31.1'
+ VERSION='0.31.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2901,29 +2778,21 @@
 
 LIBVA_MAJOR_VERSION=0
 LIBVA_MINOR_VERSION=31
-LIBVA_MICRO_VERSION=1
-LIBVA_VERSION=0.31.1
+LIBVA_MICRO_VERSION=0
+LIBVA_VERSION=0.31.0
 
 
 
 
 
 LIBVA_LT_CURRENT=1
-LIBVA_LT_REV=4
+LIBVA_LT_REV=1
 LIBVA_LT_AGE=0
 LIBVA_LT_VERSION="$LIBVA_LT_CURRENT:$LIBVA_LT_REV:$LIBVA_LT_AGE"
 LIBVA_LT_LDFLAGS="-version-info $LIBVA_LT_VERSION"
 
 
 
-# Check whether --enable-glx was given.
-if test "${enable_glx+set}" = set; then :
-  enableval=$enable_glx;
-else
-  enable_glx=yes
-fi
-
-
 # Check whether --enable-dummy-driver was given.
 if test "${enable_dummy_driver+set}" = set; then :
   enableval=$enable_dummy_driver;
@@ -2940,14 +2809,6 @@
 fi
 
 
-# Check whether --enable-dummy-backend was given.
-if test "${enable_dummy_backend+set}" = set; then :
-  enableval=$enable_dummy_backend;
-else
-  enable_dummy_backend=no
-fi
-
-
 # Check whether --enable-i965-driver was given.
 if test "${enable_i965_driver+set}" = set; then :
   enableval=$enable_i965_driver;
@@ -3026,7 +2887,7 @@
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
@@ -3037,16 +2898,16 @@
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3071,7 +2932,7 @@
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
@@ -3079,7 +2940,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3457,8 +3318,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3572,8 +3433,9 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3615,8 +3477,8 @@
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3673,9 +3535,9 @@
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
+as_fn_error "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
     fi
   fi
 fi
@@ -3726,8 +3588,8 @@
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -4131,7 +3993,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
@@ -4207,7 +4069,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
@@ -4273,7 +4135,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -4340,7 +4202,7 @@
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -4456,7 +4318,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if test "${lt_cv_prog_gnu_ld+set}" = set; then :
@@ -4658,13 +4520,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4661: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4523: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4664: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4526: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4667: output\"" >&5)
+  (eval echo "\"\$as_me:4529: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5870,7 +5732,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5873 "configure"' > conftest.$ac_ext
+  echo '#line 5735 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6659,7 +6521,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6675,11 +6537,11 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
@@ -6718,7 +6580,7 @@
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
@@ -6734,18 +6596,18 @@
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -6874,7 +6736,8 @@
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -7365,11 +7228,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7368: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7231: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7372: \$? = $ac_status" >&5
+   echo "$as_me:7235: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7704,11 +7567,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7707: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7570: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7711: \$? = $ac_status" >&5
+   echo "$as_me:7574: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7809,11 +7672,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7812: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7675: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7816: \$? = $ac_status" >&5
+   echo "$as_me:7679: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7864,11 +7727,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7867: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7730: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7871: \$? = $ac_status" >&5
+   echo "$as_me:7734: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10248,7 +10111,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10251 "configure"
+#line 10114 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10344,7 +10207,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10347 "configure"
+#line 10210 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10871,8 +10734,8 @@
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -11552,10 +11415,6 @@
 
 
 
-
-
-
-
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11668,16 +11527,18 @@
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
+
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
 $as_echo_n "checking for X11... " >&6; }
 
-if test -n "$X11_CFLAGS"; then
-    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$X11_CFLAGS"; then
+        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -11687,13 +11548,15 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$X11_LIBS"; then
-    pkg_cv_X11_LIBS="$X11_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$X11_LIBS"; then
+        pkg_cv_X11_LIBS="$X11_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
@@ -11703,15 +11566,14 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -11719,14 +11581,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
         else
-	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
+	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$X11_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (x11) were not met:
+	as_fn_error "Package requirements (x11) were not met:
 
 $X11_PKG_ERRORS
 
@@ -11735,13 +11597,12 @@
 
 Alternatively, you may set the environment variables X11_CFLAGS
 and X11_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+See the pkg-config man page for more details.
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -11750,23 +11611,24 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	X11_CFLAGS=$pkg_cv_X11_CFLAGS
 	X11_LIBS=$pkg_cv_X11_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	:
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5
 $as_echo_n "checking for XEXT... " >&6; }
 
-if test -n "$XEXT_CFLAGS"; then
-    pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XEXT_CFLAGS"; then
+        pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xext") 2>&5
   ac_status=$?
@@ -11776,13 +11638,15 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XEXT_LIBS"; then
-    pkg_cv_XEXT_LIBS="$XEXT_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XEXT_LIBS"; then
+        pkg_cv_XEXT_LIBS="$XEXT_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xext") 2>&5
   ac_status=$?
@@ -11792,15 +11656,14 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -11808,14 +11671,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xext" 2>&1`
+	        XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xext"`
         else
-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xext" 2>&1`
+	        XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XEXT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (xext) were not met:
+	as_fn_error "Package requirements (xext) were not met:
 
 $XEXT_PKG_ERRORS
 
@@ -11824,13 +11687,12 @@
 
 Alternatively, you may set the environment variables XEXT_CFLAGS
 and XEXT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+See the pkg-config man page for more details.
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -11839,23 +11701,24 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XEXT_CFLAGS=$pkg_cv_XEXT_CFLAGS
 	XEXT_LIBS=$pkg_cv_XEXT_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	:
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFIXES" >&5
 $as_echo_n "checking for XFIXES... " >&6; }
 
-if test -n "$XFIXES_CFLAGS"; then
-    pkg_cv_XFIXES_CFLAGS="$XFIXES_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XFIXES_CFLAGS"; then
+        pkg_cv_XFIXES_CFLAGS="$XFIXES_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfixes\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xfixes") 2>&5
   ac_status=$?
@@ -11865,13 +11728,15 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$XFIXES_LIBS"; then
-    pkg_cv_XFIXES_LIBS="$XFIXES_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$XFIXES_LIBS"; then
+        pkg_cv_XFIXES_LIBS="$XFIXES_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfixes\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xfixes") 2>&5
   ac_status=$?
@@ -11881,15 +11746,14 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -11897,14 +11761,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfixes" 2>&1`
+	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfixes"`
         else
-	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfixes" 2>&1`
+	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfixes"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XFIXES_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (xfixes) were not met:
+	as_fn_error "Package requirements (xfixes) were not met:
 
 $XFIXES_PKG_ERRORS
 
@@ -11913,13 +11777,12 @@
 
 Alternatively, you may set the environment variables XFIXES_CFLAGS
 and XFIXES_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+See the pkg-config man page for more details.
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -11928,23 +11791,24 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	XFIXES_CFLAGS=$pkg_cv_XFIXES_CFLAGS
 	XFIXES_LIBS=$pkg_cv_XFIXES_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	:
 fi
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRM" >&5
 $as_echo_n "checking for DRM... " >&6; }
 
-if test -n "$DRM_CFLAGS"; then
-    pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRM_CFLAGS"; then
+        pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
   ac_status=$?
@@ -11954,13 +11818,15 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$DRM_LIBS"; then
-    pkg_cv_DRM_LIBS="$DRM_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$DRM_LIBS"; then
+        pkg_cv_DRM_LIBS="$DRM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
   ac_status=$?
@@ -11970,15 +11836,14 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -11986,14 +11851,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm" 2>&1`
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm"`
         else
-	        DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm" 2>&1`
+	        DRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DRM_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libdrm) were not met:
+	as_fn_error "Package requirements (libdrm) were not met:
 
 $DRM_PKG_ERRORS
 
@@ -12002,13 +11867,12 @@
 
 Alternatively, you may set the environment variables DRM_CFLAGS
 and DRM_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+See the pkg-config man page for more details.
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -12017,13 +11881,13 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	DRM_CFLAGS=$pkg_cv_DRM_CFLAGS
 	DRM_LIBS=$pkg_cv_DRM_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-
+	:
 fi
 
 
@@ -12031,10 +11895,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEN4ASM" >&5
 $as_echo_n "checking for GEN4ASM... " >&6; }
 
-if test -n "$GEN4ASM_CFLAGS"; then
-    pkg_cv_GEN4ASM_CFLAGS="$GEN4ASM_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GEN4ASM_CFLAGS"; then
+        pkg_cv_GEN4ASM_CFLAGS="$GEN4ASM_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5
   ac_status=$?
@@ -12044,13 +11909,15 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
-if test -n "$GEN4ASM_LIBS"; then
-    pkg_cv_GEN4ASM_LIBS="$GEN4ASM_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GEN4ASM_LIBS"; then
+        pkg_cv_GEN4ASM_LIBS="$GEN4ASM_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5
   ac_status=$?
@@ -12060,15 +11927,14 @@
 else
   pkg_failed=yes
 fi
- else
-    pkg_failed=untried
+    fi
+else
+	pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -12076,17 +11942,17 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "intel-gen4asm >= 1.0" 2>&1`
+	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"`
         else
-	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --print-errors "intel-gen4asm >= 1.0" 2>&1`
+	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GEN4ASM_PKG_ERRORS" >&5
 
-	gen4asm=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+                gen4asm=no
+elif test $pkg_failed = untried; then
 	gen4asm=no
 else
 	GEN4ASM_CFLAGS=$pkg_cv_GEN4ASM_CFLAGS
@@ -12104,10 +11970,10 @@
 fi
 
 
-# Check for libdrm >= 2.4.21 (needed for i965_drv_video.so)
-if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4.21 libdrm; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdrm < 2.4.21 found, disabling build of i965 video driver" >&5
-$as_echo "$as_me: WARNING: libdrm < 2.4.21 found, disabling build of i965 video driver" >&2;}
+# Check for libdrm >= 2.4 (needed for i965_drv_video.so)
+if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdrm < 2.4 found, disabling build of i965 video driver" >&5
+$as_echo "$as_me: WARNING: libdrm < 2.4 found, disabling build of i965 video driver" >&2;}
     enable_i965_driver=no
 fi
  if test x$enable_i965_driver = xyes; then
@@ -12119,173 +11985,6 @@
 fi
 
 
-if test x$enable_dummy_backend = xyes; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UDEV" >&5
-$as_echo_n "checking for UDEV... " >&6; }
-
-if test -n "$UDEV_CFLAGS"; then
-    pkg_cv_UDEV_CFLAGS="$UDEV_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_UDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$UDEV_LIBS"; then
-    pkg_cv_UDEV_LIBS="$UDEV_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libudev") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_UDEV_LIBS=`$PKG_CONFIG --libs "libudev" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        UDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libudev" 2>&1`
-        else
-	        UDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors "libudev" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$UDEV_PKG_ERRORS" >&5
-
-	libudev=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	libudev=no
-else
-	UDEV_CFLAGS=$pkg_cv_UDEV_CFLAGS
-	UDEV_LIBS=$pkg_cv_UDEV_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	libudev=yes
-fi
-fi
-if test x$libudev = xno; then
-   enable_dummy_backend=no
-fi
- if test x$enable_dummy_backend = xyes; then
-  BUILD_DUMMY_BACKEND_TRUE=
-  BUILD_DUMMY_BACKEND_FALSE='#'
-else
-  BUILD_DUMMY_BACKEND_TRUE='#'
-  BUILD_DUMMY_BACKEND_FALSE=
-fi
-
-
-# Check for OpenGL (X11)
-USE_GLX="no"
-GL_DEPS_CFLAGS=""
-GL_DEPS_LIBS=""
-if test x$enable_glx = xyes; then
-    for ac_header in GL/gl.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default"
-if test "x$ac_cv_header_GL_gl_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GL_GL_H 1
-_ACEOF
-
-fi
-
-done
-
-    for ac_header in GL/glx.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "GL/glx.h" "ac_cv_header_GL_glx_h" "$ac_includes_default"
-if test "x$ac_cv_header_GL_glx_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GL_GLX_H 1
-_ACEOF
-
-fi
-
-done
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
-$as_echo_n "checking for glXCreateContext in -lGL... " >&6; }
-if test "${ac_cv_lib_GL_glXCreateContext+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char glXCreateContext ();
-int
-main ()
-{
-return glXCreateContext ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_GL_glXCreateContext=yes
-else
-  ac_cv_lib_GL_glXCreateContext=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glXCreateContext" >&5
-$as_echo "$ac_cv_lib_GL_glXCreateContext" >&6; }
-if test "x$ac_cv_lib_GL_glXCreateContext" = x""yes; then :
-
-        USE_GLX="yes"
-        GL_DEPS_LIBS="-lX11 -lGL"
-
-fi
-
-fi
-
-
- if test "$USE_GLX" = "yes"; then
-  USE_GLX_TRUE=
-  USE_GLX_FALSE='#'
-else
-  USE_GLX_TRUE='#'
-  USE_GLX_FALSE=
-fi
-
-
 # We only need the headers, we don't link against the DRM libraries
 LIBVA_CFLAGS="$DRM_CFLAGS"
 
@@ -12300,7 +11999,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile va/Makefile va/va_version.h va/x11/Makefile va/glx/Makefile va/dummy/Makefile dummy_drv_video/Makefile i965_drv_video/Makefile i965_drv_video/shaders/Makefile i965_drv_video/shaders/h264/Makefile i965_drv_video/shaders/h264/mc/Makefile i965_drv_video/shaders/mpeg2/Makefile i965_drv_video/shaders/mpeg2/vld/Makefile i965_drv_video/shaders/render/Makefile test/Makefile test/basic/Makefile test/decode/Makefile test/putsurface/Makefile test/encode/Makefile libva.pc libva-x11.pc libva-glx.pc"
+ac_config_files="$ac_config_files Makefile src/Makefile src/va_version.h src/x11/Makefile dummy_drv_video/Makefile i965_drv_video/Makefile i965_drv_video/shaders/Makefile i965_drv_video/shaders/mpeg2/Makefile i965_drv_video/shaders/mpeg2/vld/Makefile i965_drv_video/shaders/render/Makefile test/Makefile test/basic/Makefile test/decode/Makefile test/putsurface/Makefile test/encode/Makefile libva.pc libva-x11.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12385,7 +12084,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -12409,35 +12107,27 @@
 fi
 
 if test -z "${BUILD_DUMMY_DRIVER_TRUE}" && test -z "${BUILD_DUMMY_DRIVER_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_DUMMY_DRIVER\" was never defined.
+  as_fn_error "conditional \"BUILD_DUMMY_DRIVER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
+  as_fn_error "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_GEN4ASM_TRUE}" && test -z "${HAVE_GEN4ASM_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_GEN4ASM\" was never defined.
+  as_fn_error "conditional \"HAVE_GEN4ASM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${BUILD_I965_DRIVER_TRUE}" && test -z "${BUILD_I965_DRIVER_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_I965_DRIVER\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${BUILD_DUMMY_BACKEND_TRUE}" && test -z "${BUILD_DUMMY_BACKEND_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_DUMMY_BACKEND\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${USE_GLX_TRUE}" && test -z "${USE_GLX_FALSE}"; then
-  as_fn_error $? "conditional \"USE_GLX\" was never defined.
+  as_fn_error "conditional \"BUILD_I965_DRIVER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -12587,19 +12277,19 @@
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
+# script with status $?, using 1 if that was 0.
 as_fn_error ()
 {
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
   fi
-  $as_echo "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $1" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -12795,7 +12485,7 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
@@ -12848,8 +12538,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libva $as_me 0.31.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+This file was extended by libva $as_me 0.31.0, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -12914,11 +12604,11 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libva config.status 0.31.1
-configured by $0, generated by GNU Autoconf 2.67,
+libva config.status 0.31.0
+configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -12936,16 +12626,11 @@
 while test $# != 0
 do
   case $1 in
-  --*=?*)
+  --*=*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
   *)
     ac_option=$1
     ac_optarg=$2
@@ -12967,7 +12652,6 @@
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
@@ -12980,7 +12664,7 @@
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
+    as_fn_error "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
@@ -12989,7 +12673,7 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
+  -*) as_fn_error "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
@@ -13302,16 +12986,12 @@
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "va/Makefile") CONFIG_FILES="$CONFIG_FILES va/Makefile" ;;
-    "va/va_version.h") CONFIG_FILES="$CONFIG_FILES va/va_version.h" ;;
-    "va/x11/Makefile") CONFIG_FILES="$CONFIG_FILES va/x11/Makefile" ;;
-    "va/glx/Makefile") CONFIG_FILES="$CONFIG_FILES va/glx/Makefile" ;;
-    "va/dummy/Makefile") CONFIG_FILES="$CONFIG_FILES va/dummy/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/va_version.h") CONFIG_FILES="$CONFIG_FILES src/va_version.h" ;;
+    "src/x11/Makefile") CONFIG_FILES="$CONFIG_FILES src/x11/Makefile" ;;
     "dummy_drv_video/Makefile") CONFIG_FILES="$CONFIG_FILES dummy_drv_video/Makefile" ;;
     "i965_drv_video/Makefile") CONFIG_FILES="$CONFIG_FILES i965_drv_video/Makefile" ;;
     "i965_drv_video/shaders/Makefile") CONFIG_FILES="$CONFIG_FILES i965_drv_video/shaders/Makefile" ;;
-    "i965_drv_video/shaders/h264/Makefile") CONFIG_FILES="$CONFIG_FILES i965_drv_video/shaders/h264/Makefile" ;;
-    "i965_drv_video/shaders/h264/mc/Makefile") CONFIG_FILES="$CONFIG_FILES i965_drv_video/shaders/h264/mc/Makefile" ;;
     "i965_drv_video/shaders/mpeg2/Makefile") CONFIG_FILES="$CONFIG_FILES i965_drv_video/shaders/mpeg2/Makefile" ;;
     "i965_drv_video/shaders/mpeg2/vld/Makefile") CONFIG_FILES="$CONFIG_FILES i965_drv_video/shaders/mpeg2/vld/Makefile" ;;
     "i965_drv_video/shaders/render/Makefile") CONFIG_FILES="$CONFIG_FILES i965_drv_video/shaders/render/Makefile" ;;
@@ -13322,9 +13002,8 @@
     "test/encode/Makefile") CONFIG_FILES="$CONFIG_FILES test/encode/Makefile" ;;
     "libva.pc") CONFIG_FILES="$CONFIG_FILES libva.pc" ;;
     "libva-x11.pc") CONFIG_FILES="$CONFIG_FILES libva-x11.pc" ;;
-    "libva-glx.pc") CONFIG_FILES="$CONFIG_FILES libva-glx.pc" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -13362,7 +13041,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -13379,7 +13058,7 @@
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -13393,18 +13072,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -13493,28 +13172,20 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^\([^=]*=[	 ]*\):*/\1/
 s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
@@ -13542,7 +13213,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -13627,7 +13298,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -13640,7 +13311,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -13668,7 +13339,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -13695,7 +13366,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -13832,22 +13503,22 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
+which seems to be undefined.  Please make sure it is defined." >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -13858,19 +13529,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -14655,7 +14326,7 @@
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -14676,7 +14347,7 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff -Nru libva-1.0.4/configure.ac libva-1.0.1/configure.ac
--- libva-1.0.4/configure.ac	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/configure.ac	2009-12-17 03:05:38.000000000 +0000
@@ -23,13 +23,13 @@
 # libva package version number, (as distinct from shared library version)
 m4_define([libva_major_version], [0])
 m4_define([libva_minor_version], [31])
-m4_define([libva_micro_version], [1])
+m4_define([libva_micro_version], [0])
 
 m4_define([libva_version],
           [libva_major_version.libva_minor_version.libva_micro_version])
 
 # if the library source code has changed, increment revision
-m4_define([libva_lt_revision], [4])
+m4_define([libva_lt_revision], [1])
 # if any interface was added/removed/changed, then inc current, reset revision
 m4_define([libva_lt_current], [1])
 # if any interface was added since last public release, then increment age
@@ -60,22 +60,12 @@
 AC_SUBST(LIBVA_LT_VERSION)
 AC_SUBST(LIBVA_LT_LDFLAGS)
 
-AC_ARG_ENABLE(glx,
-              [AC_HELP_STRING([--enable-glx],
-                              [build with OpenGL for X11 support])],
-              [], [enable_glx=yes])
-
 AC_ARG_ENABLE(dummy-driver,
               [AC_HELP_STRING([--enable-dummy-driver],
                               [build dummy video driver])],
               [], [enable_dummy_driver=yes])
 AM_CONDITIONAL(BUILD_DUMMY_DRIVER, test x$enable_dummy_driver = xyes)
 
-AC_ARG_ENABLE(dummy-backend,
-              [AC_HELP_STRING([--enable-dummy-backend],
-                              [build dummy libva backend])],
-              [], [enable_dummy_backend=no])
-
 AC_ARG_ENABLE(i965-driver,
               [AC_HELP_STRING([--enable-i965-driver],
                               [build i965 video driver])],
@@ -103,37 +93,13 @@
 PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.0], [gen4asm=yes], [gen4asm=no])
 AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes)
 
-# Check for libdrm >= 2.4.21 (needed for i965_drv_video.so)
-if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4.21 libdrm; then
-    AC_MSG_WARN([libdrm < 2.4.21 found, disabling build of i965 video driver])
+# Check for libdrm >= 2.4 (needed for i965_drv_video.so)
+if test x$enable_i965_driver = xyes && ! $PKG_CONFIG --atleast-version=2.4 libdrm; then
+    AC_MSG_WARN([libdrm < 2.4 found, disabling build of i965 video driver])
     enable_i965_driver=no
 fi
 AM_CONDITIONAL(BUILD_I965_DRIVER, test x$enable_i965_driver = xyes)
 
-if test x$enable_dummy_backend = xyes; then
-    PKG_CHECK_MODULES([UDEV], [libudev], [libudev=yes], [libudev=no])
-fi
-if test x$libudev = xno; then
-   enable_dummy_backend=no
-fi
-AM_CONDITIONAL(BUILD_DUMMY_BACKEND, test x$enable_dummy_backend = xyes)
-
-# Check for OpenGL (X11)
-USE_GLX="no"
-GL_DEPS_CFLAGS=""
-GL_DEPS_LIBS=""
-if test x$enable_glx = xyes; then
-    AC_CHECK_HEADERS([GL/gl.h])
-    AC_CHECK_HEADERS([GL/glx.h])
-    AC_CHECK_LIB(GL, glXCreateContext, [
-        USE_GLX="yes"
-        GL_DEPS_LIBS="-lX11 -lGL"
-    ])
-fi
-AC_SUBST(GL_DEPS_CFLAGS)
-AC_SUBST(GL_DEPS_LIBS)
-AM_CONDITIONAL(USE_GLX, test "$USE_GLX" = "yes")
-
 # We only need the headers, we don't link against the DRM libraries
 LIBVA_CFLAGS="$DRM_CFLAGS"
 AC_SUBST(LIBVA_CFLAGS)
@@ -150,16 +116,12 @@
 
 AC_OUTPUT([
 	Makefile
-	va/Makefile
-	va/va_version.h
-	va/x11/Makefile
-	va/glx/Makefile
-	va/dummy/Makefile
+	src/Makefile
+	src/va_version.h
+	src/x11/Makefile
 	dummy_drv_video/Makefile
 	i965_drv_video/Makefile
 	i965_drv_video/shaders/Makefile
-	i965_drv_video/shaders/h264/Makefile
-	i965_drv_video/shaders/h264/mc/Makefile
 	i965_drv_video/shaders/mpeg2/Makefile
 	i965_drv_video/shaders/mpeg2/vld/Makefile
 	i965_drv_video/shaders/render/Makefile
@@ -170,6 +132,5 @@
 	test/encode/Makefile
 	libva.pc
 	libva-x11.pc
-	libva-glx.pc
 ])
 
diff -Nru libva-1.0.4/debian/changelog libva-1.0.1/debian/changelog
--- libva-1.0.4/debian/changelog	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/changelog	2010-11-20 21:12:33.000000000 +0000
@@ -1,18 +1,8 @@
-libva (1.0.4-1~ppa1~lucid1) lucid; urgency=low
+libva (1.0.1-3~ppa1~lucid2) lucid; urgency=low
 
-  * Backport to Lucidbleed ppa.
+  * Backport to Lucid.
 
- -- Nicola Ferralis <feranick@hotmail.com>  Thu, 18 Nov 2010 13:50:00 -0800
-
-libva (1.0.4-1) experimental; urgency=low
-
-  * New upstream release.
-  * Fix bad names for library packages.
-  * Update Standards-Version to 3.9.1. No changes needed.
-  * Include TPI and GLX libraries. (Closes: #592070)
-  * Have dev package also depend on new TPI and GLX library packages.
-
- -- Andres Mejia <mcitadel@gmail.com>  Fri, 10 Sep 2010 13:52:00 -0400
+ -- Nicola Ferralis <feranick@hotmail.com>  Sat, 17 Jul 2010 13:06:44 -0700
 
 libva (1.0.1-3) unstable; urgency=low
 
diff -Nru libva-1.0.4/debian/control libva-1.0.1/debian/control
--- libva-1.0.4/debian/control	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/control	2010-11-20 21:12:33.000000000 +0000
@@ -5,12 +5,11 @@
 Build-Depends: debhelper (>= 7.0.50),
                quilt (>= 0.46-7),
                pkg-config,
-               libdrm-dev (>= 2.4.21),
+               libdrm-dev (>= 2.3.0),
                libxext-dev,
                libxfixes-dev,
                libx11-dev,
-               libgl1-mesa-dev | libgl-dev,
-Standards-Version: 3.9.1
+Standards-Version: 3.8.4
 Section: libs
 Homepage: http://www.freedesktop.org/wiki/Software/vaapi
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/libva.git
@@ -24,10 +23,6 @@
          libva1 (<< ${source:Upstream-Version}+1~),
          libva-x11-1 (>= ${source:Upstream-Version}),
          libva-x11-1 (<< ${source:Upstream-Version}+1~),
-         libva-tpi1 (>= ${source:Upstream-Version}),
-         libva-tpi1 (<< ${source:Upstream-Version}+1~),
-         libva-glx1 (>= ${source:Upstream-Version}),
-         libva-glx1 (<< ${source:Upstream-Version}+1~),
          ${shlibs:Depends},
          ${misc:Depends}
 Description: Video Acceleration (VA) API for Linux -- development files
@@ -72,36 +67,6 @@
  .
  This package provides the libva-x11 library.
 
-Package: libva-glx1
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Video Acceleration (VA) API for Linux -- GLX runtime
- Video Acceleration API (VA API) is a library ("libVA") and API specification
- which enables and provides access to graphics hardware (GPU) acceleration for
- video processing on Linux and UNIX based operating systems. Accelerated
- processing includes video decoding, video encoding, subpicture blending and
- rendering. The specification was originally designed by Intel for its GMA
- (Graphics Media Accelerator) series of GPU hardware, the API is however not
- limited to GPUs or Intel specific hardware, as other hardware and manufacturers
- can also freely use this API for hardware accelerated video decoding.
- .
- This package provides the libva-glx library.
-
-Package: libva-tpi1
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Video Acceleration (VA) API for Linux -- TPI runtime
- Video Acceleration API (VA API) is a library ("libVA") and API specification
- which enables and provides access to graphics hardware (GPU) acceleration for
- video processing on Linux and UNIX based operating systems. Accelerated
- processing includes video decoding, video encoding, subpicture blending and
- rendering. The specification was originally designed by Intel for its GMA
- (Graphics Media Accelerator) series of GPU hardware, the API is however not
- limited to GPUs or Intel specific hardware, as other hardware and manufacturers
- can also freely use this API for hardware accelerated video decoding.
- .
- This package provides the libva-tpi library.
-
 Package: i965-va-driver
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Provides: va-driver
diff -Nru libva-1.0.4/debian/libva-dev.install libva-1.0.1/debian/libva-dev.install
--- libva-1.0.4/debian/libva-dev.install	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/libva-dev.install	2010-11-20 21:12:33.000000000 +0000
@@ -1,6 +1,4 @@
 usr/include
 usr/lib/libva.so
 usr/lib/libva-x11.so
-usr/lib/libva-glx.so
-usr/lib/libva-tpi.so
 usr/lib/pkgconfig
diff -Nru libva-1.0.4/debian/libva-get-orig-source libva-1.0.1/debian/libva-get-orig-source
--- libva-1.0.4/debian/libva-get-orig-source	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/libva-get-orig-source	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# This script is used to download the upstream source for libva and
-# generate it into an orig source tarball for Debian.
-
-# Common variables used to ease maintenance of this script
-LIBVA_VERSION="1.0.4"
-LIBVA_TARBALL="libva-$LIBVA_VERSION.tar.gz"
-LIBVA_TARBALL_CHECKSUM="29a415ce293a515df8d2ee499b97ba752ee631f6f4403f2d982acbf39b92a225"
-LIBVA_ORIG_TARBALL="libva_$LIBVA_VERSION.orig.tar.gz"
-USAGE="\n\
-This script is used to generate the orig tarball used in building\n\
-Debian packages for libva-$LIBVA_VERSION.\n\
-Usage: libva-get-orig-source [OPTION]\n\
-\n\
- -h, --help                 Display this help message.\n"
-
-while [ "$#" -gt "0" ]
-do
-    case "$1" in
-        -h|--help|*)
-            echo "${USAGE}"
-            exit 1
-            ;;
-    esac
-done
-
-make_current_tarball() {
-    # Download the tarball if it's not available in the current directory
-    [ -f $LIBVA_TARBALL ] || \
-        wget -c http://cgit.freedesktop.org/libva/snapshot/$LIBVA_TARBALL
-
-    # Verify the checksum
-    COMPUTED_CHECKSUM=`sha256sum $LIBVA_TARBALL | cut -d ' ' -f 1`
-    if [ $LIBVA_TARBALL_CHECKSUM != $COMPUTED_CHECKSUM ] ; then
-        echo "Checksum verification failed. Checksum was $COMPUTED_CHECKSUM
-    Expected checksum $LIBVA_TARBALL_CHECKSUM."
-        exit 1
-    else
-        echo "Checksum verified. Checksum is $COMPUTED_CHECKSUM."
-    fi
-
-    # Extract tarball and run 'autoreconf -vif'
-    echo "Extracting tarball and running 'autoreconf -vif'"
-    tar -zxf $LIBVA_TARBALL
-    cd libva-$LIBVA_VERSION
-    autoreconf -vif
-    cd ..
-
-    # Remove temp files and other cruft from source tarball
-    # The find command snippet here was taken from debhelper's dh_clean command
-    # with some modification to delete more unneeded files.
-    echo "Removing temp files and other cruft from source tarball"
-    find libva-$LIBVA_VERSION \( \( -type f -a \
-        \( -name '#*#' -o -name '.*~' -o -name '*~' -o -name DEADJOE \
-        -o -name '*.orig' -o -name '*.rej' -o -name '*.bak' \
-        -o -name '.*.orig' -o -name .*.rej -o -name '.SUMS' \
-        -o -name TAGS -o \( -path '*/.deps/*' -a -name '*.P' \) \
-        -o -name config.status -o -name config.cache -o -name config.log \
-        \) -exec rm -f "{}" \; \) -o \
-        \( -type d -a -name autom4te.cache -prune -exec rm -rf "{}" \; \) \)
-    rm libva-$LIBVA_VERSION/.gitignore
-    rm libva-$LIBVA_VERSION/.cvsignore
-    rm -rf libva-$LIBVA_VERSION/debian
-
-    # Remove empty directories
-    echo "Removing empty directories"
-    find libva-$LIBVA_VERSION -type d -empty -delete
-
-    # Repack tarball to final orig tarball
-    echo "Creating orig tarball"
-    tar --exclude-vcs -zcf "$LIBVA_ORIG_TARBALL" "libva-$LIBVA_VERSION/"
-}
-
-make_current_tarball
diff -Nru libva-1.0.4/debian/libva-glx1.install libva-1.0.1/debian/libva-glx1.install
--- libva-1.0.4/debian/libva-glx1.install	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/libva-glx1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/libva-glx.so.*
diff -Nru libva-1.0.4/debian/libva-tpi1.install libva-1.0.1/debian/libva-tpi1.install
--- libva-1.0.4/debian/libva-tpi1.install	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/libva-tpi1.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/libva-tpi.so.*
diff -Nru libva-1.0.4/debian/patches/autoreconf.patch libva-1.0.1/debian/patches/autoreconf.patch
--- libva-1.0.4/debian/patches/autoreconf.patch	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/patches/autoreconf.patch	2010-11-20 21:12:33.000000000 +0000
@@ -1,5 +1,1153 @@
 Patch that applies modifications after running 'autoreconf -vif'
 ==========================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -217,6 +217,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -7986,6 +7986,7 @@
+ m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+ 
+ # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ # 
+ # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+ #
+@@ -8013,7 +8014,10 @@
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -8026,7 +8030,6 @@
+ 		AC_MSG_RESULT([no])
+ 		PKG_CONFIG=""
+ 	fi
+-		
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+ 
+@@ -8035,34 +8038,31 @@
+ # Check to see whether a particular set of modules exists.  Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+-  m4_ifval([$2], [$2], [:])
++  m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+   $3])dnl
+ fi])
+ 
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$PKG_CONFIG"; then
+-    if test -n "$$1"; then
+-        pkg_cv_[]$1="$$1"
+-    else
+-        PKG_CHECK_EXISTS([$3],
+-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+-			 [pkg_failed=yes])
+-    fi
+-else
+-	pkg_failed=untried
++[if test -n "$$1"; then
++    pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++    PKG_CHECK_EXISTS([$3],
++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++		     [pkg_failed=yes])
++ else
++    pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+ 
+@@ -8104,16 +8104,17 @@
+ See the pkg-config man page for more details.])
+ 
+ if test $pkg_failed = yes; then
++   	AC_MSG_RESULT([no])
+         _PKG_SHORT_ERRORS_SUPPORTED
+         if test $_pkg_short_errors_supported = yes; then
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+         else 
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ 
+-	ifelse([$4], , [AC_MSG_ERROR(dnl
++	m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+ 
+ $$1_PKG_ERRORS
+@@ -8121,25 +8122,24 @@
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT
+-])],
+-		[AC_MSG_RESULT([no])
+-                $4])
++_PKG_TEXT])dnl
++        ])
+ elif test $pkg_failed = untried; then
+-	ifelse([$4], , [AC_MSG_FAILURE(dnl
++     	AC_MSG_RESULT([no])
++	m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+-		[$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++        ])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+         AC_MSG_RESULT([yes])
+-	ifelse([$3], , :, [$3])
++	$3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+--- a/config.guess
++++ b/config.guess
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-06-10'
++timestamp='2009-12-30'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -27,16 +27,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches@gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,8 +56,9 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -333,6 +334,9 @@
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	eval $set_cc_for_build
+ 	SUN_ARCH="i386"
+@@ -807,12 +811,12 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    *:Interix*:[3456]*)
++    *:Interix*:*)
+     	case ${UNAME_MACHINE} in
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd | genuineintel)
++	    authenticamd | genuineintel | EM64T)
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+@@ -854,6 +858,20 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -876,6 +894,17 @@
+     frv:Linux:*:*)
+     	echo frv-unknown-linux-gnu
+ 	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+@@ -901,39 +930,18 @@
+ 	#endif
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+ 	echo or32-unknown-linux-gnu
+ 	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+-	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+-	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep -q ld.so.1
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+-	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+ 	exit ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -942,8 +950,11 @@
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+@@ -966,58 +977,6 @@
+     xtensa*:Linux:*:*)
+     	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+@@ -1247,6 +1206,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+--- a/config.sub
++++ b/config.sub
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-06-11'
++timestamp='2010-01-22'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -32,13 +32,16 @@
+ 
+ 
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,7 +153,7 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+@@ -284,6 +288,7 @@
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
++	| rx \
+ 	| score \
+ 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+@@ -291,13 +296,14 @@
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ 	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
++	| ubicom32 \
+ 	| v850 | v850e \
+ 	| we32k \
+ 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ 	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
++	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+@@ -340,7 +346,7 @@
+ 	| lm32-* \
+ 	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+@@ -368,15 +374,17 @@
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+-	| romp-* | rs6000-* \
++	| romp-* | rs6000-* | rx-* \
+ 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+ 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile-* | tilegx-* \
+ 	| tron-* \
++	| ubicom32-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -726,6 +734,9 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++        microblaze)
++		basic_machine=microblaze-xilinx
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+@@ -1076,6 +1087,11 @@
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
++		os=-linux-gnu
++		;;
+ 	tile*)
+ 		basic_machine=tile-unknown
+ 		os=-linux-gnu
+@@ -1247,6 +1263,9 @@
+         # First match some system type aliases
+         # that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++        -auroraux)
++	        os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1268,8 +1287,8 @@
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+-	      | -kopensolaris* \
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1290,7 +1309,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1423,6 +1442,8 @@
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++        -nacl*)
++	        ;;
+ 	-none)
+ 		;;
+ 	*)
+--- a/configure
++++ b/configure
+@@ -766,6 +766,8 @@
+ XEXT_CFLAGS
+ X11_LIBS
+ X11_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ CPP
+ OTOOL64
+@@ -906,6 +908,8 @@
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ X11_CFLAGS
+ X11_LIBS
+ XEXT_CFLAGS
+@@ -1565,6 +1569,10 @@
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   PKG_CONFIG  path to pkg-config utility
++  PKG_CONFIG_PATH
++              directories to add to pkg-config's search path
++  PKG_CONFIG_LIBDIR
++              path overriding pkg-config's built-in search path
+   X11_CFLAGS  C compiler flags for X11, overriding pkg-config
+   X11_LIBS    linker flags for X11, overriding pkg-config
+   XEXT_CFLAGS C compiler flags for XEXT, overriding pkg-config
+@@ -4520,13 +4528,13 @@
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:4523: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4531: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4526: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4534: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:4529: output\"" >&5)
++  (eval echo "\"\$as_me:4537: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -5732,7 +5740,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5735 "configure"' > conftest.$ac_ext
++  echo '#line 5743 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7228,11 +7236,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7231: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7239: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7235: \$? = $ac_status" >&5
++   echo "$as_me:7243: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7567,11 +7575,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7570: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7578: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7574: \$? = $ac_status" >&5
++   echo "$as_me:7582: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s "$ac_outfile"; then
+      # The compiler can only warn and ignore the option if not recognized
+      # So say no if there are warnings other than the usual output.
+@@ -7672,11 +7680,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7675: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7683: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:7679: \$? = $ac_status" >&5
++   echo "$as_me:7687: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -7727,11 +7735,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:7730: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7738: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:7734: \$? = $ac_status" >&5
++   echo "$as_me:7742: \$? = $ac_status" >&5
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -10111,7 +10119,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10114 "configure"
++#line 10122 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10207,7 +10215,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 10210 "configure"
++#line 10218 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11415,6 +11423,10 @@
+ 
+ 
+ 
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -11527,18 +11539,16 @@
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+-
+ fi
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
+ $as_echo_n "checking for X11... " >&6; }
+ 
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$X11_CFLAGS"; then
+-        pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$X11_CFLAGS"; then
++    pkg_cv_X11_CFLAGS="$X11_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+   ac_status=$?
+@@ -11548,15 +11558,13 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$X11_LIBS"; then
+-        pkg_cv_X11_LIBS="$X11_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$X11_LIBS"; then
++    pkg_cv_X11_LIBS="$X11_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+   ac_status=$?
+@@ -11566,14 +11574,15 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+ 
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -11581,9 +11590,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"`
++	        X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11" 2>&1`
+         else
+-	        X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"`
++	        X11_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$X11_PKG_ERRORS" >&5
+@@ -11597,9 +11606,10 @@
+ 
+ Alternatively, you may set the environment variables X11_CFLAGS
+ and X11_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -11617,18 +11627,17 @@
+ 	X11_LIBS=$pkg_cv_X11_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5
+ $as_echo_n "checking for XEXT... " >&6; }
+ 
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$XEXT_CFLAGS"; then
+-        pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$XEXT_CFLAGS"; then
++    pkg_cv_XEXT_CFLAGS="$XEXT_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "xext") 2>&5
+   ac_status=$?
+@@ -11638,15 +11647,13 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$XEXT_LIBS"; then
+-        pkg_cv_XEXT_LIBS="$XEXT_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$XEXT_LIBS"; then
++    pkg_cv_XEXT_LIBS="$XEXT_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xext\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "xext") 2>&5
+   ac_status=$?
+@@ -11656,14 +11663,15 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+ 
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -11671,9 +11679,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xext"`
++	        XEXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xext" 2>&1`
+         else
+-	        XEXT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xext"`
++	        XEXT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xext" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$XEXT_PKG_ERRORS" >&5
+@@ -11687,9 +11695,10 @@
+ 
+ Alternatively, you may set the environment variables XEXT_CFLAGS
+ and XEXT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -11707,18 +11716,17 @@
+ 	XEXT_LIBS=$pkg_cv_XEXT_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFIXES" >&5
+ $as_echo_n "checking for XFIXES... " >&6; }
+ 
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$XFIXES_CFLAGS"; then
+-        pkg_cv_XFIXES_CFLAGS="$XFIXES_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$XFIXES_CFLAGS"; then
++    pkg_cv_XFIXES_CFLAGS="$XFIXES_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfixes\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "xfixes") 2>&5
+   ac_status=$?
+@@ -11728,15 +11736,13 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$XFIXES_LIBS"; then
+-        pkg_cv_XFIXES_LIBS="$XFIXES_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$XFIXES_LIBS"; then
++    pkg_cv_XFIXES_LIBS="$XFIXES_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xfixes\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "xfixes") 2>&5
+   ac_status=$?
+@@ -11746,14 +11752,15 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+ 
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -11761,9 +11768,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xfixes"`
++	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xfixes" 2>&1`
+         else
+-	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xfixes"`
++	        XFIXES_PKG_ERRORS=`$PKG_CONFIG --print-errors "xfixes" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$XFIXES_PKG_ERRORS" >&5
+@@ -11777,9 +11784,10 @@
+ 
+ Alternatively, you may set the environment variables XFIXES_CFLAGS
+ and XFIXES_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -11797,18 +11805,17 @@
+ 	XFIXES_LIBS=$pkg_cv_XFIXES_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRM" >&5
+ $as_echo_n "checking for DRM... " >&6; }
+ 
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$DRM_CFLAGS"; then
+-        pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$DRM_CFLAGS"; then
++    pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
+   ac_status=$?
+@@ -11818,15 +11825,13 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$DRM_LIBS"; then
+-        pkg_cv_DRM_LIBS="$DRM_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$DRM_LIBS"; then
++    pkg_cv_DRM_LIBS="$DRM_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libdrm") 2>&5
+   ac_status=$?
+@@ -11836,14 +11841,15 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+ 
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -11851,9 +11857,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm"`
++	        DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm" 2>&1`
+         else
+-	        DRM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm"`
++	        DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$DRM_PKG_ERRORS" >&5
+@@ -11867,9 +11873,10 @@
+ 
+ Alternatively, you may set the environment variables DRM_CFLAGS
+ and DRM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -11887,7 +11894,7 @@
+ 	DRM_LIBS=$pkg_cv_DRM_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -11895,11 +11902,10 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEN4ASM" >&5
+ $as_echo_n "checking for GEN4ASM... " >&6; }
+ 
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$GEN4ASM_CFLAGS"; then
+-        pkg_cv_GEN4ASM_CFLAGS="$GEN4ASM_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$GEN4ASM_CFLAGS"; then
++    pkg_cv_GEN4ASM_CFLAGS="$GEN4ASM_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5
+   ac_status=$?
+@@ -11909,15 +11915,13 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$GEN4ASM_LIBS"; then
+-        pkg_cv_GEN4ASM_LIBS="$GEN4ASM_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$GEN4ASM_LIBS"; then
++    pkg_cv_GEN4ASM_LIBS="$GEN4ASM_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"intel-gen4asm >= 1.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "intel-gen4asm >= 1.0") 2>&5
+   ac_status=$?
+@@ -11927,14 +11931,15 @@
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+ 
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -11942,17 +11947,17 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"`
++	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "intel-gen4asm >= 1.0" 2>&1`
+         else
+-	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "intel-gen4asm >= 1.0"`
++	        GEN4ASM_PKG_ERRORS=`$PKG_CONFIG --print-errors "intel-gen4asm >= 1.0" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GEN4ASM_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                gen4asm=no
++	gen4asm=no
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	gen4asm=no
+ else
+ 	GEN4ASM_CFLAGS=$pkg_cv_GEN4ASM_CFLAGS
 --- a/dummy_drv_video/Makefile.in
 +++ b/dummy_drv_video/Makefile.in
 @@ -91,6 +91,7 @@
@@ -10,89 +1158,224 @@
  am_dummy_drv_video_la_OBJECTS = dummy_drv_video.lo object_heap.lo
  dummy_drv_video_la_OBJECTS = $(am_dummy_drv_video_la_OBJECTS)
  dummy_drv_video_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-@@ -258,8 +259,6 @@
+@@ -182,6 +183,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+@@ -252,8 +255,6 @@
  dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
  dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
  dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
--dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
--dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd
+-dummy_drv_video_la_LIBADD = $(top_srcdir)/src/$(libvabackendlib)
+-dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA
  dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
  noinst_HEADERS = dummy_drv_video.h object_heap.h
+--- a/i965_drv_video/Makefile.in
++++ b/i965_drv_video/Makefile.in
+@@ -223,6 +223,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+--- a/i965_drv_video/shaders/Makefile.in
++++ b/i965_drv_video/shaders/Makefile.in
+@@ -153,6 +153,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+--- a/i965_drv_video/shaders/mpeg2/Makefile.in
++++ b/i965_drv_video/shaders/mpeg2/Makefile.in
+@@ -153,6 +153,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+--- a/i965_drv_video/shaders/mpeg2/vld/Makefile.in
++++ b/i965_drv_video/shaders/mpeg2/vld/Makefile.in
+@@ -113,6 +113,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+--- a/i965_drv_video/shaders/render/Makefile.in
++++ b/i965_drv_video/shaders/render/Makefile.in
+@@ -113,6 +113,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -227,6 +227,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+@@ -310,9 +312,9 @@
+ libva_la_LDFLAGS = $(LDADD) -no-undefined
+ libva_la_LIBADD = $(LIBVA_LIBS) -ldl
+ libva_x11_la_SOURCES = 
+-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
++libva_x11_la_LIBADD = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
+ libva_x11_la_LDFLAGS = $(LDADD)
+-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
++libva_x11_la_DEPENDENCIES = x11/libva_x11.la
+ SUBDIRS = x11
+ libva_la_SOURCES = va.c
+ libvaincludedir = ${includedir}/va
+--- a/src/x11/Makefile.in
++++ b/src/x11/Makefile.in
+@@ -179,6 +179,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -194,6 +194,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+@@ -262,8 +264,12 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
+-vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
++vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
++
++vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
++
+ vainfo_SOURCES = vainfo.c
+ SUBDIRS = basic decode encode putsurface
+ all: all-recursive
 --- a/test/basic/Makefile.in
 +++ b/test/basic/Makefile.in
-@@ -270,7 +270,9 @@
+@@ -196,6 +196,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+@@ -264,7 +266,9 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
 +
  test_01_LDADD = $(TEST_LIBS)
  test_01_SOURCES = test_01.c
  test_02_LDADD = $(TEST_LIBS)
 --- a/test/decode/Makefile.in
 +++ b/test/decode/Makefile.in
-@@ -231,7 +231,9 @@
+@@ -157,6 +157,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+@@ -225,7 +227,9 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
 +
  mpeg2vldemo_LDADD = $(TEST_LIBS)
  mpeg2vldemo_SOURCES = mpeg2vldemo.c
  all: all-am
 --- a/test/encode/Makefile.in
 +++ b/test/encode/Makefile.in
-@@ -231,7 +231,9 @@
+@@ -157,6 +157,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+@@ -225,7 +227,9 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
 +
  h264encode_LDADD = $(TEST_LIBS)
  h264encode_SOURCES = h264encode.c
  all: all-am
 --- a/test/putsurface/Makefile.in
 +++ b/test/putsurface/Makefile.in
-@@ -71,7 +71,8 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_putsurface_OBJECTS = putsurface.$(OBJEXT)
- putsurface_OBJECTS = $(am_putsurface_OBJECTS)
--am__DEPENDENCIES_1 = $(top_builddir)/va/$(libvabackendlib)
-+am__DEPENDENCIES_1 = $(top_builddir)/va/$(libvabackendlib) \
-+	$(top_builddir)/va/$(libvacorelib)
- putsurface_DEPENDENCIES = $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -232,7 +233,10 @@
+@@ -157,6 +157,8 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ RANLIB = @RANLIB@
+ SED = @SED@
+ SET_MAKE = @SET_MAKE@
+@@ -225,7 +227,9 @@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib) \
-+  -lpthread
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
 +
  putsurface_LDADD = $(TEST_LIBS)
  putsurface_SOURCES = putsurface.c
- EXTRA_DIST = loadsurface.h
---- a/va/Makefile.in
-+++ b/va/Makefile.in
-@@ -339,9 +339,9 @@
- libva_x11_backend = libva-x11.la
- libva_x11_backenddir = x11
- libva_x11_la_SOURCES = 
--libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
-+libva_x11_la_LIBADD = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
- libva_x11_la_LDFLAGS = $(LDADD)
--libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
-+libva_x11_la_DEPENDENCIES = x11/libva_x11.la
- @BUILD_DUMMY_BACKEND_FALSE@libva_dummy_backend = 
- @BUILD_DUMMY_BACKEND_TRUE@libva_dummy_backend = libva-dummy.la
- @BUILD_DUMMY_BACKEND_FALSE@libva_dummy_backenddir = 
+ all: all-am
diff -Nru libva-1.0.4/debian/patches/fix-warnings.patch libva-1.0.1/debian/patches/fix-warnings.patch
--- libva-1.0.4/debian/patches/fix-warnings.patch	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/patches/fix-warnings.patch	2010-11-20 21:12:33.000000000 +0000
@@ -1,6 +1,19 @@
 Patch to fix a few warnings.
-Fix "cast to pointer from integer of different size" warning.
+Fix for strtok_r is for "expected ‘char * __restrict__’ but argument is of type
+‘const char *’" warning.
+Second is to fix "cast to pointer from integer of different size" warning.
 ==========================================================================
+--- a/src/va.c
++++ b/src/va.c
+@@ -141,7 +141,7 @@
+     }
+ 
+     search_path = strdup((const char *)search_path);
+-    driver_dir = strtok_r((const char *)search_path, ":", &saveptr);
++    driver_dir = strtok_r(search_path, ":", &saveptr);
+     while(driver_dir)
+     {
+         void *handle = NULL;
 --- a/test/putsurface/putsurface.c
 +++ b/test/putsurface/putsurface.c
 @@ -241,7 +241,7 @@
diff -Nru libva-1.0.4/debian/patches/remove-unneeded-dep2.patch libva-1.0.1/debian/patches/remove-unneeded-dep2.patch
--- libva-1.0.4/debian/patches/remove-unneeded-dep2.patch	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/patches/remove-unneeded-dep2.patch	2010-11-20 21:12:33.000000000 +0000
@@ -1,29 +1,29 @@
 Patch to remove unnecessary dependency on libva for libva-x11. libva-x11 uses
 none of libva's symbols.
 ==========================================================================
---- a/va/Makefile.am
-+++ b/va/Makefile.am
-@@ -43,9 +43,9 @@
- libva_x11_backenddir   = x11
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,9 +37,9 @@
+ libva_la_LIBADD = $(LIBVA_LIBS) -ldl
  
  libva_x11_la_SOURCES = 
--libva_x11_la_LIBADD  = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
-+libva_x11_la_LIBADD  = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
+-libva_x11_la_LIBADD  = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
++libva_x11_la_LIBADD  = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
  libva_x11_la_LDFLAGS = $(LDADD)
 -libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
 +libva_x11_la_DEPENDENCIES = x11/libva_x11.la
  
- if BUILD_DUMMY_BACKEND
- libva_dummy_backend = libva-dummy.la
+ SUBDIRS = x11
+ 
 --- a/test/basic/Makefile.am
 +++ b/test/basic/Makefile.am
 @@ -25,7 +25,8 @@
  
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
  
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
  
  test_01_LDADD = $(TEST_LIBS)
  test_01_SOURCES = test_01.c
@@ -31,11 +31,11 @@
 +++ b/test/decode/Makefile.am
 @@ -24,7 +24,8 @@
  
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
  
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
  
  mpeg2vldemo_LDADD = $(TEST_LIBS)
  mpeg2vldemo_SOURCES = mpeg2vldemo.c
@@ -43,24 +43,38 @@
 +++ b/test/encode/Makefile.am
 @@ -24,7 +24,8 @@
  
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
  
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib)
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
  
  h264encode_LDADD = $(TEST_LIBS)
  h264encode_SOURCES = h264encode.c
 --- a/test/putsurface/Makefile.am
 +++ b/test/putsurface/Makefile.am
-@@ -24,7 +24,9 @@
+@@ -24,7 +24,8 @@
  
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
  
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib) \
-+  -lpthread
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
  
  putsurface_LDADD = $(TEST_LIBS)
  putsurface_SOURCES = putsurface.c
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -26,8 +26,10 @@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
+ 
+ 
+-vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
+-vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
++vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
++vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) \
++	$(top_srcdir)/src/$(libvacorelib)
+ vainfo_SOURCES = vainfo.c
+ 
+ SUBDIRS = basic decode encode putsurface
diff -Nru libva-1.0.4/debian/patches/remove-unneeded-dep.patch libva-1.0.1/debian/patches/remove-unneeded-dep.patch
--- libva-1.0.4/debian/patches/remove-unneeded-dep.patch	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/patches/remove-unneeded-dep.patch	2010-11-20 21:12:33.000000000 +0000
@@ -6,8 +6,8 @@
  dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
  dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
  dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
--dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
--dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
+-dummy_drv_video_la_LIBADD = $(top_srcdir)/src/$(libvabackendlib)
+-dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
  
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA
  dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
diff -Nru libva-1.0.4/debian/rules libva-1.0.1/debian/rules
--- libva-1.0.4/debian/rules	2010-11-20 21:12:32.000000000 +0000
+++ libva-1.0.1/debian/rules	2010-11-20 21:12:33.000000000 +0000
@@ -14,6 +14,3 @@
 override_dh_auto_configure:
 	dh_testdir
 	./configure $(CONFIGURE_OPTIONS)
-
-get-orig-source:
-	$(dir $_)libva-get-orig-source
diff -Nru libva-1.0.4/dummy_drv_video/dummy_drv_video.c libva-1.0.1/dummy_drv_video/dummy_drv_video.c
--- libva-1.0.4/dummy_drv_video/dummy_drv_video.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/dummy_drv_video/dummy_drv_video.c	2009-12-17 03:05:38.000000000 +0000
@@ -22,13 +22,12 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <va/va_backend.h>
+#include "va_backend.h"
 
 #include "dummy_drv_video.h"
 
 #include "assert.h"
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 
@@ -1040,7 +1039,7 @@
 VAStatus dummy_PutSurface(
    		VADriverContextP ctx,
 		VASurfaceID surface,
-		void *draw, /* X Drawable */
+		Drawable draw, /* X Drawable */
 		short srcx,
 		short srcy,
 		unsigned short srcw,
@@ -1055,10 +1054,6 @@
 	)
 {
     /* TODO */
-    Drawable drawable = (Drawable)draw;
-
-    (void)drawable;
-    
     return VA_STATUS_ERROR_UNKNOWN;
 }
 
@@ -1111,22 +1106,7 @@
 }
 
 
-VAStatus dummy_BufferInfo(
-        VADriverContextP ctx,
-        VAContextID context,	/* in */
-        VABufferID buf_id,	/* in */
-        VABufferType *type,	/* out */
-        unsigned int *size,    	/* out */
-        unsigned int *num_elements /* out */
-    )
-{
-    /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
-
-    
-
-VAStatus dummy_LockSurface(
+VAStatus dummy_CopySurfaceToBuffer(
 		VADriverContextP ctx,
 		VASurfaceID surface,
                 unsigned int *fourcc, /* following are output argument */
@@ -1136,21 +1116,11 @@
                 unsigned int *luma_offset,
                 unsigned int *chroma_u_offset,
                 unsigned int *chroma_v_offset,
-                unsigned int *buffer_name,
 		void **buffer
 	)
 {
     /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
-
-VAStatus dummy_UnlockSurface(
-		VADriverContextP ctx,
-		VASurfaceID surface
-	)
-{
-    /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
+    return VA_STATUS_ERROR_UNKNOWN;
 }
 
 VAStatus dummy_Terminate( VADriverContextP ctx )
@@ -1251,9 +1221,8 @@
     ctx->vtable.vaQueryDisplayAttributes = dummy_QueryDisplayAttributes;
     ctx->vtable.vaGetDisplayAttributes = dummy_GetDisplayAttributes;
     ctx->vtable.vaSetDisplayAttributes = dummy_SetDisplayAttributes;
-    ctx->vtable.vaLockSurface = dummy_LockSurface;
-    ctx->vtable.vaUnlockSurface = dummy_UnlockSurface;
-    ctx->vtable.vaBufferInfo = dummy_BufferInfo;
+    
+    ctx->vtable.vaCopySurfaceToBuffer = dummy_CopySurfaceToBuffer;
 
     driver_data = (struct dummy_driver_data *) malloc( sizeof(*driver_data) );
     ctx->pDriverData = (void *) driver_data;
diff -Nru libva-1.0.4/dummy_drv_video/dummy_drv_video.h libva-1.0.1/dummy_drv_video/dummy_drv_video.h
--- libva-1.0.4/dummy_drv_video/dummy_drv_video.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/dummy_drv_video/dummy_drv_video.h	2009-12-17 03:05:38.000000000 +0000
@@ -25,7 +25,7 @@
 #ifndef _DUMMY_DRV_VIDEO_H_
 #define _DUMMY_DRV_VIDEO_H_
 
-#include <va/va.h>
+#include "va.h"
 #include "object_heap.h"
 
 #define DUMMY_MAX_PROFILES			11
diff -Nru libva-1.0.4/dummy_drv_video/Makefile.am libva-1.0.1/dummy_drv_video/Makefile.am
--- libva-1.0.4/dummy_drv_video/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/dummy_drv_video/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -23,10 +23,10 @@
 dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
 dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
 dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
-dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
-dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
+dummy_drv_video_la_LIBADD = $(top_srcdir)/src/$(libvabackendlib)
+dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
 
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA
 dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
 
 noinst_HEADERS = dummy_drv_video.h object_heap.h
diff -Nru libva-1.0.4/dummy_drv_video/Makefile.in libva-1.0.1/dummy_drv_video/Makefile.in
--- libva-1.0.4/dummy_drv_video/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/dummy_drv_video/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -142,8 +142,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -184,15 +182,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -258,9 +252,9 @@
 dummy_drv_video_la_LTLIBRARIES = dummy_drv_video.la
 dummy_drv_video_ladir = @LIBVA_DRIVERS_PATH@
 dummy_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined
-dummy_drv_video_la_LIBADD = $(top_builddir)/va/$(libvabackendlib)
-dummy_drv_video_la_DEPENDENCIES = $(top_builddir)/va/$(libvabackendlib)
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd
+dummy_drv_video_la_LIBADD = $(top_srcdir)/src/$(libvabackendlib)
+dummy_drv_video_la_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/../../include/external/ -I$(top_srcdir)/../../include/kmd -DIN_LIBVA
 dummy_drv_video_la_SOURCES = dummy_drv_video.c object_heap.c
 noinst_HEADERS = dummy_drv_video.h object_heap.h
 all: all-am
diff -Nru libva-1.0.4/i965_drv_video/i965_avc_bsd.c libva-1.0.1/i965_drv_video/i965_avc_bsd.c
--- libva-1.0.4/i965_drv_video/i965_avc_bsd.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_avc_bsd.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1133 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Xiang Haihao <haihao.xiang@intel.com>
- *
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "va_backend.h"
-
-#include "intel_batchbuffer.h"
-#include "intel_driver.h"
-
-#include "i965_defines.h"
-#include "i965_drv_video.h"
-#include "i965_avc_bsd.h"
-#include "i965_media_h264.h"
-#include "i965_media.h"
-
-static void 
-i965_avc_bsd_free_avc_bsd_surface(void **data)
-{
-    struct i965_avc_bsd_surface *avc_bsd_surface = *data;
-
-    if (!avc_bsd_surface)
-        return;
-
-    dri_bo_unreference(avc_bsd_surface->dmv_top);
-    avc_bsd_surface->dmv_top = NULL;
-    dri_bo_unreference(avc_bsd_surface->dmv_bottom);
-    avc_bsd_surface->dmv_bottom = NULL;
-
-    free(avc_bsd_surface);
-    *data = NULL;
-}
-
-static void
-i965_avc_bsd_init_avc_bsd_surface(VADriverContextP ctx, 
-                                  struct object_surface *obj_surface,
-                                  VAPictureParameterBufferH264 *pic_param)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_bsd_context *i965_avc_bsd_context = &i965_h264_context->i965_avc_bsd_context;
-    struct i965_avc_bsd_surface *avc_bsd_surface = obj_surface->private_data;
-
-    obj_surface->free_private_data = i965_avc_bsd_free_avc_bsd_surface;
-
-    if (!avc_bsd_surface) {
-        avc_bsd_surface = calloc(sizeof(struct i965_avc_bsd_surface), 1);
-        assert((obj_surface->size & 0x3f) == 0);
-        obj_surface->private_data = avc_bsd_surface;
-    }
-
-    avc_bsd_surface->ctx = i965_avc_bsd_context;
-    avc_bsd_surface->dmv_bottom_flag = (pic_param->pic_fields.bits.field_pic_flag &&
-                                        !pic_param->seq_fields.bits.direct_8x8_inference_flag);
-
-    if (avc_bsd_surface->dmv_top == NULL) {
-        avc_bsd_surface->dmv_top = dri_bo_alloc(i965->intel.bufmgr,
-                                                "direct mv w/r buffer",
-                                                DMV_SIZE,
-                                                0x1000);
-    }
-
-    if (avc_bsd_surface->dmv_bottom_flag &&
-        avc_bsd_surface->dmv_bottom == NULL) {
-        avc_bsd_surface->dmv_bottom = dri_bo_alloc(i965->intel.bufmgr,
-                                                   "direct mv w/r buffer",
-                                                   DMV_SIZE,
-                                                   0x1000);
-    }
-}
-
-static void
-i965_bsd_ind_obj_base_address(VADriverContextP ctx, struct decode_state *decode_state, int slice)
-{
-    dri_bo *ind_bo = decode_state->slice_datas[slice]->bo;
-
-    BEGIN_BCS_BATCH(ctx, 3);
-    OUT_BCS_BATCH(ctx, CMD_BSD_IND_OBJ_BASE_ADDR | (3 - 2));
-    OUT_BCS_RELOC(ctx, ind_bo,
-                  I915_GEM_DOMAIN_INSTRUCTION, 0,
-                  0);
-    OUT_BCS_BATCH(ctx, 0);
-    ADVANCE_BCS_BATCH(ctx);
-}
-
-static void
-i965_avc_bsd_img_state(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    int qm_present_flag;
-    int img_struct;
-    int mbaff_frame_flag;
-    unsigned int avc_it_command_header;
-    unsigned int width_in_mbs, height_in_mbs;
-    VAPictureParameterBufferH264 *pic_param;
-
-    if (decode_state->iq_matrix && decode_state->iq_matrix->buffer)
-        qm_present_flag = 1;
-    else
-        qm_present_flag = 0; /* built-in QM matrices */
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-
-    assert(!(pic_param->CurrPic.flags & VA_PICTURE_H264_INVALID));
-
-    if (pic_param->CurrPic.flags & VA_PICTURE_H264_TOP_FIELD)
-        img_struct = 1;
-    else if (pic_param->CurrPic.flags & VA_PICTURE_H264_BOTTOM_FIELD)
-        img_struct = 3;
-    else
-        img_struct = 0;
-
-    if ((img_struct & 0x1) == 0x1) {
-        assert(pic_param->pic_fields.bits.field_pic_flag == 0x1);
-    } else {
-        assert(pic_param->pic_fields.bits.field_pic_flag == 0x0);
-    }
-
-    if (pic_param->seq_fields.bits.frame_mbs_only_flag) { /* a frame containing only frame macroblocks */
-        assert(pic_param->seq_fields.bits.mb_adaptive_frame_field_flag == 0);
-        assert(pic_param->pic_fields.bits.field_pic_flag == 0);
-    } else {
-        assert(pic_param->seq_fields.bits.direct_8x8_inference_flag == 1); /* see H.264 spec */
-    }
-
-    mbaff_frame_flag = (pic_param->seq_fields.bits.mb_adaptive_frame_field_flag &&
-                        !pic_param->pic_fields.bits.field_pic_flag);
-
-    width_in_mbs = ((pic_param->picture_width_in_mbs_minus1 + 1) & 0xff);
-    height_in_mbs = ((pic_param->picture_height_in_mbs_minus1 + 1) & 0xff); /* frame height */
-                                                                               
-    assert(!((width_in_mbs * height_in_mbs) & 0x8000)); /* hardware requirement */
-
-    /* BSD unit doesn't support 4:2:2 and 4:4:4 picture */
-    assert(pic_param->seq_fields.bits.chroma_format_idc == 0 || /* monochrome picture */
-           pic_param->seq_fields.bits.chroma_format_idc == 1);  /* 4:2:0 */
-    assert(pic_param->seq_fields.bits.residual_colour_transform_flag == 0); /* only available for 4:4:4 */
-
-    avc_it_command_header = (CMD_MEDIA_OBJECT_EX | (12 - 2));
-
-    BEGIN_BCS_BATCH(ctx, 6);
-    OUT_BCS_BATCH(ctx, CMD_AVC_BSD_IMG_STATE | (6 - 2));
-    OUT_BCS_BATCH(ctx, 
-                  ((width_in_mbs * height_in_mbs) & 0x7fff));
-    OUT_BCS_BATCH(ctx, 
-                  (height_in_mbs << 16) | 
-                  (width_in_mbs << 0));
-    OUT_BCS_BATCH(ctx, 
-                  ((pic_param->second_chroma_qp_index_offset & 0x1f) << 24) |
-                  ((pic_param->chroma_qp_index_offset & 0x1f) << 16) | 
-                  (SCAN_RASTER_ORDER << 15) | /* AVC ILDB Data */
-                  (SCAN_SPECIAL_ORDER << 14) | /* AVC IT Command */
-                  (SCAN_RASTER_ORDER << 13) | /* AVC IT Data */
-                  (1 << 12) | /* always 1, hardware requirement */
-                  (qm_present_flag << 10) |
-                  (img_struct << 8) |
-                  (16 << 0)); /* FIXME: always support 16 reference frames ??? */
-    OUT_BCS_BATCH(ctx,
-                  (RESIDUAL_DATA_OFFSET << 24) | /* residual data offset */
-                  (0 << 17) | /* don't overwrite SRT */
-                  (0 << 16) | /* Un-SRT (Unsynchronized Root Thread) */
-                  (0 << 12) | /* FIXME: no 16MV ??? */
-                  (pic_param->seq_fields.bits.chroma_format_idc << 10) |
-                  (i965_h264_context->enable_avc_ildb << 8)  | /* Enable ILDB writing output */
-                  (pic_param->pic_fields.bits.entropy_coding_mode_flag << 7) |
-                  ((!pic_param->pic_fields.bits.reference_pic_flag) << 6) |
-                  (pic_param->pic_fields.bits.constrained_intra_pred_flag << 5) |
-                  (pic_param->seq_fields.bits.direct_8x8_inference_flag << 4) |
-                  (pic_param->pic_fields.bits.transform_8x8_mode_flag << 3) |
-                  (pic_param->seq_fields.bits.frame_mbs_only_flag << 2) |
-                  (mbaff_frame_flag << 1) |
-                  (pic_param->pic_fields.bits.field_pic_flag << 0));
-    OUT_BCS_BATCH(ctx, avc_it_command_header);
-    ADVANCE_BCS_BATCH(ctx);
-}
-
-static void
-i965_avc_bsd_qm_state(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    int cmd_len;
-    VAIQMatrixBufferH264 *iq_matrix;
-    VAPictureParameterBufferH264 *pic_param;
-
-    if (!decode_state->iq_matrix || !decode_state->iq_matrix->buffer)
-        return;
-
-    iq_matrix = (VAIQMatrixBufferH264 *)decode_state->iq_matrix->buffer;
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-
-    cmd_len = 2 + 6 * 4; /* always load six 4x4 scaling matrices */
-
-    if (pic_param->pic_fields.bits.transform_8x8_mode_flag)
-        cmd_len += 2 * 16; /* load two 8x8 scaling matrices */
-
-    BEGIN_BCS_BATCH(ctx, cmd_len);
-    OUT_BCS_BATCH(ctx, CMD_AVC_BSD_QM_STATE | (cmd_len - 2));
-
-    if (pic_param->pic_fields.bits.transform_8x8_mode_flag)
-        OUT_BCS_BATCH(ctx, 
-                      (0x0  << 8) | /* don't use default built-in matrices */
-                      (0xff << 0)); /* six 4x4 and two 8x8 scaling matrices */
-    else
-        OUT_BCS_BATCH(ctx, 
-                      (0x0  << 8) | /* don't use default built-in matrices */
-                      (0x3f << 0)); /* six 4x4 scaling matrices */
-
-    intel_batchbuffer_data_bcs(ctx, &iq_matrix->ScalingList4x4[0][0], 6 * 4 * 4);
-
-    if (pic_param->pic_fields.bits.transform_8x8_mode_flag)
-        intel_batchbuffer_data_bcs(ctx, &iq_matrix->ScalingList8x8[0][0], 2 * 16 * 4);
-
-    ADVANCE_BCS_BATCH(ctx);
-}
-
-static void
-i965_avc_bsd_slice_state(VADriverContextP ctx, 
-                         VAPictureParameterBufferH264 *pic_param, 
-                         VASliceParameterBufferH264 *slice_param)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    int present_flag, cmd_len, list, j;
-    struct {
-        unsigned char bottom_idc:1;
-        unsigned char frame_store_index:4;
-        unsigned char field_picture:1;
-        unsigned char long_term:1;
-        unsigned char non_exist:1;
-    } refs[32];
-    char weightoffsets[32 * 6];
-
-    /* don't issue SLICE_STATE for intra-prediction decoding */
-    if (slice_param->slice_type == SLICE_TYPE_I ||
-        slice_param->slice_type == SLICE_TYPE_SI)
-        return;
-
-    cmd_len = 2;
-
-    if (slice_param->slice_type == SLICE_TYPE_P ||
-        slice_param->slice_type == SLICE_TYPE_SP) {
-        present_flag = PRESENT_REF_LIST0;
-        cmd_len += 8;
-    } else { 
-        present_flag = PRESENT_REF_LIST0 | PRESENT_REF_LIST1;
-        cmd_len += 16;
-    }
-
-    if ((slice_param->slice_type == SLICE_TYPE_P ||
-         slice_param->slice_type == SLICE_TYPE_SP) && 
-        (pic_param->pic_fields.bits.weighted_pred_flag == 1)) {
-        present_flag |= PRESENT_WEIGHT_OFFSET_L0;
-        cmd_len += 48;
-    }
-
-    if ((slice_param->slice_type == SLICE_TYPE_B) &&
-        (pic_param->pic_fields.bits.weighted_bipred_idc == 1)) {
-        present_flag |= PRESENT_WEIGHT_OFFSET_L0 | PRESENT_WEIGHT_OFFSET_L1;
-        cmd_len += 96;
-    }
-
-    BEGIN_BCS_BATCH(ctx, cmd_len);
-    OUT_BCS_BATCH(ctx, CMD_AVC_BSD_SLICE_STATE | (cmd_len - 2));
-    OUT_BCS_BATCH(ctx, present_flag);
-
-    for (list = 0; list < 2; list++) {
-        int flag;
-        VAPictureH264 *va_pic;
-
-        if (list == 0) {
-            flag = PRESENT_REF_LIST0;
-            va_pic = slice_param->RefPicList0;
-        } else {
-            flag = PRESENT_REF_LIST1;
-            va_pic = slice_param->RefPicList1;
-        }
-
-        if (!(present_flag & flag))
-            continue;
-
-        for (j = 0; j < 32; j++) {
-            if (va_pic->flags & VA_PICTURE_H264_INVALID) {
-                refs[j].non_exist = 1;
-                refs[j].long_term = 1;
-                refs[j].field_picture = 1;
-                refs[j].frame_store_index = 0xf;
-                refs[j].bottom_idc = 1;
-            } else {
-                int frame_idx;
-                
-                for (frame_idx = 0; frame_idx < ARRAY_ELEMS(i965_h264_context->fsid_list); frame_idx++) {
-                    if (i965_h264_context->fsid_list[frame_idx].surface_id != VA_INVALID_ID &&
-                        va_pic->picture_id == i965_h264_context->fsid_list[frame_idx].surface_id) {
-                        assert(frame_idx == i965_h264_context->fsid_list[frame_idx].frame_store_id);
-                        break;
-                    }
-                }
-
-                assert(frame_idx < ARRAY_ELEMS(i965_h264_context->fsid_list));
-                
-                refs[j].non_exist = 0;
-                refs[j].long_term = !!(va_pic->flags & VA_PICTURE_H264_LONG_TERM_REFERENCE);
-                refs[j].field_picture = !!(va_pic->flags & 
-                                           (VA_PICTURE_H264_TOP_FIELD | 
-                                            VA_PICTURE_H264_BOTTOM_FIELD));
-                refs[j].frame_store_index = frame_idx;
-                refs[j].bottom_idc = !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD);
-            }
-
-            va_pic++;
-        }
-        
-        intel_batchbuffer_data_bcs(ctx, refs, sizeof(refs));
-    }
-
-    i965_h264_context->weight128_luma_l0 = 0;
-    i965_h264_context->weight128_luma_l1 = 0;
-    i965_h264_context->weight128_chroma_l0 = 0;
-    i965_h264_context->weight128_chroma_l1 = 0;
-
-    i965_h264_context->weight128_offset0_flag = 0;
-    i965_h264_context->weight128_offset0 = 0;
-
-    if (present_flag & PRESENT_WEIGHT_OFFSET_L0) {
-        for (j = 0; j < 32; j++) {
-            weightoffsets[j * 6 + 0] = slice_param->luma_offset_l0[j];
-            weightoffsets[j * 6 + 1] = slice_param->luma_weight_l0[j];
-            weightoffsets[j * 6 + 2] = slice_param->chroma_offset_l0[j][0];
-            weightoffsets[j * 6 + 3] = slice_param->chroma_weight_l0[j][0];
-            weightoffsets[j * 6 + 4] = slice_param->chroma_offset_l0[j][1];
-            weightoffsets[j * 6 + 5] = slice_param->chroma_weight_l0[j][1];
-
-            if (pic_param->pic_fields.bits.weighted_pred_flag == 1 ||
-                pic_param->pic_fields.bits.weighted_bipred_idc == 1) {
-                if (i965_h264_context->use_hw_w128) {
-                    if (slice_param->luma_weight_l0[j] == 128)
-                        i965_h264_context->weight128_luma_l0 |= (1 << j);
-
-                    if (slice_param->chroma_weight_l0[j][0] == 128 ||
-                        slice_param->chroma_weight_l0[j][1] == 128)
-                        i965_h264_context->weight128_chroma_l0 |= (1 << j);
-                } else {
-                    /* FIXME: workaround for weight 128 */
-                    if (slice_param->luma_weight_l0[j] == 128 ||
-                        slice_param->chroma_weight_l0[j][0] == 128 ||
-                        slice_param->chroma_weight_l0[j][1] == 128)
-                        i965_h264_context->weight128_offset0_flag = 1;
-                }
-            }
-        }
-
-        intel_batchbuffer_data_bcs(ctx, weightoffsets, sizeof(weightoffsets));
-    }
-
-    if (present_flag & PRESENT_WEIGHT_OFFSET_L1) {
-        for (j = 0; j < 32; j++) {
-            weightoffsets[j * 6 + 0] = slice_param->luma_offset_l1[j];
-            weightoffsets[j * 6 + 1] = slice_param->luma_weight_l1[j];
-            weightoffsets[j * 6 + 2] = slice_param->chroma_offset_l1[j][0];
-            weightoffsets[j * 6 + 3] = slice_param->chroma_weight_l1[j][0];
-            weightoffsets[j * 6 + 4] = slice_param->chroma_offset_l1[j][1];
-            weightoffsets[j * 6 + 5] = slice_param->chroma_weight_l1[j][1];
-
-            if (pic_param->pic_fields.bits.weighted_bipred_idc == 1) {
-                if (i965_h264_context->use_hw_w128) {
-                    if (slice_param->luma_weight_l1[j] == 128)
-                        i965_h264_context->weight128_luma_l1 |= (1 << j);
-
-                    if (slice_param->chroma_weight_l1[j][0] == 128 ||
-                        slice_param->chroma_weight_l1[j][1] == 128)
-                        i965_h264_context->weight128_chroma_l1 |= (1 << j);
-                } else {
-                    if (slice_param->luma_weight_l0[j] == 128 ||
-                        slice_param->chroma_weight_l0[j][0] == 128 ||
-                        slice_param->chroma_weight_l0[j][1] == 128)
-                        i965_h264_context->weight128_offset0_flag = 1;
-                }
-            }
-        }
-
-        intel_batchbuffer_data_bcs(ctx, weightoffsets, sizeof(weightoffsets));
-    }
-
-    ADVANCE_BCS_BATCH(ctx);
-}
-
-static void
-i965_avc_bsd_buf_base_state(VADriverContextP ctx,
-                            VAPictureParameterBufferH264 *pic_param, 
-                            VASliceParameterBufferH264 *slice_param)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context;
-    struct i965_avc_bsd_context *i965_avc_bsd_context;
-    int i, j;
-    VAPictureH264 *va_pic;
-    struct object_surface *obj_surface;
-    struct i965_avc_bsd_surface *avc_bsd_surface;
-
-    assert(media_state->private_context);
-    i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    i965_avc_bsd_context = &i965_h264_context->i965_avc_bsd_context;
-
-    BEGIN_BCS_BATCH(ctx, 74);
-    OUT_BCS_BATCH(ctx, CMD_AVC_BSD_BUF_BASE_STATE | (74 - 2));
-    OUT_BCS_RELOC(ctx, i965_avc_bsd_context->bsd_raw_store.bo,
-                  I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                  0);
-    OUT_BCS_RELOC(ctx, i965_avc_bsd_context->mpr_row_store.bo,
-                  I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                  0);
-    OUT_BCS_RELOC(ctx, i965_h264_context->avc_it_command_mb_info.bo,
-                  I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                  i965_h264_context->avc_it_command_mb_info.mbs * i965_h264_context->use_avc_hw_scoreboard * MB_CMD_IN_BYTES);
-    OUT_BCS_RELOC(ctx, i965_h264_context->avc_it_data.bo,
-                  I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                  (i965_h264_context->avc_it_data.write_offset << 6));
-
-    if (i965_h264_context->enable_avc_ildb)
-        OUT_BCS_RELOC(ctx, i965_h264_context->avc_ildb_data.bo,
-                      I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                      0);
-    else
-        OUT_BCS_BATCH(ctx, 0);
-
-    for (i = 0; i < ARRAY_ELEMS(i965_h264_context->fsid_list); i++) {
-        if (i965_h264_context->fsid_list[i].surface_id != VA_INVALID_ID) {
-            int found = 0;
-            for (j = 0; j < ARRAY_ELEMS(pic_param->ReferenceFrames); j++) {
-                va_pic = &pic_param->ReferenceFrames[j];
-                
-                if (va_pic->flags & VA_PICTURE_H264_INVALID)
-                    continue;
-
-                if (va_pic->picture_id == i965_h264_context->fsid_list[i].surface_id) {
-                    found = 1;
-                    break;
-                }
-            }
-
-            assert(found == 1);
-
-            if (!(va_pic->flags & VA_PICTURE_H264_INVALID)) {
-                obj_surface = SURFACE(va_pic->picture_id);
-                assert(obj_surface);
-                avc_bsd_surface = obj_surface->private_data;
-            
-                if (avc_bsd_surface == NULL) {
-                    OUT_BCS_BATCH(ctx, 0);
-                    OUT_BCS_BATCH(ctx, 0);
-                } else {
-                    OUT_BCS_RELOC(ctx, avc_bsd_surface->dmv_top,
-                                  I915_GEM_DOMAIN_INSTRUCTION, 0,
-                                  0);
-
-                    if (avc_bsd_surface->dmv_bottom_flag == 1)
-                        OUT_BCS_RELOC(ctx, avc_bsd_surface->dmv_bottom,
-                                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                                      0);
-                    else
-                        OUT_BCS_RELOC(ctx, avc_bsd_surface->dmv_top,
-                                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                                      0);
-                }
-            } 
-        } else {
-            OUT_BCS_BATCH(ctx, 0);
-            OUT_BCS_BATCH(ctx, 0);
-        }
-    }
-
-    va_pic = &pic_param->CurrPic;
-    assert(!(va_pic->flags & VA_PICTURE_H264_INVALID));
-    obj_surface = SURFACE(va_pic->picture_id);
-    assert(obj_surface);
-    obj_surface->flags = (pic_param->pic_fields.bits.reference_pic_flag ? SURFACE_REFERENCED : 0);
-    i965_avc_bsd_init_avc_bsd_surface(ctx, obj_surface, pic_param);
-    avc_bsd_surface = obj_surface->private_data;
-
-    if (obj_surface->bo == NULL) {
-        obj_surface->bo = dri_bo_alloc(i965->intel.bufmgr,
-                                       "vaapi surface",
-                                       obj_surface->size,
-                                       0x1000);
-    }
-
-    OUT_BCS_RELOC(ctx, avc_bsd_surface->dmv_top,
-                  I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                  0);
-
-    if (avc_bsd_surface->dmv_bottom_flag == 1)
-        OUT_BCS_RELOC(ctx, avc_bsd_surface->dmv_bottom,
-                      I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                      0);
-    else
-        OUT_BCS_RELOC(ctx, avc_bsd_surface->dmv_top,
-                      I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION,
-                      0);
-
-    /* POC List */
-    for (i = 0; i < ARRAY_ELEMS(i965_h264_context->fsid_list); i++) {
-        if (i965_h264_context->fsid_list[i].surface_id != VA_INVALID_ID) {
-            int found = 0;
-            for (j = 0; j < ARRAY_ELEMS(pic_param->ReferenceFrames); j++) {
-                va_pic = &pic_param->ReferenceFrames[j];
-                
-                if (va_pic->flags & VA_PICTURE_H264_INVALID)
-                    continue;
-
-                if (va_pic->picture_id == i965_h264_context->fsid_list[i].surface_id) {
-                    found = 1;
-                    break;
-                }
-            }
-
-            assert(found == 1);
-
-            if (!(va_pic->flags & VA_PICTURE_H264_INVALID)) {
-                OUT_BCS_BATCH(ctx, va_pic->TopFieldOrderCnt);
-                OUT_BCS_BATCH(ctx, va_pic->BottomFieldOrderCnt);
-            } 
-        } else {
-            OUT_BCS_BATCH(ctx, 0);
-            OUT_BCS_BATCH(ctx, 0);
-        }
-    }
-
-    va_pic = &pic_param->CurrPic;
-    OUT_BCS_BATCH(ctx, va_pic->TopFieldOrderCnt);
-    OUT_BCS_BATCH(ctx, va_pic->BottomFieldOrderCnt);
-
-    ADVANCE_BCS_BATCH(ctx);
-}
-
-/*
- * Return the bit offset to the first bit of the slice data
- *
- * VASliceParameterBufferH264.slice_data_bit_offset will point into the part
- * of slice header if there are some escaped bytes in the slice header. The offset 
- * to slice data is needed for BSD unit so that BSD unit can fetch right slice data
- * for processing. This fixes conformance case BASQP1_Sony_C.jsv
- */
-static int
-i965_avc_bsd_get_slice_bit_offset(uint8_t *buf, int mode_flag, int in_slice_data_bit_offset)
-{
-    int out_slice_data_bit_offset;
-    int slice_header_size = in_slice_data_bit_offset / 8;
-    int i, j;
-
-    for (i = 0, j = 0; i < slice_header_size; i++, j++) {
-        if (!buf[j] && !buf[j + 1] && buf[j + 2] == 3) {
-            i++, j += 2;
-        }
-    }
-
-    out_slice_data_bit_offset = 8 * j + in_slice_data_bit_offset % 8;
-
-    if (mode_flag == ENTROPY_CABAC)
-        out_slice_data_bit_offset = ALIGN(out_slice_data_bit_offset, 0x8);
-
-    return out_slice_data_bit_offset;
-}
-
-static void
-g4x_avc_bsd_object(VADriverContextP ctx, 
-                   struct decode_state *decode_state,
-                   VAPictureParameterBufferH264 *pic_param,
-                   VASliceParameterBufferH264 *slice_param,
-                   int slice_index)
-{
-    int width_in_mbs = pic_param->picture_width_in_mbs_minus1 + 1;
-    int height_in_mbs = pic_param->picture_height_in_mbs_minus1 + 1; /* frame height */
-
-    if (slice_param) {
-        int encrypted, counter_value, cmd_len;
-        int slice_hor_pos, slice_ver_pos;
-        int num_ref_idx_l0, num_ref_idx_l1;
-        int mbaff_picture = (!pic_param->pic_fields.bits.field_pic_flag &&
-                             pic_param->seq_fields.bits.mb_adaptive_frame_field_flag);
-        int slice_data_bit_offset;
-        int weighted_pred_idc = 0;
-        int first_mb_in_slice = 0;
-        int slice_type;
-        uint8_t *slice_data = NULL;
-
-        encrypted = 0; /* FIXME: which flag in VAAPI is used for encryption? */
-
-        if (encrypted) {
-            cmd_len = 9;
-            counter_value = 0; /* FIXME: ??? */
-        } else 
-            cmd_len = 8;
-
-        dri_bo_map(decode_state->slice_datas[slice_index]->bo, 0);
-        slice_data = (uint8_t *)(decode_state->slice_datas[slice_index]->bo->virtual + slice_param->slice_data_offset);
-        slice_data_bit_offset = i965_avc_bsd_get_slice_bit_offset(slice_data,
-                                                                  pic_param->pic_fields.bits.entropy_coding_mode_flag,
-                                                                  slice_param->slice_data_bit_offset);
-        dri_bo_unmap(decode_state->slice_datas[slice_index]->bo);
-
-        if (slice_param->slice_type == SLICE_TYPE_I ||
-            slice_param->slice_type == SLICE_TYPE_SI)
-            slice_type = SLICE_TYPE_I;
-        else if (slice_param->slice_type == SLICE_TYPE_P ||
-                 slice_param->slice_type == SLICE_TYPE_SP)
-            slice_type = SLICE_TYPE_P;
-        else {
-            assert(slice_param->slice_type == SLICE_TYPE_B);
-            slice_type = SLICE_TYPE_B;
-        }
-
-        if (slice_type == SLICE_TYPE_I) {
-            assert(slice_param->num_ref_idx_l0_active_minus1 == 0);
-            assert(slice_param->num_ref_idx_l1_active_minus1 == 0);
-            num_ref_idx_l0 = 0;
-            num_ref_idx_l1 = 0;
-        } else if (slice_type == SLICE_TYPE_P) {
-            assert(slice_param->num_ref_idx_l1_active_minus1 == 0);
-            num_ref_idx_l0 = slice_param->num_ref_idx_l0_active_minus1 + 1;
-            num_ref_idx_l1 = 0;
-        } else {
-            num_ref_idx_l0 = slice_param->num_ref_idx_l0_active_minus1 + 1;
-            num_ref_idx_l1 = slice_param->num_ref_idx_l1_active_minus1 + 1;
-        }
-
-        if (slice_type == SLICE_TYPE_P)
-            weighted_pred_idc = pic_param->pic_fields.bits.weighted_pred_flag;
-        else if (slice_type == SLICE_TYPE_B)
-            weighted_pred_idc = pic_param->pic_fields.bits.weighted_bipred_idc;
-
-        first_mb_in_slice = slice_param->first_mb_in_slice << mbaff_picture;
-        slice_hor_pos = first_mb_in_slice % width_in_mbs; 
-        slice_ver_pos = first_mb_in_slice / width_in_mbs;
-
-        BEGIN_BCS_BATCH(ctx, cmd_len);
-        OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (cmd_len - 2));
-        OUT_BCS_BATCH(ctx, 
-                      (encrypted << 31) |
-                      ((slice_param->slice_data_size - (slice_data_bit_offset >> 3)) << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (slice_param->slice_data_offset +
-                       (slice_data_bit_offset >> 3)));
-        OUT_BCS_BATCH(ctx, 
-                      (0 << 31) | /* concealment mode: 0->intra 16x16 prediction, 1->inter P Copy */
-                      (0 << 14) | /* ignore BSDPrematureComplete Error handling */
-                      (0 << 13) | /* FIXME: ??? */
-                      (0 << 12) | /* ignore MPR Error handling */
-                      (0 << 10) | /* ignore Entropy Error handling */
-                      (0 << 8)  | /* ignore MB Header Error handling */
-                      (slice_type << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (num_ref_idx_l1 << 24) |
-                      (num_ref_idx_l0 << 16) |
-                      (slice_param->chroma_log2_weight_denom << 8) |
-                      (slice_param->luma_log2_weight_denom << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (weighted_pred_idc << 30) |
-                      (slice_param->direct_spatial_mv_pred_flag << 29) |
-                      (slice_param->disable_deblocking_filter_idc << 27) |
-                      (slice_param->cabac_init_idc << 24) |
-                      ((pic_param->pic_init_qp_minus26 + 26 + slice_param->slice_qp_delta) << 16) |
-                      ((slice_param->slice_beta_offset_div2 & 0xf) << 8) |
-                      ((slice_param->slice_alpha_c0_offset_div2 & 0xf) << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (slice_ver_pos << 24) |
-                      (slice_hor_pos << 16) | 
-                      (first_mb_in_slice << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (0 << 7) | /* FIXME: ??? */
-                      ((0x7 - (slice_data_bit_offset & 0x7)) << 0));
-
-        if (encrypted) {
-            OUT_BCS_BATCH(ctx, counter_value);
-        }
-
-        ADVANCE_BCS_BATCH(ctx); 
-    } else {
-        BEGIN_BCS_BATCH(ctx, 8); 
-        OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (8 - 2));
-        OUT_BCS_BATCH(ctx, 0); /* indirect data length for phantom slice is 0 */
-        OUT_BCS_BATCH(ctx, 0); /* indirect data start address for phantom slice is 0 */
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, width_in_mbs * height_in_mbs / (1 + !!pic_param->pic_fields.bits.field_pic_flag));
-        OUT_BCS_BATCH(ctx, 0);
-        ADVANCE_BCS_BATCH(ctx);
-    }
-}
-
-static void
-ironlake_avc_bsd_object(VADriverContextP ctx, 
-                        struct decode_state *decode_state,
-                        VAPictureParameterBufferH264 *pic_param,
-                        VASliceParameterBufferH264 *slice_param,
-                        int slice_index)
-{
-    int width_in_mbs = pic_param->picture_width_in_mbs_minus1 + 1;
-    int height_in_mbs = pic_param->picture_height_in_mbs_minus1 + 1; /* frame height */
-
-    if (slice_param) {
-        struct i965_driver_data *i965 = i965_driver_data(ctx);
-        struct i965_media_state *media_state = &i965->media_state;
-        struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-        int encrypted, counter_value;
-        int slice_hor_pos, slice_ver_pos;
-        int num_ref_idx_l0, num_ref_idx_l1;
-        int mbaff_picture = (!pic_param->pic_fields.bits.field_pic_flag &&
-                             pic_param->seq_fields.bits.mb_adaptive_frame_field_flag);
-        int slice_data_bit_offset;
-        int weighted_pred_idc = 0;
-        int first_mb_in_slice;
-        int slice_type;
-        uint8_t *slice_data = NULL;
-
-        encrypted = 0; /* FIXME: which flag in VAAPI is used for encryption? */
-
-        if (encrypted) {
-            counter_value = 0; /* FIXME: ??? */
-        } else 
-            counter_value = 0;
-
-        dri_bo_map(decode_state->slice_datas[slice_index]->bo, 0);
-        slice_data = (uint8_t *)(decode_state->slice_datas[slice_index]->bo->virtual + slice_param->slice_data_offset);
-        slice_data_bit_offset = i965_avc_bsd_get_slice_bit_offset(slice_data,
-                                                                  pic_param->pic_fields.bits.entropy_coding_mode_flag,
-                                                                  slice_param->slice_data_bit_offset);
-        dri_bo_unmap(decode_state->slice_datas[slice_index]->bo);
-
-        if (slice_param->slice_type == SLICE_TYPE_I ||
-            slice_param->slice_type == SLICE_TYPE_SI)
-            slice_type = SLICE_TYPE_I;
-        else if (slice_param->slice_type == SLICE_TYPE_P ||
-                 slice_param->slice_type == SLICE_TYPE_SP)
-            slice_type = SLICE_TYPE_P;
-        else {
-            assert(slice_param->slice_type == SLICE_TYPE_B);
-            slice_type = SLICE_TYPE_B;
-        }
-
-        if (slice_type == SLICE_TYPE_I) {
-            assert(slice_param->num_ref_idx_l0_active_minus1 == 0);
-            assert(slice_param->num_ref_idx_l1_active_minus1 == 0);
-            num_ref_idx_l0 = 0;
-            num_ref_idx_l1 = 0;
-        } else if (slice_type == SLICE_TYPE_P) {
-            assert(slice_param->num_ref_idx_l1_active_minus1 == 0);
-            num_ref_idx_l0 = slice_param->num_ref_idx_l0_active_minus1 + 1;
-            num_ref_idx_l1 = 0;
-        } else {
-            num_ref_idx_l0 = slice_param->num_ref_idx_l0_active_minus1 + 1;
-            num_ref_idx_l1 = slice_param->num_ref_idx_l1_active_minus1 + 1;
-        }
-
-        if (slice_type == SLICE_TYPE_P)
-            weighted_pred_idc = pic_param->pic_fields.bits.weighted_pred_flag;
-        else if (slice_type == SLICE_TYPE_B)
-            weighted_pred_idc = pic_param->pic_fields.bits.weighted_bipred_idc;
-
-        first_mb_in_slice = slice_param->first_mb_in_slice << mbaff_picture;
-        slice_hor_pos = first_mb_in_slice % width_in_mbs; 
-        slice_ver_pos = first_mb_in_slice / width_in_mbs;
-
-        BEGIN_BCS_BATCH(ctx, 16);
-        OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (16 - 2));
-        OUT_BCS_BATCH(ctx, 
-                      (encrypted << 31) |
-                      (0 << 30) | /* FIXME: packet based bit stream */
-                      (0 << 29) | /* FIXME: packet format */
-                      ((slice_param->slice_data_size - (slice_data_bit_offset >> 3)) << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (slice_param->slice_data_offset +
-                       (slice_data_bit_offset >> 3)));
-        OUT_BCS_BATCH(ctx, 
-                      (0 << 31) | /* concealment mode: 0->intra 16x16 prediction, 1->inter P Copy */
-                      (0 << 14) | /* ignore BSDPrematureComplete Error handling */
-                      (0 << 13) | /* FIXME: ??? */
-                      (0 << 12) | /* ignore MPR Error handling */
-                      (0 << 10) | /* ignore Entropy Error handling */
-                      (0 << 8)  | /* ignore MB Header Error handling */
-                      (slice_type << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (num_ref_idx_l1 << 24) |
-                      (num_ref_idx_l0 << 16) |
-                      (slice_param->chroma_log2_weight_denom << 8) |
-                      (slice_param->luma_log2_weight_denom << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (weighted_pred_idc << 30) |
-                      (slice_param->direct_spatial_mv_pred_flag << 29) |
-                      (slice_param->disable_deblocking_filter_idc << 27) |
-                      (slice_param->cabac_init_idc << 24) |
-                      ((pic_param->pic_init_qp_minus26 + 26 + slice_param->slice_qp_delta) << 16) |
-                      ((slice_param->slice_beta_offset_div2 & 0xf) << 8) |
-                      ((slice_param->slice_alpha_c0_offset_div2 & 0xf) << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (slice_ver_pos << 24) |
-                      (slice_hor_pos << 16) | 
-                      (first_mb_in_slice << 0));
-        OUT_BCS_BATCH(ctx, 
-                      (0 << 7) | /* FIXME: ??? */
-                      ((0x7 - (slice_data_bit_offset & 0x7)) << 0));
-        OUT_BCS_BATCH(ctx, counter_value);
-        
-        /* FIXME: dw9-dw11 */
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, i965_h264_context->weight128_luma_l0);
-        OUT_BCS_BATCH(ctx, i965_h264_context->weight128_luma_l1);
-        OUT_BCS_BATCH(ctx, i965_h264_context->weight128_chroma_l0);
-        OUT_BCS_BATCH(ctx, i965_h264_context->weight128_chroma_l1);
-
-        ADVANCE_BCS_BATCH(ctx); 
-    } else {
-        BEGIN_BCS_BATCH(ctx, 16);
-        OUT_BCS_BATCH(ctx, CMD_AVC_BSD_OBJECT | (16 - 2));
-        OUT_BCS_BATCH(ctx, 0); /* indirect data length for phantom slice is 0 */
-        OUT_BCS_BATCH(ctx, 0); /* indirect data start address for phantom slice is 0 */
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, width_in_mbs * height_in_mbs / (1 + !!pic_param->pic_fields.bits.field_pic_flag));
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        OUT_BCS_BATCH(ctx, 0);
-        ADVANCE_BCS_BATCH(ctx);
-    }
-}
-
-static void
-i965_avc_bsd_object(VADriverContextP ctx, 
-                    struct decode_state *decode_state,
-                    VAPictureParameterBufferH264 *pic_param,
-                    VASliceParameterBufferH264 *slice_param,
-                    int slice_index)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-
-    if (IS_IRONLAKE(i965->intel.device_id))
-        ironlake_avc_bsd_object(ctx, decode_state, pic_param, slice_param, slice_index);
-    else
-        g4x_avc_bsd_object(ctx, decode_state, pic_param, slice_param, slice_index);
-}
-
-static void
-i965_avc_bsd_phantom_slice(VADriverContextP ctx, 
-                           struct decode_state *decode_state,
-                           VAPictureParameterBufferH264 *pic_param)
-{
-    i965_avc_bsd_object(ctx, decode_state, pic_param, NULL, 0);
-}
-
-static void
-i965_avc_bsd_frame_store_index(VADriverContextP ctx,
-                               VAPictureParameterBufferH264 *pic_param)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    int i, j;
-
-    assert(ARRAY_ELEMS(i965_h264_context->fsid_list) == ARRAY_ELEMS(pic_param->ReferenceFrames));
-
-    for (i = 0; i < ARRAY_ELEMS(i965_h264_context->fsid_list); i++) {
-        int found = 0;
-
-        if (i965_h264_context->fsid_list[i].surface_id == VA_INVALID_ID)
-            continue;
-
-        for (j = 0; j < ARRAY_ELEMS(pic_param->ReferenceFrames); j++) {
-            VAPictureH264 *ref_pic = &pic_param->ReferenceFrames[j];
-            if (ref_pic->flags & VA_PICTURE_H264_INVALID)
-                continue;
-
-            if (i965_h264_context->fsid_list[i].surface_id == ref_pic->picture_id) {
-                found = 1;
-                break;
-            }
-        }
-
-        if (!found) {
-            struct object_surface *obj_surface = SURFACE(i965_h264_context->fsid_list[i].surface_id);
-            obj_surface->flags &= ~SURFACE_REFERENCED;
-
-            if (obj_surface->flags & SURFACE_DISPLAYED) {
-                dri_bo_unreference(obj_surface->bo);
-                obj_surface->bo = NULL;
-                obj_surface->flags = 0;
-            }
-
-            if (obj_surface->free_private_data)
-                obj_surface->free_private_data(&obj_surface->private_data);
-
-            i965_h264_context->fsid_list[i].surface_id = VA_INVALID_ID;
-            i965_h264_context->fsid_list[i].frame_store_id = -1;
-        }
-    }
-
-    for (i = 0; i < ARRAY_ELEMS(pic_param->ReferenceFrames); i++) {
-        VAPictureH264 *ref_pic = &pic_param->ReferenceFrames[i];
-        int found = 0;
-
-        if (ref_pic->flags & VA_PICTURE_H264_INVALID)
-            continue;
-
-        for (j = 0; j < ARRAY_ELEMS(i965_h264_context->fsid_list); j++) {
-            if (i965_h264_context->fsid_list[j].surface_id == VA_INVALID_ID)
-                continue;
-            
-            if (i965_h264_context->fsid_list[j].surface_id == ref_pic->picture_id) {
-                found = 1;
-                break;
-            }
-        }
-
-        if (!found) {
-            int frame_idx;
-            struct object_surface *obj_surface = SURFACE(ref_pic->picture_id);
-            
-            if (obj_surface->bo == NULL) {
-                /* Some broken sources such as conformance case FM2_SVA_C
-                 * will get here !!!. Allocating a BO for it to avoid SEGMENT FAULT
-                 */
-                obj_surface->bo = dri_bo_alloc(i965->intel.bufmgr,
-                                               "vaapi surface",
-                                               obj_surface->size,
-                                               0x1000);
-            }
-
-            for (frame_idx = 0; frame_idx < ARRAY_ELEMS(i965_h264_context->fsid_list); frame_idx++) {
-                for (j = 0; j < ARRAY_ELEMS(i965_h264_context->fsid_list); j++) {
-                    if (i965_h264_context->fsid_list[j].surface_id == VA_INVALID_ID)
-                        continue;
-
-                    if (i965_h264_context->fsid_list[j].frame_store_id == frame_idx)
-                        break;
-                }
-
-                if (j == ARRAY_ELEMS(i965_h264_context->fsid_list))
-                    break;
-            }
-
-            assert(frame_idx < ARRAY_ELEMS(i965_h264_context->fsid_list));
-
-            for (j = 0; j < ARRAY_ELEMS(i965_h264_context->fsid_list); j++) {
-                if (i965_h264_context->fsid_list[j].surface_id == VA_INVALID_ID) {
-                    i965_h264_context->fsid_list[j].surface_id = ref_pic->picture_id;
-                    i965_h264_context->fsid_list[j].frame_store_id = frame_idx;
-                    break;
-                }
-            }
-        }
-    }
-
-    for (i = 0; i < ARRAY_ELEMS(i965_h264_context->fsid_list) - 1; i++) {
-        if (i965_h264_context->fsid_list[i].surface_id != VA_INVALID_ID &&
-            i965_h264_context->fsid_list[i].frame_store_id == i)
-            continue;
-
-        for (j = i + 1; j < ARRAY_ELEMS(i965_h264_context->fsid_list); j++) {
-            if (i965_h264_context->fsid_list[j].surface_id != VA_INVALID_ID &&
-                i965_h264_context->fsid_list[j].frame_store_id == i) {
-                VASurfaceID id = i965_h264_context->fsid_list[i].surface_id;
-                int frame_idx = i965_h264_context->fsid_list[i].frame_store_id;
-
-                i965_h264_context->fsid_list[i].surface_id = i965_h264_context->fsid_list[j].surface_id;
-                i965_h264_context->fsid_list[i].frame_store_id = i965_h264_context->fsid_list[j].frame_store_id;
-                i965_h264_context->fsid_list[j].surface_id = id;
-                i965_h264_context->fsid_list[j].frame_store_id = frame_idx;
-                break;
-            }
-        }
-    }
-}
-
-void 
-i965_avc_bsd_pipeline(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    VAPictureParameterBufferH264 *pic_param;
-    VASliceParameterBufferH264 *slice_param;
-    int i, j;
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-    i965_avc_bsd_frame_store_index(ctx, pic_param);
-
-    i965_h264_context->enable_avc_ildb = 0;
-    i965_h264_context->picture.i_flag = 1;
-
-    for (j = 0; j < decode_state->num_slice_params && i965_h264_context->enable_avc_ildb == 0; j++) {
-        assert(decode_state->slice_params && decode_state->slice_params[j]->buffer);
-        slice_param = (VASliceParameterBufferH264 *)decode_state->slice_params[j]->buffer;
-
-        assert(decode_state->slice_params[j]->num_elements == 1);  /* FIXME */
-        for (i = 0; i < decode_state->slice_params[j]->num_elements; i++) {
-            assert(slice_param->slice_data_flag == VA_SLICE_DATA_FLAG_ALL);
-            assert((slice_param->slice_type == SLICE_TYPE_I) ||
-                   (slice_param->slice_type == SLICE_TYPE_SI) ||
-                   (slice_param->slice_type == SLICE_TYPE_P) ||
-                   (slice_param->slice_type == SLICE_TYPE_SP) ||
-                   (slice_param->slice_type == SLICE_TYPE_B));
-
-            if (slice_param->disable_deblocking_filter_idc != 1) {
-                i965_h264_context->enable_avc_ildb = 1;
-                break;
-            }
-
-            slice_param++;
-        }
-    }
-
-    intel_batchbuffer_start_atomic_bcs(ctx, 0x1000);
-
-    i965_avc_bsd_img_state(ctx, decode_state);
-    i965_avc_bsd_qm_state(ctx, decode_state);
-
-    for (j = 0; j < decode_state->num_slice_params; j++) {
-        assert(decode_state->slice_params && decode_state->slice_params[j]->buffer);
-        slice_param = (VASliceParameterBufferH264 *)decode_state->slice_params[j]->buffer;
-
-        i965_bsd_ind_obj_base_address(ctx, decode_state, j);
-
-        assert(decode_state->slice_params[j]->num_elements == 1);  /* FIXME */
-        for (i = 0; i < decode_state->slice_params[j]->num_elements; i++) {
-            assert(slice_param->slice_data_flag == VA_SLICE_DATA_FLAG_ALL);
-            assert((slice_param->slice_type == SLICE_TYPE_I) ||
-                   (slice_param->slice_type == SLICE_TYPE_SI) ||
-                   (slice_param->slice_type == SLICE_TYPE_P) ||
-                   (slice_param->slice_type == SLICE_TYPE_SP) ||
-                   (slice_param->slice_type == SLICE_TYPE_B));
-
-            if (i965_h264_context->picture.i_flag && 
-                (slice_param->slice_type != SLICE_TYPE_I ||
-                 slice_param->slice_type != SLICE_TYPE_SI))
-                i965_h264_context->picture.i_flag = 0;
-
-            i965_avc_bsd_slice_state(ctx, pic_param, slice_param);
-            i965_avc_bsd_buf_base_state(ctx, pic_param, slice_param);
-            i965_avc_bsd_object(ctx, decode_state, pic_param, slice_param, j);
-            slice_param++;
-        }
-    }
-
-    i965_avc_bsd_phantom_slice(ctx, decode_state, pic_param);
-    intel_batchbuffer_emit_mi_flush_bcs(ctx);
-    intel_batchbuffer_end_atomic_bcs(ctx);
-    intel_batchbuffer_flush_bcs(ctx);
-}
-
-void 
-i965_avc_bsd_decode_init(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_bsd_context *i965_avc_bsd_context;
-    dri_bo *bo;
-
-    assert(i965_h264_context);
-    i965_avc_bsd_context = &i965_h264_context->i965_avc_bsd_context;
-
-    dri_bo_unreference(i965_avc_bsd_context->bsd_raw_store.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr,
-                      "bsd raw store",
-                      0x3000, /* at least 11520 bytes to support 120 MBs per row */
-                      64);
-    assert(bo);
-    i965_avc_bsd_context->bsd_raw_store.bo = bo;
-
-    dri_bo_unreference(i965_avc_bsd_context->mpr_row_store.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr,
-                      "mpr row store",
-                      0x2000, /* at least 7680 bytes to support 120 MBs per row */
-                      64);
-    assert(bo);
-    i965_avc_bsd_context->mpr_row_store.bo = bo;
-
-    if (!i965_avc_bsd_context->init) {
-        i965_avc_bsd_context->init = 1;
-    }
-}
-
-Bool 
-i965_avc_bsd_ternimate(struct i965_avc_bsd_context *i965_avc_bsd_context)
-{
-    dri_bo_unreference(i965_avc_bsd_context->bsd_raw_store.bo);
-    dri_bo_unreference(i965_avc_bsd_context->mpr_row_store.bo);
-
-    return True;
-}
diff -Nru libva-1.0.4/i965_drv_video/i965_avc_bsd.h libva-1.0.1/i965_drv_video/i965_avc_bsd.h
--- libva-1.0.4/i965_drv_video/i965_avc_bsd.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_avc_bsd.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Xiang Haihao <haihao.xiang@intel.com>
- *
- */
-
-#ifndef __I965_AVC_BSD_H__
-#define __I965_AVC_BSD_H__
-
-#define DMV_SIZE        0x88000 /* 557056 bytes for a frame */
-
-struct i965_avc_bsd_context
-{
-    struct {
-        dri_bo *bo;
-    } bsd_raw_store;
-
-    struct {
-        dri_bo *bo;
-    } mpr_row_store;
-
-    int init;
-};
-
-struct i965_avc_bsd_surface
-{
-    struct i965_avc_bsd_context *ctx;
-    dri_bo *dmv_top;
-    dri_bo *dmv_bottom;
-    int dmv_bottom_flag;
-};
-
-void i965_avc_bsd_pipeline(VADriverContextP, struct decode_state *);
-void i965_avc_bsd_decode_init(VADriverContextP);
-Bool i965_avc_bsd_ternimate(struct i965_avc_bsd_context *);
-
-#endif /* __I965_AVC_BSD_H__ */
-
diff -Nru libva-1.0.4/i965_drv_video/i965_avc_hw_scoreboard.c libva-1.0.1/i965_drv_video/i965_avc_hw_scoreboard.c
--- libva-1.0.4/i965_drv_video/i965_avc_hw_scoreboard.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_avc_hw_scoreboard.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,444 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Xiang Haihao <haihao.xiang@intel.com>
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "va_backend.h"
-
-#include "intel_batchbuffer.h"
-#include "intel_driver.h"
-
-#include "i965_defines.h"
-#include "i965_drv_video.h"
-#include "i965_avc_hw_scoreboard.h"
-#include "i965_media_h264.h"
-#include "i965_media.h"
-
-extern struct media_kernel *h264_avc_kernels;
-
-/* On Ironlake */
-#include "shaders/h264/mc/export.inc.gen5"
-
-enum {
-    AVC_HW_SCOREBOARD = 0,
-    AVC_HW_SCOREBOARD_MBAFF
-};
-
-static unsigned long avc_hw_scoreboard_kernel_offset[] = {
-    SETHWSCOREBOARD_IP_GEN5 * INST_UNIT_GEN5,
-    SETHWSCOREBOARD_MBAFF_IP_GEN5 * INST_UNIT_GEN5
-};
-
-static unsigned int avc_hw_scoreboard_constants[] = {
-    0x08040201,
-    0x00000010,
-    0x08000210,
-    0x00000000,
-    0x08040201,
-    0x08040210,
-    0x01000010,
-    0x08040200
-};
-
-static void
-i965_avc_hw_scoreboard_surface_state(struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    struct i965_surface_state *ss;
-    dri_bo *bo;
-
-    bo = avc_hw_scoreboard_context->surface.ss_bo;
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    ss = bo->virtual;
-    memset(ss, 0, sizeof(*ss));
-    ss->ss0.surface_type = I965_SURFACE_BUFFER;
-    ss->ss1.base_addr = avc_hw_scoreboard_context->surface.s_bo->offset;
-    ss->ss2.width = ((avc_hw_scoreboard_context->surface.total_mbs * MB_CMD_IN_OWS - 1) & 0x7f);
-    ss->ss2.height = (((avc_hw_scoreboard_context->surface.total_mbs * MB_CMD_IN_OWS - 1) >> 7) & 0x1fff);
-    ss->ss3.depth = (((avc_hw_scoreboard_context->surface.total_mbs * MB_CMD_IN_OWS - 1) >> 20) & 0x7f);
-    dri_bo_emit_reloc(bo,
-                      I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER,
-                      0,
-                      offsetof(struct i965_surface_state, ss1),
-                      avc_hw_scoreboard_context->surface.s_bo);
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_avc_hw_scoreboard_interface_descriptor_table(struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    struct i965_interface_descriptor *desc;
-    dri_bo *bo;
-
-    bo = avc_hw_scoreboard_context->idrt.bo;
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    desc = bo->virtual;
-    memset(desc, 0, sizeof(*desc));
-    desc->desc0.grf_reg_blocks = 7;
-    desc->desc0.kernel_start_pointer = (avc_hw_scoreboard_context->hw_kernel.bo->offset + 
-                                        avc_hw_scoreboard_context->hw_kernel.offset) >> 6; /* reloc */
-    desc->desc1.const_urb_entry_read_offset = 0;
-    desc->desc1.const_urb_entry_read_len = 1;
-    desc->desc3.binding_table_entry_count = 0;
-    desc->desc3.binding_table_pointer = 
-        avc_hw_scoreboard_context->binding_table.bo->offset >> 5; /*reloc */
-
-    dri_bo_emit_reloc(bo,
-                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                      desc->desc0.grf_reg_blocks + avc_hw_scoreboard_context->hw_kernel.offset,
-                      offsetof(struct i965_interface_descriptor, desc0),
-                      avc_hw_scoreboard_context->hw_kernel.bo);
-
-    dri_bo_emit_reloc(bo,
-                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                      desc->desc3.binding_table_entry_count,
-                      offsetof(struct i965_interface_descriptor, desc3),
-                      avc_hw_scoreboard_context->binding_table.bo);
-
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_avc_hw_scoreboard_binding_table(struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    unsigned int *binding_table;
-    dri_bo *bo = avc_hw_scoreboard_context->binding_table.bo;
-
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    binding_table = bo->virtual;
-    memset(binding_table, 0, bo->size);
-    binding_table[0] = avc_hw_scoreboard_context->surface.ss_bo->offset;
-    dri_bo_emit_reloc(bo,
-                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                      0,
-                      0,
-                      avc_hw_scoreboard_context->surface.ss_bo);
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_avc_hw_scoreboard_vfe_state(struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    struct i965_vfe_state *vfe_state;
-    dri_bo *bo;
-
-    bo = avc_hw_scoreboard_context->vfe_state.bo;
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    vfe_state = bo->virtual;
-    memset(vfe_state, 0, sizeof(*vfe_state));
-    vfe_state->vfe1.max_threads = avc_hw_scoreboard_context->urb.num_vfe_entries - 1;
-    vfe_state->vfe1.urb_entry_alloc_size = avc_hw_scoreboard_context->urb.size_vfe_entry - 1;
-    vfe_state->vfe1.num_urb_entries = avc_hw_scoreboard_context->urb.num_vfe_entries;
-    vfe_state->vfe1.vfe_mode = VFE_GENERIC_MODE;
-    vfe_state->vfe1.children_present = 0;
-    vfe_state->vfe2.interface_descriptor_base = 
-        avc_hw_scoreboard_context->idrt.bo->offset >> 4; /* reloc */
-    dri_bo_emit_reloc(bo,
-                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                      0,
-                      offsetof(struct i965_vfe_state, vfe2),
-                      avc_hw_scoreboard_context->idrt.bo);
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_avc_hw_scoreboard_upload_constants(struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    unsigned char *constant_buffer;
-
-    if (avc_hw_scoreboard_context->curbe.upload)
-        return;
-
-    dri_bo_map(avc_hw_scoreboard_context->curbe.bo, 1);
-    assert(avc_hw_scoreboard_context->curbe.bo->virtual);
-    constant_buffer = avc_hw_scoreboard_context->curbe.bo->virtual;
-    memcpy(constant_buffer, avc_hw_scoreboard_constants, sizeof(avc_hw_scoreboard_constants));
-    dri_bo_unmap(avc_hw_scoreboard_context->curbe.bo);
-    avc_hw_scoreboard_context->curbe.upload = 1;
-}
-
-static void
-i965_avc_hw_scoreboard_states_setup(struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    i965_avc_hw_scoreboard_surface_state(avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_binding_table(avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_interface_descriptor_table(avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_vfe_state(avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_upload_constants(avc_hw_scoreboard_context);
-}
-
-static void
-i965_avc_hw_scoreboard_pipeline_select(VADriverContextP ctx)
-{
-    BEGIN_BATCH(ctx, 1);
-    OUT_BATCH(ctx, CMD_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_hw_scoreboard_urb_layout(VADriverContextP ctx, struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    unsigned int vfe_fence, cs_fence;
-
-    vfe_fence = avc_hw_scoreboard_context->urb.cs_start;
-    cs_fence = URB_SIZE((&i965->intel));
-
-    BEGIN_BATCH(ctx, 3);
-    OUT_BATCH(ctx, CMD_URB_FENCE | UF0_VFE_REALLOC | UF0_CS_REALLOC | 1);
-    OUT_BATCH(ctx, 0);
-    OUT_BATCH(ctx, 
-              (vfe_fence << UF2_VFE_FENCE_SHIFT) |      /* VFE_SIZE */
-              (cs_fence << UF2_CS_FENCE_SHIFT));        /* CS_SIZE */
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_hw_scoreboard_state_base_address(VADriverContextP ctx)
-{
-    BEGIN_BATCH(ctx, 8);
-    OUT_BATCH(ctx, CMD_STATE_BASE_ADDRESS | 6);
-    OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-    OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_hw_scoreboard_state_pointers(VADriverContextP ctx, struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    BEGIN_BATCH(ctx, 3);
-    OUT_BATCH(ctx, CMD_MEDIA_STATE_POINTERS | 1);
-    OUT_BATCH(ctx, 0);
-    OUT_RELOC(ctx, avc_hw_scoreboard_context->vfe_state.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-    ADVANCE_BATCH(ctx);
-}
-
-static void 
-i965_avc_hw_scoreboard_cs_urb_layout(VADriverContextP ctx, struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    BEGIN_BATCH(ctx, 2);
-    OUT_BATCH(ctx, CMD_CS_URB_STATE | 0);
-    OUT_BATCH(ctx,
-              ((avc_hw_scoreboard_context->urb.size_cs_entry - 1) << 4) |     /* URB Entry Allocation Size */
-              (avc_hw_scoreboard_context->urb.num_cs_entries << 0));          /* Number of URB Entries */
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_hw_scoreboard_constant_buffer(VADriverContextP ctx, struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    BEGIN_BATCH(ctx, 2);
-    OUT_BATCH(ctx, CMD_CONSTANT_BUFFER | (1 << 8) | (2 - 2));
-    OUT_RELOC(ctx, avc_hw_scoreboard_context->curbe.bo,
-              I915_GEM_DOMAIN_INSTRUCTION, 0,
-              avc_hw_scoreboard_context->urb.size_cs_entry - 1);
-    ADVANCE_BATCH(ctx);    
-}
-
-static void
-i965_avc_hw_scoreboard_objects(VADriverContextP ctx, struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    int number_mb_cmds = 512;
-    int starting_mb_number = avc_hw_scoreboard_context->inline_data.starting_mb_number;
-    int i;
-
-    for (i = 0; i < avc_hw_scoreboard_context->inline_data.num_mb_cmds / 512; i++) {
-        BEGIN_BATCH(ctx, 6);
-        OUT_BATCH(ctx, CMD_MEDIA_OBJECT | 4);
-        OUT_BATCH(ctx, 0); /* interface descriptor offset: 0 */
-        OUT_BATCH(ctx, 0); /* no indirect data */
-        OUT_BATCH(ctx, 0);
-        OUT_BATCH(ctx, ((number_mb_cmds << 16) |
-                        (starting_mb_number << 0)));
-        OUT_BATCH(ctx, avc_hw_scoreboard_context->inline_data.pic_width_in_mbs);
-        ADVANCE_BATCH(ctx);
-
-        starting_mb_number += 512;
-    }
-
-    number_mb_cmds = avc_hw_scoreboard_context->inline_data.num_mb_cmds % 512;
-
-    if (number_mb_cmds) {
-        BEGIN_BATCH(ctx, 6);
-        OUT_BATCH(ctx, CMD_MEDIA_OBJECT | 4);
-        OUT_BATCH(ctx, 0); /* interface descriptor offset: 0 */
-        OUT_BATCH(ctx, 0); /* no indirect data */
-        OUT_BATCH(ctx, 0);
-        OUT_BATCH(ctx, ((number_mb_cmds << 16) |
-                        (starting_mb_number << 0)));
-        OUT_BATCH(ctx, avc_hw_scoreboard_context->inline_data.pic_width_in_mbs);
-        ADVANCE_BATCH(ctx);
-    }
-}
-
-static void
-i965_avc_hw_scoreboard_pipeline_setup(VADriverContextP ctx, struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    intel_batchbuffer_start_atomic(ctx, 0x1000);
-    intel_batchbuffer_emit_mi_flush(ctx);
-    i965_avc_hw_scoreboard_pipeline_select(ctx);
-    i965_avc_hw_scoreboard_state_base_address(ctx);
-    i965_avc_hw_scoreboard_state_pointers(ctx, avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_urb_layout(ctx, avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_cs_urb_layout(ctx, avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_constant_buffer(ctx, avc_hw_scoreboard_context);
-    i965_avc_hw_scoreboard_objects(ctx, avc_hw_scoreboard_context);
-    intel_batchbuffer_end_atomic(ctx);
-}
-
-void
-i965_avc_hw_scoreboard(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    if (i965_h264_context->use_avc_hw_scoreboard) {
-        struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context = &i965_h264_context->avc_hw_scoreboard_context;
-
-        avc_hw_scoreboard_context->inline_data.num_mb_cmds = i965_h264_context->avc_it_command_mb_info.mbs;
-        avc_hw_scoreboard_context->inline_data.starting_mb_number = i965_h264_context->avc_it_command_mb_info.mbs;
-        avc_hw_scoreboard_context->inline_data.pic_width_in_mbs = i965_h264_context->picture.width_in_mbs;
-        avc_hw_scoreboard_context->surface.total_mbs = i965_h264_context->avc_it_command_mb_info.mbs * 2;
-        
-        dri_bo_unreference(avc_hw_scoreboard_context->hw_kernel.bo);
-        avc_hw_scoreboard_context->hw_kernel.bo = h264_avc_kernels[H264_AVC_COMBINED].bo;
-        assert(avc_hw_scoreboard_context->hw_kernel.bo != NULL);
-        dri_bo_reference(avc_hw_scoreboard_context->hw_kernel.bo);
-
-        if (i965_h264_context->picture.mbaff_frame_flag)
-            avc_hw_scoreboard_context->hw_kernel.offset = avc_hw_scoreboard_kernel_offset[AVC_HW_SCOREBOARD_MBAFF];
-        else
-            avc_hw_scoreboard_context->hw_kernel.offset = avc_hw_scoreboard_kernel_offset[AVC_HW_SCOREBOARD];
-
-        i965_avc_hw_scoreboard_states_setup(avc_hw_scoreboard_context);
-        i965_avc_hw_scoreboard_pipeline_setup(ctx, avc_hw_scoreboard_context);
-    }
-}
-
-void
-i965_avc_hw_scoreboard_decode_init(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    if (i965_h264_context->use_avc_hw_scoreboard) {
-        struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context = &i965_h264_context->avc_hw_scoreboard_context;
-        dri_bo *bo;
-
-        if (avc_hw_scoreboard_context->curbe.bo == NULL) {
-            bo = dri_bo_alloc(i965->intel.bufmgr,
-                              "constant buffer",
-                              4096, 64);
-            assert(bo);
-            avc_hw_scoreboard_context->curbe.bo = bo;
-            avc_hw_scoreboard_context->curbe.upload = 0;
-        }
-
-        dri_bo_unreference(avc_hw_scoreboard_context->surface.s_bo);
-        avc_hw_scoreboard_context->surface.s_bo = i965_h264_context->avc_it_command_mb_info.bo;
-        assert(avc_hw_scoreboard_context->surface.s_bo != NULL);
-        dri_bo_reference(avc_hw_scoreboard_context->surface.s_bo);
-
-        dri_bo_unreference(avc_hw_scoreboard_context->surface.ss_bo);
-        bo = dri_bo_alloc(i965->intel.bufmgr, 
-                          "surface state", 
-                          sizeof(struct i965_surface_state), 32);
-        assert(bo);
-        avc_hw_scoreboard_context->surface.ss_bo = bo;
-
-        dri_bo_unreference(avc_hw_scoreboard_context->binding_table.bo);
-        bo = dri_bo_alloc(i965->intel.bufmgr, 
-                          "binding table",
-                          MAX_MEDIA_SURFACES * sizeof(unsigned int), 32);
-        assert(bo);
-        avc_hw_scoreboard_context->binding_table.bo = bo;
-
-        dri_bo_unreference(avc_hw_scoreboard_context->idrt.bo);
-        bo = dri_bo_alloc(i965->intel.bufmgr, 
-                          "interface discriptor", 
-                          MAX_INTERFACE_DESC * sizeof(struct i965_interface_descriptor), 16);
-        assert(bo);
-        avc_hw_scoreboard_context->idrt.bo = bo;
-
-        dri_bo_unreference(avc_hw_scoreboard_context->vfe_state.bo);
-        bo = dri_bo_alloc(i965->intel.bufmgr, 
-                          "vfe state", 
-                          sizeof(struct i965_vfe_state), 32);
-        assert(bo);
-        avc_hw_scoreboard_context->vfe_state.bo = bo;
-
-        avc_hw_scoreboard_context->urb.num_vfe_entries = 32;
-        avc_hw_scoreboard_context->urb.size_vfe_entry = 2;
-        avc_hw_scoreboard_context->urb.num_cs_entries = 1;
-        avc_hw_scoreboard_context->urb.size_cs_entry = 1;
-        avc_hw_scoreboard_context->urb.vfe_start = 0;
-        avc_hw_scoreboard_context->urb.cs_start = avc_hw_scoreboard_context->urb.vfe_start + 
-            avc_hw_scoreboard_context->urb.num_vfe_entries * avc_hw_scoreboard_context->urb.size_vfe_entry;
-        assert(avc_hw_scoreboard_context->urb.cs_start + 
-               avc_hw_scoreboard_context->urb.num_cs_entries * avc_hw_scoreboard_context->urb.size_cs_entry <= URB_SIZE((&i965->intel)));
-    }
-}
-
-Bool 
-i965_avc_hw_scoreboard_ternimate(struct i965_avc_hw_scoreboard_context *avc_hw_scoreboard_context)
-{
-    dri_bo_unreference(avc_hw_scoreboard_context->curbe.bo);
-    avc_hw_scoreboard_context->curbe.bo = NULL;
-
-    dri_bo_unreference(avc_hw_scoreboard_context->surface.ss_bo);
-    avc_hw_scoreboard_context->surface.ss_bo = NULL;
-
-    dri_bo_unreference(avc_hw_scoreboard_context->surface.s_bo);
-    avc_hw_scoreboard_context->surface.s_bo = NULL;
-
-    dri_bo_unreference(avc_hw_scoreboard_context->binding_table.bo);
-    avc_hw_scoreboard_context->binding_table.bo = NULL;
-
-    dri_bo_unreference(avc_hw_scoreboard_context->idrt.bo);
-    avc_hw_scoreboard_context->idrt.bo = NULL;
-
-    dri_bo_unreference(avc_hw_scoreboard_context->vfe_state.bo);
-    avc_hw_scoreboard_context->vfe_state.bo = NULL;
-
-    dri_bo_unreference(avc_hw_scoreboard_context->hw_kernel.bo);
-    avc_hw_scoreboard_context->hw_kernel.bo = NULL;
-
-    return True;
-}
diff -Nru libva-1.0.4/i965_drv_video/i965_avc_hw_scoreboard.h libva-1.0.1/i965_drv_video/i965_avc_hw_scoreboard.h
--- libva-1.0.4/i965_drv_video/i965_avc_hw_scoreboard.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_avc_hw_scoreboard.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Xiang Haihao <haihao.xiang@intel.com>
- *
- */
-
-#ifndef __I965_AVC_HW_SCOREBOARD_H__
-#define __I965_AVC_HW_SCOREBOARD_H__
-
-struct i965_avc_hw_scoreboard_context
-{
-    struct {
-        unsigned int num_mb_cmds;
-        unsigned int starting_mb_number;
-        unsigned int pic_width_in_mbs;
-    } inline_data;
-
-    struct {
-        dri_bo *ss_bo;
-        dri_bo *s_bo;
-        unsigned int total_mbs;
-    } surface;
-
-    struct {
-        dri_bo *bo;
-    } binding_table;
-
-    struct {
-        dri_bo *bo;
-    } idrt;
-
-    struct {
-        dri_bo *bo;
-    } vfe_state;
-
-    struct {
-        dri_bo *bo;
-        int upload;
-    } curbe;
-
-    struct {
-        dri_bo *bo;
-        unsigned long offset;
-    } hw_kernel;
-
-    struct {
-        unsigned int vfe_start;
-        unsigned int cs_start;
-
-        unsigned int num_vfe_entries;
-        unsigned int num_cs_entries;
-
-        unsigned int size_vfe_entry;
-        unsigned int size_cs_entry;
-    } urb;
-};
-
-void i965_avc_hw_scoreboard(VADriverContextP, struct decode_state *);
-void i965_avc_hw_scoreboard_decode_init(VADriverContextP);
-Bool i965_avc_hw_scoreboard_ternimate(struct i965_avc_hw_scoreboard_context *);
-
-#endif /* __I965_AVC_HW_SCOREBOARD_H__ */
-
diff -Nru libva-1.0.4/i965_drv_video/i965_avc_ildb.c libva-1.0.1/i965_drv_video/i965_avc_ildb.c
--- libva-1.0.4/i965_drv_video/i965_avc_ildb.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_avc_ildb.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,671 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Xiang Haihao <haihao.xiang@intel.com>
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "va_backend.h"
-
-#include "intel_batchbuffer.h"
-#include "intel_driver.h"
-
-#include "i965_defines.h"
-#include "i965_drv_video.h"
-#include "i965_avc_ildb.h"
-#include "i965_media_h264.h"
-#include "i965_media.h"
-
-/* On Cantiga */
-#include "shaders/h264/mc/export.inc"
-
-/* On Ironlake */
-#include "shaders/h264/mc/export.inc.gen5"
-
-#define PICTURE_FRAME   0
-#define PICTURE_FIELD   1
-#define PICTURE_MBAFF   2
-
-enum {
-    AVC_ILDB_ROOT_Y_ILDB_FRAME,
-    AVC_ILDB_CHILD_Y_ILDB_FRAME,
-    AVC_ILDB_ROOT_UV_ILDB_FRAME,
-    AVC_ILDB_CHILD_UV_ILDB_FRAME,
-    AVC_ILDB_ROOT_Y_ILDB_FIELD,
-    AVC_ILDB_CHILD_Y_ILDB_FIELD,
-    AVC_ILDB_ROOT_UV_ILDB_FIELD,
-    AVC_ILDB_CHILD_UV_ILDB_FIELD,
-    AVC_ILDB_ROOT_Y_ILDB_MBAFF,
-    AVC_ILDB_CHILD_Y_ILDB_MBAFF,
-    AVC_ILDB_ROOT_UV_ILDB_MBAFF,
-    AVC_ILDB_CHILD_UV_ILDB_MBAFF
-};
-
-static unsigned long avc_ildb_kernel_offset_gen4[] = {
-    AVC_ILDB_ROOT_Y_ILDB_FRAME_IP * INST_UNIT_GEN4,
-    AVC_ILDB_CHILD_Y_ILDB_FRAME_IP * INST_UNIT_GEN4,
-    AVC_ILDB_ROOT_UV_ILDB_FRAME_IP * INST_UNIT_GEN4,
-    AVC_ILDB_CHILD_UV_ILDB_FRAME_IP * INST_UNIT_GEN4,
-    AVC_ILDB_ROOT_Y_ILDB_FIELD_IP * INST_UNIT_GEN4,
-    AVC_ILDB_CHILD_Y_ILDB_FIELD_IP * INST_UNIT_GEN4,
-    AVC_ILDB_ROOT_UV_ILDB_FIELD_IP * INST_UNIT_GEN4,
-    AVC_ILDB_CHILD_UV_ILDB_FIELD_IP * INST_UNIT_GEN4,
-    AVC_ILDB_ROOT_Y_ILDB_MBAFF_IP * INST_UNIT_GEN4,
-    AVC_ILDB_CHILD_Y_ILDB_MBAFF_IP * INST_UNIT_GEN4,
-    AVC_ILDB_ROOT_UV_ILDB_MBAFF_IP * INST_UNIT_GEN4,
-    AVC_ILDB_CHILD_UV_ILDB_MBAFF_IP * INST_UNIT_GEN4
-};
-
-static unsigned long avc_ildb_kernel_offset_gen5[] = {
-    AVC_ILDB_ROOT_Y_ILDB_FRAME_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_CHILD_Y_ILDB_FRAME_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_ROOT_UV_ILDB_FRAME_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_CHILD_UV_ILDB_FRAME_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_ROOT_Y_ILDB_FIELD_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_CHILD_Y_ILDB_FIELD_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_ROOT_UV_ILDB_FIELD_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_CHILD_UV_ILDB_FIELD_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_ROOT_Y_ILDB_MBAFF_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_CHILD_Y_ILDB_MBAFF_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_ROOT_UV_ILDB_MBAFF_IP_GEN5 * INST_UNIT_GEN5,
-    AVC_ILDB_CHILD_UV_ILDB_MBAFF_IP_GEN5 * INST_UNIT_GEN5
-};
-
-struct avc_ildb_root_input
-{
-    unsigned int blocks_per_row : 16;
-    unsigned int blocks_per_column : 16;
-
-    unsigned int picture_type : 16;
-    unsigned int max_concurrent_threads : 16;
-
-    unsigned int debug_field : 16;
-    unsigned int mbaff_frame_flag : 1;
-    unsigned int bottom_field_flag : 1;
-    unsigned int control_data_expansion_flag : 1;
-    unsigned int chroma_format : 1;
-    unsigned int pad0 : 12;
-
-    unsigned int ramp_constant_0;
-    
-    unsigned int ramp_constant_1;
-
-    int constant_0 : 8;
-    int constant_1 : 8;
-    int pad1 : 16;
-
-    unsigned int pad2;
-    unsigned int pad3;
-};
-
-extern struct media_kernel *h264_avc_kernels;
-
-#define NUM_AVC_ILDB_INTERFACES ARRAY_ELEMS(avc_ildb_kernel_offset_gen4)
-static unsigned long *avc_ildb_kernel_offset = NULL;
-
-static void
-i965_avc_ildb_surface_state(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-    struct i965_surface_state *ss;
-    struct object_surface *obj_surface;
-    VAPictureParameterBufferH264 *pic_param;
-    VAPictureH264 *va_pic;
-    dri_bo *bo;
-    int i;
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-    va_pic = &pic_param->CurrPic;
-    assert(!(va_pic->flags & VA_PICTURE_H264_INVALID));
-    obj_surface = SURFACE(va_pic->picture_id);
-    assert(obj_surface);
-
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].s_bo = i965_h264_context->avc_ildb_data.bo;
-    dri_bo_reference(avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].s_bo);
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].offset = 0;
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].surface_type = I965_SURFACE_BUFFER;
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].width = ((avc_ildb_context->mbs_per_picture * EDGE_CONTROL_DATA_IN_DWS - 1) & 0x7f);
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].height = (((avc_ildb_context->mbs_per_picture * EDGE_CONTROL_DATA_IN_DWS - 1) >> 7) & 0x1fff);
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].depth = (((avc_ildb_context->mbs_per_picture * EDGE_CONTROL_DATA_IN_DWS - 1) >> 20) & 0x7f);
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].pitch = EDGE_CONTROL_DATA_IN_BTYES - 1;
-    avc_ildb_context->surface[SURFACE_EDGE_CONTROL_DATA].is_target = 0;
-    
-    avc_ildb_context->surface[SURFACE_SRC_Y].s_bo = obj_surface->bo;
-    dri_bo_reference(avc_ildb_context->surface[SURFACE_SRC_Y].s_bo);
-    avc_ildb_context->surface[SURFACE_SRC_Y].offset = 0;
-    avc_ildb_context->surface[SURFACE_SRC_Y].surface_type = I965_SURFACE_2D;
-    avc_ildb_context->surface[SURFACE_SRC_Y].format = I965_SURFACEFORMAT_R8_SINT;
-    avc_ildb_context->surface[SURFACE_SRC_Y].width = obj_surface->width / 4 - 1;
-    avc_ildb_context->surface[SURFACE_SRC_Y].height = obj_surface->height - 1;
-    avc_ildb_context->surface[SURFACE_SRC_Y].depth = 0;
-    avc_ildb_context->surface[SURFACE_SRC_Y].pitch = obj_surface->width - 1;
-    avc_ildb_context->surface[SURFACE_SRC_Y].vert_line_stride = !!(va_pic->flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD));
-    avc_ildb_context->surface[SURFACE_SRC_Y].vert_line_stride_ofs = !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD);
-    avc_ildb_context->surface[SURFACE_SRC_Y].is_target = 0;
-    
-    avc_ildb_context->surface[SURFACE_SRC_UV].s_bo = obj_surface->bo;
-    dri_bo_reference(avc_ildb_context->surface[SURFACE_SRC_UV].s_bo);
-    avc_ildb_context->surface[SURFACE_SRC_UV].offset = obj_surface->width * obj_surface->height;
-    avc_ildb_context->surface[SURFACE_SRC_UV].surface_type = I965_SURFACE_2D;
-    avc_ildb_context->surface[SURFACE_SRC_UV].format = I965_SURFACEFORMAT_R8G8_SINT;
-    avc_ildb_context->surface[SURFACE_SRC_UV].width = obj_surface->width / 4 - 1;
-    avc_ildb_context->surface[SURFACE_SRC_UV].height = obj_surface->height / 2 - 1;
-    avc_ildb_context->surface[SURFACE_SRC_UV].depth = 0;
-    avc_ildb_context->surface[SURFACE_SRC_UV].pitch = obj_surface->width - 1;
-    avc_ildb_context->surface[SURFACE_SRC_UV].vert_line_stride = !!(va_pic->flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD));
-    avc_ildb_context->surface[SURFACE_SRC_UV].vert_line_stride_ofs = !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD);
-    avc_ildb_context->surface[SURFACE_SRC_UV].is_target = 0;
-
-    avc_ildb_context->surface[SURFACE_DEST_Y].s_bo = obj_surface->bo;
-    dri_bo_reference(avc_ildb_context->surface[SURFACE_DEST_Y].s_bo);
-    avc_ildb_context->surface[SURFACE_DEST_Y].offset = 0;
-    avc_ildb_context->surface[SURFACE_DEST_Y].surface_type = I965_SURFACE_2D;
-    avc_ildb_context->surface[SURFACE_DEST_Y].format = I965_SURFACEFORMAT_R8_SINT;
-    avc_ildb_context->surface[SURFACE_DEST_Y].width = obj_surface->width / 4 - 1;
-    avc_ildb_context->surface[SURFACE_DEST_Y].height = obj_surface->height - 1;
-    avc_ildb_context->surface[SURFACE_DEST_Y].depth = 0;
-    avc_ildb_context->surface[SURFACE_DEST_Y].pitch = obj_surface->width - 1;
-    avc_ildb_context->surface[SURFACE_DEST_Y].vert_line_stride = !!(va_pic->flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD));
-    avc_ildb_context->surface[SURFACE_DEST_Y].vert_line_stride_ofs = !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD);
-    avc_ildb_context->surface[SURFACE_DEST_Y].is_target = 1;
-
-    avc_ildb_context->surface[SURFACE_DEST_UV].s_bo = obj_surface->bo;
-    dri_bo_reference(avc_ildb_context->surface[SURFACE_DEST_UV].s_bo);
-    avc_ildb_context->surface[SURFACE_DEST_UV].offset = obj_surface->width * obj_surface->height;
-    avc_ildb_context->surface[SURFACE_DEST_UV].surface_type = I965_SURFACE_2D;
-    avc_ildb_context->surface[SURFACE_DEST_UV].format = I965_SURFACEFORMAT_R8G8_SINT;
-    avc_ildb_context->surface[SURFACE_DEST_UV].width = obj_surface->width / 4 - 1;
-    avc_ildb_context->surface[SURFACE_DEST_UV].height = obj_surface->height / 2 - 1;
-    avc_ildb_context->surface[SURFACE_DEST_UV].depth = 0;
-    avc_ildb_context->surface[SURFACE_DEST_UV].pitch = obj_surface->width - 1;
-    avc_ildb_context->surface[SURFACE_DEST_UV].vert_line_stride = !!(va_pic->flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD));
-    avc_ildb_context->surface[SURFACE_DEST_UV].vert_line_stride_ofs = !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD);
-    avc_ildb_context->surface[SURFACE_DEST_UV].is_target = 1;
-
-    for (i = 0; i < NUM_AVC_ILDB_SURFACES; i++) {
-        bo = avc_ildb_context->surface[i].ss_bo;
-        dri_bo_map(bo, 1);
-        assert(bo->virtual);
-        ss = bo->virtual;
-        memset(ss, 0, sizeof(*ss));
-        ss->ss0.surface_type = avc_ildb_context->surface[i].surface_type;
-        ss->ss0.surface_format = avc_ildb_context->surface[i].format;
-        ss->ss0.vert_line_stride = avc_ildb_context->surface[i].vert_line_stride;
-        ss->ss0.vert_line_stride_ofs = avc_ildb_context->surface[i].vert_line_stride_ofs;
-        ss->ss1.base_addr = avc_ildb_context->surface[i].s_bo->offset + avc_ildb_context->surface[i].offset;
-        ss->ss2.width = avc_ildb_context->surface[i].width;
-        ss->ss2.height = avc_ildb_context->surface[i].height;
-        ss->ss3.depth = avc_ildb_context->surface[i].depth;
-        ss->ss3.pitch = avc_ildb_context->surface[i].pitch;
-        dri_bo_emit_reloc(bo,
-                          I915_GEM_DOMAIN_RENDER, 
-                          avc_ildb_context->surface[i].is_target ? I915_GEM_DOMAIN_RENDER : 0,
-                          avc_ildb_context->surface[i].offset,
-                          offsetof(struct i965_surface_state, ss1),
-                          avc_ildb_context->surface[i].s_bo);
-        dri_bo_unmap(bo);
-    }
-}
-
-static void
-i965_avc_ildb_binding_table(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-    unsigned int *binding_table;
-    dri_bo *bo = avc_ildb_context->binding_table.bo;
-    int i;
-
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    binding_table = bo->virtual;
-    memset(binding_table, 0, bo->size);
-
-    for (i = 0; i < NUM_AVC_ILDB_SURFACES; i++) {
-        binding_table[i] = avc_ildb_context->surface[i].ss_bo->offset;
-        dri_bo_emit_reloc(bo,
-                          I915_GEM_DOMAIN_INSTRUCTION, 0,
-                          0,
-                          i * sizeof(*binding_table),
-                          avc_ildb_context->surface[i].ss_bo);
-    }
-
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_avc_ildb_interface_descriptor_table(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-    struct i965_interface_descriptor *desc;
-    dri_bo *bo;
-    int i;
-
-    bo = avc_ildb_context->idrt.bo;
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    desc = bo->virtual;
-
-    for (i = 0; i < NUM_AVC_ILDB_INTERFACES; i++) {
-        int kernel_offset = avc_ildb_kernel_offset[i];
-        memset(desc, 0, sizeof(*desc));
-        desc->desc0.grf_reg_blocks = 7; 
-        desc->desc0.kernel_start_pointer = (h264_avc_kernels[H264_AVC_COMBINED].bo->offset + kernel_offset) >> 6; /* reloc */
-        desc->desc1.const_urb_entry_read_offset = 0;
-        desc->desc1.const_urb_entry_read_len = ((i == AVC_ILDB_ROOT_Y_ILDB_FRAME ||
-                                                 i == AVC_ILDB_ROOT_Y_ILDB_FIELD ||
-                                                 i == AVC_ILDB_ROOT_Y_ILDB_MBAFF) ? 1 : 0);
-        desc->desc3.binding_table_entry_count = 0;
-        desc->desc3.binding_table_pointer = 
-            avc_ildb_context->binding_table.bo->offset >> 5; /*reloc */
-
-        dri_bo_emit_reloc(bo,
-                          I915_GEM_DOMAIN_INSTRUCTION, 0,
-                          desc->desc0.grf_reg_blocks + kernel_offset,
-                          i * sizeof(*desc) + offsetof(struct i965_interface_descriptor, desc0),
-                          h264_avc_kernels[H264_AVC_COMBINED].bo);
-
-        dri_bo_emit_reloc(bo,
-                          I915_GEM_DOMAIN_INSTRUCTION, 0,
-                          desc->desc3.binding_table_entry_count,
-                          i * sizeof(*desc) + offsetof(struct i965_interface_descriptor, desc3),
-                          avc_ildb_context->binding_table.bo);
-        desc++;
-    }
-
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_avc_ildb_vfe_state(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-    struct i965_vfe_state *vfe_state;
-    dri_bo *bo;
-
-    bo = avc_ildb_context->vfe_state.bo;
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    vfe_state = bo->virtual;
-    memset(vfe_state, 0, sizeof(*vfe_state));
-    vfe_state->vfe1.max_threads = 0;
-    vfe_state->vfe1.urb_entry_alloc_size = avc_ildb_context->urb.size_vfe_entry - 1;
-    vfe_state->vfe1.num_urb_entries = avc_ildb_context->urb.num_vfe_entries;
-    vfe_state->vfe1.vfe_mode = VFE_GENERIC_MODE;
-    vfe_state->vfe1.children_present = 1;
-    vfe_state->vfe2.interface_descriptor_base = 
-        avc_ildb_context->idrt.bo->offset >> 4; /* reloc */
-    dri_bo_emit_reloc(bo,
-                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                      0,
-                      offsetof(struct i965_vfe_state, vfe2),
-                      avc_ildb_context->idrt.bo);
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_avc_ildb_upload_constants(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-    VAPictureParameterBufferH264 *pic_param;
-    struct avc_ildb_root_input *root_input;
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-
-    dri_bo_map(avc_ildb_context->curbe.bo, 1);
-    assert(avc_ildb_context->curbe.bo->virtual);
-    root_input = avc_ildb_context->curbe.bo->virtual;
-
-    if (IS_IRONLAKE(i965->intel.device_id)) {
-        root_input->max_concurrent_threads = 76; /* 72 - 2 + 8 - 2 */
-    } else {
-        root_input->max_concurrent_threads = 54; /* 50 - 2 + 8 = 2 */
-    }
-
-    if (pic_param->pic_fields.bits.field_pic_flag)
-        root_input->picture_type = PICTURE_FIELD;
-    else {
-        if (pic_param->seq_fields.bits.mb_adaptive_frame_field_flag)
-            root_input->picture_type = PICTURE_MBAFF;
-        else
-            root_input->picture_type = PICTURE_FRAME;
-    }
-
-    avc_ildb_context->picture_type = root_input->picture_type;
-    root_input->blocks_per_row = pic_param->picture_width_in_mbs_minus1 + 1;
-    root_input->blocks_per_column = (pic_param->picture_height_in_mbs_minus1 + 1) / 
-        (1 + (root_input->picture_type != PICTURE_FRAME));
-    avc_ildb_context->mbs_per_picture = (pic_param->picture_width_in_mbs_minus1 + 1) *
-        (pic_param->picture_height_in_mbs_minus1 + 1);
-    
-    root_input->mbaff_frame_flag = (root_input->picture_type == PICTURE_MBAFF);
-    root_input->bottom_field_flag = !!(pic_param->CurrPic.flags & VA_PICTURE_H264_BOTTOM_FIELD);
-    root_input->control_data_expansion_flag = 1; /* Always 1 on G4x+ */
-    root_input->chroma_format = (pic_param->seq_fields.bits.chroma_format_idc != 1); /* 0=4:0:0, 1=4:2:0 */
-    
-    root_input->ramp_constant_0 = 0x03020100;
-    
-    root_input->ramp_constant_1 = 0x07060504;
-
-    root_input->constant_0 = -2;
-    root_input->constant_1 = 1;
-
-    dri_bo_unmap(avc_ildb_context->curbe.bo);
-}
-
-static void
-i965_avc_ildb_states_setup(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    i965_avc_ildb_surface_state(ctx, decode_state);
-    i965_avc_ildb_binding_table(ctx);
-    i965_avc_ildb_interface_descriptor_table(ctx);
-    i965_avc_ildb_vfe_state(ctx);
-    i965_avc_ildb_upload_constants(ctx, decode_state);
-}
-
-static void
-i965_avc_ildb_pipeline_select(VADriverContextP ctx)
-{
-    BEGIN_BATCH(ctx, 1);
-    OUT_BATCH(ctx, CMD_PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_ildb_urb_layout(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-
-    unsigned int vfe_fence, cs_fence;
-
-    vfe_fence = avc_ildb_context->urb.cs_start;
-    cs_fence = URB_SIZE((&i965->intel));
-
-    BEGIN_BATCH(ctx, 3);
-    OUT_BATCH(ctx, CMD_URB_FENCE | UF0_VFE_REALLOC | UF0_CS_REALLOC | 1);
-    OUT_BATCH(ctx, 0);
-    OUT_BATCH(ctx, 
-              (vfe_fence << UF2_VFE_FENCE_SHIFT) |      /* VFE_SIZE */
-              (cs_fence << UF2_CS_FENCE_SHIFT));        /* CS_SIZE */
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_ildb_state_base_address(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx); 
-
-    if (IS_IRONLAKE(i965->intel.device_id)) {
-        BEGIN_BATCH(ctx, 8);
-        OUT_BATCH(ctx, CMD_STATE_BASE_ADDRESS | 6);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        ADVANCE_BATCH(ctx);
-    } else {
-        BEGIN_BATCH(ctx, 6);
-        OUT_BATCH(ctx, CMD_STATE_BASE_ADDRESS | 4);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        ADVANCE_BATCH(ctx);
-    }
-}
-
-static void
-i965_avc_ildb_state_pointers(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-
-    BEGIN_BATCH(ctx, 3);
-    OUT_BATCH(ctx, CMD_MEDIA_STATE_POINTERS | 1);
-    OUT_BATCH(ctx, 0);
-    OUT_RELOC(ctx, avc_ildb_context->vfe_state.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 0);
-    ADVANCE_BATCH(ctx);
-}
-
-static void 
-i965_avc_ildb_cs_urb_layout(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-
-    BEGIN_BATCH(ctx, 2);
-    OUT_BATCH(ctx, CMD_CS_URB_STATE | 0);
-    OUT_BATCH(ctx,
-              ((avc_ildb_context->urb.size_cs_entry - 1) << 4) |     /* URB Entry Allocation Size */
-              (avc_ildb_context->urb.num_cs_entries << 0));          /* Number of URB Entries */
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_ildb_constant_buffer(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-
-    BEGIN_BATCH(ctx, 2);
-    OUT_BATCH(ctx, CMD_CONSTANT_BUFFER | (1 << 8) | (2 - 2));
-    OUT_RELOC(ctx, avc_ildb_context->curbe.bo,
-              I915_GEM_DOMAIN_INSTRUCTION, 0,
-              avc_ildb_context->urb.size_cs_entry - 1);
-    ADVANCE_BATCH(ctx);    
-}
-
-static void
-i965_avc_ildb_objects(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;
-
-    BEGIN_BATCH(ctx, 6);
-    OUT_BATCH(ctx, CMD_MEDIA_OBJECT | 4);
-
-    switch (avc_ildb_context->picture_type) {
-    case PICTURE_FRAME:
-        OUT_BATCH(ctx, AVC_ILDB_ROOT_Y_ILDB_FRAME);
-        break;
-
-    case PICTURE_FIELD:
-        OUT_BATCH(ctx, AVC_ILDB_ROOT_Y_ILDB_FIELD);
-        break;
-
-    case PICTURE_MBAFF:
-        OUT_BATCH(ctx, AVC_ILDB_ROOT_Y_ILDB_MBAFF);
-        break;
-
-    default:
-        assert(0);
-        OUT_BATCH(ctx, 0);
-        break;
-    }
-
-    OUT_BATCH(ctx, 0); /* no indirect data */
-    OUT_BATCH(ctx, 0);
-    OUT_BATCH(ctx, 0);
-    OUT_BATCH(ctx, 0);
-    ADVANCE_BATCH(ctx);
-}
-
-static void
-i965_avc_ildb_pipeline_setup(VADriverContextP ctx)
-{
-    intel_batchbuffer_emit_mi_flush(ctx);
-    i965_avc_ildb_pipeline_select(ctx);
-    i965_avc_ildb_state_base_address(ctx);
-    i965_avc_ildb_state_pointers(ctx);
-    i965_avc_ildb_urb_layout(ctx);
-    i965_avc_ildb_cs_urb_layout(ctx);
-    i965_avc_ildb_constant_buffer(ctx);
-    i965_avc_ildb_objects(ctx);
-}
-
-void
-i965_avc_ildb(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    if (i965_h264_context->enable_avc_ildb) {
-        i965_avc_ildb_states_setup(ctx, decode_state);
-        i965_avc_ildb_pipeline_setup(ctx);
-    }
-}
-
-void
-i965_avc_ildb_decode_init(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-    struct i965_avc_ildb_context *avc_ildb_context = &i965_h264_context->avc_ildb_context;;
-    dri_bo *bo;
-    int i;
-
-    dri_bo_unreference(avc_ildb_context->curbe.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr,
-                      "constant buffer",
-                      4096, 64);
-    assert(bo);
-    avc_ildb_context->curbe.bo = bo;
-
-    dri_bo_unreference(avc_ildb_context->binding_table.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr, 
-                      "binding table",
-                      NUM_AVC_ILDB_SURFACES * sizeof(unsigned int), 32);
-    assert(bo);
-    avc_ildb_context->binding_table.bo = bo;
-
-    dri_bo_unreference(avc_ildb_context->idrt.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr, 
-                      "interface discriptor", 
-                      NUM_AVC_ILDB_INTERFACES * sizeof(struct i965_interface_descriptor), 16);
-    assert(bo);
-    avc_ildb_context->idrt.bo = bo;
-
-    dri_bo_unreference(avc_ildb_context->vfe_state.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr, 
-                      "vfe state", 
-                      sizeof(struct i965_vfe_state), 32);
-    assert(bo);
-    avc_ildb_context->vfe_state.bo = bo;
-
-    avc_ildb_context->urb.num_vfe_entries = 1;
-    avc_ildb_context->urb.size_vfe_entry = 640;
-    avc_ildb_context->urb.num_cs_entries = 1;
-    avc_ildb_context->urb.size_cs_entry = 1;
-    avc_ildb_context->urb.vfe_start = 0;
-    avc_ildb_context->urb.cs_start = avc_ildb_context->urb.vfe_start + 
-        avc_ildb_context->urb.num_vfe_entries * avc_ildb_context->urb.size_vfe_entry;
-    assert(avc_ildb_context->urb.cs_start + 
-           avc_ildb_context->urb.num_cs_entries * avc_ildb_context->urb.size_cs_entry <= URB_SIZE((&i965->intel)));
-
-    for (i = 0; i < NUM_AVC_ILDB_SURFACES; i++) {
-        dri_bo_unreference(avc_ildb_context->surface[i].s_bo);
-        avc_ildb_context->surface[i].s_bo = NULL;
-
-        dri_bo_unreference(avc_ildb_context->surface[i].ss_bo);
-        bo = dri_bo_alloc(i965->intel.bufmgr, 
-                          "surface state", 
-                          sizeof(struct i965_surface_state), 32);
-        assert(bo);
-        avc_ildb_context->surface[i].ss_bo = bo;
-    }
-
-    /* kernel offset */
-    assert(NUM_AVC_ILDB_INTERFACES == ARRAY_ELEMS(avc_ildb_kernel_offset_gen5));
-
-    if (IS_IRONLAKE(i965->intel.device_id)) {
-        avc_ildb_kernel_offset = avc_ildb_kernel_offset_gen5;
-    } else {
-        avc_ildb_kernel_offset = avc_ildb_kernel_offset_gen4;
-    }
-}
-
-Bool 
-i965_avc_ildb_ternimate(struct i965_avc_ildb_context *avc_ildb_context)
-{
-    int i;
-
-    dri_bo_unreference(avc_ildb_context->curbe.bo);
-    avc_ildb_context->curbe.bo = NULL;
-
-    dri_bo_unreference(avc_ildb_context->binding_table.bo);
-    avc_ildb_context->binding_table.bo = NULL;
-
-    dri_bo_unreference(avc_ildb_context->idrt.bo);
-    avc_ildb_context->idrt.bo = NULL;
-
-    dri_bo_unreference(avc_ildb_context->vfe_state.bo);
-    avc_ildb_context->vfe_state.bo = NULL;
-
-    for (i = 0; i < NUM_AVC_ILDB_SURFACES; i++) {
-        dri_bo_unreference(avc_ildb_context->surface[i].ss_bo);
-        avc_ildb_context->surface[i].ss_bo = NULL;
-
-        dri_bo_unreference(avc_ildb_context->surface[i].s_bo);
-        avc_ildb_context->surface[i].s_bo = NULL;
-    }
-
-    return True;
-}
diff -Nru libva-1.0.4/i965_drv_video/i965_avc_ildb.h libva-1.0.1/i965_drv_video/i965_avc_ildb.h
--- libva-1.0.4/i965_drv_video/i965_avc_ildb.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_avc_ildb.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Xiang Haihao <haihao.xiang@intel.com>
- *
- */
-
-#ifndef __I965_AVC_ILDB_H__
-#define __I965_AVC_ILDB_H__
-
-#define SURFACE_EDGE_CONTROL_DATA       0
-#define SURFACE_SRC_Y                   1
-#define SURFACE_SRC_UV                  2
-#define SURFACE_DEST_Y                  3
-#define SURFACE_DEST_UV                 4
-
-#define NUM_AVC_ILDB_SURFACES           5
-
-#define EDGE_CONTROL_DATA_IN_DWS        16
-#define EDGE_CONTROL_DATA_IN_BTYES      64
-
-struct i965_avc_ildb_context
-{
-    struct {
-        dri_bo *bo;
-    } curbe;
-
-    struct {
-        dri_bo *ss_bo;
-        dri_bo *s_bo;
-        unsigned long offset;
-        int surface_type;
-        int width;
-        int height;
-        int depth;
-        int pitch;
-        int format;
-        int vert_line_stride;
-        int vert_line_stride_ofs;
-        int is_target;
-    } surface[NUM_AVC_ILDB_SURFACES];
-
-    struct {
-        dri_bo *bo;
-    } binding_table;
-
-    struct {
-        dri_bo *bo;
-    } idrt;
-
-    struct {
-        dri_bo *bo;
-    } vfe_state;
-
-    struct {
-        unsigned int vfe_start;
-        unsigned int cs_start;
-
-        unsigned int num_vfe_entries;
-        unsigned int num_cs_entries;
-
-        unsigned int size_vfe_entry;
-        unsigned int size_cs_entry;
-    } urb;
-
-    int picture_type;
-    int mbs_per_picture;
-};
-
-void i965_avc_ildb(VADriverContextP, struct decode_state *);
-void i965_avc_ildb_decode_init(VADriverContextP);
-Bool i965_avc_ildb_ternimate(struct i965_avc_ildb_context *);
-
-#endif /* __I965_AVC_ILDB_H__ */
-
diff -Nru libva-1.0.4/i965_drv_video/i965_defines.h libva-1.0.1/i965_drv_video/i965_defines.h
--- libva-1.0.4/i965_drv_video/i965_defines.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_defines.h	2009-12-17 03:05:38.000000000 +0000
@@ -20,13 +20,6 @@
 #define CMD_MEDIA_OBJECT                        CMD(2, 1, 0)
 #define CMD_MEDIA_OBJECT_EX                     CMD(2, 1, 1)
 
-#define CMD_AVC_BSD_IMG_STATE                   CMD(2, 4, 0)
-#define CMD_AVC_BSD_QM_STATE                    CMD(2, 4, 1)
-#define CMD_AVC_BSD_SLICE_STATE                 CMD(2, 4, 2)
-#define CMD_AVC_BSD_BUF_BASE_STATE              CMD(2, 4, 3)
-#define CMD_BSD_IND_OBJ_BASE_ADDR               CMD(2, 4, 4)
-#define CMD_AVC_BSD_OBJECT                      CMD(2, 4, 8)
-
 #define CMD_PIPELINED_POINTERS                  CMD(3, 0, 0)
 #define CMD_BINDING_TABLE_POINTERS              CMD(3, 0, 1)
 #define CMD_VERTEX_BUFFERS                      CMD(3, 0, 8)
@@ -35,9 +28,6 @@
 #define CMD_CONSTANT_COLOR                      CMD(3, 1, 1)
 #define CMD_3DPRIMITIVE                         CMD(3, 3, 0)
 
-#define CMD_DEPTH_BUFFER                        CMD(3, 1, 5)
-#define I965_DEPTHFORMAT_D32_FLOAT              1
-
 #define BASE_ADDRESS_MODIFY             (1 << 0)
 
 #define PIPELINE_SELECT_3D              0
@@ -331,32 +321,6 @@
 #define I965_TILEWALK_XMAJOR                 0
 #define I965_TILEWALK_YMAJOR                 1
 
-#define SCAN_RASTER_ORDER       0
-#define SCAN_SPECIAL_ORDER      1
-
-#define ENTROPY_CAVLD           0
-#define ENTROPY_CABAC           1
-
-#define SLICE_TYPE_P            0
-#define SLICE_TYPE_B            1
-#define SLICE_TYPE_I            2
-#define SLICE_TYPE_SP           3
-#define SLICE_TYPE_SI           4
-
-#define PRESENT_REF_LIST0               (1 << 0)
-#define PRESENT_REF_LIST1               (1 << 1)
-#define PRESENT_WEIGHT_OFFSET_L0        (1 << 2)
-#define PRESENT_WEIGHT_OFFSET_L1        (1 << 3)
-
-#define RESIDUAL_DATA_OFFSET    48
-
-#define PRESENT_NOMV            0
-#define PRESENT_NOWO            1
-#define PRESENT_MV_WO           3
-
-#define SCOREBOARD_STALLING     0
-#define SCOREBOARD_NON_STALLING 1
-
-#define URB_SIZE(intel)         (IS_IRONLAKE(intel->device_id) ? 1024 : \
+#define URB_SIZE(intel)         (IS_IGDNG(intel->device_id) ? 1024 : \
                                  IS_G4X(intel->device_id) ? 384 : 256)
 #endif /* _I965_DEFINES_H_ */
diff -Nru libva-1.0.4/i965_drv_video/i965_drv_video.c libva-1.0.1/i965_drv_video/i965_drv_video.c
--- libva-1.0.4/i965_drv_video/i965_drv_video.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_drv_video.c	2009-12-17 03:05:38.000000000 +0000
@@ -27,11 +27,11 @@
  *
  */
 
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include "va/x11/va_dricommon.h"
+#include "va_backend.h"
+#include "va_dricommon.h"
 
 #include "intel_driver.h"
 #include "intel_memman.h"
@@ -54,22 +54,6 @@
     I965_SURFACETYPE_INDEXED
 };
 
-/* List of supported image formats */
-typedef struct {
-    unsigned int        type;
-    VAImageFormat       va_format;
-} i965_image_format_map_t;
-
-static const i965_image_format_map_t
-i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
-    { I965_SURFACETYPE_YUV,
-      { VA_FOURCC('Y','V','1','2'), VA_LSB_FIRST, 12, } },
-    { I965_SURFACETYPE_YUV,
-      { VA_FOURCC('I','4','2','0'), VA_LSB_FIRST, 12, } },
-    { I965_SURFACETYPE_YUV,
-      { VA_FOURCC('N','V','1','2'), VA_LSB_FIRST, 12, } },
-};
-
 /* List of supported subpicture formats */
 typedef struct {
     unsigned int        type;
@@ -86,21 +70,13 @@
     { I965_SURFACETYPE_INDEXED, I965_SURFACEFORMAT_A4P4_UNORM,
       { VA_FOURCC('A','I','4','4'), VA_MSB_FIRST, 8, },
       0 },
-    { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_B8G8R8A8_UNORM,
-      { VA_FOURCC('B','G','R','A'), VA_LSB_FIRST, 32,
-        32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 },
-      0 },
-    { I965_SURFACETYPE_RGBA, I965_SURFACEFORMAT_R8G8B8A8_UNORM,
-      { VA_FOURCC('R','G','B','A'), VA_LSB_FIRST, 32,
-        32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000 },
-      0 },
 };
 
 static const i965_subpic_format_map_t *
 get_subpic_format(const VAImageFormat *va_format)
 {
     unsigned int i;
-    for (i = 0; i965_subpic_formats_map[i].type != 0; i++) {
+    for (i = 0; i < sizeof(i965_subpic_formats_map)/sizeof(i965_subpic_formats_map[0]); i++) {
         const i965_subpic_format_map_t * const m = &i965_subpic_formats_map[i];
         if (m->va_format.fourcc == va_format->fourcc &&
             (m->type == I965_SURFACETYPE_RGBA ?
@@ -123,9 +99,6 @@
 
     profile_list[i++] = VAProfileMPEG2Simple;
     profile_list[i++] = VAProfileMPEG2Main;
-    profile_list[i++] = VAProfileH264Baseline;
-    profile_list[i++] = VAProfileH264Main;
-    profile_list[i++] = VAProfileH264High;
 
     /* If the assert fails then I965_MAX_PROFILES needs to be bigger */
     assert(i <= I965_MAX_PROFILES);
@@ -149,13 +122,6 @@
         entrypoint_list[0] = VAEntrypointVLD;
         break;
 
-    case VAProfileH264Baseline:
-    case VAProfileH264Main:
-    case VAProfileH264High:
-        *num_entrypoints = 1;
-        entrypoint_list[0] = VAEntrypointVLD;
-        break;
-
     default:
         vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
         *num_entrypoints = 0;
@@ -251,17 +217,6 @@
         }
         break;
 
-    case VAProfileH264Baseline:
-    case VAProfileH264Main:
-    case VAProfileH264High:
-        if (VAEntrypointVLD == entrypoint) {
-            vaStatus = VA_STATUS_SUCCESS;
-        } else {
-            vaStatus = VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT;
-        }
-
-        break;
-
     default:
         vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
         break;
@@ -350,12 +305,6 @@
 
     dri_bo_unreference(obj_surface->bo);
     obj_surface->bo = NULL;
-
-    if (obj_surface->free_private_data != NULL) {
-        obj_surface->free_private_data(&obj_surface->private_data);
-        obj_surface->private_data = NULL;
-    }
-
     object_heap_free(heap, obj);
 }
 
@@ -388,15 +337,19 @@
         surfaces[i] = surfaceID;
         obj_surface->status = VASurfaceReady;
         obj_surface->subpic = VA_INVALID_ID;
-        obj_surface->orig_width = width;
-        obj_surface->orig_height = height;
-        obj_surface->width = ALIGN(obj_surface->orig_width, 16);
-        obj_surface->height = ALIGN(obj_surface->orig_height, 16);
-        obj_surface->size = SIZE_YUV420(obj_surface->width, obj_surface->height);
-        obj_surface->flags = SURFACE_REFERENCED;
-        obj_surface->bo = NULL;
-        obj_surface->private_data = NULL;
-        obj_surface->free_private_data = NULL;
+        obj_surface->width = width;
+        obj_surface->height = height;
+        obj_surface->size = SIZE_YUV420(width, height);
+        obj_surface->bo = dri_bo_alloc(i965->intel.bufmgr,
+                                       "vaapi surface",
+                                       obj_surface->size,
+                                       64);
+
+        assert(obj_surface->bo);
+        if (NULL == obj_surface->bo) {
+            vaStatus = VA_STATUS_ERROR_UNKNOWN;
+            break;
+        }
     }
 
     /* Error recovery */
@@ -437,32 +390,24 @@
                        VAImageFormat *format_list,      /* out */
                        int *num_formats)                /* out */
 {
-    int n;
-
-    for (n = 0; i965_image_formats_map[n].va_format.fourcc != 0; n++) {
-        const i965_image_format_map_t * const m = &i965_image_formats_map[n];
-        if (format_list)
-            format_list[n] = m->va_format;
-    }
-
     if (num_formats)
-        *num_formats = n;
+        *num_formats = 0;
 
     return VA_STATUS_SUCCESS;
 }
 
 VAStatus 
 i965_PutImage(VADriverContextP ctx,
-              VASurfaceID surface,
-              VAImageID image,
-              int src_x,
-              int src_y,
-              unsigned int src_width,
-              unsigned int src_height,
-              int dest_x,
-              int dest_y,
-              unsigned int dest_width,
-              unsigned int dest_height)
+               VASurfaceID surface,
+               VAImageID image,
+               int src_x,
+               int src_y,
+               unsigned int src_width,
+               unsigned int src_height,
+               int dest_x,
+               int dest_y,
+               unsigned int dest_width,
+               unsigned int dest_height)
 {
     return VA_STATUS_SUCCESS;
 }
@@ -505,7 +450,7 @@
     struct i965_driver_data *i965 = i965_driver_data(ctx);
     VASubpictureID subpicID = NEW_SUBPIC_ID()
 	
-        struct object_subpic *obj_subpic = SUBPIC(subpicID);
+    struct object_subpic *obj_subpic = SUBPIC(subpicID);
     if (!obj_subpic)
         return VA_STATUS_ERROR_ALLOCATION_FAILED;
 
@@ -522,7 +467,6 @@
     obj_subpic->format = m->format;
     obj_subpic->width  = obj_image->image.width;
     obj_subpic->height = obj_image->image.height;
-    obj_subpic->pitch  = obj_image->image.pitches[0];
     obj_subpic->bo     = obj_image->bo;
     return VA_STATUS_SUCCESS;
 }
@@ -543,8 +487,7 @@
                         VASubpictureID subpicture,
                         VAImageID image)
 {
-    /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
+    return VA_STATUS_SUCCESS;
 }
 
 VAStatus 
@@ -554,8 +497,7 @@
                             unsigned int chromakey_max,
                             unsigned int chromakey_mask)
 {
-    /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
+    return VA_STATUS_SUCCESS;
 }
 
 VAStatus 
@@ -563,8 +505,7 @@
                               VASubpictureID subpicture,
                               float global_alpha)
 {
-    /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
+    return VA_STATUS_SUCCESS;
 }
 
 VAStatus 
@@ -667,23 +608,12 @@
 i965_destroy_context(struct object_heap *heap, struct object_base *obj)
 {
     struct object_context *obj_context = (struct object_context *)obj;
-    int i;
-
-    assert(obj_context->decode_state.num_slice_params <= obj_context->decode_state.max_slice_params);
-    assert(obj_context->decode_state.num_slice_datas <= obj_context->decode_state.max_slice_datas);
 
     i965_release_buffer_store(&obj_context->decode_state.pic_param);
+    i965_release_buffer_store(&obj_context->decode_state.slice_param);
     i965_release_buffer_store(&obj_context->decode_state.iq_matrix);
     i965_release_buffer_store(&obj_context->decode_state.bit_plane);
-
-    for (i = 0; i < obj_context->decode_state.num_slice_params; i++)
-        i965_release_buffer_store(&obj_context->decode_state.slice_params[i]);
-
-    for (i = 0; i < obj_context->decode_state.num_slice_datas; i++)
-        i965_release_buffer_store(&obj_context->decode_state.slice_datas[i]);
-
-    free(obj_context->decode_state.slice_params);
-    free(obj_context->decode_state.slice_datas);
+    i965_release_buffer_store(&obj_context->decode_state.slice_data);
     free(obj_context->render_targets);
     object_heap_free(heap, obj);
 }
@@ -699,7 +629,6 @@
                    VAContextID *context)                /* out */
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_render_state *render_state = &i965->render_state;
     struct object_config *obj_config = CONFIG(config_id);
     struct object_context *obj_context = NULL;
     VAStatus vaStatus = VA_STATUS_SUCCESS;
@@ -721,26 +650,10 @@
         return vaStatus;
     }
 
-    switch (obj_config->profile) {
-    case VAProfileH264Baseline:
-    case VAProfileH264Main:
-    case VAProfileH264High:
-        render_state->interleaved_uv = 1;
-        break;
-    default:
-        render_state->interleaved_uv = 0;
-    }
-
     obj_context->context_id = contextID;
     *context = contextID;
     memset(&obj_context->decode_state, 0, sizeof(obj_context->decode_state));
     obj_context->decode_state.current_render_target = -1;
-    obj_context->decode_state.max_slice_params = NUM_SLICES;
-    obj_context->decode_state.max_slice_datas = NUM_SLICES;
-    obj_context->decode_state.slice_params = calloc(obj_context->decode_state.max_slice_params,
-                                                    sizeof(*obj_context->decode_state.slice_params));
-    obj_context->decode_state.slice_datas = calloc(obj_context->decode_state.max_slice_datas,
-                                                   sizeof(*obj_context->decode_state.slice_datas));
     obj_context->config_id = config_id;
     obj_context->picture_width = picture_width;
     obj_context->picture_height = picture_height;
@@ -840,8 +753,8 @@
 
     if (type == VASliceDataBufferType || type == VAImageBufferType) {
         buffer_store->bo = dri_bo_alloc(i965->intel.bufmgr, 
-                                        "Buffer", 
-                                        size * num_elements, 64);
+                                      "Buffer", 
+                                      size * num_elements, 64);
         assert(buffer_store->bo);
 
         if (data)
@@ -854,7 +767,6 @@
             memcpy(buffer_store->buffer, data, size * num_elements);
     }
 
-    buffer_store->num_elements = obj_buffer->num_elements;
     i965_reference_buffer_store(&obj_buffer->buffer_store, buffer_store);
     i965_release_buffer_store(&buffer_store);
     *buf_id = bufferID;
@@ -969,12 +881,6 @@
         vaStatus = VA_STATUS_SUCCESS;
         break;
 
-    case VAProfileH264Baseline:
-    case VAProfileH264Main:
-    case VAProfileH264High:
-        vaStatus = VA_STATUS_SUCCESS;
-        break;
-
     default:
         assert(0);
         vaStatus = VA_STATUS_ERROR_UNSUPPORTED_PROFILE;
@@ -1023,7 +929,7 @@
     assert(obj_buffer->buffer_store->buffer);
     i965_release_buffer_store(&obj_context->decode_state.bit_plane);
     i965_reference_buffer_store(&obj_context->decode_state.bit_plane,
-                                obj_buffer->buffer_store);
+                                 obj_buffer->buffer_store);
     
     return VA_STATUS_SUCCESS;
 }
@@ -1035,18 +941,10 @@
 {
     assert(obj_buffer->buffer_store->bo == NULL);
     assert(obj_buffer->buffer_store->buffer);
-    
-    if (obj_context->decode_state.num_slice_params == obj_context->decode_state.max_slice_params) {
-        obj_context->decode_state.slice_params = realloc(obj_context->decode_state.slice_params,
-                                                         (obj_context->decode_state.max_slice_params + NUM_SLICES) * sizeof(*obj_context->decode_state.slice_params));
-        memset(obj_context->decode_state.slice_params + obj_context->decode_state.max_slice_params, 0, NUM_SLICES * sizeof(*obj_context->decode_state.slice_params));
-        obj_context->decode_state.max_slice_params += NUM_SLICES;
-    }
-        
-    i965_release_buffer_store(&obj_context->decode_state.slice_params[obj_context->decode_state.num_slice_params]);
-    i965_reference_buffer_store(&obj_context->decode_state.slice_params[obj_context->decode_state.num_slice_params],
+    i965_release_buffer_store(&obj_context->decode_state.slice_param);
+    i965_reference_buffer_store(&obj_context->decode_state.slice_param,
                                 obj_buffer->buffer_store);
-    obj_context->decode_state.num_slice_params++;
+    obj_context->decode_state.num_slices = obj_buffer->num_elements;    
     
     return VA_STATUS_SUCCESS;
 }
@@ -1058,18 +956,9 @@
 {
     assert(obj_buffer->buffer_store->buffer == NULL);
     assert(obj_buffer->buffer_store->bo);
-
-    if (obj_context->decode_state.num_slice_datas == obj_context->decode_state.max_slice_datas) {
-        obj_context->decode_state.slice_datas = realloc(obj_context->decode_state.slice_datas,
-                                                        (obj_context->decode_state.max_slice_datas + NUM_SLICES) * sizeof(*obj_context->decode_state.slice_datas));
-        memset(obj_context->decode_state.slice_datas + obj_context->decode_state.max_slice_datas, 0, NUM_SLICES * sizeof(*obj_context->decode_state.slice_datas));
-        obj_context->decode_state.max_slice_datas += NUM_SLICES;
-    }
-        
-    i965_release_buffer_store(&obj_context->decode_state.slice_datas[obj_context->decode_state.num_slice_datas]);
-    i965_reference_buffer_store(&obj_context->decode_state.slice_datas[obj_context->decode_state.num_slice_datas],
+    i965_release_buffer_store(&obj_context->decode_state.slice_data);
+    i965_reference_buffer_store(&obj_context->decode_state.slice_data,
                                 obj_buffer->buffer_store);
-    obj_context->decode_state.num_slice_datas++;
     
     return VA_STATUS_SUCCESS;
 }
@@ -1128,30 +1017,23 @@
     struct object_context *obj_context = CONTEXT(context);
     struct object_config *obj_config;
     VAContextID config;
-    int i;
 
     assert(obj_context);
     assert(obj_context->decode_state.pic_param);
-    assert(obj_context->decode_state.num_slice_params >= 1);
-    assert(obj_context->decode_state.num_slice_datas >= 1);
-    assert(obj_context->decode_state.num_slice_params == obj_context->decode_state.num_slice_datas);
+    assert(obj_context->decode_state.slice_param);
+    assert(obj_context->decode_state.slice_data);
 
     config = obj_context->config_id;
     obj_config = CONFIG(config);
     assert(obj_config);
-
     i965_media_decode_picture(ctx, obj_config->profile, &obj_context->decode_state);
     obj_context->decode_state.current_render_target = -1;
-    obj_context->decode_state.num_slice_params = 0;
-    obj_context->decode_state.num_slice_datas = 0;
+    obj_context->decode_state.num_slices = 0;
     i965_release_buffer_store(&obj_context->decode_state.pic_param);
+    i965_release_buffer_store(&obj_context->decode_state.slice_param);
     i965_release_buffer_store(&obj_context->decode_state.iq_matrix);
     i965_release_buffer_store(&obj_context->decode_state.bit_plane);
-
-    for (i = 0; i < obj_context->decode_state.num_slice_params; i++) {
-        i965_release_buffer_store(&obj_context->decode_state.slice_params[i]);
-        i965_release_buffer_store(&obj_context->decode_state.slice_datas[i]);
-    }
+    i965_release_buffer_store(&obj_context->decode_state.slice_data);
 
     return VA_STATUS_SUCCESS;
 }
@@ -1212,7 +1094,7 @@
                           int num_attributes)
 {
     /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
+    return VA_STATUS_ERROR_UNKNOWN;
 }
 
 /* 
@@ -1227,7 +1109,7 @@
                           int num_attributes)
 {
     /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
+    return VA_STATUS_ERROR_UNKNOWN;
 }
 
 VAStatus 
@@ -1237,7 +1119,7 @@
                             unsigned int *stride)       /* out */
 {
     /* TODO */
-    return VA_STATUS_ERROR_UNIMPLEMENTED;
+    return VA_STATUS_ERROR_UNKNOWN;
 }
 
 static VAStatus 
@@ -1249,7 +1131,7 @@
         return VA_STATUS_ERROR_UNKNOWN;
 
     if (!IS_G4X(i965->intel.device_id) &&
-        !IS_IRONLAKE(i965->intel.device_id))
+        !IS_IGDNG(i965->intel.device_id))
         return VA_STATUS_ERROR_UNKNOWN;
 
     if (i965_media_init(ctx) == False)
@@ -1336,43 +1218,6 @@
         image->component_order[1]  = 'G';
         image->component_order[2]  = 'B';
         break;
-    case VA_FOURCC('A','R','G','B'):
-    case VA_FOURCC('A','B','G','R'):
-    case VA_FOURCC('B','G','R','A'):
-    case VA_FOURCC('R','G','B','A'):
-        image->num_planes = 1;
-        image->pitches[0] = width * 4;
-        image->offsets[0] = 0;
-        image->data_size  = image->offsets[0] + image->pitches[0] * height;
-        break;
-    case VA_FOURCC('Y','V','1','2'):
-        image->num_planes = 3;
-        image->pitches[0] = width;
-        image->offsets[0] = 0;
-        image->pitches[1] = width2;
-        image->offsets[1] = size + size2;
-        image->pitches[2] = width2;
-        image->offsets[2] = size;
-        image->data_size  = size + 2 * size2;
-        break;
-    case VA_FOURCC('I','4','2','0'):
-        image->num_planes = 3;
-        image->pitches[0] = width;
-        image->offsets[0] = 0;
-        image->pitches[1] = width2;
-        image->offsets[1] = size;
-        image->pitches[2] = width2;
-        image->offsets[2] = size + size2;
-        image->data_size  = size + 2 * size2;
-        break;
-    case VA_FOURCC('N','V','1','2'):
-        image->num_planes = 2;
-        image->pitches[0] = width;
-        image->offsets[0] = 0;
-        image->pitches[1] = width;
-        image->offsets[1] = size;
-        image->data_size  = size + 2 * size2;
-        break;
     default:
         goto error;
     }
@@ -1398,7 +1243,7 @@
     *out_image                  = *image;
     return VA_STATUS_SUCCESS;
 
-error:
+ error:
     i965_DestroyImage(ctx, image_id);
     return va_status;
 }
@@ -1407,8 +1252,7 @@
                           VASurfaceID surface,
                           VAImage *image)        /* out */
 {
-    /* TODO */
-    return VA_STATUS_ERROR_OPERATION_FAILED;
+    return VA_STATUS_SUCCESS;
 }
 
 static void 
@@ -1465,113 +1309,10 @@
     for (i = 0; i < obj_image->image.num_palette_entries; i++)
         obj_image->palette[i] = (((unsigned int)palette[3*i + 0] << 16) |
                                  ((unsigned int)palette[3*i + 1] <<  8) |
-                                 (unsigned int)palette[3*i + 2]);
+                                  (unsigned int)palette[3*i + 2]);
     return VA_STATUS_SUCCESS;
 }
 
-static inline void
-memcpy_pic(uint8_t *dst, unsigned int dst_stride,
-           const uint8_t *src, unsigned int src_stride,
-           unsigned int len, unsigned int height)
-{
-    unsigned int i;
-
-    for (i = 0; i < height; i++) {
-        memcpy(dst, src, len);
-        dst += dst_stride;
-        src += src_stride;
-    }
-}
-
-static void
-get_image_i420(struct object_image *obj_image, uint8_t *image_data,
-               struct object_surface *obj_surface,
-               const VARectangle *rect)
-{
-    uint8_t *dst[3], *src[3];
-    const int Y = 0;
-    const int U = obj_image->image.format.fourcc == VA_FOURCC_YV12 ? 2 : 1;
-    const int V = obj_image->image.format.fourcc == VA_FOURCC_YV12 ? 1 : 2;
-
-    if (!obj_surface->bo)
-        return;
-
-    dri_bo_map(obj_surface->bo, 0);
-
-    if (!obj_surface->bo->virtual)
-        return;
-
-    /* Dest VA image has either I420 or YV12 format.
-       Source VA surface alway has I420 format */
-    dst[Y] = image_data + obj_image->image.offsets[Y];
-    src[0] = (uint8_t *)obj_surface->bo->virtual;
-    dst[U] = image_data + obj_image->image.offsets[U];
-    src[1] = src[0] + obj_surface->width * obj_surface->height;
-    dst[V] = image_data + obj_image->image.offsets[V];
-    src[2] = src[1] + (obj_surface->width / 2) * (obj_surface->height / 2);
-
-    /* Y plane */
-    dst[Y] += rect->y * obj_image->image.pitches[Y] + rect->x;
-    src[0] += rect->y * obj_surface->width + rect->x;
-    memcpy_pic(dst[Y], obj_image->image.pitches[Y],
-               src[0], obj_surface->width,
-               rect->width, rect->height);
-
-    /* U plane */
-    dst[U] += (rect->y / 2) * obj_image->image.pitches[U] + rect->x / 2;
-    src[1] += (rect->y / 2) * obj_surface->width / 2 + rect->x / 2;
-    memcpy_pic(dst[U], obj_image->image.pitches[U],
-               src[1], obj_surface->width / 2,
-               rect->width / 2, rect->height / 2);
-
-    /* V plane */
-    dst[V] += (rect->y / 2) * obj_image->image.pitches[V] + rect->x / 2;
-    src[2] += (rect->y / 2) * obj_surface->width / 2 + rect->x / 2;
-    memcpy_pic(dst[V], obj_image->image.pitches[V],
-               src[2], obj_surface->width / 2,
-               rect->width / 2, rect->height / 2);
-
-    dri_bo_unmap(obj_surface->bo);
-}
-
-static void
-get_image_nv12(struct object_image *obj_image, uint8_t *image_data,
-               struct object_surface *obj_surface,
-               const VARectangle *rect)
-{
-    uint8_t *dst[2], *src[2];
-
-    if (!obj_surface->bo)
-        return;
-
-    dri_bo_map(obj_surface->bo, 0);
-
-    if (!obj_surface->bo->virtual)
-        return;
-
-    /* Both dest VA image and source surface have NV12 format */
-    dst[0] = image_data + obj_image->image.offsets[0];
-    src[0] = (uint8_t *)obj_surface->bo->virtual;
-    dst[1] = image_data + obj_image->image.offsets[1];
-    src[1] = src[0] + obj_surface->width * obj_surface->height;
-
-    /* Y plane */
-    dst[0] += rect->y * obj_image->image.pitches[0] + rect->x;
-    src[0] += rect->y * obj_surface->width + rect->x;
-    memcpy_pic(dst[0], obj_image->image.pitches[0],
-               src[0], obj_surface->width,
-               rect->width, rect->height);
-
-    /* UV plane */
-    dst[1] += (rect->y / 2) * obj_image->image.pitches[1] + (rect->x & -2);
-    src[1] += (rect->y / 2) * obj_surface->width + (rect->x & -2);
-    memcpy_pic(dst[1], obj_image->image.pitches[1],
-               src[1], obj_surface->width,
-               rect->width, rect->height / 2);
-
-    dri_bo_unmap(obj_surface->bo);
-}
-
 VAStatus 
 i965_GetImage(VADriverContextP ctx,
               VASurfaceID surface,
@@ -1581,64 +1322,7 @@
               unsigned int height,
               VAImageID image)
 {
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_render_state *render_state = &i965->render_state;
-
-    struct object_surface *obj_surface = SURFACE(surface);
-    if (!obj_surface)
-        return VA_STATUS_ERROR_INVALID_SURFACE;
-
-    struct object_image *obj_image = IMAGE(image);
-    if (!obj_image)
-        return VA_STATUS_ERROR_INVALID_IMAGE;
-
-    if (x < 0 || y < 0)
-        return VA_STATUS_ERROR_INVALID_PARAMETER;
-    if (x + width > obj_surface->orig_width ||
-        y + height > obj_surface->orig_height)
-        return VA_STATUS_ERROR_INVALID_PARAMETER;
-    if (x + width > obj_image->image.width ||
-        y + height > obj_image->image.height)
-        return VA_STATUS_ERROR_INVALID_PARAMETER;
-
-    /* Commit pending operations to the HW */
-    intel_batchbuffer_flush(ctx);
-
-    VAStatus va_status;
-    void *image_data = NULL;
-
-    va_status = i965_MapBuffer(ctx, obj_image->image.buf, &image_data);
-    if (va_status != VA_STATUS_SUCCESS)
-        return va_status;
-
-    VARectangle rect;
-    rect.x = x;
-    rect.y = y;
-    rect.width = width;
-    rect.height = height;
-
-    switch (obj_image->image.format.fourcc) {
-    case VA_FOURCC('Y','V','1','2'):
-    case VA_FOURCC('I','4','2','0'):
-        /* I420 is native format for MPEG-2 decoded surfaces */
-        if (render_state->interleaved_uv)
-            goto operation_failed;
-        get_image_i420(obj_image, image_data, obj_surface, &rect);
-        break;
-    case VA_FOURCC('N','V','1','2'):
-        /* NV12 is native format for H.264 decoded surfaces */
-        if (!render_state->interleaved_uv)
-            goto operation_failed;
-        get_image_nv12(obj_image, image_data, obj_surface, &rect);
-        break;
-    default:
-    operation_failed:
-        va_status = VA_STATUS_ERROR_OPERATION_FAILED;
-        break;
-    }
-
-    i965_UnmapBuffer(ctx, obj_image->image.buf);
-    return va_status;
+    return VA_STATUS_SUCCESS;
 }
 
 VAStatus 
@@ -1664,20 +1348,13 @@
     union dri_buffer *buffer;
     struct intel_region *dest_region;
     struct object_surface *obj_surface; 
-    int ret;
+	int ret;
     uint32_t name;
     Bool new_region = False;
     /* Currently don't support DRI1 */
     if (dri_state->driConnectedFlag != VA_DRI2)
         return VA_STATUS_ERROR_UNKNOWN;
 
-    /* Some broken sources such as H.264 conformance case FM2_SVA_C
-     * will get here
-     */
-    obj_surface = SURFACE(surface);
-    if (obj_surface->bo == NULL)
-        return VA_STATUS_SUCCESS;
-
     dri_drawable = dri_get_drawable(ctx, draw);
     assert(dri_drawable);
 
@@ -1719,24 +1396,13 @@
     i965_render_put_surface(ctx, surface,
                             srcx, srcy, srcw, srch,
                             destx, desty, destw, desth);
-
+    obj_surface = SURFACE(surface);
     if(obj_surface->subpic != VA_INVALID_ID) {	
 	i965_render_put_subpic(ctx, surface,
-                               srcx, srcy, srcw, srch,
-                               destx, desty, destw, desth);
+                           srcx, srcy, srcw, srch,
+                           destx, desty, destw, desth);
     } 
-
     dri_swap_buffer(ctx, dri_drawable);
-    obj_surface->flags |= SURFACE_DISPLAYED;
-
-    if (!(obj_surface->flags & SURFACE_REFERENCED)) {
-        dri_bo_unreference(obj_surface->bo);
-        obj_surface->bo = NULL;
-        obj_surface->flags = 0;
-
-        if (obj_surface->free_private_data)
-            obj_surface->free_private_data(&obj_surface->private_data);
-    }
 
     return VA_STATUS_SUCCESS;
 }
@@ -1860,6 +1526,6 @@
                               sizeof(struct object_subpic), 
                               SUBPIC_ID_OFFSET);
     assert(result == 0);
-    
+
     return i965_Init(ctx);
 }
diff -Nru libva-1.0.4/i965_drv_video/i965_drv_video.h libva-1.0.1/i965_drv_video/i965_drv_video.h
--- libva-1.0.4/i965_drv_video/i965_drv_video.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_drv_video.h	2009-12-17 03:05:38.000000000 +0000
@@ -30,9 +30,7 @@
 #ifndef _I965_DRV_VIDEO_H_
 #define _I965_DRV_VIDEO_H_
 
-#include <va/va.h>
-#include <va/va_backend.h>
-
+#include "va.h"
 #include "object_heap.h"
 
 #include "intel_driver.h"
@@ -43,8 +41,8 @@
 #define I965_MAX_PROFILES                       11
 #define I965_MAX_ENTRYPOINTS                    5
 #define I965_MAX_CONFIG_ATTRIBUTES              10
-#define I965_MAX_IMAGE_FORMATS                  3
-#define I965_MAX_SUBPIC_FORMATS                 4
+#define I965_MAX_IMAGE_FORMATS                  10
+#define I965_MAX_SUBPIC_FORMATS                 2
 #define I965_MAX_DISPLAY_ATTRIBUTES             4
 #define I965_STR_VENDOR                         "i965 Driver 0.1"
 
@@ -53,7 +51,6 @@
     unsigned char *buffer;
     dri_bo *bo;
     int ref_count;
-    int num_elements;
 };
     
 struct object_config 
@@ -65,20 +62,15 @@
     int num_attribs;
 };
 
-#define NUM_SLICES     10
-
 struct decode_state
 {
     struct buffer_store *pic_param;
-    struct buffer_store **slice_params;
+    struct buffer_store *slice_param;
     struct buffer_store *iq_matrix;
     struct buffer_store *bit_plane;
-    struct buffer_store **slice_datas;
+    struct buffer_store *slice_data;
     VASurfaceID current_render_target;
-    int max_slice_params;
-    int max_slice_datas;
-    int num_slice_params;
-    int num_slice_datas;
+    int num_slices;
 };
 
 struct object_context 
@@ -94,9 +86,6 @@
     struct decode_state decode_state;
 };
 
-#define SURFACE_REFERENCED      (1 << 0)
-#define SURFACE_DISPLAYED       (1 << 1)
-
 struct object_surface 
 {
     struct object_base base;
@@ -105,12 +94,7 @@
     int width;
     int height;
     int size;
-    int orig_width;
-    int orig_height;
-    int flags;
     dri_bo *bo;
-    void (*free_private_data)(void **data);
-    void *private_data;
 };
 
 struct object_buffer 
@@ -140,10 +124,11 @@
     unsigned int format;
     int width;
     int height;
-    int pitch;
     dri_bo *bo;
 };
 
+
+
 struct i965_driver_data 
 {
     struct intel_driver_data intel;
diff -Nru libva-1.0.4/i965_drv_video/i965_media.c libva-1.0.1/i965_drv_video/i965_media.c
--- libva-1.0.4/i965_drv_video/i965_media.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_media.c	2009-12-17 03:05:38.000000000 +0000
@@ -31,14 +31,13 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
+#include "va_backend.h"
 
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 
 #include "i965_defines.h"
 #include "i965_media_mpeg2.h"
-#include "i965_media_h264.h"
 #include "i965_media.h"
 #include "i965_drv_video.h"
 
@@ -73,21 +72,13 @@
 i965_media_state_base_address(VADriverContextP ctx)
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx); 
-    struct i965_media_state *media_state = &i965->media_state;
 
-    if (IS_IRONLAKE(i965->intel.device_id)) {
+    if (IS_IGDNG(i965->intel.device_id)) {
         BEGIN_BATCH(ctx, 8);
         OUT_BATCH(ctx, CMD_STATE_BASE_ADDRESS | 6);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        
-        if (media_state->indirect_object.bo) {
-            OUT_RELOC(ctx, media_state->indirect_object.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 
-                      media_state->indirect_object.offset | BASE_ADDRESS_MODIFY);
-        } else {
-            OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        }
-
+        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
@@ -98,14 +89,7 @@
         OUT_BATCH(ctx, CMD_STATE_BASE_ADDRESS | 4);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-
-        if (media_state->indirect_object.bo) {
-            OUT_RELOC(ctx, media_state->indirect_object.bo, I915_GEM_DOMAIN_INSTRUCTION, 0, 
-                      media_state->indirect_object.offset | BASE_ADDRESS_MODIFY);
-        } else {
-            OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
-        }
-
+        OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
         ADVANCE_BATCH(ctx);
@@ -166,20 +150,6 @@
     ADVANCE_BATCH(ctx);    
 }
 
-static void 
-i965_media_depth_buffer(VADriverContextP ctx)
-{
-    BEGIN_BATCH(ctx, 6);
-    OUT_BATCH(ctx, CMD_DEPTH_BUFFER | 4);
-    OUT_BATCH(ctx, (I965_DEPTHFORMAT_D32_FLOAT << 18) | 
-              (I965_SURFACE_NULL << 29));
-    OUT_BATCH(ctx, 0);
-    OUT_BATCH(ctx, 0);
-    OUT_BATCH(ctx, 0);
-    OUT_BATCH(ctx, 0);
-    ADVANCE_BATCH();
-}
-
 static void
 i965_media_pipeline_setup(VADriverContextP ctx, struct decode_state *decode_state)
 {
@@ -188,7 +158,6 @@
 
     intel_batchbuffer_start_atomic(ctx, 0x1000);
     intel_batchbuffer_emit_mi_flush(ctx);                       /* step 1 */
-    i965_media_depth_buffer(ctx);
     i965_media_pipeline_select(ctx);                            /* step 2 */
     i965_media_urb_layout(ctx);                                 /* step 3 */
     i965_media_pipeline_state(ctx);                             /* step 4 */
@@ -199,7 +168,7 @@
 }
 
 static void 
-i965_media_decode_init(VADriverContextP ctx, VAProfile profile, struct decode_state *decode_state)
+i965_media_decode_init(VADriverContextP ctx, VAProfile profile)
 {
     int i;
     struct i965_driver_data *i965 = i965_driver_data(ctx);
@@ -250,13 +219,7 @@
     switch (profile) {
     case VAProfileMPEG2Simple:
     case VAProfileMPEG2Main:
-        i965_media_mpeg2_decode_init(ctx, decode_state);
-        break;
-        
-    case VAProfileH264Baseline:
-    case VAProfileH264Main:
-    case VAProfileH264High:
-        i965_media_h264_decode_init(ctx, decode_state);
+        i965_media_mpeg2_decode_init(ctx);
         break;
 
     default:
@@ -273,15 +236,17 @@
     struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct i965_media_state *media_state = &i965->media_state;
 
-    i965_media_decode_init(ctx, profile, decode_state);
-    assert(media_state->media_states_setup);
-    media_state->media_states_setup(ctx, decode_state);
+    i965_media_decode_init(ctx, profile);
+    assert(media_state->states_setup);
+    media_state->states_setup(ctx, decode_state);
     i965_media_pipeline_setup(ctx, decode_state);
+    intel_batchbuffer_flush(ctx);
 }
 
 Bool 
 i965_media_init(VADriverContextP ctx)
 {
+    i965_media_mpeg2_init(ctx);
     return True;
 }
 
@@ -292,9 +257,6 @@
     struct i965_media_state *media_state = &i965->media_state;
     int i;
 
-    if (media_state->free_private_context)
-        media_state->free_private_context(&media_state->private_context);
-
     for (i = 0; i < MAX_MEDIA_SURFACES; i++) {
         dri_bo_unreference(media_state->surface_state[i].bo);
         media_state->surface_state[i].bo = NULL;
@@ -315,9 +277,7 @@
     dri_bo_unreference(media_state->curbe.bo);
     media_state->curbe.bo = NULL;
 
-    dri_bo_unreference(media_state->indirect_object.bo);
-    media_state->indirect_object.bo = NULL;
-
+    i965_media_mpeg2_ternimate(ctx);
     return True;
 }
 
diff -Nru libva-1.0.4/i965_drv_video/i965_media.h libva-1.0.1/i965_drv_video/i965_media.h
--- libva-1.0.4/i965_drv_video/i965_media.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_media.h	2009-12-17 03:05:38.000000000 +0000
@@ -38,7 +38,7 @@
 #include "i965_structs.h"
 
 #define MAX_INTERFACE_DESC      16
-#define MAX_MEDIA_SURFACES      34
+#define MAX_MEDIA_SURFACES      32
 
 #define MPEG_TOP_FIELD		1
 #define MPEG_BOTTOM_FIELD	2
@@ -83,11 +83,6 @@
     } curbe;
 
     struct {
-        dri_bo *bo;
-        unsigned long offset;
-    } indirect_object;
-
-    struct {
         unsigned int vfe_start;
         unsigned int cs_start;
 
@@ -98,10 +93,8 @@
         unsigned int size_cs_entry;
     } urb;
 
-    void *private_context;
-    void (*media_states_setup)(VADriverContextP ctx, struct decode_state *decode_state);
+    void (*states_setup)(VADriverContextP ctx, struct decode_state *decode_state);
     void (*media_objects)(VADriverContextP ctx, struct decode_state *decode_state);
-    void (*free_private_context)(void **data);
 };
 
 Bool i965_media_init(VADriverContextP ctx);
diff -Nru libva-1.0.4/i965_drv_video/i965_media_h264.c libva-1.0.1/i965_drv_video/i965_media_h264.c
--- libva-1.0.4/i965_drv_video/i965_media_h264.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_media_h264.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,907 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "va_backend.h"
-
-#include "intel_batchbuffer.h"
-#include "intel_driver.h"
-
-#include "i965_defines.h"
-#include "i965_drv_video.h"
-#include "i965_media.h"
-#include "i965_media_h264.h"
-
-enum {
-    INTRA_16X16 = 0,
-    INTRA_8X8,
-    INTRA_4X4,
-    INTRA_PCM,
-    FRAMEMB_MOTION,
-    FIELDMB_MOTION,
-    MBAFF_MOTION,
-};
-
-struct intra_kernel_header
-{
-    /* R1.0 */
-    unsigned char intra_4x4_luma_mode_0_offset;
-    unsigned char intra_4x4_luma_mode_1_offset;
-    unsigned char intra_4x4_luma_mode_2_offset;
-    unsigned char intra_4x4_luma_mode_3_offset;
-    /* R1.1 */
-    unsigned char intra_4x4_luma_mode_4_offset;
-    unsigned char intra_4x4_luma_mode_5_offset;
-    unsigned char intra_4x4_luma_mode_6_offset;
-    unsigned char intra_4x4_luma_mode_7_offset;
-    /* R1.2 */
-    unsigned char intra_4x4_luma_mode_8_offset;
-    unsigned char pad0;
-    unsigned short top_reference_offset;
-    /* R1.3 */
-    unsigned char intra_8x8_luma_mode_0_offset;
-    unsigned char intra_8x8_luma_mode_1_offset;
-    unsigned char intra_8x8_luma_mode_2_offset;
-    unsigned char intra_8x8_luma_mode_3_offset;
-    /* R1.4 */
-    unsigned char intra_8x8_luma_mode_4_offset;
-    unsigned char intra_8x8_luma_mode_5_offset;
-    unsigned char intra_8x8_luma_mode_6_offset;
-    unsigned char intra_8x8_luma_mode_7_offset;
-    /* R1.5 */
-    unsigned char intra_8x8_luma_mode_8_offset;
-    unsigned char pad1;
-    unsigned short const_reverse_data_transfer_intra_8x8;
-    /* R1.6 */
-    unsigned char intra_16x16_luma_mode_0_offset;
-    unsigned char intra_16x16_luma_mode_1_offset;
-    unsigned char intra_16x16_luma_mode_2_offset;
-    unsigned char intra_16x16_luma_mode_3_offset;
-    /* R1.7 */
-    unsigned char intra_chroma_mode_0_offset;
-    unsigned char intra_chroma_mode_1_offset;
-    unsigned char intra_chroma_mode_2_offset;
-    unsigned char intra_chroma_mode_3_offset;
-    /* R2.0 */
-    unsigned int const_intra_16x16_plane_0;
-    /* R2.1 */
-    unsigned int const_intra_16x16_chroma_plane_0;
-    /* R2.2 */
-    unsigned int const_intra_16x16_chroma_plane_1;
-    /* R2.3 */
-    unsigned int const_intra_16x16_plane_1;
-    /* R2.4 */
-    unsigned int left_shift_count_reverse_dw_ordering;
-    /* R2.5 */
-    unsigned int const_reverse_data_transfer_intra_4x4;
-    /* R2.6 */
-    unsigned int intra_4x4_pred_mode_offset;
-};
-
-struct inter_kernel_header
-{
-    unsigned short weight_offset;
-    unsigned char weight_offset_flag;
-    unsigned char pad0;
-};
-
-#include "shaders/h264/mc/export.inc"
-static unsigned long avc_mc_kernel_offset_gen4[] = {
-    INTRA_16x16_IP * INST_UNIT_GEN4,
-    INTRA_8x8_IP * INST_UNIT_GEN4,
-    INTRA_4x4_IP * INST_UNIT_GEN4,
-    INTRA_PCM_IP * INST_UNIT_GEN4,
-    FRAME_MB_IP * INST_UNIT_GEN4,
-    FIELD_MB_IP * INST_UNIT_GEN4,
-    MBAFF_MB_IP * INST_UNIT_GEN4
-};
-
-struct intra_kernel_header intra_kernel_header_gen4 = {
-    0,
-    (INTRA_4X4_HORIZONTAL_IP - INTRA_4X4_VERTICAL_IP),
-    (INTRA_4X4_DC_IP - INTRA_4X4_VERTICAL_IP),
-    (INTRA_4X4_DIAG_DOWN_LEFT_IP - INTRA_4X4_VERTICAL_IP),
-
-    (INTRA_4X4_DIAG_DOWN_RIGHT_IP - INTRA_4X4_VERTICAL_IP),
-    (INTRA_4X4_VERT_RIGHT_IP - INTRA_4X4_VERTICAL_IP),
-    (INTRA_4X4_HOR_DOWN_IP - INTRA_4X4_VERTICAL_IP),
-    (INTRA_4X4_VERT_LEFT_IP - INTRA_4X4_VERTICAL_IP),
-
-    (INTRA_4X4_HOR_UP_IP - INTRA_4X4_VERTICAL_IP),
-    0,
-    0xFFFC,
-
-    0,
-    (INTRA_8X8_HORIZONTAL_IP - INTRA_8X8_VERTICAL_IP),
-    (INTRA_8X8_DC_IP - INTRA_8X8_VERTICAL_IP),
-    (INTRA_8X8_DIAG_DOWN_LEFT_IP - INTRA_8X8_VERTICAL_IP),
-
-    (INTRA_8X8_DIAG_DOWN_RIGHT_IP - INTRA_8X8_VERTICAL_IP),
-    (INTRA_8X8_VERT_RIGHT_IP - INTRA_8X8_VERTICAL_IP),
-    (INTRA_8X8_HOR_DOWN_IP - INTRA_8X8_VERTICAL_IP),
-    (INTRA_8X8_VERT_LEFT_IP - INTRA_8X8_VERTICAL_IP),
-
-    (INTRA_8X8_HOR_UP_IP - INTRA_8X8_VERTICAL_IP),
-    0,
-    0x0001,
-
-    0,
-    (INTRA_16x16_HORIZONTAL_IP - INTRA_16x16_VERTICAL_IP),
-    (INTRA_16x16_DC_IP - INTRA_16x16_VERTICAL_IP),
-    (INTRA_16x16_PLANE_IP - INTRA_16x16_VERTICAL_IP),
-
-    0,
-    (INTRA_CHROMA_HORIZONTAL_IP - INTRA_CHROMA_DC_IP),
-    (INTRA_CHROMA_VERTICAL_IP - INTRA_CHROMA_DC_IP),
-    (INTRA_Chroma_PLANE_IP - INTRA_CHROMA_DC_IP),
-
-    0xFCFBFAF9,
-
-    0x00FFFEFD,
-
-    0x04030201,
-
-    0x08070605,
-
-    0x18100800,
-
-    0x00020406,
-
-    (intra_Pred_4x4_Y_IP - ADD_ERROR_SB3_IP) * 0x1000000 + 
-    (intra_Pred_4x4_Y_IP - ADD_ERROR_SB2_IP) * 0x10000 + 
-    (intra_Pred_4x4_Y_IP - ADD_ERROR_SB1_IP) * 0x100 + 
-    (intra_Pred_4x4_Y_IP - ADD_ERROR_SB0_IP)
-};
-
-static uint32_t h264_avc_combined_gen4[][4] = {
-#include "shaders/h264/mc/avc_mc.g4b"
-};
-
-static uint32_t h264_avc_null_gen4[][4] = {
-#include "shaders/h264/mc/null.g4b"
-};
-
-static struct media_kernel h264_avc_kernels_gen4[] = {
-    {
-        "AVC combined kernel",
-        H264_AVC_COMBINED,
-        h264_avc_combined_gen4,
-        sizeof(h264_avc_combined_gen4),
-        NULL
-    },
-
-    {
-        "NULL kernel",
-        H264_AVC_NULL,
-        h264_avc_null_gen4,
-        sizeof(h264_avc_null_gen4),
-        NULL
-    }
-};
-
-/* On Ironlake */
-#include "shaders/h264/mc/export.inc.gen5"
-static unsigned long avc_mc_kernel_offset_gen5[] = {
-    INTRA_16x16_IP_GEN5 * INST_UNIT_GEN5,
-    INTRA_8x8_IP_GEN5 * INST_UNIT_GEN5,
-    INTRA_4x4_IP_GEN5 * INST_UNIT_GEN5,
-    INTRA_PCM_IP_GEN5 * INST_UNIT_GEN5,
-    FRAME_MB_IP_GEN5 * INST_UNIT_GEN5,
-    FIELD_MB_IP_GEN5 * INST_UNIT_GEN5,
-    MBAFF_MB_IP_GEN5 * INST_UNIT_GEN5
-};
-
-struct intra_kernel_header intra_kernel_header_gen5 = {
-    0,
-    (INTRA_4X4_HORIZONTAL_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-    (INTRA_4X4_DC_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-    (INTRA_4X4_DIAG_DOWN_LEFT_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-
-    (INTRA_4X4_DIAG_DOWN_RIGHT_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-    (INTRA_4X4_VERT_RIGHT_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-    (INTRA_4X4_HOR_DOWN_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-    (INTRA_4X4_VERT_LEFT_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-
-    (INTRA_4X4_HOR_UP_IP_GEN5 - INTRA_4X4_VERTICAL_IP_GEN5),
-    0,
-    0xFFFC,
-
-    0,
-    (INTRA_8X8_HORIZONTAL_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-    (INTRA_8X8_DC_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-    (INTRA_8X8_DIAG_DOWN_LEFT_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-
-    (INTRA_8X8_DIAG_DOWN_RIGHT_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-    (INTRA_8X8_VERT_RIGHT_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-    (INTRA_8X8_HOR_DOWN_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-    (INTRA_8X8_VERT_LEFT_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-
-    (INTRA_8X8_HOR_UP_IP_GEN5 - INTRA_8X8_VERTICAL_IP_GEN5),
-    0,
-    0x0001,
-
-    0,
-    (INTRA_16x16_HORIZONTAL_IP_GEN5 - INTRA_16x16_VERTICAL_IP_GEN5),
-    (INTRA_16x16_DC_IP_GEN5 - INTRA_16x16_VERTICAL_IP_GEN5),
-    (INTRA_16x16_PLANE_IP_GEN5 - INTRA_16x16_VERTICAL_IP_GEN5),
-
-    0,
-    (INTRA_CHROMA_HORIZONTAL_IP_GEN5 - INTRA_CHROMA_DC_IP_GEN5),
-    (INTRA_CHROMA_VERTICAL_IP_GEN5 - INTRA_CHROMA_DC_IP_GEN5),
-    (INTRA_Chroma_PLANE_IP_GEN5 - INTRA_CHROMA_DC_IP_GEN5),
-
-    0xFCFBFAF9,
-
-    0x00FFFEFD,
-
-    0x04030201,
-
-    0x08070605,
-
-    0x18100800,
-
-    0x00020406,
-
-    (intra_Pred_4x4_Y_IP_GEN5 - ADD_ERROR_SB3_IP_GEN5) * 0x1000000 + 
-    (intra_Pred_4x4_Y_IP_GEN5 - ADD_ERROR_SB2_IP_GEN5) * 0x10000 + 
-    (intra_Pred_4x4_Y_IP_GEN5 - ADD_ERROR_SB1_IP_GEN5) * 0x100 + 
-    (intra_Pred_4x4_Y_IP_GEN5 - ADD_ERROR_SB0_IP_GEN5)
-};
-
-static uint32_t h264_avc_combined_gen5[][4] = {
-#include "shaders/h264/mc/avc_mc.g4b.gen5"
-};
-
-static uint32_t h264_avc_null_gen5[][4] = {
-#include "shaders/h264/mc/null.g4b.gen5"
-};
-
-static struct media_kernel h264_avc_kernels_gen5[] = {
-    {
-        "AVC combined kernel",
-        H264_AVC_COMBINED,
-        h264_avc_combined_gen5,
-        sizeof(h264_avc_combined_gen5),
-        NULL
-    },
-
-    {
-        "NULL kernel",
-        H264_AVC_NULL,
-        h264_avc_null_gen5,
-        sizeof(h264_avc_null_gen5),
-        NULL
-    }
-};
-
-#define NUM_H264_AVC_KERNELS (sizeof(h264_avc_kernels_gen4) / sizeof(h264_avc_kernels_gen4[0]))
-struct media_kernel *h264_avc_kernels = NULL;
-
-#define NUM_AVC_MC_INTERFACES (sizeof(avc_mc_kernel_offset_gen4) / sizeof(avc_mc_kernel_offset_gen4[0]))
-static unsigned long *avc_mc_kernel_offset = NULL;
-
-static struct intra_kernel_header *intra_kernel_header = NULL;
-
-static void
-i965_media_h264_surface_state(VADriverContextP ctx, 
-                              int index,
-                              struct object_surface *obj_surface,
-                              unsigned long offset, 
-                              int w, int h, int pitch,
-                              Bool is_dst,
-                              int vert_line_stride,
-                              int vert_line_stride_ofs,
-                              int format)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);  
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_surface_state *ss;
-    dri_bo *bo;
-    uint32_t write_domain, read_domain;
-
-    bo = dri_bo_alloc(i965->intel.bufmgr, 
-                      "surface state", 
-                      sizeof(struct i965_surface_state), 32);
-    assert(bo);
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    ss = bo->virtual;
-    memset(ss, 0, sizeof(*ss));
-    ss->ss0.surface_type = I965_SURFACE_2D;
-    ss->ss0.surface_format = format;
-    ss->ss0.vert_line_stride = vert_line_stride;
-    ss->ss0.vert_line_stride_ofs = vert_line_stride_ofs;
-    ss->ss1.base_addr = obj_surface->bo->offset + offset;
-    ss->ss2.width = w - 1;
-    ss->ss2.height = h - 1;
-    ss->ss3.pitch = pitch - 1;
-
-    if (is_dst) {
-        write_domain = I915_GEM_DOMAIN_RENDER;
-        read_domain = I915_GEM_DOMAIN_RENDER;
-    } else {
-        write_domain = 0;
-        read_domain = I915_GEM_DOMAIN_SAMPLER;
-    }
-
-    dri_bo_emit_reloc(bo,
-                      read_domain, write_domain,
-                      offset,
-                      offsetof(struct i965_surface_state, ss1),
-                      obj_surface->bo);
-    dri_bo_unmap(bo);
-
-    assert(index < MAX_MEDIA_SURFACES);
-    media_state->surface_state[index].bo = bo;
-}
-
-static void 
-i965_media_h264_surfaces_setup(VADriverContextP ctx, 
-                               struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);  
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context;
-    struct object_surface *obj_surface;
-    VAPictureParameterBufferH264 *pic_param;
-    VAPictureH264 *va_pic;
-    int i, j, w, h;
-    int field_picture;
-
-    assert(media_state->private_context);
-    i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-
-    /* Target Picture */
-    va_pic = &pic_param->CurrPic;
-    assert(!(va_pic->flags & VA_PICTURE_H264_INVALID));
-    obj_surface = SURFACE(va_pic->picture_id);
-    assert(obj_surface);
-    w = obj_surface->width;
-    h = obj_surface->height;
-    field_picture = !!(va_pic->flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD));
-    i965_media_h264_surface_state(ctx, 0, obj_surface,
-                                  0, w / 4, h / (1 + field_picture), w,
-                                  1, 
-                                  field_picture,
-                                  !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD),
-                                  I965_SURFACEFORMAT_R8_SINT); /* Y */
-    i965_media_h264_surface_state(ctx, 1, obj_surface,
-                                  w * h, w / 4, h / 2 / (1 + field_picture), w,
-                                  1, 
-                                  field_picture,
-                                  !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD),
-                                  I965_SURFACEFORMAT_R8G8_SINT);  /* INTERLEAVED U/V */
-
-    /* Reference Pictures */
-    for (i = 0; i < ARRAY_ELEMS(i965_h264_context->fsid_list); i++) {
-        if (i965_h264_context->fsid_list[i].surface_id != VA_INVALID_ID) {
-            int found = 0;
-            for (j = 0; j < ARRAY_ELEMS(pic_param->ReferenceFrames); j++) {
-                va_pic = &pic_param->ReferenceFrames[j];
-                
-                if (va_pic->flags & VA_PICTURE_H264_INVALID)
-                    continue;
-
-                if (va_pic->picture_id == i965_h264_context->fsid_list[i].surface_id) {
-                    found = 1;
-                    break;
-                }
-            }
-
-            assert(found == 1);
-
-            obj_surface = SURFACE(va_pic->picture_id);
-            assert(obj_surface);
-            w = obj_surface->width;
-            h = obj_surface->height;
-            field_picture = !!(va_pic->flags & (VA_PICTURE_H264_TOP_FIELD | VA_PICTURE_H264_BOTTOM_FIELD));
-            i965_media_h264_surface_state(ctx, 2 + i, obj_surface,
-                                          0, w / 4, h / (1 + field_picture), w,
-                                          0, 
-                                          field_picture,
-                                          !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD),
-                                          I965_SURFACEFORMAT_R8_SINT); /* Y */
-            i965_media_h264_surface_state(ctx, 18 + i, obj_surface,
-                                          w * h, w / 4, h / 2 / (1 + field_picture), w,
-                                          0, 
-                                          field_picture,
-                                          !!(va_pic->flags & VA_PICTURE_H264_BOTTOM_FIELD),
-                                          I965_SURFACEFORMAT_R8G8_SINT);  /* INTERLEAVED U/V */
-        }
-    }
-}
-
-static void
-i965_media_h264_binding_table(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    int i;
-    unsigned int *binding_table;
-    dri_bo *bo = media_state->binding_table.bo;
-
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    binding_table = bo->virtual;
-    memset(binding_table, 0, bo->size);
-
-    for (i = 0; i < MAX_MEDIA_SURFACES; i++) {
-        if (media_state->surface_state[i].bo) {
-            binding_table[i] = media_state->surface_state[i].bo->offset;
-            dri_bo_emit_reloc(bo,
-                              I915_GEM_DOMAIN_INSTRUCTION, 0,
-                              0,
-                              i * sizeof(*binding_table),
-                              media_state->surface_state[i].bo);
-        }
-    }
-
-    dri_bo_unmap(media_state->binding_table.bo);
-}
-
-static void 
-i965_media_h264_interface_descriptor_remap_table(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_interface_descriptor *desc;
-    int i;
-    dri_bo *bo;
-
-    bo = media_state->idrt.bo;
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    desc = bo->virtual;
-
-    for (i = 0; i < NUM_AVC_MC_INTERFACES; i++) {
-        int kernel_offset = avc_mc_kernel_offset[i];
-        memset(desc, 0, sizeof(*desc));
-        desc->desc0.grf_reg_blocks = 7; 
-        desc->desc0.kernel_start_pointer = (h264_avc_kernels[H264_AVC_COMBINED].bo->offset + kernel_offset) >> 6; /* reloc */
-        desc->desc1.const_urb_entry_read_offset = 0;
-        desc->desc1.const_urb_entry_read_len = 2;
-        desc->desc3.binding_table_entry_count = 0;
-        desc->desc3.binding_table_pointer = 
-            media_state->binding_table.bo->offset >> 5; /*reloc */
-
-        dri_bo_emit_reloc(bo,
-                          I915_GEM_DOMAIN_INSTRUCTION, 0,
-                          desc->desc0.grf_reg_blocks + kernel_offset,
-                          i * sizeof(*desc) + offsetof(struct i965_interface_descriptor, desc0),
-                          h264_avc_kernels[H264_AVC_COMBINED].bo);
-
-        dri_bo_emit_reloc(bo,
-                          I915_GEM_DOMAIN_INSTRUCTION, 0,
-                          desc->desc3.binding_table_entry_count,
-                          i * sizeof(*desc) + offsetof(struct i965_interface_descriptor, desc3),
-                          media_state->binding_table.bo);
-        desc++;
-    }
-
-    dri_bo_unmap(bo);
-}
-
-static void
-i965_media_h264_vfe_state(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_vfe_state *vfe_state;
-    dri_bo *bo;
-
-    bo = media_state->vfe_state.bo;
-    dri_bo_map(bo, 1);
-    assert(bo->virtual);
-    vfe_state = bo->virtual;
-    memset(vfe_state, 0, sizeof(*vfe_state));
-    vfe_state->vfe0.extend_vfe_state_present = 1;
-    vfe_state->vfe1.max_threads = media_state->urb.num_vfe_entries - 1;
-    vfe_state->vfe1.urb_entry_alloc_size = media_state->urb.size_vfe_entry - 1;
-    vfe_state->vfe1.num_urb_entries = media_state->urb.num_vfe_entries;
-    vfe_state->vfe1.vfe_mode = VFE_AVC_IT_MODE;
-    vfe_state->vfe1.children_present = 0;
-    vfe_state->vfe2.interface_descriptor_base = 
-        media_state->idrt.bo->offset >> 4; /* reloc */
-    dri_bo_emit_reloc(bo,
-                      I915_GEM_DOMAIN_INSTRUCTION, 0,
-                      0,
-                      offsetof(struct i965_vfe_state, vfe2),
-                      media_state->idrt.bo);
-    dri_bo_unmap(bo);
-}
-
-static void 
-i965_media_h264_vfe_state_extension(VADriverContextP ctx, 
-                                    struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context;
-    struct i965_vfe_state_ex *vfe_state_ex;
-    VAPictureParameterBufferH264 *pic_param;
-    int mbaff_frame_flag;
-
-    assert(media_state->private_context);
-    i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-    mbaff_frame_flag = (pic_param->seq_fields.bits.mb_adaptive_frame_field_flag &&
-                        !pic_param->pic_fields.bits.field_pic_flag);
-
-    assert(media_state->extended_state.bo);
-    dri_bo_map(media_state->extended_state.bo, 1);
-    assert(media_state->extended_state.bo->virtual);
-    vfe_state_ex = media_state->extended_state.bo->virtual;
-    memset(vfe_state_ex, 0, sizeof(*vfe_state_ex));
-
-    /*
-     * Indirect data buffer:
-     * --------------------------------------------------------
-     * | Motion Vectors | Weight/Offset data | Residual data |
-     * --------------------------------------------------------
-     * R4-R7: Motion Vectors
-     * R8-R9: Weight/Offset
-     * R10-R33: Residual data
-     */
-    vfe_state_ex->vfex1.avc.residual_data_fix_offset_flag = !!RESIDUAL_DATA_OFFSET;
-    vfe_state_ex->vfex1.avc.residual_data_offset = RESIDUAL_DATA_OFFSET;
-
-    if (i965_h264_context->picture.i_flag) {
-        vfe_state_ex->vfex1.avc.sub_field_present_flag = PRESENT_NOMV; /* NoMV */
-        vfe_state_ex->vfex1.avc.weight_grf_offset = 0;
-        vfe_state_ex->vfex1.avc.residual_grf_offset = 0;
-    } else {
-        vfe_state_ex->vfex1.avc.sub_field_present_flag = PRESENT_MV_WO; /* Both MV and W/O */
-        vfe_state_ex->vfex1.avc.weight_grf_offset = 4;
-        vfe_state_ex->vfex1.avc.residual_grf_offset = 6;
-    }
-
-    if (!pic_param->pic_fields.bits.field_pic_flag) {
-        if (mbaff_frame_flag) {
-            vfe_state_ex->remap_table0.remap_index_0 = INTRA_16X16;
-            vfe_state_ex->remap_table0.remap_index_1 = INTRA_8X8;
-            vfe_state_ex->remap_table0.remap_index_2 = INTRA_4X4;
-            vfe_state_ex->remap_table0.remap_index_3 = INTRA_PCM;
-            vfe_state_ex->remap_table0.remap_index_4 = MBAFF_MOTION;
-            vfe_state_ex->remap_table0.remap_index_5 = MBAFF_MOTION;
-            vfe_state_ex->remap_table0.remap_index_6 = MBAFF_MOTION;
-            vfe_state_ex->remap_table0.remap_index_7 = MBAFF_MOTION;
-
-            vfe_state_ex->remap_table1.remap_index_8 = MBAFF_MOTION;
-            vfe_state_ex->remap_table1.remap_index_9 = MBAFF_MOTION;
-            vfe_state_ex->remap_table1.remap_index_10 = MBAFF_MOTION;
-            vfe_state_ex->remap_table1.remap_index_11 = MBAFF_MOTION;
-            vfe_state_ex->remap_table1.remap_index_12 = MBAFF_MOTION;
-            vfe_state_ex->remap_table1.remap_index_13 = MBAFF_MOTION;
-            vfe_state_ex->remap_table1.remap_index_14 = MBAFF_MOTION;
-            vfe_state_ex->remap_table1.remap_index_15 = MBAFF_MOTION;
-        } else {
-            vfe_state_ex->remap_table0.remap_index_0 = INTRA_16X16;
-            vfe_state_ex->remap_table0.remap_index_1 = INTRA_8X8;
-            vfe_state_ex->remap_table0.remap_index_2 = INTRA_4X4;
-            vfe_state_ex->remap_table0.remap_index_3 = INTRA_PCM;
-            vfe_state_ex->remap_table0.remap_index_4 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table0.remap_index_5 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table0.remap_index_6 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table0.remap_index_7 = FRAMEMB_MOTION;
-
-            vfe_state_ex->remap_table1.remap_index_8 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table1.remap_index_9 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table1.remap_index_10 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table1.remap_index_11 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table1.remap_index_12 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table1.remap_index_13 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table1.remap_index_14 = FRAMEMB_MOTION;
-            vfe_state_ex->remap_table1.remap_index_15 = FRAMEMB_MOTION;
-        }
-    } else {
-        vfe_state_ex->remap_table0.remap_index_0 = INTRA_16X16;
-        vfe_state_ex->remap_table0.remap_index_1 = INTRA_8X8;
-        vfe_state_ex->remap_table0.remap_index_2 = INTRA_4X4;
-        vfe_state_ex->remap_table0.remap_index_3 = INTRA_PCM;
-        vfe_state_ex->remap_table0.remap_index_4 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table0.remap_index_5 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table0.remap_index_6 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table0.remap_index_7 = FIELDMB_MOTION;
-
-        vfe_state_ex->remap_table1.remap_index_8 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table1.remap_index_9 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table1.remap_index_10 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table1.remap_index_11 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table1.remap_index_12 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table1.remap_index_13 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table1.remap_index_14 = FIELDMB_MOTION;
-        vfe_state_ex->remap_table1.remap_index_15 = FIELDMB_MOTION;
-    }
-
-    if (i965_h264_context->use_avc_hw_scoreboard) {
-        vfe_state_ex->scoreboard0.enable = 1;
-        vfe_state_ex->scoreboard0.type = SCOREBOARD_STALLING;
-        vfe_state_ex->scoreboard0.mask = 0xff;
-
-        vfe_state_ex->scoreboard1.delta_x0 = -1;
-        vfe_state_ex->scoreboard1.delta_y0 = 0;
-        vfe_state_ex->scoreboard1.delta_x1 = 0;
-        vfe_state_ex->scoreboard1.delta_y1 = -1;
-        vfe_state_ex->scoreboard1.delta_x2 = 1;
-        vfe_state_ex->scoreboard1.delta_y2 = -1;
-        vfe_state_ex->scoreboard1.delta_x3 = -1;
-        vfe_state_ex->scoreboard1.delta_y3 = -1;
-
-        vfe_state_ex->scoreboard2.delta_x4 = -1;
-        vfe_state_ex->scoreboard2.delta_y4 = 1;
-        vfe_state_ex->scoreboard2.delta_x5 = 0;
-        vfe_state_ex->scoreboard2.delta_y5 = -2;
-        vfe_state_ex->scoreboard2.delta_x6 = 1;
-        vfe_state_ex->scoreboard2.delta_y6 = -2;
-        vfe_state_ex->scoreboard2.delta_x7 = -1;
-        vfe_state_ex->scoreboard2.delta_y7 = -2;
-    }
-
-    dri_bo_unmap(media_state->extended_state.bo);
-}
-
-static void
-i965_media_h264_upload_constants(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context;
-    unsigned char *constant_buffer;
-    VASliceParameterBufferH264 *slice_param;
-
-    assert(media_state->private_context);
-    i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    assert(decode_state->slice_params[0] && decode_state->slice_params[0]->buffer);
-    slice_param = (VASliceParameterBufferH264 *)decode_state->slice_params[0]->buffer;
-
-    dri_bo_map(media_state->curbe.bo, 1);
-    assert(media_state->curbe.bo->virtual);
-    constant_buffer = media_state->curbe.bo->virtual;
-
-    /* HW solution for W=128 */
-    if (i965_h264_context->use_hw_w128) {
-        memcpy(constant_buffer, intra_kernel_header, sizeof(*intra_kernel_header));
-    } else {
-        if (slice_param->slice_type == SLICE_TYPE_I ||
-            slice_param->slice_type == SLICE_TYPE_SI) {
-            memcpy(constant_buffer, intra_kernel_header, sizeof(*intra_kernel_header));
-        } else {
-            /* FIXME: Need to upload CURBE data to inter kernel interface 
-             * to support weighted prediction work-around 
-             */
-            *(short *)constant_buffer = i965_h264_context->weight128_offset0;
-            constant_buffer += 2;
-            *(char *)constant_buffer = i965_h264_context->weight128_offset0_flag;
-            constant_buffer++;
-            *constant_buffer = 0;
-        }
-    }
-
-    dri_bo_unmap(media_state->curbe.bo);
-}
-
-static void
-i965_media_h264_states_setup(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context;
-
-    assert(media_state->private_context);
-    i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    i965_avc_bsd_pipeline(ctx, decode_state);
-
-    i965_avc_hw_scoreboard(ctx, decode_state);
-
-    i965_media_h264_surfaces_setup(ctx, decode_state);
-    i965_media_h264_binding_table(ctx);
-    i965_media_h264_interface_descriptor_remap_table(ctx);
-    i965_media_h264_vfe_state_extension(ctx, decode_state);
-    i965_media_h264_vfe_state(ctx);
-    i965_media_h264_upload_constants(ctx, decode_state);
-}
-
-static void
-i965_media_h264_objects(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context;
-    unsigned int *object_command;
-
-    assert(media_state->private_context);
-    i965_h264_context = (struct i965_h264_context *)media_state->private_context;
-
-    dri_bo_map(i965_h264_context->avc_it_command_mb_info.bo, True);
-    assert(i965_h264_context->avc_it_command_mb_info.bo->virtual);
-    object_command = i965_h264_context->avc_it_command_mb_info.bo->virtual;
-    memset(object_command, 0, i965_h264_context->avc_it_command_mb_info.mbs * i965_h264_context->use_avc_hw_scoreboard * MB_CMD_IN_BYTES);
-    object_command += i965_h264_context->avc_it_command_mb_info.mbs * (1 + i965_h264_context->use_avc_hw_scoreboard) * MB_CMD_IN_DWS;
-    *object_command++ = 0;
-    *object_command = MI_BATCH_BUFFER_END;
-    dri_bo_unmap(i965_h264_context->avc_it_command_mb_info.bo);
-
-    BEGIN_BATCH(ctx, 2);
-    OUT_BATCH(ctx, MI_BATCH_BUFFER_START | (2 << 6));
-    OUT_RELOC(ctx, i965_h264_context->avc_it_command_mb_info.bo, 
-              I915_GEM_DOMAIN_COMMAND, 0, 
-              0);
-    ADVANCE_BATCH(ctx);
-
-    /* Have to execute the batch buffer here becuase MI_BATCH_BUFFER_END
-     * will cause control to pass back to ring buffer 
-     */
-    intel_batchbuffer_end_atomic(ctx);
-    intel_batchbuffer_flush(ctx);
-    intel_batchbuffer_start_atomic(ctx, 0x1000);
-    i965_avc_ildb(ctx, decode_state);
-}
-
-static void 
-i965_media_h264_free_private_context(void **data)
-{
-    struct i965_h264_context *i965_h264_context = *data;
-    int i;
-
-    if (i965_h264_context == NULL)
-        return;
-
-    i965_avc_ildb_ternimate(&i965_h264_context->avc_ildb_context);
-    i965_avc_hw_scoreboard_ternimate(&i965_h264_context->avc_hw_scoreboard_context);
-    i965_avc_bsd_ternimate(&i965_h264_context->i965_avc_bsd_context);
-    dri_bo_unreference(i965_h264_context->avc_it_command_mb_info.bo);
-    dri_bo_unreference(i965_h264_context->avc_it_data.bo);
-    dri_bo_unreference(i965_h264_context->avc_ildb_data.bo);
-    free(i965_h264_context);
-    *data = NULL;
-
-    for (i = 0; i < NUM_H264_AVC_KERNELS; i++) {
-        struct media_kernel *kernel = &h264_avc_kernels[i];
-
-        dri_bo_unreference(kernel->bo);
-        kernel->bo = NULL;
-    }
-}
-
-void
-i965_media_h264_decode_init(VADriverContextP ctx, struct decode_state *decode_state)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_media_state *media_state = &i965->media_state;
-    struct i965_h264_context *i965_h264_context;
-    dri_bo *bo;
-    int i;
-    VAPictureParameterBufferH264 *pic_param;
-
-    i965_h264_context = media_state->private_context;
-
-    if (i965_h264_context == NULL) {
-        /* kernel */
-        assert(NUM_H264_AVC_KERNELS == (sizeof(h264_avc_kernels_gen5) / 
-                                        sizeof(h264_avc_kernels_gen5[0])));
-        assert(NUM_AVC_MC_INTERFACES == (sizeof(avc_mc_kernel_offset_gen5) /
-                                         sizeof(avc_mc_kernel_offset_gen5[0])));
-
-        i965_h264_context = calloc(1, sizeof(struct i965_h264_context));
-
-        if (IS_IRONLAKE(i965->intel.device_id)) {
-            h264_avc_kernels = h264_avc_kernels_gen5;
-            avc_mc_kernel_offset = avc_mc_kernel_offset_gen5;
-            intra_kernel_header = &intra_kernel_header_gen5;
-            i965_h264_context->use_avc_hw_scoreboard = 1;
-            i965_h264_context->use_hw_w128 = 1;
-        } else {
-            h264_avc_kernels = h264_avc_kernels_gen4;
-            avc_mc_kernel_offset = avc_mc_kernel_offset_gen4;
-            intra_kernel_header = &intra_kernel_header_gen4;
-            i965_h264_context->use_avc_hw_scoreboard = 0;
-            i965_h264_context->use_hw_w128 = 0;
-        }
-
-        for (i = 0; i < NUM_H264_AVC_KERNELS; i++) {
-            struct media_kernel *kernel = &h264_avc_kernels[i];
-            kernel->bo = dri_bo_alloc(i965->intel.bufmgr, 
-                                      kernel->name, 
-                                      kernel->size, 0x1000);
-            assert(kernel->bo);
-            dri_bo_subdata(kernel->bo, 0, kernel->size, kernel->bin);
-        }
-
-        for (i = 0; i < 16; i++) {
-            i965_h264_context->fsid_list[i].surface_id = VA_INVALID_ID;
-            i965_h264_context->fsid_list[i].frame_store_id = -1;
-        }
-
-        media_state->private_context = i965_h264_context;
-        media_state->free_private_context = i965_media_h264_free_private_context;
-
-        /* URB */
-        if (IS_IRONLAKE(i965->intel.device_id)) {
-            media_state->urb.num_vfe_entries = 63;
-        } else {
-            media_state->urb.num_vfe_entries = 23;
-        }
-
-        media_state->urb.size_vfe_entry = 16;
-
-        media_state->urb.num_cs_entries = 1;
-        media_state->urb.size_cs_entry = 1;
-
-        media_state->urb.vfe_start = 0;
-        media_state->urb.cs_start = media_state->urb.vfe_start + 
-            media_state->urb.num_vfe_entries * media_state->urb.size_vfe_entry;
-        assert(media_state->urb.cs_start + 
-               media_state->urb.num_cs_entries * media_state->urb.size_cs_entry <= URB_SIZE((&i965->intel)));
-
-        /* hook functions */
-        media_state->media_states_setup = i965_media_h264_states_setup;
-        media_state->media_objects = i965_media_h264_objects;
-    }
-
-    assert(decode_state->pic_param && decode_state->pic_param->buffer);
-    pic_param = (VAPictureParameterBufferH264 *)decode_state->pic_param->buffer;
-    i965_h264_context->picture.width_in_mbs = ((pic_param->picture_width_in_mbs_minus1 + 1) & 0xff);
-    i965_h264_context->picture.height_in_mbs = ((pic_param->picture_height_in_mbs_minus1 + 1) & 0xff) / 
-        (1 + !!pic_param->pic_fields.bits.field_pic_flag); /* picture height */
-    i965_h264_context->picture.mbaff_frame_flag = (pic_param->seq_fields.bits.mb_adaptive_frame_field_flag &&
-                                                   !pic_param->pic_fields.bits.field_pic_flag);
-    i965_h264_context->avc_it_command_mb_info.mbs = (i965_h264_context->picture.width_in_mbs * 
-                                                     i965_h264_context->picture.height_in_mbs);
-
-    dri_bo_unreference(i965_h264_context->avc_it_command_mb_info.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr,
-                      "avc it command mb info",
-                      i965_h264_context->avc_it_command_mb_info.mbs * MB_CMD_IN_BYTES * (1 + i965_h264_context->use_avc_hw_scoreboard) + 8,
-                      0x1000);
-    assert(bo);
-    i965_h264_context->avc_it_command_mb_info.bo = bo;
-
-    dri_bo_unreference(i965_h264_context->avc_it_data.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr,
-                      "avc it data",
-                      i965_h264_context->avc_it_command_mb_info.mbs * 
-                      0x800 * 
-                      (1 + !!pic_param->pic_fields.bits.field_pic_flag),
-                      0x1000);
-    assert(bo);
-    i965_h264_context->avc_it_data.bo = bo;
-    i965_h264_context->avc_it_data.write_offset = 0;
-    dri_bo_unreference(media_state->indirect_object.bo);
-    media_state->indirect_object.bo = bo;
-    dri_bo_reference(media_state->indirect_object.bo);
-    media_state->indirect_object.offset = i965_h264_context->avc_it_data.write_offset;
-
-    dri_bo_unreference(i965_h264_context->avc_ildb_data.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr,
-                      "AVC-ILDB Data Buffer",
-                      i965_h264_context->avc_it_command_mb_info.mbs * 64 * 2,
-                      0x1000);
-    assert(bo);
-    i965_h264_context->avc_ildb_data.bo = bo;
-
-    /* bsd pipeline */
-    i965_avc_bsd_decode_init(ctx);
-
-    /* HW scoreboard */
-    i965_avc_hw_scoreboard_decode_init(ctx);
-
-    /* ILDB */
-    i965_avc_ildb_decode_init(ctx);
-
-    /* for Media pipeline */
-    media_state->extended_state.enabled = 1;
-    dri_bo_unreference(media_state->extended_state.bo);
-    bo = dri_bo_alloc(i965->intel.bufmgr, 
-                      "extened vfe state", 
-                      sizeof(struct i965_vfe_state_ex), 32);
-    assert(bo);
-    media_state->extended_state.bo = bo;
-}
diff -Nru libva-1.0.4/i965_drv_video/i965_media_h264.h libva-1.0.1/i965_drv_video/i965_media_h264.h
--- libva-1.0.4/i965_drv_video/i965_media_h264.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_media_h264.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-#ifndef _I965_MEDIA_H264_H_
-#define _I965_MEDIA_H264_H_
-
-#include "i965_avc_bsd.h"
-#include "i965_avc_hw_scoreboard.h"
-#include "i965_avc_ildb.h"
-
-#define INST_UNIT_GEN4  16
-#define INST_UNIT_GEN5  8
-
-#define MB_CMD_IN_BYTES         64
-#define MB_CMD_IN_DWS           16
-#define MB_CMD_IN_OWS           4
-
-enum {
-    H264_AVC_COMBINED = 0,
-    H264_AVC_NULL
-};
-
-struct i965_h264_context
-{
-    struct {
-        dri_bo *bo;
-        unsigned int mbs;
-    } avc_it_command_mb_info;
-
-    struct {
-        dri_bo *bo;
-        long write_offset;
-    } avc_it_data;
-
-    struct {
-        dri_bo *bo;
-    } avc_ildb_data;
-
-    struct {
-        unsigned int width_in_mbs;
-        unsigned int height_in_mbs;
-        int mbaff_frame_flag;
-        int i_flag;
-    } picture;
-
-    int enable_avc_ildb;
-    int use_avc_hw_scoreboard;
-
-    int use_hw_w128;
-    unsigned int weight128_luma_l0;
-    unsigned int weight128_luma_l1;
-    unsigned int weight128_chroma_l0;
-    unsigned int weight128_chroma_l1;
-    char weight128_offset0_flag;
-    short weight128_offset0;
-
-    struct i965_avc_bsd_context i965_avc_bsd_context;
-    struct i965_avc_hw_scoreboard_context avc_hw_scoreboard_context;
-    struct i965_avc_ildb_context avc_ildb_context;
-
-    struct {
-        VASurfaceID surface_id;
-        int frame_store_id;
-    } fsid_list[16];
-};
-
-void i965_media_h264_decode_init(VADriverContextP ctx, struct decode_state *decode_state);
-
-#endif /* _I965_MEDIA_H264_H_ */
diff -Nru libva-1.0.4/i965_drv_video/i965_media_mpeg2.c libva-1.0.1/i965_drv_video/i965_media_mpeg2.c
--- libva-1.0.4/i965_drv_video/i965_media_mpeg2.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_media_mpeg2.c	2009-12-17 03:05:38.000000000 +0000
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
+#include "va_backend.h"
 
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
@@ -280,7 +280,7 @@
     }
 };
 
-/* On IRONLAKE */
+/* On IGDNG */
 static uint32_t frame_intra_kernel_gen5[][4] = {
    #include "shaders/mpeg2/vld/frame_intra.g4b.gen5"
 };
@@ -518,15 +518,6 @@
     int w = obj_surface->width;
     int h = obj_surface->height;
 
-    if (obj_surface->bo == NULL) {
-        struct i965_driver_data *i965 = i965_driver_data(ctx);  
-        
-        obj_surface->bo = dri_bo_alloc(i965->intel.bufmgr,
-                                       "vaapi surface",
-                                       obj_surface->size,
-                                       0x1000);
-    }
-
     if (picture_structure == MPEG_FRAME) {
 	i965_media_mpeg2_surface_state(ctx, base_index + 0, obj_surface,
 					0, w, h, 
@@ -860,104 +851,107 @@
 static void
 i965_media_mpeg2_objects(VADriverContextP ctx, struct decode_state *decode_state)
 {
-    int i, j;
+    int i;
     VASliceParameterBufferMPEG2 *slice_param;
 
-    for (j = 0; j < decode_state->num_slice_params; j++) {
-        assert(decode_state->slice_params[j] && decode_state->slice_params[j]->buffer);
-        assert(decode_state->slice_datas[j] && decode_state->slice_datas[j]->bo);
-        slice_param = (VASliceParameterBufferMPEG2 *)decode_state->slice_params[j]->buffer;
-
-        for (i = 0; i < decode_state->slice_params[j]->num_elements; i++) {
-            assert(slice_param->slice_data_flag == VA_SLICE_DATA_FLAG_ALL);
-
-            BEGIN_BATCH(ctx, 6);
-            OUT_BATCH(ctx, CMD_MEDIA_OBJECT | 4);
-            OUT_BATCH(ctx, 0);
-            OUT_BATCH(ctx, slice_param->slice_data_size - (slice_param->macroblock_offset >> 3));
-            OUT_RELOC(ctx, decode_state->slice_datas[j]->bo, 
-                      I915_GEM_DOMAIN_SAMPLER, 0, 
-                      slice_param->slice_data_offset + (slice_param->macroblock_offset >> 3));
-            OUT_BATCH(ctx, 
-                      ((slice_param->slice_horizontal_position << 24) |     
-                       (slice_param->slice_vertical_position << 16) |
-                       (127 << 8) | 
-                       (slice_param->macroblock_offset & 0x7)));
-            OUT_BATCH(ctx, slice_param->quantiser_scale_code << 24);
-            ADVANCE_BATCH(ctx);          
-            slice_param++;
-        }
-    }
-}
-
-static void
-i965_media_mpeg2_free_private_context(void **data)
-{
-    int i;
+    assert(decode_state->slice_param && decode_state->slice_param->buffer);
+    slice_param = (VASliceParameterBufferMPEG2 *)decode_state->slice_param->buffer;
 
-    for (i = 0; i < NUM_MPEG2_VLD_KERNELS; i++) {
-        struct media_kernel *kernel = &mpeg2_vld_kernels[i];
+    for (i = 0; i < decode_state->num_slices; i++) {
+        assert(slice_param->slice_data_flag == VA_SLICE_DATA_FLAG_ALL);
 
-        dri_bo_unreference(kernel->bo);
-        kernel->bo = NULL;
+        BEGIN_BATCH(ctx, 6);
+        OUT_BATCH(ctx, CMD_MEDIA_OBJECT | 4);
+        OUT_BATCH(ctx, 0);
+        OUT_BATCH(ctx, slice_param->slice_data_size - (slice_param->macroblock_offset >> 3));
+        OUT_RELOC(ctx, decode_state->slice_data->bo, 
+                  I915_GEM_DOMAIN_SAMPLER, 0, 
+                  slice_param->slice_data_offset + (slice_param->macroblock_offset >> 3));
+        OUT_BATCH(ctx, 
+                  ((slice_param->slice_horizontal_position << 24) |     
+                   (slice_param->slice_vertical_position << 16) |
+                   (127 << 8) | 
+                   (slice_param->macroblock_offset & 0x7)));
+        OUT_BATCH(ctx, slice_param->quantiser_scale_code << 24);
+        ADVANCE_BATCH(ctx);          
+        slice_param++;
     }
-
-    mpeg2_vld_kernels = NULL;
 }
 
 void 
-i965_media_mpeg2_decode_init(VADriverContextP ctx, struct decode_state *decode_state)
+i965_media_mpeg2_decode_init(VADriverContextP ctx)
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct i965_media_state *media_state = &i965->media_state;
     dri_bo *bo;
-    int i;
-    if (mpeg2_vld_kernels == NULL) {
-        /* kernel */
-        assert(NUM_MPEG2_VLD_KERNELS == (sizeof(mpeg2_vld_kernels_gen5) / 
-                                         sizeof(mpeg2_vld_kernels_gen5[0])));
-        assert(NUM_MPEG2_VLD_KERNELS <= MAX_INTERFACE_DESC);
-
-        if (IS_IRONLAKE(i965->intel.device_id))
-            mpeg2_vld_kernels = mpeg2_vld_kernels_gen5;
-        else
-            mpeg2_vld_kernels = mpeg2_vld_kernels_gen4;
-
-        for (i = 0; i < NUM_MPEG2_VLD_KERNELS; i++) {
-            struct media_kernel *kernel = &mpeg2_vld_kernels[i];
-            kernel->bo = dri_bo_alloc(i965->intel.bufmgr, 
-                                      kernel->name, 
-                                      kernel->size, 64);
-            assert(kernel->bo);
-            dri_bo_subdata(kernel->bo, 0, kernel->size, kernel->bin);
-        }
-
-        /* URB */
-        media_state->urb.num_vfe_entries = 28;
-        media_state->urb.size_vfe_entry = 13;
-
-        media_state->urb.num_cs_entries = 1;
-        media_state->urb.size_cs_entry = 16;
-
-        media_state->urb.vfe_start = 0;
-        media_state->urb.cs_start = media_state->urb.vfe_start + 
-            media_state->urb.num_vfe_entries * media_state->urb.size_vfe_entry;
-        assert(media_state->urb.cs_start + 
-               media_state->urb.num_cs_entries * media_state->urb.size_cs_entry <= URB_SIZE((&i965->intel)));
-
-        /* hook functions */
-        media_state->media_states_setup = i965_media_mpeg2_states_setup;
-        media_state->media_objects = i965_media_mpeg2_objects;
-        media_state->free_private_context = i965_media_mpeg2_free_private_context;
-    }
 
     media_state->extended_state.enabled = 1;
-    media_state->indirect_object.bo = NULL;
     dri_bo_unreference(media_state->extended_state.bo);
     bo = dri_bo_alloc(i965->intel.bufmgr, 
                       "vld state", 
                       sizeof(struct i965_vld_state), 32);
     assert(bo);
     media_state->extended_state.bo = bo;
+
+    /* URB */
+    media_state->urb.num_vfe_entries = 28;
+    media_state->urb.size_vfe_entry = 13;
+
+    media_state->urb.num_cs_entries = 1;
+    media_state->urb.size_cs_entry = 16;
+
+    media_state->urb.vfe_start = 0;
+    media_state->urb.cs_start = media_state->urb.vfe_start + 
+        media_state->urb.num_vfe_entries * media_state->urb.size_vfe_entry;
+    assert(media_state->urb.cs_start + 
+           media_state->urb.num_cs_entries * media_state->urb.size_cs_entry <= URB_SIZE((&i965->intel)));
+
+    /* hook functions */
+    media_state->states_setup = i965_media_mpeg2_states_setup;
+    media_state->media_objects = i965_media_mpeg2_objects;
+
+}
+
+Bool 
+i965_media_mpeg2_init(VADriverContextP ctx)
+{
+    struct i965_driver_data *i965 = i965_driver_data(ctx);
+    int i;
+
+    /* kernel */
+    assert(NUM_MPEG2_VLD_KERNELS == (sizeof(mpeg2_vld_kernels_gen5) / 
+                                     sizeof(mpeg2_vld_kernels_gen5[0])));
+    assert(NUM_MPEG2_VLD_KERNELS <= MAX_INTERFACE_DESC);
+
+    if (IS_IGDNG(i965->intel.device_id))
+        mpeg2_vld_kernels = mpeg2_vld_kernels_gen5;
+    else
+        mpeg2_vld_kernels = mpeg2_vld_kernels_gen4;
+
+    for (i = 0; i < NUM_MPEG2_VLD_KERNELS; i++) {
+        struct media_kernel *kernel = &mpeg2_vld_kernels[i];
+        kernel->bo = dri_bo_alloc(i965->intel.bufmgr, 
+                                  kernel->name, 
+                                  kernel->size, 64);
+        assert(kernel->bo);
+        dri_bo_subdata(kernel->bo, 0, kernel->size, kernel->bin);
+    }
+
+    return True;
+}
+
+Bool 
+i965_media_mpeg2_ternimate(VADriverContextP ctx)
+{
+    int i;
+
+    for (i = 0; i < NUM_MPEG2_VLD_KERNELS; i++) {
+        struct media_kernel *kernel = &mpeg2_vld_kernels[i];
+
+        dri_bo_unreference(kernel->bo);
+        kernel->bo = NULL;
+    }
+
+    return True;
 }
 
diff -Nru libva-1.0.4/i965_drv_video/i965_media_mpeg2.h libva-1.0.1/i965_drv_video/i965_media_mpeg2.h
--- libva-1.0.4/i965_drv_video/i965_media_mpeg2.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_media_mpeg2.h	2009-12-17 03:05:38.000000000 +0000
@@ -39,6 +39,8 @@
 
 struct decode_state;
 
-void i965_media_mpeg2_decode_init(VADriverContextP ctx, struct decode_state * decode_state);
+Bool i965_media_mpeg2_init(VADriverContextP ctx);
+Bool i965_media_mpeg2_ternimate(VADriverContextP ctx);
+void i965_media_mpeg2_decode_init(VADriverContextP ctx);
 
 #endif /* _I965_MEDIA_MPEG2_H_ */
diff -Nru libva-1.0.4/i965_drv_video/i965_render.c libva-1.0.1/i965_drv_video/i965_render.c
--- libva-1.0.4/i965_drv_video/i965_render.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_render.c	2009-12-17 03:05:38.000000000 +0000
@@ -32,12 +32,11 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-#include "va/x11/va_dricommon.h"
+#include "va_backend.h"
+#include "va_dricommon.h"
 
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
@@ -75,7 +74,7 @@
 #include "shaders/render/exa_wm_write.g4b"
 };
 
-/* On IRONLAKE */
+/* On IGDNG */
 static const unsigned int sf_kernel_static_gen5[][4] = 
 {
 #include "shaders/render/exa_sf.g4b.gen5"
@@ -183,8 +182,8 @@
 #define URB_SF_ENTRIES	      1
 #define URB_SF_ENTRY_SIZE     2
 
-#define URB_CS_ENTRIES	      1
-#define URB_CS_ENTRY_SIZE     1
+#define URB_CS_ENTRIES	      0
+#define URB_CS_ENTRY_SIZE     0
 
 static void
 i965_render_vs_unit(VADriverContextP ctx)
@@ -198,7 +197,7 @@
     vs_state = render_state->vs.state->virtual;
     memset(vs_state, 0, sizeof(*vs_state));
 
-    if (IS_IRONLAKE(i965->intel.device_id))
+    if (IS_IGDNG(i965->intel.device_id))
         vs_state->thread4.nr_urb_entries = URB_VS_ENTRIES >> 2;
     else
         vs_state->thread4.nr_urb_entries = URB_VS_ENTRIES;
@@ -312,7 +311,7 @@
 
     wm_state->thread1.single_program_flow = 1; /* XXX */
 
-    if (IS_IRONLAKE(i965->intel.device_id))
+    if (IS_IGDNG(i965->intel.device_id))
         wm_state->thread1.binding_table_entry_count = 0; /* hardware requirement */
     else
         wm_state->thread1.binding_table_entry_count = 7;
@@ -329,14 +328,12 @@
     wm_state->wm4.stats_enable = 0;
     wm_state->wm4.sampler_state_pointer = render_state->wm.sampler->offset >> 5; 
 
-    if (IS_IRONLAKE(i965->intel.device_id)) {
+    if (IS_IGDNG(i965->intel.device_id))
         wm_state->wm4.sampler_count = 0;        /* hardware requirement */
-        wm_state->wm5.max_threads = 12 * 6 - 1;
-    } else {
+    else
         wm_state->wm4.sampler_count = (render_state->wm.sampler_count + 3) / 4;
-        wm_state->wm5.max_threads = 10 * 5 - 1;
-    }
 
+    wm_state->wm5.max_threads = PS_MAX_THREADS - 1;
     wm_state->wm5.thread_dispatch_enable = 1;
     wm_state->wm5.enable_16_pix = 1;
     wm_state->wm5.enable_8_pix = 0;
@@ -377,7 +374,7 @@
 
     wm_state->thread1.single_program_flow = 1; /* XXX */
 
-    if (IS_IRONLAKE(i965->intel.device_id))
+    if (IS_IGDNG(i965->intel.device_id))
         wm_state->thread1.binding_table_entry_count = 0;        /* hardware requirement */
     else
         wm_state->thread1.binding_table_entry_count = 7;
@@ -385,8 +382,8 @@
     wm_state->thread2.scratch_space_base_pointer = 0;
     wm_state->thread2.per_thread_scratch_space = 0; /* 1024 bytes */
 
-    wm_state->thread3.dispatch_grf_start_reg = 2; /* XXX */
-    wm_state->thread3.const_urb_entry_read_length = 1;
+    wm_state->thread3.dispatch_grf_start_reg = 3; /* XXX */
+    wm_state->thread3.const_urb_entry_read_length = 0;
     wm_state->thread3.const_urb_entry_read_offset = 0;
     wm_state->thread3.urb_entry_read_length = 1; /* XXX */
     wm_state->thread3.urb_entry_read_offset = 0; /* XXX */
@@ -394,14 +391,12 @@
     wm_state->wm4.stats_enable = 0;
     wm_state->wm4.sampler_state_pointer = render_state->wm.sampler->offset >> 5; 
 
-    if (IS_IRONLAKE(i965->intel.device_id)) {
+    if (IS_IGDNG(i965->intel.device_id))
         wm_state->wm4.sampler_count = 0;        /* hardware requirement */
-        wm_state->wm5.max_threads = 12 * 6 - 1;
-    } else {
+    else 
         wm_state->wm4.sampler_count = (render_state->wm.sampler_count + 3) / 4;
-        wm_state->wm5.max_threads = 10 * 5 - 1;
-    }
 
+    wm_state->wm5.max_threads = PS_MAX_THREADS - 1;
     wm_state->wm5.thread_dispatch_enable = 1;
     wm_state->wm5.enable_16_pix = 1;
     wm_state->wm5.enable_8_pix = 0;
@@ -536,8 +531,7 @@
                               int index,
                               dri_bo *region,
                               unsigned long offset,
-                              int w, int h,
-                              int pitch, int format)
+                              int w, int h)
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);  
     struct i965_render_state *render_state = &i965->render_state;
@@ -553,7 +547,7 @@
     ss = ss_bo->virtual;
     memset(ss, 0, sizeof(*ss));
     ss->ss0.surface_type = I965_SURFACE_2D;
-    ss->ss0.surface_format = format;
+    ss->ss0.surface_format = I965_SURFACEFORMAT_R8_UNORM;
     ss->ss0.writedisable_alpha = 0;
     ss->ss0.writedisable_red = 0;
     ss->ss0.writedisable_green = 0;
@@ -571,7 +565,7 @@
     ss->ss2.mip_count = 0;
     ss->ss2.render_target_rotation = 0;
 
-    ss->ss3.pitch = pitch - 1;
+    ss->ss3.pitch = w - 1;
 
     dri_bo_emit_reloc(ss_bo,
                       I915_GEM_DOMAIN_SAMPLER, 0,
@@ -592,7 +586,7 @@
                               int index,
                               dri_bo *region,
                               unsigned long offset,
-                              int w, int h, int p, int format)
+                              int w, int h, int format)
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);  
     struct i965_render_state *render_state = &i965->render_state;
@@ -626,7 +620,7 @@
     ss->ss2.mip_count = 0;
     ss->ss2.render_target_rotation = 0;
 
-    ss->ss3.pitch = p - 1;
+    ss->ss3.pitch = w - 1;
 
     dri_bo_emit_reloc(ss_bo,
                       I915_GEM_DOMAIN_SAMPLER, 0,
@@ -647,10 +641,8 @@
                               VASurfaceID surface)
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);  
-    struct i965_render_state *render_state = &i965->render_state;
     struct object_surface *obj_surface;
     int w, h;
-    int rw, rh;
     dri_bo *region;
 
     obj_surface = SURFACE(surface);
@@ -658,22 +650,14 @@
     assert(obj_surface->bo);
     w = obj_surface->width;
     h = obj_surface->height;
-    rw = obj_surface->orig_width;
-    rh = obj_surface->orig_height;
     region = obj_surface->bo;
 
-    i965_render_src_surface_state(ctx, 1, region, 0, rw, rh, w, I965_SURFACEFORMAT_R8_UNORM);     /* Y */
-    i965_render_src_surface_state(ctx, 2, region, 0, rw, rh, w, I965_SURFACEFORMAT_R8_UNORM);
-
-    if (render_state->interleaved_uv) {
-        i965_render_src_surface_state(ctx, 3, region, w * h, rw / 2, rh / 2, w, I965_SURFACEFORMAT_R8G8_UNORM); /* UV */
-        i965_render_src_surface_state(ctx, 4, region, w * h, rw / 2, rh / 2, w, I965_SURFACEFORMAT_R8G8_UNORM);
-    } else {
-        i965_render_src_surface_state(ctx, 3, region, w * h, rw / 2, rh / 2, w / 2, I965_SURFACEFORMAT_R8_UNORM); /* U */
-        i965_render_src_surface_state(ctx, 4, region, w * h, rw / 2, rh / 2, w / 2, I965_SURFACEFORMAT_R8_UNORM);
-        i965_render_src_surface_state(ctx, 5, region, w * h + w * h / 4, rw / 2, rh / 2, w / 2, I965_SURFACEFORMAT_R8_UNORM);     /* V */
-        i965_render_src_surface_state(ctx, 6, region, w * h + w * h / 4, rw / 2, rh / 2, w / 2, I965_SURFACEFORMAT_R8_UNORM);
-    }
+    i965_render_src_surface_state(ctx, 1, region, 0, w, h);     /* Y */
+    i965_render_src_surface_state(ctx, 2, region, 0, w, h);
+    i965_render_src_surface_state(ctx, 3, region, w * h + w * h / 4, w / 2, h / 2);     /* V */
+    i965_render_src_surface_state(ctx, 4, region, w * h + w * h / 4, w / 2, h / 2);
+    i965_render_src_surface_state(ctx, 5, region, w * h, w / 2, h / 2); /* U */
+    i965_render_src_surface_state(ctx, 6, region, w * h, w / 2, h / 2);
 }
 
 static void
@@ -694,8 +678,8 @@
     region = obj_surface->bo;
     subpic_region = obj_image->bo;
     /*subpicture surface*/
-    i965_subpic_render_src_surface_state(ctx, 1, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->pitch, obj_subpic->format);     
-    i965_subpic_render_src_surface_state(ctx, 2, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->pitch, obj_subpic->format);     
+    i965_subpic_render_src_surface_state(ctx, 1, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->format);     
+    i965_subpic_render_src_surface_state(ctx, 2, subpic_region, 0, obj_subpic->width, obj_subpic->height, obj_subpic->format);     
 }
 
 static void
@@ -813,8 +797,12 @@
     struct object_surface    *obj_surface  = SURFACE(surface);
     struct object_subpic     *obj_subpic   = SUBPIC(obj_surface->subpic);
 
-    const float sx = (float)output_rect->width  / (float)obj_surface->orig_width;
-    const float sy = (float)output_rect->height / (float)obj_surface->orig_height;
+    const float psx = (float)obj_surface->width  / (float)obj_subpic->width;
+    const float psy = (float)obj_surface->height / (float)obj_subpic->height;
+    const float ssx = (float)output_rect->width  / (float)obj_surface->width;
+    const float ssy = (float)output_rect->height / (float)obj_surface->height;
+    const float sx  = psx * ssx;
+    const float sy  = psy * ssy;
     float *vb, tx1, tx2, ty1, ty2, x1, x2, y1, y2;
     int i = 0;
 
@@ -882,8 +870,8 @@
 
     obj_surface = SURFACE(surface);
     assert(surface);
-    width = obj_surface->orig_width;
-    height = obj_surface->orig_height;
+    width = obj_surface->width;
+    height = obj_surface->height;
 
     u1 = (float)srcx / width;
     v1 = (float)srcy / height;
@@ -914,29 +902,6 @@
 }
 
 static void
-i965_render_upload_constants(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_render_state *render_state = &i965->render_state;
-    unsigned short *constant_buffer;
-
-    if (render_state->curbe.upload)
-        return;
-
-    dri_bo_map(render_state->curbe.bo, 1);
-    assert(render_state->curbe.bo->virtual);
-    constant_buffer = render_state->curbe.bo->virtual;
-
-    if (render_state->interleaved_uv)
-        *constant_buffer = 1;
-    else
-        *constant_buffer = 0;
-
-    dri_bo_unmap(render_state->curbe.bo);
-    render_state->curbe.upload = 1;
-}
-
-static void
 i965_surface_render_state_setup(VADriverContextP ctx,
                         VASurfaceID surface,
                         short srcx,
@@ -960,7 +925,6 @@
     i965_render_upload_vertex(ctx, surface,
                               srcx, srcy, srcw, srch,
                               destx, desty, destw, desth);
-    i965_render_upload_constants(ctx);
 }
 static void
 i965_subpic_render_state_setup(VADriverContextP ctx,
@@ -1015,7 +979,7 @@
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
 
-    if (IS_IRONLAKE(i965->intel.device_id)) {
+    if (IS_IGDNG(i965->intel.device_id)) {
         BEGIN_BATCH(ctx, 8);
         OUT_BATCH(ctx, CMD_STATE_BASE_ADDRESS | 6);
         OUT_BATCH(ctx, 0 | BASE_ADDRESS_MODIFY);
@@ -1134,20 +1098,6 @@
 }
 
 static void
-i965_render_constant_buffer(VADriverContextP ctx)
-{
-    struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_render_state *render_state = &i965->render_state;
-
-    BEGIN_BATCH(ctx, 2);
-    OUT_BATCH(ctx, CMD_CONSTANT_BUFFER | (1 << 8) | (2 - 2));
-    OUT_RELOC(ctx, render_state->curbe.bo,
-              I915_GEM_DOMAIN_INSTRUCTION, 0,
-              URB_CS_ENTRY_SIZE - 1);
-    ADVANCE_BATCH(ctx);    
-}
-
-static void
 i965_render_drawing_rectangle(VADriverContextP ctx)
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);  
@@ -1167,7 +1117,7 @@
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);  
 
-    if (IS_IRONLAKE(i965->intel.device_id)) {
+    if (IS_IGDNG(i965->intel.device_id)) {
         BEGIN_BATCH(ctx, 5);
         OUT_BATCH(ctx, CMD_VERTEX_ELEMENTS | 3);
         /* offset 0: X,Y -> {X, Y, 1.0, 1.0} */
@@ -1255,7 +1205,7 @@
               ((4 * 4) << VB0_BUFFER_PITCH_SHIFT));
     OUT_RELOC(ctx, render_state->vb.vertex_buffer, I915_GEM_DOMAIN_VERTEX, 0, 0);
 
-    if (IS_IRONLAKE(i965->intel.device_id))
+    if (IS_IGDNG(i965->intel.device_id))
         OUT_RELOC(ctx, render_state->vb.vertex_buffer, I915_GEM_DOMAIN_VERTEX, 0, 12 * 4);
     else
         OUT_BATCH(ctx, 3);
@@ -1331,7 +1281,6 @@
     i965_render_pipelined_pointers(ctx);
     i965_render_urb_layout(ctx);
     i965_render_cs_urb_layout(ctx);
-    i965_render_constant_buffer(ctx);
     i965_render_drawing_rectangle(ctx);
     i965_render_vertex_elements(ctx);
     i965_render_startup(ctx);
@@ -1495,14 +1444,13 @@
 i965_render_init(VADriverContextP ctx)
 {
     struct i965_driver_data *i965 = i965_driver_data(ctx);
-    struct i965_render_state *render_state = &i965->render_state;
     int i;
 
     /* kernel */
     assert(NUM_RENDER_KERNEL == (sizeof(render_kernels_gen5) / 
                                  sizeof(render_kernels_gen5[0])));
 
-    if (IS_IRONLAKE(i965->intel.device_id))
+    if (IS_IGDNG(i965->intel.device_id))
         render_kernels = render_kernels_gen5;
     else
         render_kernels = render_kernels_gen4;
@@ -1511,18 +1459,11 @@
         struct render_kernel *kernel = &render_kernels[i];
         kernel->bo = dri_bo_alloc(i965->intel.bufmgr, 
                                   kernel->name, 
-                                  kernel->size, 0x1000);
+                                  kernel->size, 64);
         assert(kernel->bo);
         dri_bo_subdata(kernel->bo, 0, kernel->size, kernel->bin);
     }
 
-    /* constant buffer */
-    render_state->curbe.bo = dri_bo_alloc(i965->intel.bufmgr,
-                      "constant buffer",
-                      4096, 64);
-    assert(render_state->curbe.bo);
-    render_state->curbe.upload = 0;
-
     return True;
 }
 
@@ -1533,9 +1474,6 @@
     struct i965_driver_data *i965 = i965_driver_data(ctx);
     struct i965_render_state *render_state = &i965->render_state;
 
-    dri_bo_unreference(render_state->curbe.bo);
-    render_state->curbe.bo = NULL;
-
     for (i = 0; i < NUM_RENDER_KERNEL; i++) {
         struct render_kernel *kernel = &render_kernels[i];
         
diff -Nru libva-1.0.4/i965_drv_video/i965_render.h libva-1.0.1/i965_drv_video/i965_render.h
--- libva-1.0.4/i965_drv_video/i965_render.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_render.h	2009-12-17 03:05:38.000000000 +0000
@@ -43,6 +43,7 @@
     
     struct {
         dri_bo *state;
+        dri_bo *prog;
     } sf;
 
     struct {
@@ -51,6 +52,7 @@
         dri_bo *surface[MAX_RENDER_SURFACES];
         dri_bo *binding_table;
         dri_bo *state;
+        dri_bo *prog;
     } wm;
 
     struct {
@@ -58,12 +60,6 @@
         dri_bo *viewport;
     } cc;
 
-    struct {
-        dri_bo *bo;
-        int upload;
-    } curbe;
-
-    int interleaved_uv;
     struct intel_region *draw_region;
 };
 
diff -Nru libva-1.0.4/i965_drv_video/i965_structs.h libva-1.0.1/i965_drv_video/i965_structs.h
--- libva-1.0.4/i965_drv_video/i965_structs.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/i965_structs.h	2009-12-17 03:05:38.000000000 +0000
@@ -34,20 +34,16 @@
 	unsigned int obj_id:24;
     } vfex0;
 
-    union {
-        struct {
-            unsigned int residual_grf_offset:5;
-            unsigned int pad0:3;
-            unsigned int weight_grf_offset:5;
-            unsigned int pad1:3;
-            unsigned int residual_data_offset:8;
-            unsigned int sub_field_present_flag:2;
-            unsigned int residual_data_fix_offset_flag:1;
-            unsigned int pad2:5;
-        } avc;
-        
-        unsigned int vc1;
-    } vfex1;
+    struct {
+	unsigned int residual_grf_offset:5;
+	unsigned int pad0:3;
+	unsigned int weight_grf_offset:5;
+	unsigned int pad1:3;
+	unsigned int residual_data_offset:8;
+	unsigned int sub_field_present_flag:2;
+	unsigned int residual_data_fix_offset:1;
+	unsigned int pad2:5;
+    }vfex1;
 
     struct {
 	unsigned int remap_index_0:4;
@@ -72,32 +68,18 @@
     } remap_table1;
 
     struct {
-	unsigned int mask:8;
+	unsigned int scoreboard_mask:8;
 	unsigned int pad:22;
 	unsigned int type:1;
 	unsigned int enable:1;
     } scoreboard0;
 
     struct {
-        int delta_x0:4;
-        int delta_y0:4;
-        int delta_x1:4;
-        int delta_y1:4;
-        int delta_x2:4;
-        int delta_y2:4;
-        int delta_x3:4;
-        int delta_y3:4;
+	unsigned int ignore;
     } scoreboard1;
 
     struct {
-        int delta_x4:4;
-        int delta_y4:4;
-        int delta_x5:4;
-        int delta_y5:4;
-        int delta_x6:4;
-        int delta_y6:4;
-        int delta_x7:4;
-        int delta_y7:4;
+	unsigned int ignore;
     } scoreboard2;
 
     unsigned int pad;
@@ -195,9 +177,8 @@
 	unsigned int cube_neg_y:1;
 	unsigned int cube_pos_x:1;
 	unsigned int cube_neg_x:1;
-	unsigned int pad:2;
+	unsigned int pad:3;
 	unsigned int render_cache_read_mode:1;
-	unsigned int cube_map_corner_mode:1;
 	unsigned int mipmap_layout_mode:1;
 	unsigned int vert_line_stride_ofs:1;
 	unsigned int vert_line_stride:1;
diff -Nru libva-1.0.4/i965_drv_video/intel_batchbuffer.c libva-1.0.1/i965_drv_video/intel_batchbuffer.c
--- libva-1.0.4/i965_drv_video/intel_batchbuffer.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/intel_batchbuffer.c	2009-12-17 03:05:38.000000000 +0000
@@ -25,11 +25,10 @@
  *                                                                                                                                                           
  **************************************************************************/      
 
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
+#include "va_backend.h"
 
 #include "intel_batchbuffer.h"
 
@@ -37,21 +36,19 @@
 intel_batchbuffer_reset(struct intel_batchbuffer *batch)
 {
     struct intel_driver_data *intel = batch->intel; 
-    int batch_size = batch->flag == I915_EXEC_RENDER ? BATCH_SIZE : (BATCH_SIZE * 8);
 
-    assert(batch->flag == I915_EXEC_RENDER ||
-           batch->flag == I915_EXEC_BSD);
+    if (batch->buffer != NULL) {
+        dri_bo_unreference(batch->buffer);
+        batch->buffer = NULL;
+    }
+
+    batch->buffer = dri_bo_alloc(intel->bufmgr, "batch buffer", 
+                                 BATCH_SIZE, 0x1000);
 
-    dri_bo_unreference(batch->buffer);
-    batch->buffer = dri_bo_alloc(intel->bufmgr, 
-                                 batch->flag == I915_EXEC_RENDER ? "render batch buffer" : "bsd batch buffer", 
-                                 batch_size,
-                                 0x1000);
     assert(batch->buffer);
     dri_bo_map(batch->buffer, 1);
-    assert(batch->buffer->virtual);
     batch->map = batch->buffer->virtual;
-    batch->size = batch_size;
+    batch->size = BATCH_SIZE;
     batch->ptr = batch->map;
     batch->atomic = 0;
 }
@@ -60,19 +57,11 @@
 intel_batchbuffer_init(struct intel_driver_data *intel)
 {
     intel->batch = calloc(1, sizeof(*(intel->batch)));
+
     assert(intel->batch);
     intel->batch->intel = intel;
-    intel->batch->flag = I915_EXEC_RENDER;
-    intel->batch->run = drm_intel_bo_mrb_exec;
     intel_batchbuffer_reset(intel->batch);
 
-    intel->batch_bcs = calloc(1, sizeof(*(intel->batch_bcs)));
-    assert(intel->batch_bcs);
-    intel->batch_bcs->intel = intel;
-    intel->batch_bcs->flag = I915_EXEC_BSD;
-    intel->batch_bcs->run = drm_intel_bo_mrb_exec;
-    intel_batchbuffer_reset(intel->batch_bcs);
-
     return True;
 }
 
@@ -90,25 +79,14 @@
         intel->batch = NULL;
     }
 
-    if (intel->batch_bcs) {
-        if (intel->batch_bcs->map) {
-            dri_bo_unmap(intel->batch_bcs->buffer);
-            intel->batch_bcs->map = NULL;
-        }
-
-        dri_bo_unreference(intel->batch_bcs->buffer);
-        free(intel->batch_bcs);
-        intel->batch_bcs = NULL;
-    }
-
     return True;
 }
 
-static Bool
-intel_batchbuffer_flush_helper(VADriverContextP ctx,
-                               struct intel_batchbuffer *batch)
+Bool 
+intel_batchbuffer_flush(VADriverContextP ctx)
 {
-    struct intel_driver_data *intel = batch->intel;
+    struct intel_driver_data *intel = intel_driver_data(ctx);
+    struct intel_batchbuffer *batch = intel->batch;
     unsigned int used = batch->ptr - batch->map;
     int is_locked = intel->locked;
 
@@ -129,74 +107,31 @@
     if (!is_locked)
         intel_lock_hardware(ctx);
 
-    batch->run(batch->buffer, used, 0, 0, 0, batch->flag);
+    dri_bo_exec(batch->buffer, used, 0, 0, 0);
 
     if (!is_locked)
         intel_unlock_hardware(ctx);
 
-    intel_batchbuffer_reset(batch);
+    intel_batchbuffer_reset(intel->batch);
 
     return True;
 }
 
-Bool 
-intel_batchbuffer_flush(VADriverContextP ctx)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-    
-    return intel_batchbuffer_flush_helper(ctx, intel->batch);
-}
-
-Bool 
-intel_batchbuffer_flush_bcs(VADriverContextP ctx)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-    
-    return intel_batchbuffer_flush_helper(ctx, intel->batch_bcs);
-}
-
 static unsigned int
-intel_batchbuffer_space_helper(struct intel_batchbuffer *batch)
+intel_batchbuffer_space(struct intel_batchbuffer *batch)
 {
     return (batch->size - BATCH_RESERVED) - (batch->ptr - batch->map);
 }
 
-static void
-intel_batchbuffer_emit_dword_helper(struct intel_batchbuffer *batch, 
-                                    unsigned int x)
-{
-    assert(intel_batchbuffer_space_helper(batch) >= 4);
-    *(unsigned int *)batch->ptr = x;
-    batch->ptr += 4;
-}
-
 void 
 intel_batchbuffer_emit_dword(VADriverContextP ctx, unsigned int x)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
+    struct intel_batchbuffer *batch = intel->batch;
 
-    intel_batchbuffer_emit_dword_helper(intel->batch, x);
-}
-
-void 
-intel_batchbuffer_emit_dword_bcs(VADriverContextP ctx, unsigned int x)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_emit_dword_helper(intel->batch_bcs, x);
-}
-
-static void 
-intel_batchbuffer_emit_reloc_helper(VADriverContextP ctx, 
-                                    struct intel_batchbuffer *batch,
-                                    dri_bo *bo, 
-                                    uint32_t read_domains, uint32_t write_domains, 
-                                    uint32_t delta)
-{
-    assert(batch->ptr - batch->map < batch->size);
-    dri_bo_emit_reloc(batch->buffer, read_domains, write_domains,
-                      delta, batch->ptr - batch->map, bo);
-    intel_batchbuffer_emit_dword_helper(batch, bo->offset + delta);
+    assert(intel_batchbuffer_space(batch) >= 4);
+    *(unsigned int*)batch->ptr = x;
+    batch->ptr += 4;
 }
 
 void 
@@ -205,152 +140,65 @@
                              uint32_t delta)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
+    struct intel_batchbuffer *batch = intel->batch;
 
-    intel_batchbuffer_emit_reloc_helper(ctx, intel->batch,
-                                        bo, read_domains, write_domains,
-                                        delta);
+    assert(batch->ptr - batch->map < batch->size);
+    dri_bo_emit_reloc(batch->buffer, read_domains, write_domains,
+                      delta, batch->ptr - batch->map, bo);
+    intel_batchbuffer_emit_dword(ctx, bo->offset + delta);
 }
 
 void 
-intel_batchbuffer_emit_reloc_bcs(VADriverContextP ctx, dri_bo *bo, 
-                                 uint32_t read_domains, uint32_t write_domains, 
-                                 uint32_t delta)
+intel_batchbuffer_require_space(VADriverContextP ctx, unsigned int size)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
+    struct intel_batchbuffer *batch = intel->batch;
 
-    intel_batchbuffer_emit_reloc_helper(ctx, intel->batch_bcs,
-                                        bo, read_domains, write_domains,
-                                        delta);
-}
-
-static void 
-intel_batchbuffer_require_space_helper(VADriverContextP ctx, 
-                                struct intel_batchbuffer *batch,
-                                unsigned int size)
-{
     assert(size < batch->size - 8);
 
-    if (intel_batchbuffer_space_helper(batch) < size) {
-        intel_batchbuffer_flush_helper(ctx, batch);
+    if (intel_batchbuffer_space(batch) < size) {
+        intel_batchbuffer_flush(ctx);
     }
 }
 
 void 
-intel_batchbuffer_require_space(VADriverContextP ctx, unsigned int size)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_require_space_helper(ctx, intel->batch, size);
-}
-
-void 
-intel_batchbuffer_require_space_bcs(VADriverContextP ctx, unsigned int size)
+intel_batchbuffer_data(VADriverContextP ctx, void *data, unsigned int size)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
+    struct intel_batchbuffer *batch = intel->batch;
 
-    intel_batchbuffer_require_space_helper(ctx, intel->batch_bcs, size);
-}
-
-static void 
-intel_batchbuffer_data_helper(VADriverContextP ctx, 
-                              struct intel_batchbuffer *batch,
-                              void *data,
-                              unsigned int size)
-{
     assert((size & 3) == 0);
-    intel_batchbuffer_require_space_helper(ctx, batch, size);
+    intel_batchbuffer_require_space(ctx, size);
 
     assert(batch->ptr);
     memcpy(batch->ptr, data, size);
     batch->ptr += size;
 }
 
-void 
-intel_batchbuffer_data(VADriverContextP ctx, void *data, unsigned int size)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_data_helper(ctx, intel->batch, data, size);
-}
-
-void 
-intel_batchbuffer_data_bcs(VADriverContextP ctx, void *data, unsigned int size)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_data_helper(ctx, intel->batch_bcs, data, size);
-}
-
-static void
-intel_batchbuffer_emit_mi_flush_helper(VADriverContextP ctx,
-                                       struct intel_batchbuffer *batch)
-{
-    intel_batchbuffer_require_space_helper(ctx, batch, 4);
-    intel_batchbuffer_emit_dword_helper(batch, 
-                                        MI_FLUSH | STATE_INSTRUCTION_CACHE_INVALIDATE);
-}
-
 void
 intel_batchbuffer_emit_mi_flush(VADriverContextP ctx)
 {
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_emit_mi_flush_helper(ctx, intel->batch);
+    intel_batchbuffer_require_space(ctx, 4);
+    intel_batchbuffer_emit_dword(ctx, MI_FLUSH | STATE_INSTRUCTION_CACHE_INVALIDATE);
 }
 
 void
-intel_batchbuffer_emit_mi_flush_bcs(VADriverContextP ctx)
+intel_batchbuffer_start_atomic(VADriverContextP ctx, unsigned int size)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
+    struct intel_batchbuffer *batch = intel->batch;
 
-    intel_batchbuffer_emit_mi_flush_helper(ctx, intel->batch_bcs);
-}
-
-void
-intel_batchbuffer_start_atomic_helper(VADriverContextP ctx, 
-                                      struct intel_batchbuffer *batch,
-                                      unsigned int size)
-{
     assert(!batch->atomic);
-    intel_batchbuffer_require_space_helper(ctx, batch, size);
+    intel_batchbuffer_require_space(ctx, size);
     batch->atomic = 1;
 }
 
 void
-intel_batchbuffer_start_atomic(VADriverContextP ctx, unsigned int size)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_start_atomic_helper(ctx, intel->batch, size);
-}
-
-void
-intel_batchbuffer_start_atomic_bcs(VADriverContextP ctx, unsigned int size)
+intel_batchbuffer_end_atomic(VADriverContextP ctx)
 {
     struct intel_driver_data *intel = intel_driver_data(ctx);
-    intel_batchbuffer_start_atomic_helper(ctx, intel->batch_bcs, size);
-}
+    struct intel_batchbuffer *batch = intel->batch;
 
-void
-intel_batchbuffer_end_atomic_helper(struct intel_batchbuffer *batch)
-{
     assert(batch->atomic);
     batch->atomic = 0;
 }
-
-void
-intel_batchbuffer_end_atomic(VADriverContextP ctx)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_end_atomic_helper(intel->batch);
-}
-
-void
-intel_batchbuffer_end_atomic_bcs(VADriverContextP ctx)
-{
-    struct intel_driver_data *intel = intel_driver_data(ctx);
-
-    intel_batchbuffer_end_atomic_helper(intel->batch_bcs);
-}
-
diff -Nru libva-1.0.4/i965_drv_video/intel_batchbuffer_dump.c libva-1.0.1/i965_drv_video/intel_batchbuffer_dump.c
--- libva-1.0.4/i965_drv_video/intel_batchbuffer_dump.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/intel_batchbuffer_dump.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,409 +0,0 @@
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include "intel_driver.h"
-#include "intel_batchbuffer_dump.h"
-
-#define BUFFER_FAIL(_count, _len, _name) do {			\
-    fprintf(gout, "Buffer size too small in %s (%d < %d)\n",	\
-	    (_name), (_count), (_len));				\
-    (*failures)++;						\
-    return count;						\
-} while (0)
-
-static FILE *gout;
-
-static void
-instr_out(unsigned int *data, unsigned int offset, unsigned int index, char *fmt, ...)
-{
-    va_list va;
-
-    fprintf(gout, "0x%08x: 0x%08x:%s ", offset + index * 4, data[index],
-	    index == 0 ? "" : "  ");
-    va_start(va, fmt);
-    vfprintf(gout, fmt, va);
-    va_end(va);
-}
-
-
-static int
-dump_mi(unsigned int *data, unsigned int offset, int count, unsigned int device, int *failures)
-{
-    unsigned int opcode;
-    int length, i;
-
-    struct {
-	unsigned int opcode;
-	int mask_length;
-	int min_len;
-	int max_len;
-	char *name;
-    } mi_commands[] = {
-	{ 0x00, 0, 1, 1, "MI_NOOP" },
-	{ 0x04, 0, 1, 1, "MI_FLUSH" },
-	{ 0x0a, 0, 1, 1, "MI_BATCH_BUFFER_END" },
-    };
-
-    opcode = ((data[0] & MASK_MI_OPCODE) >> SHIFT_MI_OPCODE);
-
-    for (i = 0; i < sizeof(mi_commands) / sizeof(mi_commands[0]); i++) {
-        if (opcode == mi_commands[i].opcode) {
-            int index;
-
-            length = 1;
-	    instr_out(data, offset, 0, "%s\n", mi_commands[i].name);
-
-	    if (mi_commands[i].max_len > 1) {
-                length = (data[0] & mi_commands[i].mask_length) + 2;
-
-                if (length < mi_commands[i].min_len ||
-                    length > mi_commands[i].max_len) {
-		    fprintf(gout, "Bad length (%d) in %s, [%d, %d]\n",
-			    length, mi_commands[i].name,
-			    mi_commands[i].min_len,
-			    mi_commands[i].max_len);
-		}
-	    }
-
-            for (index = 1; index < length; index++) {
-                if (index >= count)
-		    BUFFER_FAIL(count, length, mi_commands[i].name);
-
-		instr_out(data, offset, index, "dword %d\n", index);
-	    }
-
-	    return length;
-	}
-    }
-
-    instr_out(data, offset, 0, "UNKNOWN MI COMMAND\n");
-    (*failures)++;
-    return 1;
-}
-
-static int
-dump_gfxpipe_3d(unsigned int *data, unsigned int offset, int count, unsigned int device, int *failures)
-{
-    instr_out(data, offset, 0, "UNKNOWN 3D COMMAND\n");
-    (*failures)++;
-
-    return 1;
-}
-
-static void
-dump_avc_bsd_img_state(unsigned int *data, unsigned int offset, unsigned int device, int *failures)
-{
-    int img_struct = ((data[3] >> 8) & 0x3);
-
-    instr_out(data, offset, 1, "frame size: %d\n", (data[1] & 0xffff));
-    instr_out(data, offset, 2, "width: %d, height: %d\n", (data[2] & 0xff), (data[2] >> 16) & 0xff);
-    instr_out(data, offset, 3, 
-              "second_chroma_qp_offset: %d,"
-              "chroma_qp_offset: %d,"
-              "QM present flag: %d," 
-              "image struct: %s,"
-              "img_dec_fs_idc: %d,"
-              "\n",
-              (data[3] >> 24) & 0x1f,
-              (data[3] >> 16) & 0x1f,
-              (data[3] >> 10) & 0x1,
-              (img_struct == 0) ? "frame" : (img_struct == 2) ? "invalid" : (img_struct == 1) ? "top field" : "bottom field",
-              data[3] & 0xff);
-    instr_out(data, offset, 4,
-              "residual off: 0x%x,"
-              "16MV: %d,"
-              "chroma fmt: %d,"
-              "CABAC: %d,"
-              "non-ref: %d,"
-              "constrained intra: %d,"
-              "direct8x8: %d,"
-              "trans8x8: %d,"
-              "MB only: %d,"
-              "MBAFF: %d,"
-              "\n",
-              (data[4] >> 24) & 0xff,
-              (data[4] >> 12) & 0x1,
-              (data[4] >> 10) & 0x3,
-              (data[4] >> 7) & 0x1,
-              (data[4] >> 6) & 0x1,
-              (data[4] >> 5) & 0x1,
-              (data[4] >> 4) & 0x1,
-              (data[4] >> 3) & 0x1,
-              (data[4] >> 2) & 0x1,
-              (data[4] >> 1) & 0x1);
-    instr_out(data, offset, 5, "AVC-IT Command Header\n");
-}
-
-static void
-dump_avc_bsd_qm_state(unsigned int *data, unsigned int offset, unsigned int device, int *failures)
-{
-    unsigned int length = ((data[0] & MASK_GFXPIPE_LENGTH) >> SHIFT_GFXPIPE_LENGTH) + 2;
-    int i;
-
-    instr_out(data, offset, 1, "user default: %02x, QM list present: %02x\n", 
-              (data[1] >> 8) & 0xff, data[1] & 0xff);
-
-    for (i = 2; i < length; i++) {
-        instr_out(data, offset, i, "dword %d\n", i);
-    }
-}
-
-static void
-dump_avc_bsd_slice_state(unsigned int *data, unsigned int offset, unsigned int device, int *failures)
-{
-
-}
-
-static void
-dump_avc_bsd_buf_base_state(unsigned int *data, unsigned int offset, unsigned int device, int *failures)
-{
-    int i;
-
-    instr_out(data, offset, 1, "BSD row store base address\n");
-    instr_out(data, offset, 2, "MPR row store base address\n");
-    instr_out(data, offset, 3, "AVC-IT command buffer base address\n");
-    instr_out(data, offset, 4, "AVC-IT data buffer: 0x%08x, write offset: 0x%x\n", 
-              data[4] & 0xFFFFF000, data[4] & 0xFC0);
-    instr_out(data, offset, 5, "ILDB data buffer\n");
-
-    for (i = 6; i < 38; i++) {
-        instr_out(data, offset, i, "Direct MV read base address for reference frame %d\n", i - 6);
-    }
-
-    instr_out(data, offset, 38, "direct mv wr0 top\n");
-    instr_out(data, offset, 39, "direct mv wr0 bottom\n");
-
-    for (i = 40; i < 74; i++) {
-        instr_out(data, offset, i, "POC List %d\n", i - 40);
-    }
-}
-
-static void
-dump_bsd_ind_obj_base_addr(unsigned int *data, unsigned int offset, unsigned int device, int *failures)
-{
-    instr_out(data, offset, 1, "AVC indirect object base address\n");
-    instr_out(data, offset, 2, "AVC Indirect Object Access Upper Bound\n");
-}
-
-static void 
-dump_ironlake_avc_bsd_object(unsigned int *data, unsigned int offset, int *failures)
-{
-    int slice_type = data[3] & 0xf;
-    int i, is_phantom = ((data[1] & 0x3fffff) == 0);
-
-    if (!is_phantom) {
-        instr_out(data, offset, 1, "Encrypted: %d, bitsteam length: %d\n", data[1] >> 31, data[1] & 0x3fffff);
-        instr_out(data, offset, 2, "Indirect Data Start Address: %d\n", data[2] & 0x1fffffff);
-        instr_out(data, offset, 3, "%s Slice\n", slice_type == 0 ? "P" : slice_type == 1 ? "B" : "I");
-        instr_out(data, offset, 4, 
-                  "Num_Ref_Idx_L1: %d,"
-                  "Num_Ref_Idx_L0: %d,"
-                  "Log2WeightDenomChroma: %d,"
-                  "Log2WeightDenomLuma: %d"
-                  "\n",
-                  (data[4] >> 24) & 0x3f,
-                  (data[4] >> 16) & 0x3f,
-                  (data[4] >> 8) & 0x3,
-                  (data[4] >> 0) & 0x3);
-        instr_out(data, offset, 5,
-                  "WeightedPredIdc: %d,"
-                  "DirectPredType: %d,"
-                  "DisableDeblockingFilter: %d,"
-                  "CabacInitIdc: %d,"
-                  "SliceQp: %d,"
-                  "SliceBetaOffsetDiv2: %d,"
-                  "SliceAlphaC0OffsetDiv2: %d"
-                  "\n",
-                  (data[5] >> 30) & 0x3,
-                  (data[5] >> 29) & 0x1,
-                  (data[5] >> 27) & 0x3,
-                  (data[5] >> 24) & 0x3,
-                  (data[5] >> 16) & 0x3f,
-                  (data[5] >> 8) & 0xf,
-                  (data[5] >> 0) & 0xf);
-        instr_out(data, offset, 6,
-                  "Slice_MB_Start_Vert_Pos: %d,"
-                  "Slice_MB_Start_Hor_Pos: %d,"
-                  "Slice_Start_Mb_Num: %d"
-                  "\n",
-                  (data[6] >> 24) & 0xff,
-                  (data[6] >> 16) & 0xff,
-                  (data[6] >> 0) & 0x7fff);
-        instr_out(data, offset, 7,
-                  "Fix_Prev_Mb_Skipped: %d,"
-                  "First_MB_Bit_Offset: %d"
-                  "\n",
-                  (data[7] >> 7) & 0x1,
-                  (data[7] >> 0) & 0x7);
-
-        for (i = 8; i < 16; i++)
-            instr_out(data, offset, i, "dword %d\n", i);
-    } else {
-        instr_out(data, offset, 1, "phantom slice\n");
-
-        for (i = 2; i < 6; i++)
-            instr_out(data, offset, i, "dword %d\n", i);
-
-        instr_out(data, offset, 6,
-                  "Slice_Start_Mb_Num: %d"
-                  "\n",
-                  (data[6] >> 0) & 0x7fff);
-
-        for (i = 7; i < 16; i++)
-            instr_out(data, offset, i, "dword %d\n", i);
-
-    }
-}
-
-static void 
-dump_g4x_avc_bsd_object(unsigned int *data, unsigned int offset, int *failures)
-{
-
-}
-
-static void 
-dump_avc_bsd_object(unsigned int *data, unsigned int offset, unsigned int device, int *failures)
-{
-    if (IS_IRONLAKE(device))
-        dump_ironlake_avc_bsd_object(data, offset, failures);
-    else
-        dump_g4x_avc_bsd_object(data, offset, failures);
-}
-
-static int
-dump_bsd_avc(unsigned int *data, unsigned int offset, int count, unsigned int device, int *failures)
-{
-    unsigned int subopcode;
-    int length, i;
-
-    struct {
-	unsigned int subopcode;
-	int min_len;
-	int max_len;
-	char *name;
-        void (*detail)(unsigned int *data, unsigned int offset, unsigned int device, int  *failures);
-    } avc_commands[] = {
-        { 0x00, 0x06, 0x06, "AVC_BSD_IMG_STATE", dump_avc_bsd_img_state },
-        { 0x01, 0x02, 0x3a, "AVC_BSD_QM_STATE", dump_avc_bsd_qm_state },
-        { 0x02, 0x02, 0xd2, "AVC_BSD_SLICE_STATE", NULL },
-        { 0x03, 0x4a, 0x4a, "AVC_BSD_BUF_BASE_STATE", dump_avc_bsd_buf_base_state },
-        { 0x04, 0x03, 0x03, "BSD_IND_OBJ_BASE_ADDR", dump_bsd_ind_obj_base_addr },
-        { 0x08, 0x08, 0x10, "AVC_BSD_OBJECT", dump_avc_bsd_object },
-    };
-
-    subopcode = ((data[0] & MASK_GFXPIPE_SUBOPCODE) >> SHIFT_GFXPIPE_SUBOPCODE);
-
-    for (i = 0; i < sizeof(avc_commands) / sizeof(avc_commands[0]); i++) {
-        if (subopcode == avc_commands[i].subopcode) {
-            unsigned int index;
-
-            length = (data[0] & MASK_GFXPIPE_LENGTH) >> SHIFT_GFXPIPE_LENGTH;
-            length += 2;
-            instr_out(data, offset, 0, "%s\n", avc_commands[i].name);
-
-            if (length < avc_commands[i].min_len || 
-                length > avc_commands[i].max_len) {
-                fprintf(gout, "Bad length(%d) in %s [%d, %d]\n", 
-                        length, avc_commands[i].name,
-                        avc_commands[i].min_len,
-                        avc_commands[i].max_len);
-            }
-
-            if (length - 1 >= count)
-                BUFFER_FAIL(count, length, avc_commands[i].name);
-
-            if (avc_commands[i].detail)
-                avc_commands[i].detail(data, offset, device, failures);
-            else {
-                for (index = 1; index < length; index++)
-                    instr_out(data, offset, index, "dword %d\n", index);
-            }
-
-	    return length;
-	}
-    }
-
-    instr_out(data, offset, 0, "UNKNOWN AVC COMMAND\n");
-    (*failures)++;
-    return 1;
-}
-
-static int
-dump_gfxpipe_bsd(unsigned int *data, unsigned int offset, int count, unsigned int device, int *failures)
-{
-    int length;
-
-    switch ((data[0] & MASK_GFXPIPE_OPCODE) >> SHIFT_GFXPIPE_OPCODE) {
-    case OPCODE_BSD_AVC:
-        length = dump_bsd_avc(data, offset, count, device, failures);
-        break;
-
-    default:
-        length = 1;
-        (*failures)++;
-        instr_out(data, offset, 0, "UNKNOWN BSD OPCODE\n");
-        break;
-    }
-
-    return length;
-}
-
-static int
-dump_gfxpipe(unsigned int *data, unsigned int offset, int count, unsigned int device, int *failures)
-{
-    int length;
-
-    switch ((data[0] & MASK_GFXPIPE_SUBTYPE) >> SHIFT_GFXPIPE_SUBTYPE) {
-    case GFXPIPE_3D:
-        length = dump_gfxpipe_3d(data, offset, count, device, failures);
-        break;
-
-    case GFXPIPE_BSD:
-        length = dump_gfxpipe_bsd(data, offset, count, device, failures);
-        break;
-
-    default:
-        length = 1;
-        (*failures)++;
-        instr_out(data, offset, 0, "UNKNOWN GFXPIPE COMMAND\n");
-        break;
-    }
-
-    return length;
-}
-
-int intel_batchbuffer_dump(unsigned int *data, unsigned int offset, int count, unsigned int device)
-{
-    int index = 0;
-    int failures = 0;
-
-    gout = fopen("/tmp/bsd_command_dump.txt", "w+");
-
-    while (index < count) {
-	switch ((data[index] & MASK_CMD_TYPE) >> SHIFT_CMD_TYPE) {
-	case CMD_TYPE_MI:
-	    index += dump_mi(data + index, offset + index * 4,
-                             count - index, device, &failures);
-	    break;
-
-	case CMD_TYPE_GFXPIPE:
-            index += dump_gfxpipe(data + index, offset + index * 4,
-                                  count - index, device, &failures);
-	    break;
-
-	default:
-	    instr_out(data, offset, index, "UNKNOWN COMMAND\n");
-	    failures++;
-	    index++;
-	    break;
-	}
-
-	fflush(gout);
-    }
-
-    fclose(gout);
-
-    return failures;
-}
diff -Nru libva-1.0.4/i965_drv_video/intel_batchbuffer_dump.h libva-1.0.1/i965_drv_video/intel_batchbuffer_dump.h
--- libva-1.0.4/i965_drv_video/intel_batchbuffer_dump.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/intel_batchbuffer_dump.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-#ifndef _INTEL_BATCHBUFFER_DUMP_H_
-#define _INTEL_BATCHBUFFER_DUMP_H_
-
-#define MASK_CMD_TYPE           0xE0000000
-
-#define SHIFT_CMD_TYPE          29
-
-#define CMD_TYPE_GFXPIPE        3
-#define CMD_TYPE_BLT            2
-#define CMD_TYPE_MI             0
-
-
-/* GFXPIPE */
-#define MASK_GFXPIPE_SUBTYPE    0x18000000
-#define MASK_GFXPIPE_OPCODE     0x07000000
-#define MASK_GFXPIPE_SUBOPCODE  0x00FF0000
-#define MASK_GFXPIPE_LENGTH     0x0000FFFF
-
-#define SHIFT_GFXPIPE_SUBTYPE           27
-#define SHIFT_GFXPIPE_OPCODE            24
-#define SHIFT_GFXPIPE_SUBOPCODE         16
-#define SHIFT_GFXPIPE_LENGTH            0
-
-/* 3D */
-#define GFXPIPE_3D              3
-
-/* BSD */
-#define GFXPIPE_BSD             2
-
-#define OPCODE_BSD_AVC          4
-
-#define SUBOPCODE_BSD_IMG       0
-#define SUBOPCODE_BSD_QM        1
-#define SUBOPCODE_BSD_SLICE     2
-#define SUBOPCODE_BSD_BUF_BASE  3
-#define SUBOPCODE_BSD_IND_OBJ   4
-#define SUBOPCODE_BSD_OBJECT    8
-
-/* MI */
-#define MASK_MI_OPCODE          0x1F800000
-
-#define SHIFT_MI_OPCODE         23
-
-#define OPCODE_MI_FLUSH                 0x04
-#define OPCODE_MI_BATCH_BUFFER_END      0x0A
-
-int intel_batchbuffer_dump(unsigned int *data, unsigned int offset, int count, unsigned int device);
-
-#endif /* _INTEL_BATCHBUFFER_DUMP_H_ */
diff -Nru libva-1.0.4/i965_drv_video/intel_batchbuffer.h libva-1.0.1/i965_drv_video/intel_batchbuffer.h
--- libva-1.0.4/i965_drv_video/intel_batchbuffer.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/intel_batchbuffer.h	2009-12-17 03:05:38.000000000 +0000
@@ -16,16 +16,10 @@
     unsigned char *map;
     unsigned char *ptr;
     int atomic;
-    int flag;
-
-    int (*run)(drm_intel_bo *bo, int used,
-               drm_clip_rect_t *cliprects, int num_cliprects,
-               int DR4, int ring_flag);
 };
 
 Bool intel_batchbuffer_init(struct intel_driver_data *intel);
 Bool intel_batchbuffer_terminate(struct intel_driver_data *intel);
-
 void intel_batchbuffer_emit_dword(VADriverContextP ctx, unsigned int x);
 void intel_batchbuffer_emit_reloc(VADriverContextP ctx, dri_bo *bo, 
                                   uint32_t read_domains, uint32_t write_domains, 
@@ -37,17 +31,6 @@
 void intel_batchbuffer_end_atomic(VADriverContextP ctx);
 Bool intel_batchbuffer_flush(VADriverContextP ctx);
 
-void intel_batchbuffer_emit_dword_bcs(VADriverContextP ctx, unsigned int x);
-void intel_batchbuffer_emit_reloc_bcs(VADriverContextP ctx, dri_bo *bo, 
-                                      uint32_t read_domains, uint32_t write_domains, 
-                                      uint32_t delta);
-void intel_batchbuffer_require_space_bcs(VADriverContextP ctx, unsigned int size);
-void intel_batchbuffer_data_bcs(VADriverContextP ctx, void *data, unsigned int size);
-void intel_batchbuffer_emit_mi_flush_bcs(VADriverContextP ctx);
-void intel_batchbuffer_start_atomic_bcs(VADriverContextP ctx, unsigned int size);
-void intel_batchbuffer_end_atomic_bcs(VADriverContextP ctx);
-Bool intel_batchbuffer_flush_bcs(VADriverContextP ctx);
-
 #define BEGIN_BATCH(ctx, n) do {                                \
    intel_batchbuffer_require_space(ctx, (n) * 4);               \
 } while (0)
@@ -65,21 +48,4 @@
 #define ADVANCE_BATCH(ctx) do {                                         \
 } while (0)
 
-#define BEGIN_BCS_BATCH(ctx, n) do {                                    \
-   intel_batchbuffer_require_space_bcs(ctx, (n) * 4);                   \
-} while (0)
-
-#define OUT_BCS_BATCH(ctx, d) do {                                      \
-   intel_batchbuffer_emit_dword_bcs(ctx, d);                            \
-} while (0)
-
-#define OUT_BCS_RELOC(ctx, bo, read_domains, write_domain, delta) do {  \
-   assert((delta) >= 0);                                                \
-   intel_batchbuffer_emit_reloc_bcs(ctx, bo,                            \
-                                    read_domains, write_domain, delta); \
-} while (0)
-
-#define ADVANCE_BCS_BATCH(ctx) do {                                     \
-} while (0)
-
 #endif /* _INTEL_BATCHBUFFER_H_ */
diff -Nru libva-1.0.4/i965_drv_video/intel_driver.h libva-1.0.1/i965_drv_video/intel_driver.h
--- libva-1.0.4/i965_drv_video/intel_driver.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/intel_driver.h	2009-12-17 03:05:38.000000000 +0000
@@ -9,7 +9,7 @@
 #include <i915_drm.h>
 #include <intel_bufmgr.h>
 
-#include <va/va_backend.h>
+#include "va_backend.h"
 
 #if defined(__GNUC__)
 #define INLINE __inline__
@@ -26,7 +26,6 @@
 #define MI_NOOP                                 (CMD_MI | 0)
 
 #define MI_BATCH_BUFFER_END                     (CMD_MI | (0xA << 23))
-#define MI_BATCH_BUFFER_START                   (CMD_MI | (0x31 << 23))
 
 #define MI_FLUSH                                (CMD_MI | (0x4 << 23))
 #define STATE_INSTRUCTION_CACHE_INVALIDATE      (0x1 << 0)
@@ -45,7 +44,6 @@
 #define ALIGN(i, n)    (((i) + (n) - 1) & ~((n) - 1))
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
-#define ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
 
 #define SET_BLOCKED_SIGSET()   do {     \
         sigset_t bl_mask;               \
@@ -87,7 +85,6 @@
     int locked;
 
     struct intel_batchbuffer *batch;
-    struct intel_batchbuffer *batch_bcs;
     dri_bufmgr *bufmgr;
 };
 
@@ -121,8 +118,8 @@
 #define PCI_CHIP_G45_G                  0x2E22
 #define PCI_CHIP_G41_G                  0x2E32
 
-#define PCI_CHIP_IRONLAKE_D_G           0x0042
-#define PCI_CHIP_IRONLAKE_M_G           0x0046
+#define PCI_CHIP_IGDNG_D_G              0x0042
+#define PCI_CHIP_IGDNG_M_G              0x0046
 
 #define IS_G45(devid)           (devid == PCI_CHIP_IGD_E_G || \
                                  devid == PCI_CHIP_Q45_G || \
@@ -131,8 +128,8 @@
 #define IS_GM45(devid)          (devid == PCI_CHIP_GM45_GM)
 #define IS_G4X(devid)		(IS_G45(devid) || IS_GM45(devid))
 
-#define IS_IRONLAKE_D(devid)    (devid == PCI_CHIP_IRONLAKE_D_G)
-#define IS_IRONLAKE_M(devid)    (devid == PCI_CHIP_IRONLAKE_M_G)
-#define IS_IRONLAKE(devid)      (IS_IRONLAKE_D(devid) || IS_IRONLAKE_M(devid))
+#define IS_IGDNG_D(devid)       (devid == PCI_CHIP_IGDNG_D_G)
+#define IS_IGDNG_M(devid)       (devid == PCI_CHIP_IGDNG_M_G)
+#define IS_IGDNG(devid)         (IS_IGDNG_D(devid) || IS_IGDNG_M(devid))
 
 #endif /* _INTEL_DRIVER_H_ */
diff -Nru libva-1.0.4/i965_drv_video/Makefile.am libva-1.0.1/i965_drv_video/Makefile.am
--- libva-1.0.4/i965_drv_video/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -22,41 +22,31 @@
 
 SUBDIRS = shaders
 
-AM_CFLAGS = -Wall -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 @DRM_CFLAGS@
+AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 @DRM_CFLAGS@ -DIN_LIBVA
 
 i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
 i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@
 i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel
-i965_drv_video_la_LIBADD = ../va/libva-x11.la -lpthread
+i965_drv_video_la_LIBADD = ../src/libva-x11.la -lpthread
 
 i965_drv_video_la_SOURCES =	\
 	object_heap.c		\
 	intel_batchbuffer.c	\
-	intel_batchbuffer_dump.c\
 	intel_memman.c		\
 	intel_driver.c		\
 	i965_media.c		\
 	i965_media_mpeg2.c	\
-	i965_media_h264.c	\
 	i965_render.c		\
-	i965_drv_video.c	\
-	i965_avc_bsd.c		\
-	i965_avc_hw_scoreboard.c\
-	i965_avc_ildb.c
+	i965_drv_video.c
 
 noinst_HEADERS =                \
 	object_heap.h           \
 	intel_batchbuffer.h     \
-	intel_batchbuffer_dump.h\
 	intel_memman.h          \
 	intel_driver.h          \
 	i965_media.h            \
 	i965_media_mpeg2.h      \
-	i965_media_h264.h	\
 	i965_render.h           \
 	i965_drv_video.h        \
 	i965_defines.h          \
-	i965_structs.h		\
-	i965_avc_bsd.h		\
-	i965_avc_hw_scoreboard.h\
-	i965_avc_ildb.h
+	i965_structs.h
diff -Nru libva-1.0.4/i965_drv_video/Makefile.in libva-1.0.1/i965_drv_video/Makefile.in
--- libva-1.0.4/i965_drv_video/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -91,12 +91,10 @@
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(i965_drv_video_ladir)"
 LTLIBRARIES = $(i965_drv_video_la_LTLIBRARIES)
-i965_drv_video_la_DEPENDENCIES = ../va/libva-x11.la
+i965_drv_video_la_DEPENDENCIES = ../src/libva-x11.la
 am_i965_drv_video_la_OBJECTS = object_heap.lo intel_batchbuffer.lo \
-	intel_batchbuffer_dump.lo intel_memman.lo intel_driver.lo \
-	i965_media.lo i965_media_mpeg2.lo i965_media_h264.lo \
-	i965_render.lo i965_drv_video.lo i965_avc_bsd.lo \
-	i965_avc_hw_scoreboard.lo i965_avc_ildb.lo
+	intel_memman.lo intel_driver.lo i965_media.lo \
+	i965_media_mpeg2.lo i965_render.lo i965_drv_video.lo
 i965_drv_video_la_OBJECTS = $(am_i965_drv_video_la_OBJECTS)
 i965_drv_video_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -185,8 +183,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -227,15 +223,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -299,42 +291,32 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = shaders
-AM_CFLAGS = -Wall -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 @DRM_CFLAGS@
+AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 @DRM_CFLAGS@ -DIN_LIBVA
 i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
 i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@
 i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel
-i965_drv_video_la_LIBADD = ../va/libva-x11.la -lpthread
+i965_drv_video_la_LIBADD = ../src/libva-x11.la -lpthread
 i965_drv_video_la_SOURCES = \
 	object_heap.c		\
 	intel_batchbuffer.c	\
-	intel_batchbuffer_dump.c\
 	intel_memman.c		\
 	intel_driver.c		\
 	i965_media.c		\
 	i965_media_mpeg2.c	\
-	i965_media_h264.c	\
 	i965_render.c		\
-	i965_drv_video.c	\
-	i965_avc_bsd.c		\
-	i965_avc_hw_scoreboard.c\
-	i965_avc_ildb.c
+	i965_drv_video.c
 
 noinst_HEADERS = \
 	object_heap.h           \
 	intel_batchbuffer.h     \
-	intel_batchbuffer_dump.h\
 	intel_memman.h          \
 	intel_driver.h          \
 	i965_media.h            \
 	i965_media_mpeg2.h      \
-	i965_media_h264.h	\
 	i965_render.h           \
 	i965_drv_video.h        \
 	i965_defines.h          \
-	i965_structs.h		\
-	i965_avc_bsd.h		\
-	i965_avc_hw_scoreboard.h\
-	i965_avc_ildb.h
+	i965_structs.h
 
 all: all-recursive
 
@@ -410,16 +392,11 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_avc_bsd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_avc_hw_scoreboard.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_avc_ildb.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_drv_video.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_media.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_media_h264.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_media_mpeg2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/i965_render.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_batchbuffer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_batchbuffer_dump.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_driver.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/intel_memman.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/object_heap.Plo@am__quote@
diff -Nru libva-1.0.4/i965_drv_video/object_heap.c libva-1.0.1/i965_drv_video/object_heap.c
--- libva-1.0.4/i965_drv_video/object_heap.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/object_heap.c	2009-12-17 03:05:38.000000000 +0000
@@ -50,6 +50,7 @@
     {
         return -1; /* Out of memory */
     }
+    memset(new_heap_index + heap->heap_size*heap->object_size, 0, heap->heap_increment * new_heap_size);
     heap->heap_index = new_heap_index;
     next_free = heap->next_free;
     for(i = new_heap_size; i-- > heap->heap_size; )
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#include "AVC_ILDB_Child_UV.asm"
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Field_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#include "AVC_ILDB_Child_Y.asm"
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// AVC Child Kernel (Vertical and horizontal de-block a 4:2:0 MB UV comp)
-//
-// First de-block vertical edges from left to right.
-// Second de-block horizontal edge from top to bottom.
-// 
-// For 4:2:0, chroma is always de-blocked at 8x8.
-// NV12 format allows to filter U and V together.
-//
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AVC_ILDB
-
-.kernel AVC_ILDB_CHILD_MBAFF_UV
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_CHILD_UV):
-#endif
-
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xE997:w
-#endif
-
-	// Setup temp buf used by load and save code
-	#define BUF_B		RTempB
-	#define BUF_W		RTempW
-	#define BUF_D		RTempD
-
-	// Init local variables
-	mul (4)		ORIX_CUR<2>:w		ORIX<0;1,0>:w		16:w	{ NoDDClr }		// Expand X addr to bytes, repeat 4 times
-	mul (4)		ORIY_CUR<2>:w		ORIY<0;1,0>:w		32:w	{ NoDDChk }		// Expand Y addr to bytes, repeat 4 times
-
-	mov (2)		f0.0<1>:w		0:w
-
-	mov	(1)		GateWayOffsetC:uw	ORIY:uw						// Use row # as Gateway offset
-
-	//=== Null Kernel ===============================================================
-//	jmpi ILDB_LABEL(POST_ILDB_UV)
-	//===============================================================================
-
-	//====================================================================================
-	// Assuming the MB control data is laid out in scan line order in a rectangle with width = 16 bytes.
-	// Control data has dimension of X x Y = 16 x N bytes, where N = W x H / 16
-	// Each MB has 256 bytes of control data
-
-	// For CRESTLINE, 256 bytes are stored in memory and fetched into GRF.
-	// MB_offset = MBsCntX * CurRow + CurCol
-	// Byte_offset = MB_offset * (256 << Mbaff_flag),	Mbaff_flag = 0 or 1.
-	// Base address of a control data block = (x, y) = (0, y'=y/x), region width is 16 bytes
-	// where y' = Byte_offset / 16 = MB_offset * (16 << Mbaff_flag)
-	// MBCntrlDataOffsetY holds y'.
-
-	// For BearLake-C, 64 bytes are stored in memory and dataport expands to 256 bytes.  Need to use a special read command on BL-C.
-	// MB_offset = MBsCntX * CurRow + CurCol
-	// Byte_offset = MB_offset * (64 << Mbaff_flag),	Mbaff_flag = 0 or 1.
-	// MBCntrlDataOffsetY holds globel byte offset.
-	
-#if !defined(DEV_CL)
-	mul (1) CntrlDataOffsetY:ud		MBsCntX:w 				ORIY:w
-	add (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		ORIX:w
-	mul (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		128:uw
-#endif
-	//====================================================================================
-
-	add (1)		ORIX_LEFT:w			ORIX_LEFT:w			-4:w
-	add (1)		ORIY_TOP:w			ORIY_TOP:w			-4:w
-
-	//=========== Process Top MB ============
-    and (1)  	BitFields:w  		BitFields:w		TopFieldFlag:w		// Reset BotFieldFlag
-
-	// Build a ramp from 0 to 15
-	mov	(16)	RRampW(0)<1>		RampConstC<0;8,1>:ub
-	add (8)		RRampW(0,8)<1>		RRampW(0,8)			8:w				// RRampW = ramp 15-0
-
-ILDB_LABEL(RE_ENTRY_UV):	// for bootom field
-
-	// Load current MB control data
-#if defined(DEV_CL)
-	#include "Load_ILDB_Cntrl_Data_64DW.asm"	// Crestline
-#else
-	#include "Load_ILDB_Cntrl_Data_16DW.asm"	// Cantiga and beyond
-#endif
-
-	// Init addr register for vertical control data
-	mov (1)		ECM_AddrReg<1>:w		CNTRL_DATA_BASE:w		// Init ECM_AddrReg
-
-	// Use free cycles here
-	// Check loaded control data
-	and.z.f0.1  (16) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]<16;16,1>:uw	0xFFFF:uw		// Skip ILDB?		
-	and.nz.f0.0  (1) null:w		r[ECM_AddrReg, ExtBitFlags]:ub		DISABLE_ILDB_FLAG:w		// Skip ILDB?
-
-	// Set DualFieldMode for all data read, write and deblocking
-	and	(1)	CTemp1_W:uw		r[ECM_AddrReg, BitFlags]:ub		FieldModeAboveMbFlag+FieldModeCurrentMbFlag:uw
-
-	// Get Vert Edge Pattern (frame vs. field MBs)
-	and	(1)	VertEdgePattern:uw		r[ECM_AddrReg, BitFlags]:ub		FieldModeLeftMbFlag+FieldModeCurrentMbFlag:uw
-
-	(f0.1.all16h)	jmpi 	ILDB_LABEL(SKIP_ILDB_UV)						// Skip ILDB
-	(f0.0)			jmpi 	ILDB_LABEL(SKIP_ILDB_UV)						// Skip ILDB
-
-	// Set DualFieldMode for all data read, write and deblocking
-//	and	(1)	CTemp1_W:uw		r[ECM_AddrReg, BitFlags]:ub		FieldModeAboveMbFlag+FieldModeCurrentMbFlag:uw
-	cmp.z.f0.0	(1)	null:w	CTemp1_W:uw		ABOVE_FIELD_CUR_FRAME:w
-	and (1)		DualFieldMode:w		f0.0:w		0x0001:w
-
-	#include "load_Cur_UV_8x8T_Mbaff.asm"		// Load transposed data 8x8
-	#include "load_Left_UV_2x8T_Mbaff.asm"				// Load left MB (2x8) UV data from memory if exists
-
-	#include "Transpose_Cur_UV_8x8.asm"
-	#include "Transpose_Left_UV_2x8.asm"
-	
-
-	//---------- Perform vertical ILDB filting on UV ----------
-	#include "AVC_ILDB_Filter_Mbaff_UV_v.asm"	
-	//---------------------------------------------------------
-
-	#include "save_Left_UV_8x2T_Mbaff.asm"				// Write left MB (2x8) Y data to memory if exists
-	#include "load_Top_UV_8x2_Mbaff.asm"				// Load top MB (8x2) Y data from memory if exists
-
-	#include "Transpose_Cur_UV_8x8.asm"					// Transpose a MB for horizontal edge de-blocking 
-
-	//---------- Perform horizontal ILDB filting on UV ----------
-	#include "AVC_ILDB_Filter_Mbaff_UV_h.asm"	
-	//-----------------------------------------------------------
-
-	#include "save_Cur_UV_8x8_Mbaff.asm"				// Write 8x8
-	#include "save_Top_UV_8x2_Mbaff.asm"				// Write top MB (8x2) if not the top row
-
-	//-----------------------------------------------------------
-ILDB_LABEL(SKIP_ILDB_UV):
-	
-	and.z.f0.0 (1) 	null:w		BitFields:w		BotFieldFlag:w
-
-	//=========== Process Bottom MB ============
-    or (1)  	BitFields:w  	BitFields:w		BotFieldFlag:w	// Set BotFieldFlag to 1
-	(f0.0) jmpi		ILDB_LABEL(RE_ENTRY_UV)							// Loop back for bottom deblocking
-
-	// Fall through to finish
-
-	//=========== Check write commit of the last write ============
-    mov (8)	WritebackResponse(0)<1>		WritebackResponse(0)	
-
-ILDB_LABEL(POST_ILDB_UV):	
-	
-	// Send notification thru Gateway to root thread, update chroma Status[CurRow]
-	#include "AVC_ILDB_ForwardMsg.asm"
-
-#if !defined(GW_DCN)		// For non-ILK chipsets
-	//child send EOT : Request type = 1
-	END_CHILD_THREAD
-#endif	// !defined(DEV_ILK)
-	
-	// The thread finishs here
-	//------------------------------------------------------------------------------
-	
-	////////////////////////////////////////////////////////////////////////////////
-	// Include other subrutines being called
-	#include "AVC_ILDB_Chroma_Core_Mbaff.asm"
-	
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Mbaff_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// AVC Child Kernel (Vertical and horizontal de-block a 4:2:0 MB Y comp)
-//
-// First, de-block vertical edges from left to right.
-// Second, de-block horizontal edge from top to bottom.
-// 
-//	***** MBAFF Mode *****
-//	This version deblocks top MB first, followed by bottom MB.
-//
-//	Need variable CurMB	to indicate top MB or bottom MB (CurMB = 0 or 1).  
-//	We can use BotFieldFlag in BitFields to represent it.
-//
-//  Usage:
-// 	1) Access control data for top 
-//		CntrlDataOffsetY + CurMB  * Control data block size		(64 DWs for CL, 16 DWs for BLC)
-//
-// 	2) Load frame/field video data based on flags: FieldModeCurrentMbFlag, FieldModeLeftMbFlag, FieldModeaboveMbFlag, 
-//
-//	E.g. 
-//	if (pCntlData->BitField & FieldModeCurrentMbFlag)
-//		cur_y = ORIX_CUR.y + CurMB * 1;				// Add field vertical offset for bot field MB .
-//	else
-//		cur_y = ORIX_CUR.y + CurMB * MB_Rows_Y;		// Add bottom MB vertical offset for bot MB
-//
-//
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AVC_ILDB
-
-.kernel AVC_ILDB_CHILD_MBAFF_Y
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_CHILD_Y):
-#endif
-
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xE998:w
-#endif
-
-	// Setup temp buf used by load and save code
-	#define BUF_B		RTempB				
-	#define BUF_D		RTempD
-	
-	// Init local variables
-	// These coordinates are in progressive fashion
-	mul (4)		ORIX_CUR<2>:w		ORIX<0;1,0>:w		16:w	{ NoDDClr }		// Expand X addr to bytes, repeat 4 times
-	mul (4)		ORIY_CUR<2>:w		ORIY<0;1,0>:w		32:w	{ NoDDChk }		// Expand Y addr to bytes, repeat 4 times
-
-	mov (2)		f0.0<1>:w		0:w
-	
-	mov	(1)		GateWayOffsetC:uw	ORIY:uw						// Use row # as Gateway offset
-
-	//=== Null Kernel ===============================================================
-//	jmpi POST_ILDB
-	//===============================================================================
-
-	//====================================================================================
-	// Assuming the MB control data is laid out in scan line order in a rectangle with width = 16 bytes.
-	// Control data has dimension of X x Y = 16 x N bytes, where N = W x H / 16
-	// Each MB has 256 bytes of control data
-
-	// For CRESTLINE, 256 bytes are stored in memory and fetched into GRF.
-	// MB_offset = MBsCntX * CurRow + CurCol
-	// Byte_offset = MB_offset * (256 << Mbaff_flag),	Mbaff_flag = 0 or 1.
-	// Base address of a control data block = (x, y) = (0, y'=y/x), region width is 16 bytes
-	// where y' = Byte_offset / 16 = MB_offset * (16 << Mbaff_flag)
-	// MBCntrlDataOffsetY holds y'.
-
-	// For BearLake-C, 64 bytes are stored in memory and dataport expands to 256 bytes.  Need to use a special read command on BL-C.
-	// MB_offset = MBsCntX * CurRow + CurCol
-	// Byte_offset = MB_offset * (64 << Mbaff_flag),	Mbaff_flag = 0 or 1.
-	// MBCntrlDataOffsetY holds globel byte offset.
-
-#if !defined(DEV_CL)	
-	mul (1) CntrlDataOffsetY:ud		MBsCntX:w 				ORIY:w
-	add (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		ORIX:w
-	mul (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		128:uw
-#endif
-
-	//====================================================================================
-	
-	add (1)		ORIX_LEFT:w			ORIX_LEFT:w			-4:w
-	add (1)		ORIY_TOP:w			ORIY_TOP:w			-4:w
-
-
-	//=========== Process Top MB ============
-    and (1)  	BitFields:w  		BitFields:w		TopFieldFlag:w	// Reset BotFieldFlag
-
-RE_ENTRY:	// for bootom field
-
-	// Load current MB control data
-#if defined(DEV_CL)
-	#include "Load_ILDB_Cntrl_Data_64DW.asm"	// Crestline
-#else
-	#include "Load_ILDB_Cntrl_Data_16DW.asm"	// Cantiga and beyond
-#endif
-
-	// Init addr register for vertical control data
-	mov (1)		ECM_AddrReg<1>:w	CNTRL_DATA_BASE:w			// Init edge control map AddrReg
-
-	// Check loaded control data
-	and.z.f0.1  (16) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]<16;16,1>:uw	0xFFFF:uw		// Skip ILDB?		
-	and.nz.f0.0  (1) null:w		r[ECM_AddrReg, ExtBitFlags]:ub		DISABLE_ILDB_FLAG:w		// Skip ILDB?
-
-	// Use free cycles here
-	// Set DualFieldMode for all data read, write and deblocking
-	and	(1)	CTemp1_W:uw		r[ECM_AddrReg, BitFlags]:ub		FieldModeAboveMbFlag+FieldModeCurrentMbFlag:uw
-
-	// Get Vert Edge Pattern (frame vs. field MBs)
-	and	(1)	VertEdgePattern:uw		r[ECM_AddrReg, BitFlags]:ub		FieldModeLeftMbFlag+FieldModeCurrentMbFlag:uw
-
-	(f0.1.all16h)	jmpi 	SKIP_ILDB						// Skip ILDB
-	(f0.0)			jmpi 	SKIP_ILDB						// Skip ILDB
-
-	// Set DualFieldMode for all data read, write and deblocking
-//	and	(1)	CTemp1_W:uw		r[ECM_AddrReg, BitFlags]:ub		FieldModeAboveMbFlag+FieldModeCurrentMbFlag:uw
-	cmp.z.f0.0	(1)	null:w	CTemp1_W:uw		ABOVE_FIELD_CUR_FRAME:w
-	and (1)		DualFieldMode:w		f0.0:w		0x0001:w
-
-	// Load current MB 				// DDD1
-	#include "load_Cur_Y_16x16T_Mbaff.asm"				// Load cur Y, 16x16, transpose
-	#include "load_Left_Y_4x16T_Mbaff.asm"				// Load left MB (4x16) Y data from memory if exists
-
-	#include "Transpose_Cur_Y_16x16.asm"
-	#include "Transpose_Left_Y_4x16.asm"
-
-	//---------- Perform vertical ILDB filting on Y----------
-	#include "AVC_ILDB_Filter_Mbaff_Y_v.asm"	
-	//-------------------------------------------------------
-
-	#include "save_Left_Y_16x4T_Mbaff.asm"				// Write left MB (4x16) Y data to memory if exists
-	#include "load_Top_Y_16x4_Mbaff.asm"				// Load top MB (16x4) Y data from memory if exists
-	#include "Transpose_Cur_Y_16x16.asm"				// Transpose a MB for horizontal edge de-blocking 
-
-	//---------- Perform horizontal ILDB filting on Y ----------
-	#include "AVC_ILDB_Filter_Mbaff_Y_h.asm"	
-	//----------------------------------------------------------
-
-	#include "save_Cur_Y_16x16_Mbaff.asm"					// Write cur MB (16x16)
-	#include "save_Top_Y_16x4_Mbaff.asm"					// Write top MB (16x4) if not the top row
-
-SKIP_ILDB:
-	//----------------------------------------------------------
-	and.z.f0.0 (1) 	null:w		BitFields:w		BotFieldFlag:w
-
-	//=========== Process Bottom MB ============
-    or (1)  	BitFields:w  	BitFields:w		BotFieldFlag:w	// Set BotFieldFlag to 1
-	(f0.0) jmpi		RE_ENTRY								// Loop back for bottom deblocking
-
-	// Fall through to finish
-
-	//=========== Check write commit of the last write ============
-    mov (8)	WritebackResponse(0)<1>		WritebackResponse(0)	
-
-POST_ILDB:
-	
-	//---------------------------------------------------------------------------
-	// Send notification thru Gateway to root thread, update luma Status[CurRow]
-	
-	#include "AVC_ILDB_ForwardMsg.asm"	
-
-#if !defined(GW_DCN)		// For non-ILK chipsets
-	//child send EOT : Request type = 1
-	END_CHILD_THREAD
-#endif	// !defined(DEV_ILK)
-	
-	// The thread finishs here
-	//------------------------------------------------------------------------------
-	
-	
-	////////////////////////////////////////////////////////////////////////////////
-	// Include other subrutines being called
-	#include "AVC_ILDB_Luma_Core_Mbaff.asm"
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// AVC Child Kernel (Vertical and horizontal de-block a 4:2:0 MB UV comp)
-//
-// First de-block vertical edges from left to right.
-// Second de-block horizontal edge from top to bottom.
-// 
-// For 4:2:0, chroma is always de-blocked at 8x8.
-// NV12 format allows to filter U and V together.
-//
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AVC_ILDB
-
-.kernel AVC_ILDB_CHILD_UV
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_CHILD_UV):
-#endif
-
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x9997:w
-#endif
-
-	// Init local variables
-	shl (8)		ORIX_CUR<1>:w		ORIX<0;2,1>:w		4:w		// Expand addr to bytes, repeat (x,y) 4 times
-
-	// Init addr register for vertical control data
-	mov (1)		ECM_AddrReg<1>:w		CNTRL_DATA_BASE:w		// Init ECM_AddrReg
-
-	//=== Null Kernel ===============================================================
-//	jmpi ILDB_LABEL(POST_ILDB_UV_UV)
-	//===============================================================================
-
-#if defined(DEV_CL)	
-	mov	(1)		acc0.0:w		240:w	
-#else
-	//====================================================================================
-	// For BearLake-C, 64 bytes are stored in memory and dataport expands to 256 bytes.  Need to use a special read command on BL-C.
-	// MB_offset = MBsCntX * CurRow + CurCol
-	// MBCntrlDataOffsetY = globel_byte_offset = MB_offset * 64
-	mul (1) CntrlDataOffsetY:ud		MBsCntX:w 				ORIY:w
-	add (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		ORIX:w
-
-	// Assign to MSGSRC.2:ud for memory access
-	// mul (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		64:uw
-	mul (1) MSGSRC.2:ud		CntrlDataOffsetY:ud		64:uw
-		
-	mov	(1)		acc0.0:w		320:w	
-#endif
-	mac (1)		URBOffsetC:w	ORIY:w			4:w				// UV URB entries are right after Y entries		
-
-
-	// Init local variables
-//	shl (8)		ORIX_CUR<1>:w		ORIX<0;2,1>:w		4:w		// Expand addr to bytes, repeat (x,y) 4 times
-	add (1)		ORIX_LEFT:w			ORIX_LEFT:w			-4:w
-	add (1)		ORIY_TOP:w			ORIY_TOP:w			-4:w
-
-	// Build a ramp from 0 to 15
-	mov	(16)	RRampW(0)<1>		RampConstC<0;8,1>:ub
-	add (8)		RRampW(0,8)<1>		RRampW(0,8)			8:w		// RRampW = ramp 15-0
-
-	// Load current MB control data
-#if defined(DEV_CL)
-	#if defined(_APPLE)
-		#include "Load_ILDB_Cntrl_Data_22DW.asm"	// Crestline for Apple, progressive only
-	#else
-		#include "Load_ILDB_Cntrl_Data_64DW.asm"	// Crestline
-	#endif	
-#else
-	#include "Load_ILDB_Cntrl_Data_16DW.asm"	// Cantiga and beyond
-#endif
-
-	// Check loaded control data
-	#if defined(_APPLE)
-		and.z.f0.1  (8) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]<8;8,1>:uw		0xFFFF:uw		// Skip ILDB?
-		(f0.1) and.z.f0.1 (2) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz0]<2;2,1>:uw		0xFFFF:uw		// Skip ILDB?
-	#else
-		and.z.f0.1  (16) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]<16;16,1>:uw	0xFFFF:uw		// Skip ILDB?		
-	#endif	
-		
-	and.nz.f0.0  (1) null:w		r[ECM_AddrReg, ExtBitFlags]:ub		DISABLE_ILDB_FLAG:w		// Skip ILDB?
-	
-	mov	(1)		GateWayOffsetC:uw	ORIY:uw		// Use row # as Gateway offset
-
-	#if defined(_APPLE)
-		(f0.1.all8h)	jmpi 	ILDB_LABEL(READ_FOR_URB_UV)				// Skip ILDB
-	#else
-		(f0.1.all16h)	jmpi 	ILDB_LABEL(READ_FOR_URB_UV)				// Skip ILDB
-	#endif	
-
-	(f0.0)			jmpi 	ILDB_LABEL(READ_FOR_URB_UV)					// Skip ILDB
-
-
-
-	#include "load_Cur_UV_8x8T.asm"				// Load transposed data 8x8
-//	#include "load_Left_UV_2x8T.asm"
-	#include "load_Top_UV_8x2.asm"				// Load top MB (8x2) Y data from memory if exists
-
-	#include "Transpose_Cur_UV_8x8.asm"
-//	#include "Transpose_Left_UV_2x8.asm"
-
-
-	//---------- Perform vertical ILDB filting on UV ----------
-	#include "AVC_ILDB_Filter_UV_v.asm"	
-	//---------------------------------------------------------
-
-	#include "save_Left_UV_8x2T.asm"			// Write left MB (2x8) Y data to memory if exists
-	#include "Transpose_Cur_UV_8x8.asm"			// Transpose a MB for horizontal edge de-blocking 
-
-	//---------- Perform horizontal ILDB filting on UV ----------
-	#include "AVC_ILDB_Filter_UV_h.asm"	
-	//-----------------------------------------------------------
-
-	#include "save_Cur_UV_8x8.asm"				// Write 8x8
-	#include "save_Top_UV_8x2.asm"				// Write top MB (8x2) if not the top row
-
-	//---------- Write right most 4 columns of cur MB to URB ----------
-	// Transpose the right most 2 cols 2x8 (word) in GRF to 8x2 in BUF_D.  It is 2 left most cols in cur MB.
-	#include "Transpose_Cur_UV_2x8.asm"						
-		
-ILDB_LABEL(WRITE_URB_UV):
-	mov (8)		m1<1>:ud		LEFT_TEMP_D(1)<8;8,1>			// Copy 1 GRF to 1 URB entry (U+V)
-	
-	#include "writeURB_UV_Child.asm"	
-	//-----------------------------------------------------------------
-
-	//=========== Check write commit of the last write ============
-    mov (8)	WritebackResponse(0)<1>		WritebackResponse(0)	
-
-ILDB_LABEL(POST_ILDB_UV):
-	//---------------------------------		
-	
-	// Send notification thru Gateway to root thread, update chroma Status[CurRow]
-	#include "AVC_ILDB_ForwardMsg.asm"
-
-#if !defined(GW_DCN)		// For non-ILK chipsets
-	//child send EOT : Request type = 1
-	END_CHILD_THREAD
-#endif	// !defined(DEV_ILK)
-	
-	// The thread finishs here
-	//------------------------------------------------------------------------------
-	
-ILDB_LABEL(READ_FOR_URB_UV):
-	// Still need to prepare URB data for the right neighbor MB
-	#include "load_Cur_UV_Right_Most_2x8.asm"		// Load cur MB ( right most 4x16) Y data from memory
-	#include "Transpose_Cur_UV_Right_Most_2x8.asm"						
-//	jmpi ILDB_LABEL(WRITE_URB_UV)
-
-	mov (8)		m1<1>:ud		LEFT_TEMP_D(1)<8;8,1>			// Copy 1 GRF to 1 URB entry (U+V)
-	
-	#include "writeURB_UV_Child.asm"	
-	//-----------------------------------------------------------------
-
-	// Send notification thru Gateway to root thread, update chroma Status[CurRow]
-	#include "AVC_ILDB_ForwardMsg.asm"
-
-#if !defined(GW_DCN)		// For non-ILK chipsets
-	//child send EOT : Request type = 1
-	END_CHILD_THREAD
-#endif	// !defined(DEV_ILK)
-	
-	// The thread finishs here
-	//------------------------------------------------------------------------------
-	
-	
-	////////////////////////////////////////////////////////////////////////////////
-	// Include other subrutines being called
-//	#include "AVC_ILDB_Luma_Core.asm"
-	#include "AVC_ILDB_Chroma_Core.asm"
-
-	
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Child_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,176 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// AVC Child Kernel (Vertical and horizontal de-block a 4:2:0 MB Y comp)
-//
-// First, de-block vertical edges from left to right.
-// Second, de-block horizontal edge from top to bottom.
-// 
-// If transform_size_8x8_flag = 1, luma is de-blocked at 8x8.  Otherwise, luma is de-blocked at 4x4.
-//
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-#define AVC_ILDB
-
-.kernel AVC_ILDB_CHILD_Y
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_CHILD_Y):
-#endif
-
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x9998:w
-#endif
-
-	// Init local variables
-	shl (8)		ORIX_CUR<1>:w		ORIX<0;2,1>:w		4:w		// Expand addr to bytes, repeat (x,y) 4 times
-
-	// Init addr register for vertical control data
-	mov (1)		ECM_AddrReg<1>:w	CNTRL_DATA_BASE:w			// Init edge control map AddrReg
-
-	//=== Null Kernel ===============================================================
-//	jmpi ILDB_LABEL(POST_ILDB_Y)
-	//===============================================================================
-
-	mul	(1)		URBOffsetC:uw	ORIY:uw		4:w	
-	
-#if !defined(DEV_CL)	
-	//====================================================================================
-	// For BearLake-C, 64 bytes are stored in memory and dataport expands to 256 bytes.  Need to use a special read command on BL-C.
-	// MB_offset = MBsCntX * CurRow + CurCol
-	// MBCntrlDataOffsetY = globel_byte_offset = MB_offset * 64
-	mul (1) CntrlDataOffsetY:ud		MBsCntX:w 				ORIY:w
-	add (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		ORIX:w
-		
-	// Assign to MSGSRC.2:ud for memory access
-	// mul (1) CntrlDataOffsetY:ud		CntrlDataOffsetY:ud		64:uw
-	mul (1) MSGSRC.2:ud		CntrlDataOffsetY:ud		64:uw		
-	
-#endif
-
-	// Load current MB control data
-#if defined(DEV_CL) 
-	#if defined(_APPLE)
-		#include "Load_ILDB_Cntrl_Data_22DW.asm"	// Crestline for Apple, progressive only
-	#else
-		#include "Load_ILDB_Cntrl_Data_64DW.asm"	// Crestline
-	#endif	
-#else
-	#include "Load_ILDB_Cntrl_Data_16DW.asm"	// Cantiga and beyond
-#endif
-
-	// Check loaded control data
-	#if defined(_APPLE)
-		and.z.f0.1  (8) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]<8;8,1>:uw		0xFFFF:uw		// Skip ILDB?
-		(f0.1) and.z.f0.1 (2) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz0]<2;2,1>:uw		0xFFFF:uw		// Skip ILDB?
-	#else
-		and.z.f0.1  (16) null<1>:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]<16;16,1>:uw	0xFFFF:uw		// Skip ILDB?		
-	#endif	
-
-	and.nz.f0.0  (1) null:w		r[ECM_AddrReg, ExtBitFlags]:ub		DISABLE_ILDB_FLAG:w		// Skip ILDB?
-
-	// Use free cycles here
-	add (1)		ORIX_LEFT:w			ORIX_LEFT:w			-4:w
-//	add (1)		ORIY_TOP:w			ORIY_TOP:w			-4:w
-	mov	(1)		GateWayOffsetC:uw	ORIY:uw						// Use row # as Gateway offset
-
-	#if defined(_APPLE)
-		(f0.1.all8h)	jmpi 	ILDB_LABEL(READ_FOR_URB_Y)				// Skip ILDB
-	#else
-		(f0.1.all16h)	jmpi 	ILDB_LABEL(READ_FOR_URB_Y)				// Skip ILDB
-	#endif
-
-	(f0.0)			jmpi 	ILDB_LABEL(READ_FOR_URB_Y)					// Skip ILDB
-
-	add (1)		ORIY_TOP:w			ORIY_TOP:w			-4:w
-
-	// Bettr performance is observed if boundary MBs are not checked and skipped.
-	
-	#include "load_Cur_Y_16x16T.asm"				// Load cur MB Y, 16x16, transpose
-//	#include "load_Left_Y_4x16T.asm"				// Load left MB (4x16) Y data from memory
-	#include "load_Top_Y_16x4.asm"					// Load top MB (16x4) Y data from memory
-
-	#include "Transpose_Cur_Y_16x16.asm"
-//	#include "Transpose_Left_Y_4x16.asm"
-
-	//---------- Perform vertical ILDB filting on Y ---------
-	#include "AVC_ILDB_Filter_Y_v.asm"	
-	//-------------------------------------------------------
-
-	#include "save_Left_Y_16x4T.asm"				// Write left MB (4x16) Y data to memory
-	#include "Transpose_Cur_Y_16x16.asm"			// Transpose a MB for horizontal edge de-blocking 
-
-	//---------- Perform horizontal ILDB filting on Y -------
-	#include "AVC_ILDB_Filter_Y_h.asm"	
-	//-------------------------------------------------------
-
-	#include "save_Cur_Y_16x16.asm"					// Write cur MB (16x16)
-	#include "save_Top_Y_16x4.asm"					// Write top MB (16x4)
-
-	//---------- Write right most 4 columns of cur MB to URB ----------
-	// Transpose the right most 4 cols 4x16 in GRF to 16x4 in LEFT_TEMP_B.  It is 4 left most cols in cur MB.	
-	#include "Transpose_Cur_Y_4x16.asm"						
-	
-ILDB_LABEL(WRITE_URB_Y):
-	// Note: LEFT_TEMP_B(2) = TOP_TEMP_B(0), TOP_TEMP_B must be avail
-	mov (16)	m1<1>:ud		LEFT_TEMP_D(2)<8;8,1>		// Copy 2 GRFs to 2 URB entries (Y)
-	
-	#include "writeURB_Y_Child.asm"	
-	//-----------------------------------------------------------------
-
-	//=========== Check write commit of the last write ============
-    mov (8)	WritebackResponse(0)<1>		WritebackResponse(0)	
-
-ILDB_LABEL(POST_ILDB_Y):
-	// Send notification thru Gateway to root thread, update luma Status[CurRow]
-	#include "AVC_ILDB_ForwardMsg.asm"	
-
-#if !defined(GW_DCN)		// For non-ILK chipsets
-	//child send EOT : Request type = 1
-	END_CHILD_THREAD
-#endif	// !defined(DEV_ILK)
-	
-	// The thread finishs here
-	//------------------------------------------------------------------------------
-
-ILDB_LABEL(READ_FOR_URB_Y):
-	// Still need to prepare URB data for the right neighbor MB
-	#include "load_Cur_Y_Right_Most_4x16.asm"		// Load cur MB ( right most 4x16) Y data from memory
-	#include "Transpose_Cur_Y_Right_Most_4x16.asm"						
-//	jmpi ILDB_LABEL(WRITE_URB_Y)
-
-	// Note: LEFT_TEMP_B(2) = TOP_TEMP_B(0), TOP_TEMP_B must be avail
-	mov (16)	m1<1>:ud		LEFT_TEMP_D(2)<8;8,1>		// Copy 2 GRFs to 2 URB entries (Y)
-	
-	#include "writeURB_Y_Child.asm"	
-	//-----------------------------------------------------------------
-
-	// Send notification thru Gateway to root thread, update luma Status[CurRow]
-	#include "AVC_ILDB_ForwardMsg.asm"	
-
-#if !defined(GW_DCN)		// For non-ILK chipsets
-	//child send EOT : Request type = 1
-	END_CHILD_THREAD
-#endif	// !defined(DEV_ILK)
-	
-	// The thread finishs here
-	//------------------------------------------------------------------------------
-	
-	////////////////////////////////////////////////////////////////////////////////
-	// Include other subrutines being called
-	#include "AVC_ILDB_Luma_Core.asm"
-//	#include "AVC_ILDB_Chroma_Core.asm"
-
-	
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__AVC_ILDB_CHROMA_CORE__)	// Make sure this file is only included once
-#define __AVC_ILDB_CHROMA_CORE__
-
-////////// AVC ILDB Chroma Core /////////////////////////////////////////////////////////////////////////////////
-//
-//	This core performs AVC U or V ILDB filtering on one horizontal edge (8 pixels) of a MB.
-//	If data is transposed, it can also de-block a vertical edge.
-//
-//	Bafore calling this subroutine, caller needs to set the following parameters.
-//
-//	- EdgeCntlMap1				//	Edge control map A
-//	- EdgeCntlMap2				//	Edge control map B
-//	- P_AddrReg					//	Src and dest address register for P pixels
-//	- Q_AddrReg					//	Src and dest address register for Q pixels 	
-//	- alpha						//  alpha corresponding to the edge to be filtered
-//	- beta						//  beta corresponding to the edge to be filtered
-//	- tc0						// 	tc0  corresponding to the edge to be filtered
-//
-//	U or V:
-//	+----+----+----+----+
-//	| P1 | p0 | q0 | q1 |
-//	+----+----+----+----+
-//
-//	p1 = r[P_AddrReg, 0]<16;8,2> 
-//	p0 = r[P_AddrReg, 16]<16;8,2> 
-// 	q0 = r[Q_AddrReg, 0]<16;8,2>  
-//	q1 = r[Q_AddrReg, 16]<16;8,2> 
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// The region is both src and dest
-// P0-P3 and Q0-Q3 should be only used if they have not been modified to new values  
-#undef 	P1
-#undef 	P0
-#undef 	Q0
-#undef 	Q1
-
-#define P1 		r[P_AddrReg,  0]<16;8,2>:ub
-#define P0 		r[P_AddrReg, 16]<16;8,2>:ub
-#define Q0 		r[Q_AddrReg,  0]<16;8,2>:ub
-#define Q1 		r[Q_AddrReg, 16]<16;8,2>:ub
-
-// New region as dest
-#undef 	NewP0
-#undef 	NewQ0
-
-#define NewP0 	r[P_AddrReg, 16]<2>:ub
-#define NewQ0 	r[Q_AddrReg,  0]<2>:ub
-
-// Filter one chroma edge 
-FILTER_UV:
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x1112:w
-#endif
-	//---------- Derive filterSampleflag in AVC spec, equition (8-469) ----------
-	// bS is in MaskA
-
-	// Src copy of the p1, p0, q0, q1
-//	mov (8) p1(0)<1>		r[P_AddrReg, 0]<16;8,2>:ub
-//	mov (8) p0(0)<1>		r[P_AddrReg, 16]<16;8,2>:ub
-//	mov (8) q0(0)<1>		r[Q_AddrReg, 0]<16;8,2>:ub
-//	mov (8) q1(0)<1>		r[Q_AddrReg, 16]<16;8,2>:ub
-
-//	mov (1)	f0.0:uw		MaskA:uw
-
-	add (8) q0_p0(0)<1>			Q0		-P0				// q0-p0
-	add (8) TempRow0(0)<1>		P1		-P0				// p1-p0
-	add (8) TempRow1(0)<1>		Q1		-Q0				// q1-q0
-
-	// Build FilterSampleFlag
-	// abs(q0-p0) < alpha
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)q0_p0(0)			alpha:w
-	// abs(p1-p0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow0(0)		beta:w
-	// abs(q1-q0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow1(0)		beta:w
-
-	//-----------------------------------------------------------------------------------------
-
-	// if 
-    (f0.0)	if	(8)		UV_ENDIF1
-		// For channels whose edge control map1 = 1 ---> perform de-blocking
-
-//		mov (1)		f0.1:w		MaskB:w		{NoMask}		// Now check for which algorithm to apply
-
-		(f0.1)	if	(8)		UV_ELSE2
-
-			// For channels whose edge control map2 = 1 ---> bS = 4 algorithm 
-			// p0' = (2*p1 + p0 + q1 + 2) >> 2
-			// q0' = (2*q1 + q0 + p1 + 2) >> 2
-
-			// Optimized version:
-			// A = (p1 + q1 + 2)
-			// p0' = (p0 + p1 + A) >> 2
-			// q0' = (q0 + q1 + A) >> 2
-			//------------------------------------------------------------------------------------
-			
-			// p0' = (2*p1 + p0 + q1 + 2) >> 2
-			add (8) acc0<1>:w		Q1				2:w
-			mac (8) acc0<1>:w		P1				2:w
-			add (8)	acc0<1>:w		acc0<8;8,1>:w	P0
-			shr.sat	(8)	TempRow0B(0)<2>		acc0<8;8,1>:w		2:w
-			
-			// q0' = (2*q1 + q0 + p1 + 2) >> 2
-			add (8) acc0<1>:w		P1				2:w
-			mac (8) acc0<1>:w		Q1				2:w
-			add (8)	acc0<1>:w		acc0<8;8,1>:w	Q0
-			shr.sat	(8)	TempRow1B(0)<2>		acc0<8;8,1>:w		2:w
-
-			mov (8) NewP0		TempRow0B(0)					// p0'
-			mov (8) NewQ0		TempRow1B(0)					// q0'
-			
-			
-UV_ELSE2: 
-		else 	(8)		UV_ENDIF2
-			// For channels whose edge control map2 = 0 ---> bS < 4 algorithm
-			
-			// Expand tc0	(tc0 has 4 bytes)
-//			mov (8)	tc0_exp(0)<1>	tc0<1;2,0>:ub	{NoMask}				// tc0_exp = tc0, each tc0 is duplicated 2 times for 2 adjcent pixels	
-			mov (8)	acc0<1>:w	tc0<1;2,0>:ub	{NoMask}				// tc0_exp = tc0, each tc0 is duplicated 2 times for 2 adjcent pixels	
-			
-			// tc_exp = tc0_exp + 1
-//			add (8) tc_exp(0)<1>	tc0_exp(0)		1:w
-			add (8) tc_exp(0)<1>	acc0<8;8,1>:w		1:w
-
-			// delta = Clip3(-tc, tc, ((((q0 - p0)<<2) + (p1-q1) + 4) >> 3))
-			// 4 * (q0-p0) + p1 - q1 + 4
-			add (8)	acc0<1>:w		P1			4:w
-			mac (8) acc0<1>:w		q0_p0(0)	4:w	
-			add (8) acc0<1>:w		acc0<8;8,1>:w		-Q1
-			shr (8) TempRow0(0)<1>	acc0<8;8,1>:w		3:w
-
-			// tc clip
-			cmp.g.f0.0	(8) null:w		TempRow0(0)		tc_exp(0)				// Clip if > tc0
-			cmp.l.f0.1	(8) null:w		TempRow0(0)		-tc_exp(0)				// Clip if < -tc0
-			
-			(f0.0) mov (8) TempRow0(0)<1>				tc_exp(0)
-			(f0.1) mov (8) TempRow0(0)<1>				-tc_exp(0)
-			
-			// p0' = Clip1(p0 + delta) = Clip3(0, 0xFF, p0 + delta)
-			add.sat (8)	TempRow1B(0)<2>		P0			TempRow0(0)				// p0+delta
-		
-			// q0' = Clip1(q0 - delta) = Clip3(0, 0xFF, q0 - delta)
-			add.sat (8)	TempRow0B(0)<2>		Q0			-TempRow0(0)			// q0-delta
-
-			mov (8) NewP0				TempRow1B(0)			// p0'
-			mov (8) NewQ0				TempRow0B(0)			// q0'
-
-		endif
-UV_ENDIF2:
-UV_ENDIF1:
-	endif
-
-RETURN
-
-#endif	// !defined(__AVC_ILDB_CHROMA_CORE__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Chroma_Core_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,146 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC ILDB Chroma Core Mbaff /////////////////////////////////////////////////////////////////////////////////
-//
-//	This core performs AVC U or V ILDB filtering on one horizontal edge (8 pixels) of a MB.
-//	If data is transposed, it can also de-block a vertical edge.
-//
-//	Bafore calling this subroutine, caller needs to set the following parameters.
-//
-//	- EdgeCntlMap1				//	Edge control map A
-//	- EdgeCntlMap2				//	Edge control map B
-//	- P_AddrReg					//	Src and dest address register for P pixels
-//	- Q_AddrReg					//	Src and dest address register for Q pixels 	
-//	- alpha						//  alpha corresponding to the edge to be filtered
-//	- beta						//  beta corresponding to the edge to be filtered
-//	- tc0						// 	tc0  corresponding to the edge to be filtered
-//
-//	U or V:
-//	+----+----+----+----+
-//	| P1 | p0 | q0 | q1 |
-//	+----+----+----+----+
-//
-//	p1 = r[P_AddrReg, 0]<16;8,2> 
-//	p0 = r[P_AddrReg, 16]<16;8,2> 
-// 	q0 = r[Q_AddrReg, 0]<16;8,2>  
-//	q1 = r[Q_AddrReg, 16]<16;8,2> 
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// The region is both src and dest
-// P0-P3 and Q0-Q3 should be only used if they have not been modified to new values  
-#undef 	P1
-#undef 	P0
-#undef 	Q0
-#undef 	Q1
-
-#define P1 		r[P_AddrReg,  0]<16;8,2>:ub
-#define P0 		r[P_AddrReg, 16]<16;8,2>:ub
-#define Q0 		r[Q_AddrReg,  0]<16;8,2>:ub
-#define Q1 		r[Q_AddrReg, 16]<16;8,2>:ub
-
-// New region as dest
-#undef 	NewP0
-#undef 	NewQ0
-
-#define NewP0 	r[P_AddrReg, 16]<2>:ub
-#define NewQ0 	r[Q_AddrReg,  0]<2>:ub
-
-// Filter one chroma edge - mbaff
-FILTER_UV_MBAFF:
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x1112:w
-#endif
-	//---------- Derive filterSampleflag in AVC spec, equition (8-469) ----------
-
-	//===== Assume f0.0 contains MaskA when entering this routine
-//	mov (1)	f0.0:uw		MaskA:uw
-
-	add (8) q0_p0(0)<1>			Q0		-P0				// q0-p0
-	add (8) TempRow0(0)<1>		P1		-P0				// p1-p0
-	add (8) TempRow1(0)<1>		Q1		-Q0				// q1-q0
-
-	// Build FilterSampleFlag
-	// abs(q0-p0) < alpha
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)q0_p0(0)			Mbaff_ALPHA(0)
-	// abs(p1-p0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow0(0)		Mbaff_BETA(0)
-	// abs(q1-q0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow1(0)		Mbaff_BETA(0)
-
-	//-----------------------------------------------------------------------------------------
-
-	// if 
-    (f0.0)	if	(8)		MBAFF_UV_ENDIF1
-		// For channels whose edge control map1 = 1 ---> perform de-blocking
-
-//		mov (1)		f0.1:w		MaskB:w		{NoMask}		// Now check for which algorithm to apply
-
-		(f0.1)	if	(8)		MBAFF_UV_ELSE2
-
-			// For channels whose edge control map2 = 1 ---> bS = 4 algorithm 
-			// p0' = (2*p1 + P0 + q1 + 2) >> 2
-			// q0' = (2*q1 + q0 + p1 + 2) >> 2
-			//------------------------------------------------------------------------------------
-
-			// p0' = (2*p1 + p0 + q1 + 2) >> 2
-			add (8) acc0<1>:w		Q1				2:w
-			mac (8) acc0<1>:w		P1				2:w
-			add (8)	acc0<1>:w		acc0<8;8,1>:w	P0
-			shr.sat	(8)	TempRow0B(0)<2>		acc0<8;8,1>:w		2:w
-
-			// q0' = (2*q1 + q0 + p1 + 2) >> 2
-			add (8) acc0<1>:w		P1				2:w
-			mac (8) acc0<1>:w		Q1				2:w
-			add (8)	acc0<1>:w		acc0<8;8,1>:w	Q0
-			shr.sat	(8)	TempRow1B(0)<2>		acc0<8;8,1>:w		2:w
-
-			mov (8) NewP0		TempRow0B(0)					// p0'
-			mov (8) NewQ0		TempRow1B(0)					// q0'
-			
-MBAFF_UV_ELSE2: 
-		else 	(8)		MBAFF_UV_ENDIF2
-			// For channels whose edge control map2 = 0 ---> bS < 4 algorithm
-			
-			// tc_exp = tc0_exp + 1
-			add (8) tc_exp(0)<1>	Mbaff_TC0(0)		1:w
-
-			// delta = Clip3(-tc, tc, ((((q0 - p0)<<2) + (p1-q1) + 4) >> 3))
-			// 4 * (q0-p0) + p1 - q1 + 4
-			add (8)	acc0<1>:w		P1			4:w
-			mac (8) acc0<1>:w		q0_p0(0)	4:w	
-			add (8) acc0<1>:w		acc0<8;8,1>:w		-Q1
-			shr (8) TempRow0(0)<1>	acc0<8;8,1>:w		3:w
-
-			// tc clip
-			cmp.g.f0.0	(8) null:w		TempRow0(0)		tc_exp(0)				// Clip if > tc0
-			cmp.l.f0.1	(8) null:w		TempRow0(0)		-tc_exp(0)				// Clip if < -tc0
-			
-			(f0.0) mov (8) TempRow0(0)<1>				tc_exp(0)
-			(f0.1) mov (8) TempRow0(0)<1>				-tc_exp(0)
-			
-			// p0' = Clip1(p0 + delta) = Clip3(0, 0xFF, p0 + delta)
-			add.sat (8)	TempRow1B(0)<2>		P0			TempRow0(0)				// p0+delta
-		
-			// q0' = Clip1(q0 - delta) = Clip3(0, 0xFF, q0 - delta)
-			add.sat (8)	TempRow0B(0)<2>		Q0			-TempRow0(0)			// q0-delta
-
-			mov (8) NewP0				TempRow1B(0)			// p0'
-			mov (8) NewQ0				TempRow0B(0)			// q0'
-
-		endif
-MBAFF_UV_ENDIF2:
-MBAFF_UV_ENDIF1:
-	endif
-
-RETURN
-
-
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_CloseGateway.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_CloseGateway.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_CloseGateway.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_CloseGateway.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//----- Close a Message Gateway -----
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignature:b			0x4444:w
-#endif
-
-// Message descriptor
-// bit 31	EOD
-// 27:24	FFID = 0x0011 for msg gateway
-// 23:20	msg length = 1 MRF
-// 19:16	Response length	= 0
-// 1:0		SubFuncID = 01 for CloseGateway
-// Message descriptor: 0 000 0011 0001 0000 + 0 0 000000000000 01 ==> 0000 0011 0001 0000 0000 0000 0000 0001
-send (8)	null:ud 	m7	  r0.0<0;1,0>:ud    MSG_GW	CGWMSGDSC 
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Dep_Check.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Dep_Check.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Dep_Check.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Dep_Check.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//---------- Check dependency and spawn all MBs ----------
-
-// Launch the 1st round of child threads for Vertical ILDB
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignature:w			0x3333:w
-#endif
-
-//=====================================================================
-// Jump Table 1
-	// 0 0 ---> Goto ALL_SPAWNED
-	// 0 1 ---> Goto ALL_SPAWNED
-	// 1 0 ---> Goto SLEEP_ENTRY
-	// 1 1 ---> Goto POST_SLEEP
-	mov (2)		JumpTable.0<1>:d	0:d				{ NoDDClr }
-#if defined(CHROMA_ROOT) 		
-	mov (1)		JumpTable.2:d	SLEEP_ENTRY_UV_ILDB_FRAME_IP-ALL_SPAWNED_UV_ILDB_FRAME_IP:d		{ NoDDClr, NoDDChk }
-	mov (1)		JumpTable.3:d	POST_SLEEP_UV_ILDB_FRAME_IP-ALL_SPAWNED_UV_ILDB_FRAME_IP:d		{ NoDDChk }
-#else
-	mov (1)		JumpTable.2:d	SLEEP_ENTRY_Y_ILDB_FRAME_IP-ALL_SPAWNED_Y_ILDB_FRAME_IP:d		{ NoDDClr, NoDDChk }
-	mov (1)		JumpTable.3:d	POST_SLEEP_Y_ILDB_FRAME_IP-ALL_SPAWNED_Y_ILDB_FRAME_IP:d		{ NoDDChk }
-#endif
-//=====================================================================
-
-	mov (2)		f0.0<1>:w		0:w
-
-	// Get m0 most of fields ready for URB write
-	mov	(8)			MRF0<1>:ud		MSGSRC.0<8;8,1>:ud
-
-	// Add child kernel offset
-	add (1) 	CT_R0Hdr.2:ud 			r0.2:ud 		CHILD_OFFSET:w
-
-	// Init
-	mov (1)		Col_Boundary:w			2:w
-	mov (1)		Row_Boundary:w			LastRow:w
-	mov (1)		TopRowForScan:w			0:w
-	mov (2)		OutstandingThreads<1>:w	0:w
-
-	// Init Scoreboard  (idle = 0x00FF, busy = 0x0000)
-	// Low word is saved col.  High word is busy/idle status
-	mov	(16)		GatewayAperture(0)<1>	0x00FF00FF:ud		// Init r6-r7
-	mov	(16)		GatewayAperture(2)<1>	0x00FF00FF:ud		// Init r8-r9
-	mov	(16)		GatewayAperture(4)<1>	0x00FF00FF:ud		// Init r10-r11
-	mov	(16)		GatewayAperture(6)<1>	0x00FF00FF:ud		// Init r12-r13
-	mov	(16)		GatewayAperture(8)<1>	0x00FF00FF:ud		// Init r14-r15
-
-	mul	(1)	 		StatusAddr:w		CurRow:w		4:w		// dword to bytes offset conversion
-
-	//=====================================================================
-
-//SPAWN_LOOP:
-	//===== OutstandingThreads < ThreadLimit ? ============================
-	cmp.l.f0.1 (1)	null:w		OutstandingThreads:w	ThreadLimit:w		// Check the thread limit
-#if defined(CHROMA_ROOT) 
-    (f0.1) jmpi		ILDB_LABEL(POST_SLEEP_UV)
-#else	// LUMA_ROOT
-    (f0.1) jmpi		ILDB_LABEL(POST_SLEEP_Y)
-#endif
-
-#if defined(CHROMA_ROOT) 
-ILDB_LABEL(SLEEP_ENTRY_UV):
-#else	// LUMA_ROOT
-ILDB_LABEL(SLEEP_ENTRY_Y):
-#endif
-    //===== Goto Sleep ====================================================
-    // Either reached max thread limit or no child thread can be spawned due to dependency.
-	add	(1)			OutstandingThreads:w	OutstandingThreads:w	-1:w // Do this before wait is faster
-	wait 			n0.0:d												
-
-#if defined(CHROMA_ROOT) 
-ILDB_LABEL(POST_SLEEP_UV):
-#else	// LUMA_ROOT
-ILDB_LABEL(POST_SLEEP_Y):
-#endif
-	//===== Luma Status[CurRow] == busy ? =====
-	cmp.z.f0.0 (1)	null:uw		r[StatusAddr, GatewayApertureB+ScoreBd_Idx]:uw		0:uw			// Check west neighbor
-	cmp.g.f0.1 (1)	null:w		CurCol:w		LastCol:w		// Check if the curCol > LastCol
-
-#if defined(CHROMA_ROOT) 
-	mov	(16)		acc0.0<1>:w		URBOffsetUVBase<0;1,0>:w			// Add offset to UV base (MBsCntY * URB_EBTRIES_PER_MB)
-	mac (1)			URBOffset:w		CurRow:w			4:w				// 4 entries per row
-#else
-	mul	(1)			URBOffset:w		CurRow:w			4:w				// 4 entries per row
-#endif
-
-#if defined(CHROMA_ROOT) 
-	(f0.0) jmpi		ILDB_LABEL(SLEEP_ENTRY_UV)								// Current row has a child thread running, can not spawn a new child thread, go back to sleep
-	(f0.1) jmpi		ILDB_LABEL(NEXT_MB_UV)									// skip MB if the curCol > LastCol 
-#else	// LUMA_ROOT
-	(f0.0) jmpi		ILDB_LABEL(SLEEP_ENTRY_Y)								// Current row has a child thread running, can not spawn a new child thread, go back to sleep
-	(f0.1) jmpi		ILDB_LABEL(NEXT_MB_Y)									// skip MB if the curCol > LastCol 
-#endif
-		
-	//========== Spwan a child thread ========================================
-	// Save cur col and set Status[CurRow] to busy
-	mov (2)			r[StatusAddr, GatewayApertureB]<1>:uw		CurColB<2;2,1>:ub		// Store the new col
-			
-	// Increase OutstandingThreads and ProcessedMBs by 1
-	add	(2)			OutstandingThreads<1>:w		OutstandingThreads<2;2,1>:w		1:w  
-
-	#include "AVC_ILDB_SpawnChild.asm"
-
-	//===== Find next MB ===================================================
-#if defined(CHROMA_ROOT) 
-ILDB_LABEL(NEXT_MB_UV):
-#else	// LUMA_ROOT
-ILDB_LABEL(NEXT_MB_Y):
-#endif
-	// Check pic boundary, results are in f0.0 bit0 and bit1
-	cmp.ge.f0.0	(2)	null<1>:w   CurCol<2;2,1>:w 	Col_Boundary<2;2,1>:w
-
-	// Update TopRowForScan if the curCol = LastCol
-	(f0.1) add (1)	TopRowForScan:w		CurRow:w		1:w	
-
-//	cmp.l.f0.1 (1)	null<1>:w		ProcessedMBs:w		TotalBlocks:w		// Processed all blocks ?
-	// 2 sets compare
-	// ProcessedMBs:w < TotalBlocks:w		OutstandingThreads:w < ThreadLimit:wProcessedMBs:w
-	// 0 0 ---> Goto ALL_SPAWNED
-	// 0 1 ---> Goto ALL_SPAWNED
-	// 1 0 ---> Goto SLEEP_ENTRY
-	// 1 1 ---> Goto POST_SLEEP
-	cmp.l.f0.1 (2)	null<1>:w		OutstandingThreads<2;2,1>:w	ThreadLimit<2;2,1>:w
-
-	// Just do it in stalled cycles
-	mov (1)		acc0.0:w		4:w
-	mac	(1)	 	StatusAddr:w		CurRow:w		4:w						// dword to bytes offset conversion	
-	add (2)		CurCol<1>:w		CurCol<2;2,1>:w		StepToNextMB<2;2,1>:b	// CurCol -= 2 and CurRow += 1
-		
-	// Set f0.0 if turning around is needed, assuming bit 15 - 2 are zeros for correct comparison.
-	cmp.nz.f0.0 (1)	null<1>:w	f0.0:w		0x01:w
-		
-	mul (1) 	JumpAddr:w		f0.1:w		4:w		// byte offet in dword count
-		
-	// The next MB is at the row TopRowForScan
-	(f0.0) mul (1)	 	StatusAddr:w	TopRowForScan:w		4:w				// dword to bytes offset conversion
-	(f0.0) mov (1)		CurRow:w		TopRowForScan:w								{ NoDDClr }	// Restart from the top row that has MBs not deblocked yet.
-	(f0.0) add (1)		CurCol:w		r[StatusAddr, GatewayApertureB]:uw		1:w		{ NoDDChk }
-	
-	//===== Processed all blocks ? =========================================
-	// (f0.1) jmpi		SPAWN_LOOP
-
-	jmpi	r[JumpAddr, JUMPTABLE_BASE]:d
-//JUMP_BASE:
-
-	//======================================================================
-
-	// All MB are spawned at this point, check for outstanding thread count
-#if defined(CHROMA_ROOT) 
-ILDB_LABEL(ALL_SPAWNED_UV):
-#else	// LUMA_ROOT
-ILDB_LABEL(ALL_SPAWNED_Y):
-#endif
-	cmp.e.f0.1 (1) 	null:w		OutstandingThreads:w		0:w			// Check before goto sleep
-#if defined(CHROMA_ROOT) 
-	(f0.1) jmpi		ILDB_LABEL(ALL_DONE_UV)
-#else	// LUMA_ROOT
-	(f0.1) jmpi		ILDB_LABEL(ALL_DONE_Y)
-#endif
-	
-	wait 			n0.0:d												// Wake up by a finished child thread
-	add	(1)			OutstandingThreads:w	OutstandingThreads:w	-1:w
-
-#if defined(CHROMA_ROOT) 
-	// One thread is free and give it to luma thread limit --- Increase luma thread limit by one.
-	#include "AVC_ILDB_LumaThrdLimit.asm"
-#endif
-
-#if defined(CHROMA_ROOT) 
-    jmpi			ILDB_LABEL(ALL_SPAWNED_UV)							// Waked up and goto dependency check
-#else	// LUMA_ROOT
-    jmpi			ILDB_LABEL(ALL_SPAWNED_Y)							// Waked up and goto dependency check
-#endif
-
-	// All child threads are finsihed at this point 
-#if defined(CHROMA_ROOT) 
-ILDB_LABEL(ALL_DONE_UV):
-#else	// LUMA_ROOT
-ILDB_LABEL(ALL_DONE_Y):
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_h.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_h.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_h.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_h.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,223 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC ILDB filter horizontal Mbaff UV ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all horizontal edges of UV.
-//
-//	It sssumes the data for horizontal de-blocking is already transposed.  
-//
-//		Chroma:
-//
-//		+-------+-------+		H0 Edge
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+		H1 Edge
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBC:w
-#endif	
-
-//=============== Chroma deblocking ================
-
-//---------- Deblock UV external top edge ----------
-
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterTopMbEdgeFlag:w		// Check for FilterTopMbEdgeFlag 
-
-	mov	(1)	f0.1:w		DualFieldMode:w		// Check for dual field mode
-
-	// Get Luma maskA and maskB	
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz0]<0;1,0>:uw		RRampW(0)
-	shr (16)	TempRow1(0)<1>		r[ECM_AddrReg, wEdgeCntlMapB_ExtTopHorz0]<0;1,0>:uw		RRampW(0)
-
-    (f0.0)	jmpi	H0_UV_DONE				// Skip H0 UV edge
-
-	(f0.1) jmpi DUAL_FIELD_UV
-
-	// Non dual field mode	
-
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<16;8,2>		1:w
-
-	// Ext U
-	//	p1 = Prev MB U row 0
-	//	p0 = Prev MB U row 1
-	// 	q0 = Cur MB U row 0
-	//	q1 = Cur MB U row 1
-	mov (1)	P_AddrReg:w		PREV_MB_U_BASE:w	{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_U_BASE:w		{ NoDDChk }
-	
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaTop0_Cb]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop0_Cb]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_0_Cb]<1;2,0>:ub
-
-	// Store UV MaskA and MaskB
-	mov (2)		MaskA<1>:uw			f0.0<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	
-
-	// Ext V
-	mov (1)	P_AddrReg:w		PREV_MB_V_BASE:w	{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_V_BASE:w		{ NoDDChk }
-
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaTop0_Cr]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop0_Cr]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_0_Cr]<1;2,0>:ub
-
-	// Set UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	
-
-	jmpi H0_UV_DONE	
-	
-DUAL_FIELD_UV:
-	// Dual field mode, FieldModeCurrentMbFlag=0 && FieldModeAboveMbFlag=1
-
-	//===== Ext U, Top field
-
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<16;8,2>		1:w
-
-	mov (1)	P_AddrReg:w		ABOVE_CUR_MB_BASE:w			{ NoDDClr }
-	mov (1)	Q_AddrReg:w		ABOVE_CUR_MB_BASE+32:w		{ NoDDChk }
-
-	mov (16) ABOVE_CUR_MB_UW(0)<1>	PREV_MB_UW(0, 0)<16;8,1>	// Copy p1, p0
-	mov (16) ABOVE_CUR_MB_UW(1)<1>	SRC_UW(0, 0)<16;8,1>		// Copy q1, q0
-
-	//===== Ext U, top field
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaTop0_Cb]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop0_Cb]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_0_Cb]<1;2,0>:ub
-
-	// Store UV MaskA and MaskB
-	mov (2)		MaskA<1>:uw			f0.0<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	// Ext U, top field
-
-	//===== Ext V, top field
-	mov (1)	P_AddrReg:w		ABOVE_CUR_MB_BASE+1:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		ABOVE_CUR_MB_BASE+33:w		{ NoDDChk }
-
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaTop0_Cr]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop0_Cr]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_0_Cr]<1;2,0>:ub
-
-	// Set UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	// Ext U, top field
-
-	// Prefetch for bottom field
-	// Get bot field Luma maskA and maskB	
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz1]<0;1,0>:uw		RRampW(0)
-	shr (16)	TempRow1(0)<1>		r[ECM_AddrReg, wEdgeCntlMapB_ExtTopHorz1]<0;1,0>:uw		RRampW(0)
-
-	// Save deblocked top field rows
-	mov (8) PREV_MB_UW(1, 0)<1>		ABOVE_CUR_MB_UW(0, 8)	// Copy p0
-	mov (8) SRC_UW(0, 0)<1>			ABOVE_CUR_MB_UW(1, 0)	// Copy q0
-	//==========================================================================
-
-	//===== Ext U, Bot field 
-	
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<16;8,2>		1:w
-
-	mov (1)	P_AddrReg:w		ABOVE_CUR_MB_BASE:w			{ NoDDClr }
-	mov (1)	Q_AddrReg:w		ABOVE_CUR_MB_BASE+32:w		{ NoDDChk }
-
-	mov (16) ABOVE_CUR_MB_UW(0)<1>	PREV_MB_UW(0, 8)<16;8,1>	// Copy p1, p0
-	mov (16) ABOVE_CUR_MB_UW(1)<1>	SRC_UW(0, 8)<16;8,1>		// Copy q1, q0
-
-	//===== Ext U, bottom field
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaTop1_Cb]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop1_Cb]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_1_Cb]<1;2,0>:ub
-
-	// Store UV MaskA and MaskB
-	mov (2)		MaskA<1>:uw			f0.0<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	// Ext U, bottom field
-
-	//===== Ext V, bot field
-	mov (1)	P_AddrReg:w		ABOVE_CUR_MB_BASE+1:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		ABOVE_CUR_MB_BASE+33:w		{ NoDDChk }
-
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaTop1_Cr]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop1_Cr]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_1_Cr]<1;2,0>:ub
-
-	// Set UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	// Ext V, bottom field
-	
-	// Save deblocked bot field rows
-	mov (8) PREV_MB_UW(1, 8)<1>		ABOVE_CUR_MB_UW(0, 8)	// Copy p0
-	mov (8) SRC_UW(0, 8)<1>			ABOVE_CUR_MB_UW(1, 0)	// Copy q0
-	//========================================
-
-H0_UV_DONE:
-
-//---------- Deblock U internal horz middle edge ----------
-
-	//***** Need to take every other bit to form U maskA in core
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMap_IntMidHorz]<0;1,0>:uw		RRampW(0)
-
-	//	p1 = Cur MB U row 2
-	//	p0 = Cur MB U row 3
-	// 	q0 = Cur MB U row 4
-	//	q1 = Cur MB U row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_U_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_U_BASE:w		{ NoDDChk }
-
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaInternal_Cb]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaInternal_Cb]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h20_Cb]<1;2,0>:ub
-
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-
-	// Store UV MaskA and MaskB
-	mov (1)	f0.1:uw		0:w
-	mov (1)	MaskB:uw	0:w			{ NoDDClr }
-	mov (1)	MaskA:uw	f0.0:uw		{ NoDDChk }
-
-	CALL(FILTER_UV_MBAFF, 1)	
-//-----------------------------------------------
-
-
-//---------- Deblock V internal horz middle edge ----------
-
-	//	p1 = Cur MB V row 2
-	//	p0 = Cur MB V row 3
-	// 	q0 = Cur MB V row 4
-	//	q1 = Cur MB V row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_V_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_V_BASE:w		{ NoDDChk }
-
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaInternal_Cr]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaInternal_Cr]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h20_Cr]<1;2,0>:ub
-
-	// Set UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	
-//-----------------------------------------------
-
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_v.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_v.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_v.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_UV_v.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC LDB filter vertical Mbaff UV ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all vertical edges of UV.
-//
-//	It sssumes the data for vertical de-blocking is already transposed.  
-//
-//		Chroma:
-//
-//		+-------+-------+
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+
-//
-//		V0		V1		
-//		Edge	Edge	
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBC:w
-#endif	
-
-//=============== Chroma deblocking ================
-
-//---------- Deblock U external left edge ----------
-
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterLeftMbEdgeFlag:w		// Check for FilterLeftMbEdgeFlag 
-
-	cmp.z.f0.1	(1)	null:w	VertEdgePattern:uw		LEFT_FIELD_CUR_FRAME:w
-
-	// Get Luma maskA and maskB	
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMapA_ExtLeftVert0]<0;1,0>:uw		RRampW(0)
-	shr (16)	TempRow1(0)<1>		r[ECM_AddrReg, wEdgeCntlMapB_ExtLeftVert0]<0;1,0>:uw		RRampW(0)
-	
-    (f0.0)	jmpi	BYPASS_V0_UV	// Do not deblock Left ext edge
-
-	cmp.z.f0.0	(1)	null:w	VertEdgePattern:uw		LEFT_FRAME_CUR_FIELD:w
-
-	(-f0.1) jmpi V0_U_NEXT1	// Jump if not LEFT_FIELD_CUR_FRAME
-
-	//----- For LEFT_FIELD_CUR_FRAME
-	
-	// Extract UV MaskA and MaskB from every other 2 bits of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<4;2,1>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<4;2,1>		1:w
-
-	// For FieldModeLeftMbFlag=1 && FieldModeCurrentMbFlag=0 
-	mov	(4)	Mbaff_ALPHA(0,0)<2>		r[ECM_AddrReg, bAlphaLeft0_Cb]<0;1,0>:ub	{ NoDDClr }
-	mov	(4)	Mbaff_ALPHA(0,1)<2>		r[ECM_AddrReg, bAlphaLeft1_Cb]<0;1,0>:ub	{ NoDDChk }
-	mov	(4)	Mbaff_BETA(0,0)<2>		r[ECM_AddrReg, bBetaLeft0_Cb]<0;1,0>:ub		{ NoDDClr }
-	mov	(4)	Mbaff_BETA(0,1)<2>		r[ECM_AddrReg, bBetaLeft1_Cb]<0;1,0>:ub		{ NoDDChk }
-	mov (4)	Mbaff_TC0(0,0)<2>		r[ECM_AddrReg, bTc0_v00_0_Cb]<4;4,1>:ub		{ NoDDClr }
-	mov (4)	Mbaff_TC0(0,1)<2>		r[ECM_AddrReg, bTc0_v00_1_Cb]<4;4,1>:ub		{ NoDDChk }
-
-	jmpi	V0_U_NEXT3
-
-V0_U_NEXT1:
-	
-	(-f0.0) jmpi V0_U_NEXT2			// Jump if not LEFT_FRAME_CUR_FIELD
-	
-	//----- For LEFT_FRAME_CUR_FIELD
-		
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<16;8,2>		1:w
-
-	// For FieldModeLeftMbFlag=0 && FieldModeCurrentMbFlag=1
-	mov	(4)	Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaLeft0_Cb]<0;1,0>:ub	{ NoDDClr }
-	mov	(4)	Mbaff_ALPHA(0,4)<1>		r[ECM_AddrReg, bAlphaLeft1_Cb]<0;1,0>:ub	{ NoDDChk }
-	mov	(4)	Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Cb]<0;1,0>:ub		{ NoDDClr }
-	mov	(4)	Mbaff_BETA(0,4)<1>		r[ECM_AddrReg, bBetaLeft1_Cb]<0;1,0>:ub		{ NoDDChk }
-	mov (4)	Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Cb]<4;4,1>:ub		{ NoDDClr }
-	mov (4)	Mbaff_TC0(0,4)<1>		r[ECM_AddrReg, bTc0_v00_1_Cb]<4;4,1>:ub		{ NoDDChk }
-
-	jmpi	V0_U_NEXT3
-	
-V0_U_NEXT2:
-
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<16;8,2>		1:w
-	
-	// Both are frames or fields
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaLeft0_Cb]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Cb]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Cb]<1;2,0>:ub
-
-V0_U_NEXT3:	
-
-	//	p1 = Prev MB U row 0
-	//	p0 = Prev MB U row 1
-	// 	q0 = Cur MB U row 0
-	//	q1 = Cur MB U row 1
-	mov (1)	P_AddrReg:w		PREV_MB_U_BASE:w	{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_U_BASE:w		{ NoDDChk }
-
-	// Store UV MaskA and MaskB
-	mov (2)		MaskA<1>:uw			f0.0<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	
-//-----------------------------------------------
-
-//---------- Deblock V external left edge ----------
-
-	// No change to MaskA and MaskB
-
-	cmp.z.f0.0	(4)	null:w	VertEdgePattern:uw		LEFT_FIELD_CUR_FRAME:w
-	cmp.z.f0.1	(4)	null:w	VertEdgePattern:uw		LEFT_FRAME_CUR_FIELD:w
-
-	// both are frame or field
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaLeft0_Cr]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Cr]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Cr]<1;2,0>:ub
-				
-	//	p1 = Prev MB V row 0
-	//	p0 = Prev MB V row 1
-	// 	q0 = Cur MB V row 0
-	//	q1 = Cur MB V row 1
-	mov (1)	P_AddrReg:w		PREV_MB_V_BASE:w	{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_V_BASE:w		{ NoDDChk }
-				
-	// For FieldModeLeftMbFlag=1 && FieldModeCurrentMbFlag=0 
-	(f0.0) mov (4)	Mbaff_ALPHA(0,0)<2>		r[ECM_AddrReg, bAlphaLeft0_Cr]<0;1,0>:ub	{ NoDDClr }
-	(f0.0) mov (4)	Mbaff_ALPHA(0,1)<2>		r[ECM_AddrReg, bAlphaLeft1_Cr]<0;1,0>:ub	{ NoDDChk }	
-	(f0.0) mov (4)	Mbaff_BETA(0,0)<2>		r[ECM_AddrReg, bBetaLeft0_Cr]<0;1,0>:ub		{ NoDDClr }
-	(f0.0) mov (4)	Mbaff_BETA(0,1)<2>		r[ECM_AddrReg, bBetaLeft1_Cr]<0;1,0>:ub		{ NoDDChk }
-	(f0.0) mov (4)	Mbaff_TC0(0,0)<2>		r[ECM_AddrReg, bTc0_v00_0_Cr]<4;4,1>:ub		{ NoDDClr }
-	(f0.0) mov (4)	Mbaff_TC0(0,1)<2>		r[ECM_AddrReg, bTc0_v00_1_Cr]<4;4,1>:ub		{ NoDDChk }
-
-	// For FieldModeLeftMbFlag=0 && FieldModeCurrentMbFlag=1
-	(f0.1) mov (4)	Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaLeft0_Cr]<0;1,0>:ub	{ NoDDClr }
-	(f0.1) mov (4)	Mbaff_ALPHA(0,4)<1>		r[ECM_AddrReg, bAlphaLeft1_Cr]<0;1,0>:ub	{ NoDDChk }
-	(f0.1) mov (4)	Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Cr]<0;1,0>:ub		{ NoDDClr }
-	(f0.1) mov (4)	Mbaff_BETA(0,4)<1>		r[ECM_AddrReg, bBetaLeft1_Cr]<0;1,0>:ub		{ NoDDChk }
-	(f0.1) mov (4)	Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Cr]<4;4,1>:ub		{ NoDDClr }
-	(f0.1) mov (4)	Mbaff_TC0(0,4)<1>		r[ECM_AddrReg, bTc0_v00_1_Cr]<4;4,1>:ub		{ NoDDChk }
-
-	// Set UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV_MBAFF, 1)	
-//-----------------------------------------------
-
-BYPASS_V0_UV:
-	// Set EdgeCntlMap2 = 0, so it always uses bS < 4 algorithm.
-	// Same alpha and beta for all internal vert and horiz edges 
-
-//---------- Deblock U internal vert middle edge ----------
-
-	//***** Need to take every other bit to form U or V maskA
-	shr (16) TempRow0(0)<1>			r[ECM_AddrReg, wEdgeCntlMap_IntMidVert]<0;1,0>:uw		RRampW(0)
-
-	//	p1 = Cur MB U row 2
-	//	p0 = Cur MB U row 3
-	// 	q0 = Cur MB U row 4
-	//	q1 = Cur MB U row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_U_BASE:w		{ NoDDClr }		// Skip 2 U rows and 2 V rows
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_U_BASE:w		{ NoDDChk }
-
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaInternal_Cb]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaInternal_Cb]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v02_Cb]<1;2,0>:ub
-
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-
-	// Store MaskA and MaskB
-	mov (1)	f0.1:uw		0:w			
-	mov (1)	MaskB:uw	0:w			{ NoDDClr }
-	mov (1)	MaskA:uw	f0.0:uw		{ NoDDChk }
-
-	CALL(FILTER_UV_MBAFF, 1)	
-	
-//-----------------------------------------------
-
-
-//---------- Deblock V internal vert middle edge ----------
-
-	//	P1 = Cur MB V row 2
-	//	P0 = Cur MB V row 3
-	// 	Q0 = Cur MB V row 4
-	//	Q1 = Cur MB V row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_V_BASE:w		{ NoDDClr }		// Skip 2 U rows and 2 V rows
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_V_BASE:w		{ NoDDChk }
-
-	// Put MaskA into f0.0
-	// Put MaskB into f0.1
-	mov (2)	f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	mov	(8) Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaInternal_Cr]<0;1,0>:ub
-	mov	(8) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaInternal_Cr]<0;1,0>:ub
-	mov (8) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v02_Cr]<1;2,0>:ub
-
-	CALL(FILTER_UV_MBAFF, 1)	
-
-//-----------------------------------------------
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_h.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_h.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_h.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_h.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC ILDB filter horizontal Mbaff Y ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all horizontal edges of Y.
-//
-//	It sssumes the data for horizontal de-blocking is already transposed.  
-//
-//		Luma:
-//
-//		+-------+-------+-------+-------+		H0  Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+		H1 Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+		H2	Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+		H3 Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBB:w
-#endif	
-	
-
-//========== Luma deblocking ==========
-
-
-//---------- Deblock Y external top edge (H0)  ----------	
-
-	// Bypass deblocking if it is the top edge of the picture.  
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterTopMbEdgeFlag:w		// Check for FilterTopMbEdgeFlag 
-	mov	(1)	f0.1:w		DualFieldMode:w			// Check for dual field mode
-		
-	// Non dual field mode	
-
-	// Get (alpha >> 2) + 2
-	shr (16) Mbaff_ALPHA2(0,0)<1>	r[ECM_AddrReg, bAlphaTop0_Y]<0;1,0>:ub		2:w			// alpha >> 2
-
-	mov (2)	MaskA<1>:uw	r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz0]<2;2,1>:uw
-
-	// Ext Y
-	mov	(16) Mbaff_ALPHA(0,0)<1>	r[ECM_AddrReg, bAlphaTop0_Y]<0;1,0>:ub
-	mov	(16) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop0_Y]<0;1,0>:ub
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_0_Y]<1;4,0>:ub
-
-	add (16) Mbaff_ALPHA2(0,0)<1>		Mbaff_ALPHA2(0,0)<16;16,1>		2:w					// alpha2 = (alpha >> 2) + 2  
-
-    (f0.0) jmpi	H0_Y_DONE				// Skip Ext Y deblocking
-	(f0.1) jmpi	DUAL_FIELD_Y
-	
-	mov (1)	P_AddrReg:w		PREV_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_Y_BASE:w			{ NoDDChk }
-	
-	CALL(FILTER_Y_MBAFF, 1)			// Non dual field deblocking
-		
-	jmpi	H0_Y_DONE
-
-DUAL_FIELD_Y:
-	// Dual field mode, FieldModeCurrentMbFlag=0 && FieldModeAboveMbFlag=1
-
-	mov (1)	P_AddrReg:w		ABOVE_CUR_MB_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		ABOVE_CUR_MB_BASE+64:w	{ NoDDChk }
-
-	//  Must use PREV_MB_YW.  TOP_MB_YW is not big enough.
-	// Get top field rows
-	mov (16) ABOVE_CUR_MB_YW(0)<1>	PREV_MB_YW(0, 0)<16;8,1>	// Copy p3, p2
-	mov (16) ABOVE_CUR_MB_YW(1)<1>	PREV_MB_YW(2, 0)<16;8,1>	// Copy p1, p0
-	mov (16) ABOVE_CUR_MB_YW(2)<1>	SRC_YW(0, 0)<16;8,1>		// Copy q0, q1
-	mov (16) ABOVE_CUR_MB_YW(3)<1>	SRC_YW(2, 0)<16;8,1>		// Copy q2, q3
-
-	CALL(FILTER_Y_MBAFF, 1)				// Ext Y, top field
-
-	// Save deblocked top field rows
-	mov (8) PREV_MB_YW(1, 0)<1>		ABOVE_CUR_MB_YW(0, 8)	// Copy p2
-	mov (8) PREV_MB_YW(2, 0)<1>		ABOVE_CUR_MB_YW(1, 0)	// Copy p1
-	mov (8) PREV_MB_YW(3, 0)<1>		ABOVE_CUR_MB_YW(1, 8)	// Copy p0
-	mov (8) SRC_YW(0, 0)<1>			ABOVE_CUR_MB_YW(2, 0)	// Copy q0
-	mov (8) SRC_YW(1, 0)<1>			ABOVE_CUR_MB_YW(2, 8)	// Copy q1
-	mov (8) SRC_YW(2, 0)<1>			ABOVE_CUR_MB_YW(3, 0)	// Copy q2
-
-	//==================================================================================
-	// Bottom field
-	
-	// Get (alpha >> 2) + 2
-	shr (16) Mbaff_ALPHA2(0,0)<1>	r[ECM_AddrReg, bAlphaTop1_Y]<0;1,0>:ub		2:w			// alpha >> 2
-
-	mov (1)	P_AddrReg:w		ABOVE_CUR_MB_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		ABOVE_CUR_MB_BASE+64:w	{ NoDDChk }
-	
-	// Get bot field rows
-	mov (16) ABOVE_CUR_MB_YW(0)<1>	PREV_MB_YW(0, 8)<16;8,1>	// Copy p3, p2
-	mov (16) ABOVE_CUR_MB_YW(1)<1>	PREV_MB_YW(2, 8)<16;8,1>	// Copy p1, p0
-	mov (16) ABOVE_CUR_MB_YW(2)<1>	SRC_YW(0, 8)<16;8,1>		// Copy q0, q1
-	mov (16) ABOVE_CUR_MB_YW(3)<1>	SRC_YW(2, 8)<16;8,1>		// Copy q2, q3
-
-	mov (2)	MaskA<1>:uw	r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz1]<2;2,1>:uw
-
-	mov	(16) Mbaff_ALPHA(0,0)<1>	r[ECM_AddrReg, bAlphaTop1_Y]<0;1,0>:ub
-	mov	(16) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaTop1_Y]<0;1,0>:ub
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h00_1_Y]<1;4,0>:ub
-
-	add (16) Mbaff_ALPHA2(0,0)<1>		Mbaff_ALPHA2(0,0)<16;16,1>		2:w					// alpha2 = (alpha >> 2) + 2  
-
-	CALL(FILTER_Y_MBAFF, 1)				// Ext Y, bot field
-
-	// Save deblocked top field rows
-	mov (8) PREV_MB_YW(1, 8)<1>		ABOVE_CUR_MB_YW(0, 8)	// Copy p2
-	mov (8) PREV_MB_YW(2, 8)<1>		ABOVE_CUR_MB_YW(1, 0)	// Copy p1
-	mov (8) PREV_MB_YW(3, 8)<1>		ABOVE_CUR_MB_YW(1, 8)	// Copy p0
-	mov (8) SRC_YW(0, 8)<1>			ABOVE_CUR_MB_YW(2, 0)	// Copy q0
-	mov (8) SRC_YW(1, 8)<1>			ABOVE_CUR_MB_YW(2, 8)	// Copy q1
-	mov (8) SRC_YW(2, 8)<1>			ABOVE_CUR_MB_YW(3, 0)	// Copy q2
-	//==================================================================================
-
-H0_Y_DONE:
-
-//BYPASS_H0_Y:
-//------------------------------------------------------------------
-	// Same alpha, alpha2, beta and MaskB for all internal edges 
-
-	// Get (alpha >> 2) + 2
-	shr (16) Mbaff_ALPHA2(0,0)<1>	r[ECM_AddrReg, bAlphaInternal_Y]<0;1,0>:ub		2:w			// alpha >> 2
-
-	// alpha = bAlphaInternal_Y 
-	// beta = bBetaInternal_Y
-	mov	(16) Mbaff_ALPHA(0,0)<1>	r[ECM_AddrReg, bAlphaInternal_Y]<0;1,0>:ub
-	mov	(16) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaInternal_Y]<0;1,0>:ub
-
-	mov (1) MaskB:uw	0:w						// Set MaskB = 0 for all 3 edges, so it always uses bS < 4 algorithm.
-
-	add (16) Mbaff_ALPHA2(0,0)<1>		Mbaff_ALPHA2(0,0)<16;16,1>		2:w					// alpha2 = (alpha >> 2) + 2  
-
-//---------- Deblock Y internal top edge (H1)  ----------
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0 (1) null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-//    (f0.0)	jmpi	BYPASS_H1_Y
-
-	//	p3 = Cur MB Y row 0 = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 4 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 5 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 6 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 7 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		SRC_MB_Y_BASE:w					{ NoDDClr }
-	mov (1)	Q_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w	{ NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntTopHorz]:uw
-
-	// tc0 has bTc0_h13_Y + bTc0_h12_Y + bTc0_h11_Y + bTc0_h10_Y		
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h10_Y]<1;4,0>:ub
-
-//	CALL(FILTER_Y_MBAFF, 1)
-	PRED_CALL(-f0.0, FILTER_Y_MBAFF, 1)
-
-//BYPASS_H1_Y:
-//------------------------------------------------------------------
-
-
-//---------- Deblock Y internal mid horizontal edge (H2) ----------
-
-	// Bypass deblocking if FilterInternal8x8EdgesFlag = 0  
-	and.z.f0.0 (1) null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal8x8EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-//    (f0.0)	jmpi	BYPASS_H2_Y
-
-	//	p3 = Cur MB Y row 4  = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 5  = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 6  = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 7  = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 8  = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 9  = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 10 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 11 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntMidHorz]:uw
-
-	// tc0 has bTc0_h23_Y + bTc0_h22_Y + bTc0_h21_Y + bTc0_h20_Y		
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h20_Y]<1;4,0>:ub
-
-//	CALL(FILTER_Y_MBAFF, 1)
-	PRED_CALL(-f0.0, FILTER_Y_MBAFF, 1)
-
-//BYPASS_H2_Y:
-//-----------------------------------------------
-
-
-//---------- Deblock Y internal bottom edge (H3) ----------	 
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0 (1) null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-//    (f0.0)	jmpi	BYPASS_H3_Y
-
-	//	p3 = Cur MB Y row 8  = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 9  = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 10 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 11 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 12 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 13 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 14 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 15 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		12*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDChk }
-	
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntBotHorz]:uw
-
-	// tc0 has bTc0_h33_Y + bTc0_h32_Y + bTc0_h31_Y + bTc0_h30_Y
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_h30_Y]<1;4,0>:ub
-
-//	CALL(FILTER_Y_MBAFF, 1)
-	PRED_CALL(-f0.0, FILTER_Y_MBAFF, 1)
-
-//BYPASS_H3_Y:
-//-----------------------------------------------
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_v.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_v.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_v.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Mbaff_Y_v.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC ILDB filter vertical Mbaff Y ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all vertical edges of Y.
-//
-//	It sssumes the data for vertical de-blocking is already transposed.  
-//
-//		Luma:
-//
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//
-//		V0		V1		V2		V3
-//		Edge	Edge	Edge	Edge
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBB:w
-#endif	
-	
-
-//========== Luma deblocking ==========
-
-
-//---------- Deblock Y external left edge (V0) ----------	
-
-	cmp.z.f0.0	(8)	null:w	VertEdgePattern:uw		LEFT_FIELD_CUR_FRAME:w
-	cmp.z.f0.1	(8)	null:w	VertEdgePattern:uw		LEFT_FRAME_CUR_FIELD:w
-
-	// Intial set for both are frame or field
-	mov	(16) Mbaff_ALPHA(0,0)<1>	r[ECM_AddrReg, bAlphaLeft0_Y]<0;1,0>:ub
-	mov	(16) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Y]<0;1,0>:ub
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Y]<1;4,0>:ub
-		
-	// For FieldModeCurrentMbFlag=1 && FieldModeLeftMbFlag=0
-	(f0.0) mov (8)	Mbaff_ALPHA(0,0)<2>		r[ECM_AddrReg, bAlphaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	(f0.0) mov (8)	Mbaff_ALPHA(0,1)<2>		r[ECM_AddrReg, bAlphaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	(f0.0) mov (8)	Mbaff_BETA(0,0)<2>		r[ECM_AddrReg, bBetaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	(f0.0) mov (8)	Mbaff_BETA(0,1)<2>		r[ECM_AddrReg, bBetaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	(f0.0) mov (8)	Mbaff_TC0(0,0)<2>		r[ECM_AddrReg, bTc0_v00_0_Y]<1;2,0>:ub		{ NoDDClr }
-	(f0.0) mov (8)	Mbaff_TC0(0,1)<2>		r[ECM_AddrReg, bTc0_v00_1_Y]<1;2,0>:ub		{ NoDDChk }
-
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterLeftMbEdgeFlag:w		// Check for FilterLeftMbEdgeFlag 
-
-	// For FieldModeCurrentMbFlag=0 && FieldModeLeftMbFlag=1
-	(f0.1) mov (8)	Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	(f0.1) mov (8)	Mbaff_ALPHA(0,8)<1>		r[ECM_AddrReg, bAlphaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	(f0.1) mov (8)	Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	(f0.1) mov (8)	Mbaff_BETA(0,8)<1>		r[ECM_AddrReg, bBetaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	(f0.1) mov (8)	Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Y]<1;2,0>:ub		{ NoDDClr }
-	(f0.1) mov (8)	Mbaff_TC0(0,8)<1>		r[ECM_AddrReg, bTc0_v00_1_Y]<1;2,0>:ub		{ NoDDChk }
-
-	// Get (alpha >> 2) + 2
-	shr (16) Mbaff_ALPHA2(0,0)<1>	Mbaff_ALPHA(0)		2:w			// alpha >> 2
-
-	//	p3 = Prev MB Y row 0 = r[P_AddrReg, 0]<16;16,1>
-	//	p2 = Prev MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Prev MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Prev MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 0  = r[Q_AddrReg, 0]<16;16,1>
-	//	q1 = Cur MB Y row 1  = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 2  = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 3  = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		PREV_MB_Y_BASE:w	{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_Y_BASE:w		{ NoDDChk }
-
-	// Set MaskA and MaskB	
-	mov (2)	MaskA<1>:uw		r[ECM_AddrReg, wEdgeCntlMapA_ExtLeftVert0]<2;2,1>:uw
-
-	add (16) Mbaff_ALPHA2(0,0)<1>		Mbaff_ALPHA2(0,0)<16;16,1>		2:w					// alpha2 = (alpha >> 2) + 2  
-
-//	CALL(FILTER_Y_MBAFF, 1)
-	PRED_CALL(-f0.0, FILTER_Y_MBAFF, 1)
-	
-//BYPASS_V0_Y:
-//------------------------------------------------------------------
-
-
-/*
-//---------- Deblock Y external left edge (V0) ----------	
-
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterLeftMbEdgeFlag:w		// Check for FilterLeftMbEdgeFlag 
-    (f0.0)	jmpi	ILDB_LABEL(BYPASS_EXT_LEFT_EDGE_Y)	
-
-	// Get vertical border edge control data  
-
-//	mov	(1)	f0.0		0:w
-	and	(1)	CTemp1_W:uw		r[ECM_AddrReg, BitFlags]:ub		FieldModeLeftMbFlag+FieldModeCurrentMbFlag:uw
-	cmp.z.f0.0	(1)	null:w	CTemp1_W:uw		LEFT_FIELD_CUR_FRAME:w
-	(-f0.0) jmpi LEFT_EDGE_Y_NEXT1
-
-	// For FieldModeCurrentMbFlag=1 && FieldModeLeftMbFlag=0
-	mov	(8)	Mbaff_ALPHA(0,0)<2>		r[ECM_AddrReg, bAlphaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	mov	(8)	Mbaff_ALPHA(0,1)<2>		r[ECM_AddrReg, bAlphaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	mov	(8)	Mbaff_BETA(0,0)<2>		r[ECM_AddrReg, bBetaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	mov	(8)	Mbaff_BETA(0,1)<2>		r[ECM_AddrReg, bBetaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	mov (8)	Mbaff_TC0(0,0)<2>		r[ECM_AddrReg, bTc0_v00_0_Y]<1;2,0>:ub		{ NoDDClr }
-	mov (8)	Mbaff_TC0(0,1)<2>		r[ECM_AddrReg, bTc0_v00_1_Y]<1;2,0>:ub		{ NoDDChk }
-
-	jmpi	LEFT_EDGE_Y_ALPHA_BETA_TC0_SELECTED
-
-LEFT_EDGE_Y_NEXT1:
-	cmp.z.f0.0	(1)	null:w	CTemp1_W:uw		LEFT_FRAME_CUR_FIELD:w
-	(-f0.0) jmpi LEFT_EDGE_Y_NEXT2
-
-
-	// For FieldModeCurrentMbFlag=0 && FieldModeLeftMbFlag=1
-	mov	(8)	Mbaff_ALPHA(0,0)<1>		r[ECM_AddrReg, bAlphaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	mov	(8)	Mbaff_ALPHA(0,8)<1>		r[ECM_AddrReg, bAlphaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	mov	(8)	Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Y]<0;1,0>:ub		{ NoDDClr }
-	mov	(8)	Mbaff_BETA(0,8)<1>		r[ECM_AddrReg, bBetaLeft1_Y]<0;1,0>:ub		{ NoDDChk }
-	mov (8)	Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Y]<1;2,0>:ub		{ NoDDClr }
-	mov (8)	Mbaff_TC0(0,8)<1>		r[ECM_AddrReg, bTc0_v00_1_Y]<1;2,0>:ub		{ NoDDChk }
-
-	jmpi	LEFT_EDGE_Y_ALPHA_BETA_TC0_SELECTED
-	
-LEFT_EDGE_Y_NEXT2:
-	// both are frame or field
-	mov	(16) Mbaff_ALPHA(0,0)<1>	r[ECM_AddrReg, bAlphaLeft0_Y]<0;1,0>:ub
-	mov	(16) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaLeft0_Y]<0;1,0>:ub
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v00_0_Y]<1;4,0>:ub
-
-LEFT_EDGE_Y_ALPHA_BETA_TC0_SELECTED:
-
-	mov (2)	MaskA<1>:uw		r[ECM_AddrReg, wEdgeCntlMapA_ExtLeftVert0]<2;2,1>:uw
-
-	//	p3 = Prev MB Y row 0 = r[P_AddrReg, 0]<16;16,1>
-	//	p2 = Prev MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Prev MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Prev MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 0  = r[Q_AddrReg, 0]<16;16,1>
-	//	q1 = Cur MB Y row 1  = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 2  = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 3  = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		PREV_MB_Y_BASE:w	{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_Y_BASE:w		{ NoDDChk }
-	
-	// Get (alpha >> 2) + 2
-	shr (16) Mbaff_ALPHA2(0,0)<1>	r[ECM_AddrReg, bAlphaLeft0_Y]<0;1,0>:ub		2:w			// alpha >> 2
-	add (16) Mbaff_ALPHA2(0,0)<1>		Mbaff_ALPHA2(0,0)<16;16,1>		2:w					// alpha2 = (alpha >> 2) + 2  
-	
-	CALL(FILTER_Y_MBAFF, 1)
-
-ILDB_LABEL(BYPASS_EXT_LEFT_EDGE_Y):
-//------------------------------------------------------------------
-*/
-
-	// Same alpha, alpha2, beta and MaskB for all internal edges 
-	
-	// Get (alpha >> 2) + 2
-	shr (16) Mbaff_ALPHA2(0,0)<1>	r[ECM_AddrReg, bAlphaInternal_Y]<0;1,0>:ub		2:w			// alpha >> 2
-	
-	// alpha = bAlphaInternal_Y
-	// beta = bBetaInternal_Y
-	mov	(16) Mbaff_ALPHA(0,0)<1>	r[ECM_AddrReg, bAlphaInternal_Y]<0;1,0>:ub
-	mov	(16) Mbaff_BETA(0,0)<1>		r[ECM_AddrReg, bBetaInternal_Y]<0;1,0>:ub
-
-	mov (1) MaskB:uw	0:w						// Set MaskB = 0 for all 3 edges, so it always uses bS < 4 algorithm.
-
-	add (16) Mbaff_ALPHA2(0,0)<1>		Mbaff_ALPHA2(0,0)<16;16,1>		2:w						// alpha2 = (alpha >> 2) + 2  
-
-//---------- Deblock Y internal left edge (V1) ----------
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-//    (f0.0)	jmpi	BYPASS_V1_Y
-
-	//	p3 = Cur MB Y row 0 = r[P_AddrReg, 0]<16;16,1>  
-	//	p2 = Cur MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 4 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 5 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 6 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 7 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		SRC_MB_Y_BASE:w						{ NoDDClr }
-	mov (1)	Q_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]:uw
-
-	// tc0 has bTc0_v31_Y + bTc0_v21_Y + bTc0_v11_Y + bTc0_v01_Y	
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v01_Y]<1;4,0>:ub
-
-//	CALL(FILTER_Y_MBAFF, 1)
-	PRED_CALL(-f0.0, FILTER_Y_MBAFF, 1)
-
-BYPASS_V1_Y:
-//------------------------------------------------------------------
-
-
-//---------- Deblock Y internal mid vert edge (V2) ----------
-
-	// Bypass deblocking if FilterInternal8x8EdgesFlag = 0  
-	and.z.f0.0	(1)	null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal8x8EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-//    (f0.0)	jmpi	BYPASS_V2_Y
-
-	//	p3 = Cur MB Y row 4  = r[P_AddrReg, 0]<16;16,1>  
-	//	p2 = Cur MB Y row 5  = r[P_AddrReg, 16]<16;16,1> 
-	//	p1 = Cur MB Y row 6  = r[P_AddrReg, 32]<16;16,1> 
-	//	p0 = Cur MB Y row 7  = r[P_AddrReg, 48]<16;16,1> 
-	// 	q0 = Cur MB Y row 8  = r[Q_AddrReg, 0]<16;16,1>  
-	//	q1 = Cur MB Y row 9  = r[Q_AddrReg, 16]<16;16,1> 
-	//	q2 = Cur MB Y row 10 = r[Q_AddrReg, 32]<16;16,1> 
-	//	q3 = Cur MB Y row 11 = r[Q_AddrReg, 48]<16;16,1> 
-	mov (1)	P_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntMidVert]:uw
-
-	// tc0 has bTc0_v32_Y + bTc0_v22_Y + bTc0_v12_Y + bTc0_v02_Y	
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v02_Y]<1;4,0>:ub
-
-//	CALL(FILTER_Y_MBAFF, 1)
-	PRED_CALL(-f0.0, FILTER_Y_MBAFF, 1)
-
-BYPASS_V2_Y:
-//-----------------------------------------------
-
-
-//---------- Deblock Y interal right edge (V3) ----------	 
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0	(1)	null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-//    (f0.0)	jmpi	BYPASS_V3_Y
-
-	//	p3 = Cur MB Y row 8  = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 9  = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 10 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 11 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 12 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 13 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 14 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 15 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		12*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDChk }
-	
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntRightVert]:uw
-
-	// tc0 has bTc0_v33_Y + bTc0_v23_Y + bTc0_v13_Y + bTc0_v03_Y
-	mov (16) Mbaff_TC0(0,0)<1>		r[ECM_AddrReg, bTc0_v03_Y]<1;4,0>:ub
-
-//	CALL(FILTER_Y_MBAFF, 1)
-	PRED_CALL(-f0.0, FILTER_Y_MBAFF, 1)
-
-BYPASS_V3_Y:
-//-----------------------------------------------
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_h.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_h.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_h.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_h.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC ILDB filter horizontal UV ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all horizontal edges of UV.
-//
-//	It sssumes the data for horizontal de-blocking is already transposed.  
-//
-//		Chroma:
-//
-//		+-------+-------+		H0 Edge
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+		H1 Edge
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBC:w
-#endif	
-
-//=============== Chroma deblocking ================
-
-//---------- Deblock U external top edge ----------
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterTopMbEdgeFlag:w		// Check for FilterTopMbEdgeFlag 
-//    (f0.0)	jmpi	BYPASS_EXT_TOP_EDGE_UV	
-
-	// Get horizontal border edge control data.
-	
-	//***** Need to take every other bit to form U maskA and mask B
-	// Get Luma maskA and maskB	
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz0]<0;1,0>:uw		RRampW(0)
-	shr (16)	TempRow1(0)<1>		r[ECM_AddrReg, wEdgeCntlMapB_ExtTopHorz0]<0;1,0>:uw		RRampW(0)
-		
-    (f0.0)	jmpi	ILDB_LABEL(BYPASS_EXT_TOP_EDGE_UV)			
-
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<16;8,2>		1:w
-
-//---------- Deblock U external edge ----------
-	//	p1 = Prev MB U row 0
-	//	p0 = Prev MB U row 1
-	// 	q0 = Cur MB U row 0
-	//	q1 = Cur MB U row 1
-//	mov (1)	P_AddrReg:w		PREV_MB_U_BASE:w									{ NoDDClr }
-	mov (1)	P_AddrReg:w		TOP_MB_U_BASE:w										{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_U_BASE:w										{ NoDDChk }
-
-	// alpha = bAlphaTop0_Cb, beta = bBetaTop0_Cb
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaTop0_Cb]<2;2,1>:ub					{ NoDDClr } 
-	// tc0 has bTc0_h03_0_Cb + bTc0_h02_0_Cb + bTc0_h01_0_Cb + bTc0_h00_0_Cb
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h00_0_Cb]<4;4,1>:ub					{ NoDDChk } 
-		
-	// UV MaskA and MaskB
-	mov (2)		MaskA<1>:uw			f0.0<2;2,1>:uw
-
-	CALL(FILTER_UV, 1)	
-
-//---------- Deblock V external top edge ----------
-	//	p1 = Prev MB V row 0
-	//	p0 = Prev MB V row 1
-	// 	q0 = Cur MB V row 0
-	//	q1 = Cur MB V row 1
-//	mov (1)	P_AddrReg:w		PREV_MB_V_BASE:w		{ NoDDClr }
-	mov (1)	P_AddrReg:w		TOP_MB_V_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_V_BASE:w			{ NoDDChk }
-
-	// alpha = bAlphaTop0_Cr, beta = bBetaTop0_Cr
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaTop0_Cr]<2;2,1>:ub		{ NoDDClr }
-	
-	// tc0 has bTc0_h03_0_Cr + bTc0_h02_0_Cr + bTc0_h01_0_Cr + bTc0_h00_0_Cr
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h00_0_Cr]<4;4,1>:ub		{ NoDDChk }
-
-	// UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV, 1)	
-
-ILDB_LABEL(BYPASS_EXT_TOP_EDGE_UV):
-
-	// Set EdgeCntlMap2 = 0, so it always uses bS < 4 algorithm.
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-//	and.z.f0.0 (1) null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-//    (f0.0)	jmpi	BYPASS_4x4_DEBLOCK_H
-
-//---------- Deblock U internal horz middle edge ----------
-
-	//***** Need to take every other bit to form U maskA
-	// Get Luma maskA and maskB	
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMap_IntMidHorz]<0;1,0>:uw		RRampW(0)
-
-	//	p1 = Cur MB U row 2
-	//	p0 = Cur MB U row 3
-	// 	q0 = Cur MB U row 4
-	//	q1 = Cur MB U row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_U_BASE:w					{ NoDDClr }		// Skip 2 U rows and 2 V rows
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_U_BASE:w					{ NoDDChk }
-
-	// alpha = bAlphaInternal_Cb, beta = bBetaInternal_Cb
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaInternal_Cb]<2;2,1>:ub 		{ NoDDClr }
-	// tc0 has bTc0_h23_Cb + bTc0_h22_Cb + bTc0_h21_Cb + bTc0_h20_Cb		
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h20_Cb]<4;4,1>:ub				{ NoDDChk }
-
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-
-	// UV MaskA and MaskB
-	mov (1) f0.1:uw		0:w
-	mov (1)	MaskB:uw	0:w													{ NoDDClr }
-	mov (1)	MaskA:uw	f0.0:uw												{ NoDDChk }
-
-	CALL(FILTER_UV, 1)	
-
-//---------- Deblock V internal horz middle edge ----------
-	//	p1 = Cur MB V row 2
-	//	p0 = Cur MB V row 3
-	// 	q0 = Cur MB V row 4
-	//	q1 = Cur MB V row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_V_BASE:w					{ NoDDClr }		// Skip 2 U rows and 2 V rows
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_V_BASE:w					{ NoDDChk }
-
-	// alpha = bAlphaInternal_Cr, beta = bBetaInternal_Cr
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaInternal_Cr]<2;2,1>:ub 		{ NoDDClr }
-	// tc0 has bTc0_h23_Cr + bTc0_h22_Cr + bTc0_h21_Cr + bTc0_h20_Cr
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h20_Cr]<4;4,1>:ub				{ NoDDChk }
-
-	// UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV, 1)	
-
-//BYPASS_4x4_DEBLOCK_H:
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_v.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_v.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_v.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_UV_v.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,145 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC LDB filter vertical UV ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all vertical edges of UV.
-//
-//	It sssumes the data for vertical de-blocking is already transposed.  
-//
-//		Chroma:
-//
-//		+-------+-------+
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+
-//		|		|		|
-//		|		|		|
-//		|		|		|
-//		+-------+-------+
-//
-//		V0		V1		
-//		Edge	Edge	
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBC:w
-#endif	
-
-//=============== Chroma deblocking ================
-
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterLeftMbEdgeFlag:w		// Check for FilterLeftMbEdgeFlag 
-//    (f0.0)	jmpi	BYPASS_EXT_LEFT_EDGE_UV	
- 
-	// Get vertical border edge control data.  
-	
-	// Get Luma maskA and maskB	
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMapA_ExtLeftVert0]<0;1,0>:uw		RRampW(0)
-	shr (16)	TempRow1(0)<1>		r[ECM_AddrReg, wEdgeCntlMapB_ExtLeftVert0]<0;1,0>:uw		RRampW(0)
-	
-    (f0.0)	jmpi	ILDB_LABEL(BYPASS_EXT_LEFT_EDGE_UV)
-
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-	and.nz.f0.1 (8) null:w			TempRow1(0)<16;8,2>		1:w
-
-//---------- Deblock U external edge ----------
-	//	p1 = Prev MB U row 0
-	//	p0 = Prev MB U row 1
-	// 	q0 = Cur MB U row 0
-	//	q1 = Cur MB U row 1
-	mov (1)	P_AddrReg:w		PREV_MB_U_BASE:w									{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_U_BASE:w										{ NoDDChk }
-
-	// alpha = bAlphaLeft0_Cb, beta = bBetaLeft0_Cb
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaLeft0_Cb]<2;2,1>:ub				{ NoDDClr }
-	// tc0 has bTc0_v30_0_Cb + bTc0_v20_0_Cb + bTc0_v10_0_Cb + bTc0_v00_0_Cb
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v00_0_Cb]<4;4,1>:ub					{ NoDDChk }
-	
-	// UV MaskA and MaskB
-	mov (2)		MaskA<1>:uw			f0.0<2;2,1>:uw
-
-	CALL(FILTER_UV, 1)	
-
-//---------- Deblock V external edge ----------
-	//	p1 = Prev MB V row 0
-	//	p0 = Prev MB V row 1
-	// 	q0 = Cur MB V row 0
-	//	q1 = Cur MB V row 1
-	mov (1)	P_AddrReg:w		PREV_MB_V_BASE:w									{ NoDDClr }		
-	mov (1)	Q_AddrReg:w		SRC_MB_V_BASE:w										{ NoDDChk }
-
-	// for vert edge: alpha = bAlphaLeft0_Cr, beta = bBetaLeft0_Cr
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaLeft0_Cr]<2;2,1>:ub				{ NoDDClr }
-	
-	// tc0 has bTc0_v30_0_Cr + bTc0_v20_0_Cr + bTc0_v10_0_Cr + bTc0_v00_0_Cr
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v00_0_Cr]<4;4,1>:ub					{ NoDDChk }
-
-	// UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV, 1)	
-
-
-ILDB_LABEL(BYPASS_EXT_LEFT_EDGE_UV):
-	// Set EdgeCntlMap2 = 0, so it always uses bS < 4 algorithm.
-	// Same alpha and beta for all internal vert and horiz edges 
-
-
-	//***** Need to take every other bit to form U or V maskA
-	// Get Luma maskA and maskB	
-	shr (16)	TempRow0(0)<1>		r[ECM_AddrReg, wEdgeCntlMap_IntMidVert]<0;1,0>:uw		RRampW(0)
-
-//---------- Deblock U internal edge ----------
-	//	p1 = Cur MB U row 2
-	//	p0 = Cur MB U row 3
-	// 	q0 = Cur MB U row 4
-	//	q1 = Cur MB U row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_U_BASE:w					{ NoDDClr }
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_U_BASE:w					{ NoDDChk }
-
-	// alpha = bAlphaInternal_Cb, beta = bBetaInternal_Cb
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaInternal_Cb]<2;2,1>:ub 		{ NoDDClr }
-
-	// tc0 has bTc0_v32_Cb + bTc0_v22_Cb + bTc0_v12_Cb + bTc0_v02_Cb	
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v02_Cb]<4;4,1>:ub				{ NoDDChk }
-
-	// Extract UV MaskA and MaskB from every other bit of Y masks
-	and.nz.f0.0 (8) null:w			TempRow0(0)<16;8,2>		1:w
-
-	// UV MaskA and MaskB
-	mov (1) f0.1:uw		0:w
-	mov (1)	MaskB:uw	0:w													{ NoDDClr }
-	mov (1)	MaskA:uw	f0.0:uw												{ NoDDChk }
-	
-	CALL(FILTER_UV, 1)	
-
-
-//---------- Deblock V internal edge ----------
-	//	P1 = Cur MB V row 2
-	//	P0 = Cur MB V row 3
-	// 	Q0 = Cur MB V row 4
-	//	Q1 = Cur MB V row 5
-	mov (1)	P_AddrReg:w		4*UV_ROW_WIDTH+SRC_MB_V_BASE:w					{ NoDDClr }
-	mov (1)	Q_AddrReg:w		8*UV_ROW_WIDTH+SRC_MB_V_BASE:w					{ NoDDChk }
-
-	// alpha = bAlphaInternal_Cr, beta = bBetaInternal_Cr
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaInternal_Cr]<2;2,1>:ub 		{ NoDDClr }	
-
-	// tc0 has bTc0_v32_Cr + bTc0_v22_Cr + bTc0_v12_Cr + bTc0_v02_Cr	
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v02_Cr]<4;4,1>:ub				{ NoDDChk }
-
-	// UV MaskA and MaskB
-	mov (2)		f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	CALL(FILTER_UV, 1)	
-
-
-//BYPASS_4x4_DEBLOCK_V:
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_h.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_h.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_h.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_h.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,199 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC ILDB filter horizontal Y ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all horizontal edges of Y.
-//
-//	It sssumes the data for horizontal de-blocking is already transposed.  
-//
-//		Luma:
-//
-//		+-------+-------+-------+-------+		H0  Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+		H1 Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+		H2	Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+		H3 Edge
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBB:w
-#endif	
-	
-
-//========== Luma deblocking ==========
-
-
-//---------- Deblock Y external top edge (H0)  ----------	
-
-	// Bypass deblocking if it is the top edge of the picture.  
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterTopMbEdgeFlag:w		// Check for FilterTopMbEdgeFlag 
-
-//	and.z.f0.1 (1)	null:uw		r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz0]:uw		0xFFFF:uw	// MaskA = 0? 
-
-	// Get (alpha >> 2) + 2
-	shr (1) alpha2:w		r[ECM_AddrReg, bAlphaTop0_Y]:ub		2:w			// alpha >> 2
-
-	//	p3 = Prev MB Y row 0 = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Prev MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Prev MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Prev MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 0  = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 1  = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 2  = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 3  = r[Q_AddrReg, 48]<16;16,1>
-//	mov (1)	P_AddrReg:w		PREV_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	P_AddrReg:w		TOP_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_Y_BASE:w         { NoDDChk }
-	
-	// Get horizontal border edge control data
-	// alpha = bAlphaTop0_Y 
-	// beta = bBetaTop0_Y
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaTop0_Y]<2;2,1>:ub			{ NoDDClr }		// 2 channels for alpha and beta
-	
-	mov (2)	MaskA<1>:uw	r[ECM_AddrReg, wEdgeCntlMapA_ExtTopHorz0]<2;2,1>:uw		{ NoDDClr, NoDDChk }
-
-	// tc0 has bTc0_h03_0_Y | bTc0_h02_0_Y | bTc0_h01_0_Y | bTc0_h00_0_Y
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h00_0_Y]<4;4,1>:ub			{ NoDDChk }
-
-//    (f0.0)	jmpi	BYPASS_EXT_TOP_EDGE_Y	
-//	(f0.0.anyv)	 jmpi	BYPASS_EXT_TOP_EDGE_Y
-	
-	add (1) alpha2:w		alpha2:w		2:w								// alpha2 = (alpha >> 2) + 2  
-		
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-//BYPASS_EXT_TOP_EDGE_Y:
-//------------------------------------------------------------------
-	// Same alpha, alpha2, beta and MaskB for all internal edges 
-
-	// Get (alpha >> 2) + 2
-	shr (1) alpha2:w		r[ECM_AddrReg, bAlphaInternal_Y]:ub		2:w			// alpha >> 2
-
-	// alpha = bAlphaInternal_Y 
-	// beta = bBetaInternal_Y
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaInternal_Y]<2;2,1>:ub 		{ NoDDClr }
-
-	// Set MaskB = 0 for all 3 int edges, so it always uses bS < 4 algorithm.
-	mov (1) MaskB:uw	0:w						                        { NoDDChk }
-
-	add (1) alpha2:w		alpha2:w		2:w								// alpha2 = (alpha >> 2) + 2  
-		
-
-//---------- Deblock Y internal top edge (H1)  ----------
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0 (1) null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-
-	//	p3 = Cur MB Y row 0 = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 4 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 5 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 6 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 7 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		SRC_MB_Y_BASE:w					{ NoDDClr }
-	mov (1)	Q_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w   { NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntTopHorz]:uw		{ NoDDClr }
-	
-	// tc0 has bTc0_h13_Y + bTc0_h12_Y + bTc0_h11_Y + bTc0_h10_Y		
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h10_Y]<4;4,1>:ub			{ NoDDChk }
-
-//    (f0.0)	jmpi	BYPASS_4x4_DEBLOCK_H
-//	(f0.0.anyv)	 jmpi	BYPASS_4x4_DEBLOCK_H
-
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-//BYPASS_4x4_DEBLOCK_H:
-//------------------------------------------------------------------
-
-
-//---------- Deblock Y internal mid horizontal edge (H2) ----------
-
-	// Bypass deblocking if FilterInternal8x8EdgesFlag = 0  
-	and.z.f0.0 (1) null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal8x8EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-
-//	and.z.f0.1 (1)	null:uw		r[ECM_AddrReg, wEdgeCntlMap_IntMidHorz]:uw		0xFFFF:uw	// MaskA = 0? 
-
-	//	p3 = Cur MB Y row 4  = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 5  = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 6  = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 7  = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 8  = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 9  = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 10 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 11 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w      { NoDDClr }
-	mov (1)	Q_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w      { NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntMidHorz]:uw      { NoDDClr }
-//	mov (1) MaskB:uw	0:w						// Set MaskB = 0, so it always uses bS < 4 algorithm.
-
-	// tc0 has bTc0_h23_Y + bTc0_h22_Y + bTc0_h21_Y + bTc0_h20_Y		
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h20_Y]<4;4,1>:ub			{ NoDDChk }
-
-//    (f0.0)	jmpi	BYPASS_8x8_DEBLOCK_H
-//	(f0.0.anyv)	 jmpi	BYPASS_8x8_DEBLOCK_H
-   
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-//BYPASS_8x8_DEBLOCK_H:
-//-----------------------------------------------
-
-
-//---------- Deblock Y internal bottom edge (H3) ----------	 
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0 (1) null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-
-//	and.z.f0.1 (1)	null:uw		r[ECM_AddrReg, wEdgeCntlMap_IntBotHorz]:uw		0xFFFF:uw	// MaskA = 0? 
-
-	//	p3 = Cur MB Y row 8  = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 9  = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 10 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 11 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 12 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 13 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 14 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 15 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDClr } 
-	mov (1)	Q_AddrReg:w		12*Y_ROW_WIDTH+SRC_MB_Y_BASE:w      { NoDDChk } 
-
-	
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntBotHorz]:uw      { NoDDClr }
-//	mov (1) MaskB:uw	0:w						// Set MaskB = 0, so it always uses bS < 4 algorithm.
-
-	// tc0 has bTc0_h33_Y + bTc0_h32_Y + bTc0_h31_Y + bTc0_h30_Y         
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_h30_Y]<4;4,1>:ub			{ NoDDChk }
-
-//    (f0.0)	jmpi	BYPASS_4x4_DEBLOCK_H2
-//	(f0.0.anyv)	 jmpi	BYPASS_4x4_DEBLOCK_H2
-    
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-//BYPASS_4x4_DEBLOCK_H2:
-//-----------------------------------------------
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_v.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_v.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_v.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Filter_Y_v.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,203 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-////////// AVC ILDB filter vertical Y ///////////////////////////////////////////////////////
-//
-//	This filter code prepares the src data and control data for ILDB filtering on all vertical edges of Y.
-//
-//	It sssumes the data for vertical de-blocking is already transposed.  
-//
-//		Luma:
-//
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		|		|		|		|		|
-//		+-------+-------+-------+-------+
-//
-//		V0		V1		V2		V3
-//		Edge	Edge	Edge	Edge
-//
-/////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xBBBB:w
-#endif	
-	
-
-//========== Luma deblocking ==========
-
-
-//---------- Deblock Y external left edge (V0) ----------	
-
-	// Bypass deblocking if it is left edge of the picture.  
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterLeftMbEdgeFlag:w		// Check for FilterLeftMbEdgeFlag 
-
-//	and.z.f0.1 (1)	null:uw		r[ECM_AddrReg, wEdgeCntlMapA_ExtLeftVert0]:uw		0xFFFF:uw	// MaskA = 0? 
-
-	// Get (alpha >> 2) + 2
-	shr (1) alpha2:w		r[ECM_AddrReg, bAlphaLeft0_Y]:ub		2:w			// alpha >> 2
-
-	//	p3 = Prev MB Y row 0 = r[P_AddrReg, 0]<16;16,1>
-	//	p2 = Prev MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Prev MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Prev MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 0  = r[Q_AddrReg, 0]<16;16,1>
-	//	q1 = Cur MB Y row 1  = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 2  = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 3  = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		PREV_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		SRC_MB_Y_BASE:w			{ NoDDChk }
-	
-	// Get vertical border edge control data  
-	// alpha = bAlphaLeft0_Y 
-	// beta = bBetaLeft0_Y
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaLeft0_Y]<2;2,1>:ub			{ NoDDClr }		// 2 channels for alpha and beta
-
-	mov (2)	MaskA<1>:uw	r[ECM_AddrReg, wEdgeCntlMapA_ExtLeftVert0]<2;2,1>:uw	{ NoDDClr, NoDDChk }
-	
-	// tc0 has bTc0_v30_0_Y | bTc0_v20_0_Y | bTc0_v10_0_Y | bTc0_v00_0_Y
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v00_0_Y]<4;4,1>:ub			{ NoDDChk }
-
-//	(f0.0)	jmpi	BYPASS_EXT_LEFT_EDGE_Y	
-//	(f0.0.anyv)	 jmpi	BYPASS_EXT_LEFT_EDGE_Y
-		
-	add (1) alpha2:w		alpha2:w		2:w								// alpha2 = (alpha >> 2) + 2  
-		
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-
-//BYPASS_EXT_LEFT_EDGE_Y:
-//------------------------------------------------------------------
-	// Same alpha, alpha2, beta and MaskB for all internal edges 
-
-	// Get (alpha >> 2) + 2
-	shr (1) alpha2:w		r[ECM_AddrReg, bAlphaInternal_Y]:ub		2:w			// alpha >> 2
-
-	// alpha = bAlphaInternal_Y
-	// beta = bBetaInternal_Y
-	mov	(2)	alpha<1>:w	r[ECM_AddrReg, bAlphaInternal_Y]<2;2,1>:ub 		{ NoDDClr }
-
-	// Set MaskB = 0 for all 3 int edges, so it always uses bS < 4 algorithm.
-	mov (1) MaskB:uw	0:w												{ NoDDChk }
-
-	add (1) alpha2:w		alpha2:w		2:w								// alpha2 = (alpha >> 2) + 2  
-
-
-//---------- Deblock Y internal left edge (V1) ----------
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0  (1) null:w		r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-
-//	and.z.f0.1 (1)	null:uw		r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]:uw		0xFFFF:uw	// MaskA = 0? 
-
-	//	p3 = Cur MB Y row 0 = r[P_AddrReg, 0]<16;16,1>  
-	//	p2 = Cur MB Y row 1 = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 2 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 3 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 4 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 5 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 6 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 7 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		SRC_MB_Y_BASE:w					{ NoDDClr }
-	mov (1)	Q_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w   { NoDDChk }
-	
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntLeftVert]:uw		{ NoDDClr }
-
-	// tc0 has bTc0_v31_Y + bTc0_v21_Y + bTc0_v11_Y + bTc0_v01_Y	
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v01_Y]<4;4,1>:ub			{ NoDDChk }
-
-//    (f0.0)	jmpi	BYPASS_4x4_DEBLOCK_V
-//	(f0.0.anyv)	 jmpi	BYPASS_4x4_DEBLOCK_V
-
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-//BYPASS_4x4_DEBLOCK_V:
-//------------------------------------------------------------------
-
-
-//---------- Deblock Y internal mid vert edge (V2) ----------
-
-	// Bypass deblocking if FilterInternal8x8EdgesFlag = 0  
-	and.z.f0.0	(1)	null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal8x8EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-
-//	and.z.f0.1 (1)	null:uw		r[ECM_AddrReg, wEdgeCntlMap_IntMidVert]:uw		0xFFFF:uw	// MaskA = 0? 
-
-	//	p3 = Cur MB Y row 4  = r[P_AddrReg, 0]<16;16,1>  
-	//	p2 = Cur MB Y row 5  = r[P_AddrReg, 16]<16;16,1> 
-	//	p1 = Cur MB Y row 6  = r[P_AddrReg, 32]<16;16,1> 
-	//	p0 = Cur MB Y row 7  = r[P_AddrReg, 48]<16;16,1> 
-	// 	q0 = Cur MB Y row 8  = r[Q_AddrReg, 0]<16;16,1>  
-	//	q1 = Cur MB Y row 9  = r[Q_AddrReg, 16]<16;16,1> 
-	//	q2 = Cur MB Y row 10 = r[Q_AddrReg, 32]<16;16,1> 
-	//	q3 = Cur MB Y row 11 = r[Q_AddrReg, 48]<16;16,1> 
-	mov (1)	P_AddrReg:w		4*Y_ROW_WIDTH+SRC_MB_Y_BASE:w	{ NoDDClr }
-	mov (1)	Q_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w   { NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntMidVert]:uw		{ NoDDClr }
-//	mov (1) MaskB:uw	0:w						// Set MaskB = 0, so it always uses bS < 4 algorithm.
-
-	// tc0 has bTc0_v32_Y + bTc0_v22_Y + bTc0_v12_Y + bTc0_v02_Y	
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v02_Y]<4;4,1>:ub			{ NoDDChk }
-
-//    (f0.0)	jmpi	BYPASS_8x8_DEBLOCK_V
-//	(f0.0.anyv)	 jmpi	BYPASS_8x8_DEBLOCK_V
-    
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-//BYPASS_8x8_DEBLOCK_V:
-//-----------------------------------------------
-
-
-//---------- Deblock Y interal right edge (V3) ----------	 
-
-	// Bypass deblocking if FilterInternal4x4EdgesFlag = 0  
-	and.z.f0.0	(1)	null:w	r[ECM_AddrReg, BitFlags]:ub		FilterInternal4x4EdgesFlag:w		// Check for FilterInternal4x4EdgesFlag 
-
-//	and.z.f0.1 (1)	null:uw		r[ECM_AddrReg, wEdgeCntlMap_IntRightVert]:uw		0xFFFF:uw	// MaskA = 0? 
-
-	//	p3 = Cur MB Y row 8  = r[P_AddrReg, 0]<16;16,1> 
-	//	p2 = Cur MB Y row 9  = r[P_AddrReg, 16]<16;16,1>
-	//	p1 = Cur MB Y row 10 = r[P_AddrReg, 32]<16;16,1>
-	//	p0 = Cur MB Y row 11 = r[P_AddrReg, 48]<16;16,1>
-	// 	q0 = Cur MB Y row 12 = r[Q_AddrReg, 0]<16;16,1> 
-	//	q1 = Cur MB Y row 13 = r[Q_AddrReg, 16]<16;16,1>
-	//	q2 = Cur MB Y row 14 = r[Q_AddrReg, 32]<16;16,1>
-	//	q3 = Cur MB Y row 15 = r[Q_AddrReg, 48]<16;16,1>
-	mov (1)	P_AddrReg:w		8*Y_ROW_WIDTH+SRC_MB_Y_BASE:w		{ NoDDClr }
-	mov (1)	Q_AddrReg:w		12*Y_ROW_WIDTH+SRC_MB_Y_BASE:w      { NoDDChk }
-
-	mov (1)	MaskA:uw	r[ECM_AddrReg, wEdgeCntlMap_IntRightVert]:uw	{ NoDDClr }
-//	mov (1) MaskB:uw	0:w						// Set MaskB = 0, so it always uses bS < 4 algorithm.
-
-	// tc0 has bTc0_v33_Y + bTc0_v23_Y + bTc0_v13_Y + bTc0_v03_Y
-	mov (4)	tc0<1>:ub	r[ECM_AddrReg, bTc0_v03_Y]<4;4,1>:ub			{ NoDDChk }
-
-//    (f0.0)	jmpi	BYPASS_4x4_DEBLOCK_V2
-//	(f0.0.anyv)	 jmpi	BYPASS_4x4_DEBLOCK_V2
-    
-//	CALL(FILTER_Y, 1)
-	PRED_CALL(-f0.0, FILTER_Y, 1)
-
-//BYPASS_4x4_DEBLOCK_V2:
-//-----------------------------------------------
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_ForwardMsg.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_ForwardMsg.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_ForwardMsg.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_ForwardMsg.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//========== Forward message to root thread through gateway ==========
-// Each child thread write a byte into the root GRF r50 defiend in open Gataway.
-
-#if defined(_DEBUG) 
-mov		(1)		EntrySignatureC:w			0x7777:w
-#endif
-
-// Init payload to r0
-mov (8) 	GatewayPayload<1>:ud 	0:w								//{ NoDDClr } 
-
-// Forward a message:
-// Offset = x relative to r50 (defiend in open gataway), x = ORIX >> 4 [bit 28:16]
-// Need to shift left 16
-
-// shift 2 more bits for byte to word offset
-
-//shl	(1)		Offset_Length:ud		GateWayOffsetC:w	 	16:w		{ NoDDClr, NoDDChk }
-shl	(1)		Offset_Length:ud		GateWayOffsetC:w	 	18:w		
-
-// 2 bytes offset
-add	(1)		Offset_Length:ud			Offset_Length:ud		0x00020000:d	{ NoDDClr }
-	
-// Length = 1 byte,	[bit 10:8 = 000]
-//000 xxxxxxxxxxxxx 00000 000 00000000 ==> 000x xxxx xxxx xxxx 0000 0000 0000 0000
-
-//mov (1) 	DispatchID:ub 			r0.20:ub		// Dispatch ID
-
-//Move in EUid and Thread ID that we received from the PARENT thread
-mov (1) 	EUID_TID:uw 			r0.6:uw								{ NoDDClr, NoDDChk }
-
-mov (1) 	GatewayPayloadKey:uw 	0x1212:uw							{ NoDDClr, NoDDChk }	// Key
-
-//mov	(4)		GatewayPayload<1>:ud	0:ud								{ NoDDClr, NoDDChk }	// Init payload low 4 dword
-
-// Write back one byte (value = 0xFF) to root thread GRF to indicate this child thread is finished
-// All lower 4 bytes must be assigned to the same byte value.
-mov	(4)		GatewayPayload<1>:ub	0xFFFF:uw							{ NoDDChk }
-
-// msg descriptor bit 15 set to '1' for notification
-#ifdef GW_DCN
-// For ILK, EOT bit should also be set to terminate the thread. This is to fix a timing related HW issue.
-//
-send (8)  	null:ud 		m0	  		GatewayPayload<8;8,1>:ud    MSG_GW_EOT	FWDMSGDSC+NOTIFYMSG
-#else
-send (8)  	null:ud 		m0	  		GatewayPayload<8;8,1>:ud    MSG_GW	FWDMSGDSC+NOTIFYMSG
-#endif	// GW_DCN
-
-//========== Forward Msg Done ========================================
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB.inc libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,718 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__AVC_ILDB_HEADER__)	// Make sure this file is only included once
-#define __AVC_ILDB_HEADER__
-
-// Module name: AVC_ILDB.inc
-
-#undef ORIX
-#undef ORIY
-
-//========== Root thread input parameters ==================================================
-#define RootParam				r1		// :w
-#define	MBsCntX					r1.0	// :w, MB count per row
-#define	MBsCntY					r1.1	// :w, MB count per col
-//#define PicType					r1.2	// :w, Picture type
-#define	MaxThreads				r1.3	// :w, Max Thread limit
-#define EntrySignature			r1.4	// :w, Debug flag
-#define BitFields				r1.5	// :uw
-#define 	MbaffFlag			BIT0	// :w, mbaff flag, bit 0 in BitFields
-#define 	BotFieldFlag		BIT1	// :w, bottom field flag, bit 1 in BitFields
-#define 	CntlDataExpFlag		BIT2	// :w, Control Data Expansion Flag, bit 2 in BitFields
-#define RampConst				r1.12	// 8 :ub, Ramp constant, r1.12 - r1.19:ub
-#define StepToNextMB			r1.20	// :b, 2 bytes
-#define Minus2Minus1			r1.22	// :b, 2 bytes
-// next one starts at r1.11:w
-
-#define 	TopFieldFlag		0xFFFD	// :w, top field flag, used to set bit1 to 0.
-
-
-//========== Root Locals =============================================================
-
-// Variables in root kernel for launching child therad
-#define ChildParam				r2.0	// :w
-//Not used  #define	URBOffset				r2.3	// :w, Each row occupies 4 URB entries.  All children in the same row use the same set of URB entries
-#define	CurCol					r2.10	// :w, current col
-#define	CurColB					r2.20	// :b, current col
-#define	CurRow					r2.11	// :w, current row
-#define	CurRowB					r2.22	// :b, current row
-#define	LastCol					r2.12	// :w, last col
-#define	LastRow					r2.13	// :w, last row
-
-// Root local constants during spawning process
-#define	Col_Boundary			r3.0	// :w, 
-#define	Row_Boundary			r3.1	// :w, 
-//#define	TotalBlocks				r3.2	// :w, Total blocks in the frame 
-#define	URB_EntriesPerMB_2		r3.3	// :w, = URB entries per MB, but in differnt form
-#define	URBOffsetUVBase			r3.4	// :w, UV Base offset in URB
-
-#define	Temp1_D					r3.6	// :d:
-#define	Temp1_W					r3.12	// :w, Temp1
-#define	Temp1_B					r3.24	// :b, = Temp1_W
-#define	Temp2_W					r3.13	// :w, Temp2
-#define	Temp2_B					r3.26	// :b, = Temp2_W
-
-// Root local variables
-#define JumpTable				r4		// :d, jump table
-#define JUMPTABLE_BASE			4*32
-#define JumpAddr				a0.7
-
-#define TopRowForScan			r5.0 	// :w, track the top row for scan. All rows above this row is deblocked already. 
-
-
-// Child Thread R0 Header Field
-#define MRF0					m0		
-#define CT_R0Hdr				m1
-
-/*
-.declare GatewayAperture	Base=r50.0 ElementSize=4 SrcRegion=REGION(8,1) Type=ud	
-#define GatewayApertureB	1600	// r50 byte offset from r0.0
-
-// Chroma root thread updates luma root's ThreadLimit at r10.0:w via gateway
-#define ThreadLimit				r62.0	// :w, thread limit //r56.0
-#define THREAD_LIMIT_OFFSET		0x01800000	// Offset from r50 to r56 = 12*32 = 384 = 0x0180.  0x180 << 16 = 0x01800000
-	//#define THREAD_LIMIT_OFFSET		0x00C00000	// Offset from r50 to r56 = 6*32 = 192 = 0x00C0.  0xC0 << 16 = 0x00C00000
-*/
-
-// Gateway size is 16 GRF.  68 rows of MBs takes 9 GRFs (r6 - r14)
-// For CTG: Expended to support 1280 rows of pixel (80 rows of MBs).  It requires 10 GRFs (r6 - r15)
-.declare GatewayAperture	Base=r6.0 ElementSize=4 SrcRegion=REGION(8,1) Type=ud	
-#define GatewayApertureB	192	// r0.0 byte offset from r0.0
-
-// Chroma root thread updates luma root's ThreadLimit at r10.0:w via gateway
-#define ThreadLimit				r18.0	// :w, thread limit 
-#define THREAD_LIMIT_OFFSET		0x01800000	// Offset from r50 to r56 = 12*32 = 384 = 0x0180.  0x180 << 16 = 0x01800000
-#define	TotalBlocks				r18.1	// :w, Total blocks in the frame 
-
-// Root local variables
-#define	ChildThreadsID			r19.0	// :w, Child thread ID, unique to each child
-#define	OutstandingThreads		r20.0	// :w, Outstanding threads 
-#define ProcessedMBs			r20.1	// :w, # of MBs processed 
-
-#define	URBOffset				r21.0	// :w, Each row occupies 4 URB entries.  All children in the same row use the same set of URB entries
-
-//=================================================================================
-
-#define ScoreBd_Size			128 //96 // size of Status[] or ProcCol[]
-
-#define ScoreBd_Idx				2		
-//#define Saved_Col				0
-
-#define StatusAddr				a0.4	// :w, point to r50
-//=================================================================================
-
-
-// Gateway payload
-#define GatewayPayload			r48.0	// :ud
-#define GatewayPayloadKey		r48.8	// :uw
-#define DispatchID				r48.20	// :ub
-#define RegBase_GatewaySize 	r48.5	// :ud, used in open a gateway
-#define Offset_Length			r48.5	// :ud, used in forwardmsg back to root
-#define EUID_TID				r48.9	// :uw, used in forwardmsg back to root
-
-// Gateway response
-#define GatewayResponse 		r49.0	// :ud, one GRF
-
-#define URBWriteMsgDesc			a0.0	// Used in URB write, :ud
-#define URBWriteMsgDescLow		a0.0	// Used in URB write, :uw
-#define URBWriteMsgDescHigh		a0.1	// Used in URB write, :uw
-
-.declare WritebackResponse		Base=r50 ElementSize=4 SrcRegion=REGION(8,1) Type=ud	// 1 GRF for write backs
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-// IDesc Order					Offset
-//
-// 0) luma root					0 from luma root
-// 1) luma child				16 from luma root
-// 2) chroma root				32 from luma root
-// 3) chroma child				16 from chroma root
-
-// 4) luma field root			0 from luma field root
-// 5) luma field child			16 from luma field root
-// 6) chroma field root			32 from luma field root
-// 7) chroma field child		16 from chroma field root
-
-// 8) luma Mbaff root			0 from luma Mbaff root
-// 9) luma Mbaff child 			16 from luma Mbaff root
-// 10) chroma Mbaff root		32 from luma Mbaff root
-// 11) chroma Mbaff child		16 from chroma Mbaff root
-
-// IDesc offset within non-mbaff or mbaff mode
-#define CHROMA_ROOT_OFFSET 		32		// Offset from luma root to chroma root
-#define CHILD_OFFSET	  		16		// Offset from luma root to luma child, 
-										// and from chroma root to chroma child
-/////////////////////////////////////////////////////////////////////////////////////////////
-
-
-//========== End of Root Variables ======================================================
-
-
-//========== Child thread input parameters ==============================================
-//#define	MBsCntX					r1.0	// :w, MB count per row (same as root)
-//#define	MBsCntY					r1.1	// :w, MB count per col (same as root)
-//#define PicTypeC				r1.2	// :w, Picture type		same as root thread (same as root)
-#define	URBOffsetC				r1.3	// :w, 
-#define EntrySignatureC			r1.4	// :w, Debug field (same as root)
-//#define BitFields				r1.5	// :w (same as root)
-//#define 	MbaffFlag			BIT0	// :w, mbaff flag, bit 0 in BitFields
-//#define 	BotFieldFlag		BIT1	// :w, bottom field flag, bit 1 in BitFields
-//#define 	CntlDataExpFlag		BIT2	// :w, Control Data Expansion Flag, bit 2 in BitFields
-#define RampConstC				r1.12	// 8 :ub, Ramp constant, r1.12 - r1.19:ub.
-#define	ORIX					r1.10	// :w, carry over from root r1 in MB count
-#define	ORIY					r1.11	// :w, carry over from root r1 in MB count
-#define	LastColC				r1.12	// :w, last col
-#define	LastRowC				r1.13	// :w, last row
-
-.declare GatewayApertureC		Base=r1.0 ElementSize=4 SrcRegion=REGION(8,1) Type=ud	
-#define GatewayApertureCBase	32		// r1 byte offset from r0.0
-
-
-//========== Child Variables ============================================================
-
-// Mbaff Alpha, Beta, Tc0 vectors for an edge
-.declare Mbaff_ALPHA 	Base=r14.0  ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// r14
-.declare Mbaff_BETA 	Base=r15.0  ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// r15
-.declare Mbaff_TC0 		Base=r16.0  ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// r16
-.declare RRampW	   		Base=r17.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w		// r17
-
-.declare Mbaff_ALPHA2	Base=r45.0  ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// alpha2 = (alpha >> 2) + 2
-
-
-#define	ORIX_CUR				r46.0	// :w, current block origin X in bytes
-#define	ORIY_CUR				r46.1	// :w, current block origin Y in bytes
-#define	ORIX_LEFT				r46.2	// :w, left block origin X in bytes
-#define	ORIY_LEFT				r46.3	// :w, left block origin Y in bytes
-#define	ORIX_TOP				r46.4	// :w, top block origin X in bytes
-#define	ORIY_TOP				r46.5	// :w, top block origin Y in bytes
-//#define FilterSampleFlag		r46.6	// :uw,
-#define	CTemp0_W				r46.7	// :w, child Temp0
-
-#define alpha					r46.8	// :w, Scaler version for non Mbaff
-#define beta					r46.9	// :w, Scaler version for non Mbaff
-#define tc0						r46.20	// 4 :ub, r46.20 ~ r46.23, Scaler version for non Mbaff
-#define MaskA					r46.12	// :uw
-#define MaskB					r46.13	// :uw
-
-// Child control flags
-#define DualFieldMode			r47.0	// Cur MB is frame based, above MB is field based in mbaff mode
-										// :uw, 0 = not in dual field mode,  1 = in dual field mode, filter both top and bot fields
-#define	GateWayOffsetC			r47.1	// :w, Gateway offset for child writing into root space
-#define CntrlDataOffsetY		r47.1	// :ud, MB control data data offset
-#define alpha2					r47.4	// :uw, 	alpha2 = (alpha >> 2) + 2
-
-#define VertEdgePattern			r47.5	// :uw, 
-
-#define	CTemp1_W				r47.6	// :w, child Temp1
-#define	CTemp1_B				r47.12	// :b, = child Temp1_W
-#define	CTemp2_W				r47.7	// :w, child Temp2
-#define	CTemp2_B				r47.14	// :b, = child Temp2_W
-
-// Used in child
-#define ECM_AddrReg				a0.4	// Edge Control Map register
-#define P_AddrReg				a0.6	// point to P samples in left or top MB
-#define Q_AddrReg				a0.7	// point to Q samples in cur MB
-
-
-.declare 	RTempD	   Base=r26.0 ElementSize=4 SrcRegion=REGION(8,1) Type=d	// r26-27
-.declare 	RTempB	   Base=r26.0 ElementSize=1 SrcRegion=REGION(8,4) Type=ub	// r26-27
-.declare 	RTempW	   Base=r26.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w	// r26-27
-#define 	LEFT_TEMP_D		RTempD
-#define 	LEFT_TEMP_B		RTempB
-#define 	LEFT_TEMP_W		RTempW
-
-.declare 	TempRow0   Base=r26.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare 	TempRow0B  Base=r26.0 ElementSize=1 SrcRegion=REGION(8,2) Type=ub
-.declare 	TempRow1   Base=r27.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare 	TempRow1B  Base=r27.0 ElementSize=1 SrcRegion=REGION(8,2) Type=ub
-
-.declare 	CUR_TEMP_D	Base=r28.0 ElementSize=4 SrcRegion=REGION(8,1) Type=d	// 8 GRFs
-.declare 	CUR_TEMP_B	Base=r28.0 ElementSize=1 SrcRegion=REGION(8,4) Type=ub
-.declare 	CUR_TEMP_W	Base=r28.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-#define FilterSampleFlag		r28.0	// :uw,
-
-.declare 	A   		Base=r28.0 ElementSize=2 SrcRegion=REGION(16,1) Type=w
-.declare 	BB   		Base=r29.0 ElementSize=2 SrcRegion=REGION(16,1) Type=w
-
-.declare 	TempRow3   Base=r30.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare 	TempRow3B  Base=r30.0 ElementSize=1 SrcRegion=REGION(8,2) Type=ub
-
-.declare 	tc0_exp		Base=r30.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare 	tc8			Base=r30.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-.declare 	tc_exp		Base=r31.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare	tx_exp_8	Base=r31.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-.declare	q0_p0		Base=r32.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare	ABS_q0_p0	Base=r33.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-.declare	ap			Base=r34.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare	aq			Base=r35.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-// These buffers have the src data for each edge to be beblocked.
-// They have modified pixels from previous edges.
-//
-//	Y:
-//	+----+----+----+----+----+----+----+----+
-//	| p3 | p2 | P1 | p0 | q0 | q1 | q2 | q3 |
-//	+----+----+----+----+----+----+----+----+
-//
-//	p3 = r[P_AddrReg, 0]<16;16,1>  
-//	p2 = r[P_AddrReg, 16]<16;16,1> 
-//	p1 = r[P_AddrReg, 32]<16;16,1> 
-//	p0 = r[P_AddrReg, 48]<16;16,1> 
-// 	q0 = r[Q_AddrReg, 0]<16;16,1>  
-//	q1 = r[Q_AddrReg, 16]<16;16,1> 
-//	q2 = r[Q_AddrReg, 32]<16;16,1> 
-//	q3 = r[Q_AddrReg, 48]<16;16,1> 
-
-.declare	p0123_W		Base=r36.0  ElementSize=2 SrcRegion=REGION(16,1) Type=uw		// r36, r37
-.declare	q0123_W		Base=r38.0  ElementSize=2 SrcRegion=REGION(16,1) Type=uw		// r38, r39
-.declare	p3			Base=r36.0  ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-.declare	p2			Base=r36.16 ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-.declare	p1			Base=r37.0  ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-.declare	p0			Base=r37.16 ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-.declare	q0			Base=r38.0  ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-.declare	q1			Base=r38.16 ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-.declare	q2			Base=r39.0  ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-.declare	q3			Base=r39.16 ElementSize=1 SrcRegion=REGION(8,1) Type=ub
-
-.declare 	TempRow2   Base=r38.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-// Temp space for mbaff dual field mode
-#define		ABOVE_CUR_MB_BASE	40*GRFWIB											// Byte offset to r40
-.declare    ABOVE_CUR_MB_YW  Base=r40 	ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-.declare    ABOVE_CUR_MB_UW  Base=r40 	ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-
-.declare 	P0_plus_P1   Base=r41.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare 	Q0_plus_Q1   Base=r42.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-.declare 	P2_plus_P3   Base=r43.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare 	Q2_plus_Q3   Base=r44.0 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-
-//////////////////////////////////////////////////////////////////////////////////////////
-// MB control data reference
-
-// Expanded control data is in r18 - r25
-.declare    CNTRL_DATA_D Base=r18 	ElementSize=4 SrcRegion=REGION(8,1) Type=ud		// For read, 8 GRFs
-#define		CNTRL_DATA_BASE	18*GRFWIB												// Base offset to r18
-
-//  Bit mask for extracting bits
-#define	MbaffFrameFlag					0x01
-#define	FieldModeCurrentMbFlag			0x02
-#define FieldModeLeftMbFlag				0x04
-#define FieldModeAboveMbFlag			0x08
-#define FilterInternal8x8EdgesFlag		0x10
-#define FilterInternal4x4EdgesFlag		0x20
-#define FilterLeftMbEdgeFlag			0x40
-#define FilterTopMbEdgeFlag				0x80
-
-#define	DISABLE_ILDB_FLAG				0x01
-
-//  Exact bit pattern for left and cur MB coding mode (frame vs. field)
-#define LEFT_FRAME_CUR_FRAME			0x00
-#define LEFT_FRAME_CUR_FIELD			0x02
-#define LEFT_FIELD_CUR_FRAME			0x04
-#define LEFT_FIELD_CUR_FIELD			0x06
-
-//  Exact bit pattern for above and cur MB coding mode (frame vs. field)
-#define ABOVE_FRAME_CUR_FRAME			0x00
-#define ABOVE_FRAME_CUR_FIELD			0x02
-#define ABOVE_FIELD_CUR_FRAME			0x08
-#define ABOVE_FIELD_CUR_FIELD			0x0A
-
-
-
-//========== MB control data field offset in byte ==========
-
-#if !defined(_APPLE)
-
-// GRF0 - GRF1 holds original control data
-
-// GRF0
-#define HorizOrigin						0
-#define VertOrigin						1
-#define BitFlags						2		// Bit flags
-
-#define bbSinternalLeftVert				4		// Internal left vertical bS, 2 bits per bS for 4 Y pixels and 2 U/V pixels 	
-#define bbSinternalMidVert				5		// Internal mid vertical bS
-#define bbSinternalRightVert			6		// Internal right vertical bS
-#define bbSinternalTopHorz				7		// Internal top horizontal bS
-
-#define	bbSinternalMidHorz				8		// Internal mid horizontal bS
-#define	bbSinternalBotHorz				9		// Internal bottom horizontal bS
-#define	wbSLeft0						10		// External left vertical bS (0), 4 bits per bS for 4 Y pixels and 2 U/V pixels, and byte 11
-
-#define	wbSLeft1						12		// External left vertical bS (1), and byte 13
-#define	wbSTop0							14		// External top horizontal bS (0), and byte 15
-
-#define	wbSTop1							16		// Externaltop horizontal bS (1), and byte 17
-#define	bIndexAinternal_Y				18		// Internal index A for Y
-#define	bIndexBinternal_Y				19		// Internal index B for Y
-
-#define	bIndexAleft0_Y					20		// Left index A for Y (0)
-#define	bIndexBleft0_Y					21		// Left index B for Y (0)
-#define	bIndexAleft1_Y					22		// Left index A for Y (1)
-#define	bIndexBleft1_Y					23		// Left index B for Y (1)
-
-#define	bIndexAtop0_Y					24		// Top index A for Y (0)
-#define	bIndexBtop0_Y					25		// Top index B for Y (0)
-#define	bIndexAtop1_Y					26		// Top index A for Y (1)
-#define	bIndexBtop1_Y					27		// Top index B for Y (1)
-
-#define	bIndexAinternal_Cb				28		// Internal index A for Cb
-#define	bIndexBinternal_Cb				29		// Internal index B for Cb
-#define	bIndexAleft0_Cb					30		// Left index A for Cb (0)
-#define	bIndexBleft0_Cb					31		// Left index B for Cb (0)
-
-// GRF1
-#define	bIndexAleft1_Cb					32		// Left index A for Cb (1)
-#define	bIndexBleft1_Cb					33		// Left index B for Cb (1)
-#define	bIndexAtop0_Cb					34		// Top index A for Cb (0)
-#define	bIndexBtop0_Cb					35		// Top index B for Cb (0)
-
-#define	bIndexAtop1_Cb					36		// Top index A for Cb (1)
-#define	bIndexBtop1_Cb					37		// Top index B for Cb (1)
-#define	bIndexAinternal_Cr				38		// Internal index A for Cr
-#define	bIndexBinternal_Cr				39		// Internal index B for Cr
-
-#define	bIndexAleft0_Cr					40		// Left index A for Cr (0)
-#define bIndexBleft0_Cr					41		// Left index B for Cr (0)
-#define	bIndexAleft1_Cr					42		// Left index A for Cr (1)
-#define	bIndexBleft1_Cr					43		// Left index B for Cr (1)
-
-#define	bIndexAtop0_Cr					44		// Top index A for Cr (0)
-#define	bIndexBtop0_Cr					45		// Top index B for Cr (0)
-#define	bIndexAtop1_Cr					46		// Top index A for Cr (1)
-#define	bIndexBtop1_Cr					47		// Top index B for Cr (1)
-
-#define	ExtBitFlags						48		// Extended bit flags, such as disable ILDB bits
-
-// Offset 49 - 63 not used
-
-
-//===== GRF2 - GRF7 hold expanded control data =====
-
-// GRF2
-#define	wEdgeCntlMap_IntLeftVert		64		// Derived from bbSinternalLeftVert, 1 bit per pixel 
-#define	wEdgeCntlMap_IntMidVert			66		// Derived from bbSinternalLeftVert
-		
-#define	wEdgeCntlMap_IntRightVert		68		// Derived from bbSinternalRightVert
-#define	wEdgeCntlMap_IntTopHorz			70		// Derived from bbSinternalTopHorz, 1bit per pixel 
-		
-#define	wEdgeCntlMap_IntMidHorz			72		// Derived from bbSinternalMidHorz
-#define	wEdgeCntlMap_IntBotHorz			74		// Derived from bbSinternalBotHorz
-
-// Offset 76 - 79 not used
-
-#define	wEdgeCntlMapA_ExtLeftVert0		80		// Derived from wbSLeft0, 1bit per pixel
-#define	wEdgeCntlMapB_ExtLeftVert0		82		// Derived from wbSLeft0
-
-#define	wEdgeCntlMapA_ExtTopHorz0		84		// Derived from wbSTop0, 1bit per pixel
-#define	wEdgeCntlMapB_ExtTopHorz0		86		// Derived from wbSTop0
-
-#define	wEdgeCntlMapA_ExtLeftVert1		88		// Derived from wbSLeft1, 1bit per pixel
-#define	wEdgeCntlMapB_ExtLeftVert1		90		// Derived from wbSLeft1
-
-#define	wEdgeCntlMapA_ExtTopHorz1		92		// Derived from wbSTop1, 1bit per pixel
-#define	wEdgeCntlMapB_ExtTopHorz1		94		// Derived from wbSTop1
-
-
-// GRF3
-#define	bTc0_v00_0_Y					96		// Derived from bSv00_0 and bIndexAleft0_Y, 4 pixels per tc0
-#define	bTc0_v10_0_Y					97		// Derived from bSv10_0 and bIndexAleft0_Y
-#define	bTc0_v20_0_Y					98		// Derived from bSv20_0 and bIndexAleft0_Y
-#define	bTc0_v30_0_Y					99		// Derived from bSv30_0 and bIndexAleft0_Y
-
-#define	bTc0_v01_Y						100		// Derived from bSv01 and bIndexAinternal_Y
-#define	bTc0_v11_Y						101		// Derived from bSv11 and bIndexAinternal_Y
-#define	bTc0_v21_Y						102		// Derived from bSv21 and bIndexAinternal_Y
-#define	bTc0_v31_Y						103		// Derived from bSv31 and bIndexAinternal_Y
-
-#define	bTc0_v02_Y						104		// Derived from bSv02 and bIndexAinternal_Y
-#define	bTc0_v12_Y						105		// Derived from bSv12 and bIndexAinternal_Y
-#define	bTc0_v22_Y						106		// Derived from bSv22 and bIndexAinternal_Y
-#define	bTc0_v32_Y						107		// Derived from bSv32 and bIndexAinternal_Y
-
-#define	bTc0_v03_Y						108		// Derived from bSv03 and bIndexAinternal_Y
-#define	bTc0_v13_Y						109		// Derived from bSv13 and bIndexAinternal_Y
-#define	bTc0_v23_Y						110		// Derived from bSv23 and bIndexAinternal_Y
-#define	bTc0_v33_Y						111		// Derived from bSv33 and bIndexAinternal_Y
-
-#define	bTc0_h00_0_Y					112		// Derived from bSh00_0 and bIndexAleft0_Y
-#define	bTc0_h01_0_Y					113		// Derived from bSh01_0 and bIndexAleft0_Y
-#define	bTc0_h02_0_Y					114		// Derived from bSh02_0 and bIndexAleft0_Y
-#define	bTc0_h03_0_Y					115		// Derived from bSh03_0 and bIndexAleft0_Y
-
-#define	bTc0_h10_Y						116		// Derived from bSh10 and bIndexAinternal_Y
-#define	bTc0_h11_Y						117		// Derived from bSh11 and bIndexAinternal_Y
-#define	bTc0_h12_Y						118		// Derived from bSh12 and bIndexAinternal_Y
-#define	bTc0_h13_Y						119		// Derived from bSh13 and bIndexAinternal_Y
-		
-#define	bTc0_h20_Y						120		// Derived from bSh20 and bIndexAinternal_Y
-#define	bTc0_h21_Y						121		// Derived from bSh21 and bIndexAinternal_Y
-#define	bTc0_h22_Y						122		// Derived from bSh22 and bIndexAinternal_Y
-#define	bTc0_h23_Y						123		// Derived from bSh23 and bIndexAinternal_Y
-
-#define	bTc0_h30_Y						124		// Derived from bSh30 and bIndexAinternal_Y
-#define	bTc0_h31_Y						125		// Derived from bSh31 and bIndexAinternal_Y
-#define	bTc0_h32_Y						126		// Derived from bSh32 and bIndexAinternal_Y
-#define	bTc0_h33_Y						127		// Derived from bSh33 and bIndexAinternal_Y
-
-// GRF4
-#define	bAlphaLeft0_Y					128		// Derived from bIndexAleft0_Y	
-#define	bBetaLeft0_Y					129		// Derived from bIndexBleft0_Y	
-#define	bAlphaTop0_Y					130		// Derived from bIndexAtop0_Y	
-#define	bBetaTop0_Y						131		// Derived from bIndexBtop0_Y	
-
-#define	bAlphaInternal_Y				132		// Derived from bIndexAinternal_Y	
-#define	bBetaInternal_Y					133		// Derived from bIndexBinternal_Y	
-// Offset 134 - 135 not used
-
-// Offset 136 - 143 not used
-#define	bAlphaLeft1_Y					144		// Derived from bIndexAleft1_Y	Used in Mbaff mode only
-#define	bBetaLeft1_Y					145		// Derived from bIndexBleft1_Y	Used in Mbaff mode only
-#define	bAlphaTop1_Y					146		// Derived from bIndexAtop1_Y	Used in Mbaff mode only
-#define	bBetaTop1_Y						147		// Derived from bIndexBtop1_Y	Used in Mbaff mode only
-
-// Offset 148 - 151 not used
-#define	bTc0_v00_1_Y					152		// Derived from bSv00_1 and bIndexAleft1_Y	Used in Mbaff mode only
-#define	bTc0_v10_1_Y					153		// Derived from bSv10_1 and bIndexAleft1_Y	Used in Mbaff mode only
-#define	bTc0_v20_1_Y					154		// Derived from bSv20_1 and bIndexAleft1_Y	Used in Mbaff mode only
-#define	bTc0_v30_1_Y					155		// Derived from bSv30_1 and bIndexAleft1_Y	Used in Mbaff mode only
-
-#define	bTc0_h00_1_Y					156		// Derived from bSh00_1 and bIndexAleft1_Y	Used in Mbaff mode only
-#define	bTc0_h01_1_Y					157		// Derived from bSh01_1 and bIndexAleft1_Y	Used in Mbaff mode only
-#define	bTc0_h02_1_Y					158		// Derived from bSh02_1 and bIndexAleft1_Y	Used in Mbaff mode only
-#define	bTc0_h03_1_Y					159		// Derived from bSh03_1 and bIndexAleft1_Y	Used in Mbaff mode only
-
-
-// GRF5
-#define	bTc0_v00_0_Cb					160		// Derived from bSv00_0 and bIndexAleft0_Cb, 2 pixels per tc0	Left0
-#define	bTc0_v10_0_Cb					161		// Derived from bSv10_0 and bIndexAleft0_Cb	
-#define	bTc0_v20_0_Cb					162		// Derived from bSv20_0 and bIndexAleft0_Cb	
-#define	bTc0_v30_0_Cb					163		// Derived from bSv30_0 and bIndexAleft0_Cb	
-
-#define	bTc0_v02_Cb						164		// Derived from bSv02 and bIndexAinternal_Cb	MidVert
-#define	bTc0_v12_Cb						165		// Derived from bSv12 and bIndexAinternal_Cb	
-#define	bTc0_v22_Cb						166		// Derived from bSv22 and bIndexAinternal_Cb	
-#define	bTc0_v32_Cb						167		// Derived from bSv32 and bIndexAinternal_Cb	
-
-#define	bTc0_h00_0_Cb					168		// Derived from bSh00_0 and bIndexAleft0_Cb	Top0
-#define	bTc0_h01_0_Cb					169		// Derived from bSh01_0 and bIndexAleft0_Cb	
-#define	bTc0_h02_0_Cb					170		// Derived from bSh02_0 and bIndexAleft0_Cb	
-#define	bTc0_h03_0_Cb					171		// Derived from bSh03_0 and bIndexAleft0_Cb	
-
-#define	bTc0_h20_Cb						172		// Derived from bSh20 and bIndexAinternal_Cb	MidHorz
-#define	bTc0_h21_Cb						173		// Derived from bSh21 and bIndexAinternal_Cb	
-#define	bTc0_h22_Cb						174		// Derived from bSh22 and bIndexAinternal_Cb	
-#define	bTc0_h23_Cb						175		// Derived from bSh23 and bIndexAinternal_Cb	
-
-#define	bTc0_v00_0_Cr					176		// Derived from bSv00_0 and bIndexAleft0_Cr, 2 pixels per tc0	Left0
-#define	bTc0_v10_0_Cr					177		// Derived from bSv10_0 and bIndexAleft0_Cr	
-#define	bTc0_v20_0_Cr					178		// Derived from bSv20_0 and bIndexAleft0_Cr	
-#define	bTc0_v30_0_Cr					179		// Derived from bSv30_0 and bIndexAleft0_Cr	
-
-#define	bTc0_v02_Cr						180		// Derived from bSv02 and bIndexAinternal_Cr	Mid Vert
-#define	bTc0_v12_Cr						181		// Derived from bSv12 and bIndexAinternal_Cr	
-#define	bTc0_v22_Cr						182		// Derived from bSv22 and bIndexAinternal_Cr	
-#define	bTc0_v32_Cr						183		// Derived from bSv32 and bIndexAinternal_Cr	
-
-#define	bTc0_h00_0_Cr					184		// Derived from bSh00_0 and bIndexAleft0_Cr, 2 pixels per tc0	Top0
-#define	bTc0_h01_0_Cr					185		// Derived from bSh01_0 and bIndexAleft0_Cr	
-#define	bTc0_h02_0_Cr					186		// Derived from bSh02_0 and bIndexAleft0_Cr	
-#define	bTc0_h03_0_Cr					187		// Derived from bSh03_0 and bIndexAleft0_Cr	
-
-#define	bTc0_h20_Cr						188		// Derived from bSh20 and bIndexAinternal_Cr	Mid  Horz
-#define	bTc0_h21_Cr						189		// Derived from bSh21 and bIndexAinternal_Cr	
-#define	bTc0_h22_Cr						190		// Derived from bSh22 and bIndexAinternal_Cr	
-#define	bTc0_h23_Cr						191		// Derived from bSh23 and bIndexAinternal_Cr	
-
-// GRF6
-#define	bAlphaLeft0_Cb					192		// Derived from bIndexAleft0_Cb
-#define	bBetaLeft0_Cb					193		// Derived from bIndexBleft0_Cb
-#define	bAlphaTop0_Cb					194		// Derived from bIndexAtop0_Cb
-#define	bBetaTop0_Cb					195		// Derived from bIndexBtop0_Cb
-
-#define	bAlphaInternal_Cb				196		// Derived from bIndexAinternal_Cb
-#define	bBetaInternal_Cb				197		// Derived from bIndexBinternal_Cb
-// Offset 198 - 199 not used		
-
-#define	bAlphaLeft0_Cr					200		// Derived from bIndexAleft0_Cr
-#define	bBetaLeft0_Cr					201		// Derived from bIndexBleft0_Cr
-#define	bAlphaTop0_Cr					202		// Derived from bIndexAtop0_Cr
-#define	bBetaTop0_Cr					203		// Derived from bIndexBtop0_Cr
-
-#define	bAlphaInternal_Cr				204		// Derived from bIndexAinternal_Cr
-#define	bBetaInternal_Cr				205		// Derived from bIndexBinternal_Cr
-// Offset 206 - 223 not used		
-
-// GRF7
-#define	bAlphaLeft1_Cb					224		// Derived from bIndexAleft1_Cb	Used in Mbaff mode only
-#define	bBetaLeft1_Cb					225		// Derived from bIndexBleft1_Cb	Used in Mbaff mode only
-#define	bAlphaTop1_Cb					226		// Derived from bIndexAtop1_Cb	Used in Mbaff mode only
-#define	bBetaTop1_Cb					227		// Derived from bIndexBtop1_Cb	Used in Mbaff mode only
-
-// Offset 228 - 231 not used
-
-#define	bTc0_v00_1_Cb					232		// Derived from bSv00_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-#define	bTc0_v10_1_Cb					233		// Derived from bSv10_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-#define	bTc0_v20_1_Cb					234		// Derived from bSv20_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-#define	bTc0_v30_1_Cb					235		// Derived from bSv30_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-
-#define	bTc0_h00_1_Cb					236		// Derived from bSh00_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-#define	bTc0_h01_1_Cb					237		// 	Derived from bSh01_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-#define	bTc0_h02_1_Cb					238		// Derived from bSh02_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-#define	bTc0_h03_1_Cb					239		// Derived from bSh03_1 and bIndexAleft1_Cb	Used in Mbaff mode only
-
-#define	bAlphaLeft1_Cr					240		// Derived from bIndexAleft1_Cr	Used in Mbaff mode only
-#define	bBetaLeft1_Cr					241		// Derived from bIndexBleft1_Cr	Used in Mbaff mode only
-#define	bAlphaTop1_Cr					242		// Derived from bIndexAtop1_Cr	Used in Mbaff mode only
-#define	bBetaTop1_Cr					243		// Derived from bIndexBtop1_Cr	Used in Mbaff mode only
-
-// Offset 244 - 247 not used		
-
-#define	bTc0_v00_1_Cr					248		// Derived from bSv00_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-#define	bTc0_v10_1_Cr					249		// Derived from bSv10_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-#define	bTc0_v20_1_Cr					250		// Derived from bSv20_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-#define	bTc0_v30_1_Cr					251		// Derived from bSv30_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-
-#define	bTc0_h00_1_Cr					252		// Derived from bSh00_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-#define	bTc0_h01_1_Cr					253		// Derived from bSh01_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-#define	bTc0_h02_1_Cr					254		// Derived from bSh02_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-#define	bTc0_h03_1_Cr					255		// Derived from bSh03_1 and bIndexAleft1_Cr	Used in Mbaff mode only
-
-
-#else		// _APPLE is defined
-
-//******** Crestline for Apple, progressive only, 88 bytes **********
-
-// GRF0
-#define HorizOrigin						0
-#define VertOrigin						1
-#define BitFlags						2		// Bit flags
-
-#define	wEdgeCntlMap_IntLeftVert		4		// Derived from bbSinternalLeftVert, 1 bit per pixel 
-#define	wEdgeCntlMap_IntMidVert			6		// Derived from bbSinternalLeftVert
-#define	wEdgeCntlMap_IntRightVert		8		// Derived from bbSinternalRightVert
-#define	wEdgeCntlMap_IntTopHorz			10		// Derived from bbSinternalTopHorz, 1bit per pixel 
-#define	wEdgeCntlMap_IntMidHorz			12		// Derived from bbSinternalMidHorz
-#define	wEdgeCntlMap_IntBotHorz			14		// Derived from bbSinternalBotHorz
-#define	wEdgeCntlMapA_ExtLeftVert0		16		// Derived from wbSLeft0, 1bit per pixel
-#define	wEdgeCntlMapB_ExtLeftVert0		18		// Derived from wbSLeft0
-#define	wEdgeCntlMapA_ExtTopHorz0		20		// Derived from wbSTop0, 1bit per pixel
-#define	wEdgeCntlMapB_ExtTopHorz0		22		// Derived from wbSTop0
-
-#define	bAlphaLeft0_Y					24		// Derived from bIndexAleft0_Y	
-#define	bBetaLeft0_Y					25		// Derived from bIndexBleft0_Y	
-#define	bAlphaTop0_Y					26		// Derived from bIndexAtop0_Y	
-#define	bBetaTop0_Y						27		// Derived from bIndexBtop0_Y	
-#define	bAlphaInternal_Y				28		// Derived from bIndexAinternal_Y	
-#define	bBetaInternal_Y					29		// Derived from bIndexBinternal_Y	
-
-// GRF1
-#define	bTc0_v00_0_Y					32		// Derived from bSv00_0 and bIndexAleft0_Y, 4 pixels per tc0
-#define	bTc0_v10_0_Y					33		// Derived from bSv10_0 and bIndexAleft0_Y
-#define	bTc0_v20_0_Y					34		// Derived from bSv20_0 and bIndexAleft0_Y
-#define	bTc0_v30_0_Y					35		// Derived from bSv30_0 and bIndexAleft0_Y
-#define	bTc0_v01_Y						36		// Derived from bSv01 and bIndexAinternal_Y
-#define	bTc0_v11_Y						37		// Derived from bSv11 and bIndexAinternal_Y
-#define	bTc0_v21_Y						38		// Derived from bSv21 and bIndexAinternal_Y
-#define	bTc0_v31_Y						39		// Derived from bSv31 and bIndexAinternal_Y
-#define	bTc0_v02_Y						40		// Derived from bSv02 and bIndexAinternal_Y
-#define	bTc0_v12_Y						41		// Derived from bSv12 and bIndexAinternal_Y
-#define	bTc0_v22_Y						42		// Derived from bSv22 and bIndexAinternal_Y
-#define	bTc0_v32_Y						43		// Derived from bSv32 and bIndexAinternal_Y
-#define	bTc0_v03_Y						44		// Derived from bSv03 and bIndexAinternal_Y
-#define	bTc0_v13_Y						45		// Derived from bSv13 and bIndexAinternal_Y
-#define	bTc0_v23_Y						46		// Derived from bSv23 and bIndexAinternal_Y
-#define	bTc0_v33_Y						47		// Derived from bSv33 and bIndexAinternal_Y
-
-#define	bTc0_h00_0_Y					48		// Derived from bSh00_0 and bIndexAleft0_Y
-#define	bTc0_h01_0_Y					49		// Derived from bSh01_0 and bIndexAleft0_Y
-#define	bTc0_h02_0_Y					50		// Derived from bSh02_0 and bIndexAleft0_Y
-#define	bTc0_h03_0_Y					51		// Derived from bSh03_0 and bIndexAleft0_Y
-#define	bTc0_h10_Y						52		// Derived from bSh10 and bIndexAinternal_Y
-#define	bTc0_h11_Y						53		// Derived from bSh11 and bIndexAinternal_Y
-#define	bTc0_h12_Y						54		// Derived from bSh12 and bIndexAinternal_Y
-#define	bTc0_h13_Y						55		// Derived from bSh13 and bIndexAinternal_Y
-#define	bTc0_h20_Y						56		// Derived from bSh20 and bIndexAinternal_Y
-#define	bTc0_h21_Y						57		// Derived from bSh21 and bIndexAinternal_Y
-#define	bTc0_h22_Y						58		// Derived from bSh22 and bIndexAinternal_Y
-#define	bTc0_h23_Y						59		// Derived from bSh23 and bIndexAinternal_Y
-#define	bTc0_h30_Y						60		// Derived from bSh30 and bIndexAinternal_Y
-#define	bTc0_h31_Y						61		// Derived from bSh31 and bIndexAinternal_Y
-#define	bTc0_h32_Y						62		// Derived from bSh32 and bIndexAinternal_Y
-#define	bTc0_h33_Y						63		// Derived from bSh33 and bIndexAinternal_Y
-
-// GRF2, 
-#define	bTc0_v00_0_Cb					64		// Derived from bSv00_0 and bIndexAleft0_Cb, 2 pixels per tc0	Left0
-#define	bTc0_v10_0_Cb					65		// Derived from bSv10_0 and bIndexAleft0_Cb	
-#define	bTc0_v20_0_Cb					66		// Derived from bSv20_0 and bIndexAleft0_Cb	
-#define	bTc0_v30_0_Cb					67		// Derived from bSv30_0 and bIndexAleft0_Cb	
-#define	bTc0_v02_Cb						68		// Derived from bSv02 and bIndexAinternal_Cb	MidVert
-#define	bTc0_v12_Cb						69		// Derived from bSv12 and bIndexAinternal_Cb	
-#define	bTc0_v22_Cb						70		// Derived from bSv22 and bIndexAinternal_Cb	
-#define	bTc0_v32_Cb						71		// Derived from bSv32 and bIndexAinternal_Cb	
-#define	bTc0_h00_0_Cb					72		// Derived from bSh00_0 and bIndexAleft0_Cb	Top0
-#define	bTc0_h01_0_Cb					73		// Derived from bSh01_0 and bIndexAleft0_Cb	
-#define	bTc0_h02_0_Cb					74		// Derived from bSh02_0 and bIndexAleft0_Cb	
-#define	bTc0_h03_0_Cb					75		// Derived from bSh03_0 and bIndexAleft0_Cb	
-#define	bTc0_h20_Cb						76		// Derived from bSh20 and bIndexAinternal_Cb	MidHorz
-#define	bTc0_h21_Cb						77		// Derived from bSh21 and bIndexAinternal_Cb	
-#define	bTc0_h22_Cb						78		// Derived from bSh22 and bIndexAinternal_Cb	
-#define	bTc0_h23_Cb						79		// Derived from bSh23 and bIndexAinternal_Cb	
-
-#define	bAlphaLeft0_Cb					80		// Derived from bIndexAleft0_Cb
-#define	bBetaLeft0_Cb					81		// Derived from bIndexBleft0_Cb
-#define	bAlphaTop0_Cb					82		// Derived from bIndexAtop0_Cb
-#define	bBetaTop0_Cb					83		// Derived from bIndexBtop0_Cb
-#define	bAlphaInternal_Cb				84		// Derived from bIndexAinternal_Cb
-#define	bBetaInternal_Cb				85		// Derived from bIndexBinternal_Cb
-
-#define	ExtBitFlags						86		// Extended bit flags, such as disable ILDB bits
-
-// Shared between Cb and Cr
-#define	bTc0_v00_0_Cr			bTc0_v00_0_Cb	
-#define	bTc0_v10_0_Cr		    bTc0_v10_0_Cb	
-#define	bTc0_v20_0_Cr		    bTc0_v20_0_Cb	
-#define	bTc0_v30_0_Cr		    bTc0_v30_0_Cb	
-#define	bTc0_v02_Cr			    bTc0_v02_Cb		
-#define	bTc0_v12_Cr			    bTc0_v12_Cb		
-#define	bTc0_v22_Cr			    bTc0_v22_Cb		
-#define	bTc0_v32_Cr			    bTc0_v32_Cb		
-#define	bTc0_h00_0_Cr		    bTc0_h00_0_Cb	
-#define	bTc0_h01_0_Cr		    bTc0_h01_0_Cb	
-#define	bTc0_h02_0_Cr		    bTc0_h02_0_Cb	
-#define	bTc0_h03_0_Cr		    bTc0_h03_0_Cb	
-#define	bTc0_h20_Cr			    bTc0_h20_Cb		
-#define	bTc0_h21_Cr			    bTc0_h21_Cb		
-#define	bTc0_h22_Cr			    bTc0_h22_Cb		
-#define	bTc0_h23_Cr			    bTc0_h23_Cb		
-                                
-#define	bAlphaLeft0_Cr		    bAlphaLeft0_Cb		   
-#define	bBetaLeft0_Cr		    bBetaLeft0_Cb		   
-#define	bAlphaTop0_Cr		    bAlphaTop0_Cb		   
-#define	bBetaTop0_Cr		    bBetaTop0_Cb		   
-#define	bAlphaInternal_Cr	    bAlphaInternal_Cb	   
-#define	bBetaInternal_Cr	    bBetaInternal_Cb	   
-
-
-#endif
-
-
-//========== End of Child Variables ===============================================================
-
-#if !defined(COMBINED_KERNEL)
-#define ILDB_LABEL(x)	x		// No symbol extension for standalone kernels
-#endif
-
-#endif	// !defined(__AVC_ILDB_HEADER__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,419 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__AVC_ILDB_LUMA_CORE__)	// Make sure this file is only included once
-#define __AVC_ILDB_LUMA_CORE__
-
-////////// AVC ILDB Luma Core /////////////////////////////////////////////////////////////////////////////////
-//
-//	This core performs AVC LUMA ILDB filtering on one horizontal edge (16 pixels) of a MB.  
-//	If data is transposed, it can also de-block a vertical edge.
-//
-//	Bafore calling this subroutine, caller needs to set the following parameters.
-//
-//	- EdgeCntlMap1				//	Edge control map A
-//	- EdgeCntlMap2				//	Edge control map B
-//	- P_AddrReg					//	Src and dest address register for P pixels
-//	- Q_AddrReg					//	Src and dest address register for Q pixels 	
-//	- alpha						//  alpha corresponding to the edge to be filtered
-//	- beta						//  beta corresponding to the edge to be filtered
-//	- tc0						// 	tc0  corresponding to the edge to be filtered
-//
-//
-//	+----+----+----+----+----+----+----+----+
-//	| p3 | p2 | P1 | p0 | q0 | q1 | q2 | q3 |
-//	+----+----+----+----+----+----+----+----+
-//
-//	p3 = r[P_AddrReg, 0]<16;16,1>  
-//	p2 = r[P_AddrReg, 16]<16;16,1> 
-//	p1 = r[P_AddrReg, 32]<16;16,1> 
-//	p0 = r[P_AddrReg, 48]<16;16,1> 
-// 	q0 = r[Q_AddrReg, 0]<16;16,1>  
-//	q1 = r[Q_AddrReg, 16]<16;16,1> 
-//	q2 = r[Q_AddrReg, 32]<16;16,1> 
-//	q3 = r[Q_AddrReg, 48]<16;16,1> 
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// The region is both src and dest
-// P0-P3 and Q0-Q3 should be only used if they have not been modified to new values
-#undef 	P3
-#undef 	P2
-#undef 	P1
-#undef 	P0
-#undef 	Q0
-#undef 	Q1
-#undef 	Q2
-#undef 	Q3
-  
-#define P3 		r[P_AddrReg,  0]<16;16,1>:ub
-#define P2 		r[P_AddrReg, 16]<16;16,1>:ub
-#define P1 		r[P_AddrReg, 32]<16;16,1>:ub
-#define P0 		r[P_AddrReg, 48]<16;16,1>:ub
-#define Q0 		r[Q_AddrReg,  0]<16;16,1>:ub
-#define Q1 		r[Q_AddrReg, 16]<16;16,1>:ub
-#define Q2 		r[Q_AddrReg, 32]<16;16,1>:ub
-#define Q3 		r[Q_AddrReg, 48]<16;16,1>:ub
-
-// New region as dest
-#undef 	NewP2
-#undef 	NewP1
-#undef 	NewP0
-#undef 	NewQ0
-#undef 	NewQ1
-#undef 	NewQ2
-
-#define NewP2 	r[P_AddrReg, 16]<1>:ub
-#define NewP1 	r[P_AddrReg, 32]<1>:ub
-#define NewP0 	r[P_AddrReg, 48]<1>:ub
-#define NewQ0 	r[Q_AddrReg,  0]<1>:ub
-#define NewQ1 	r[Q_AddrReg, 16]<1>:ub
-#define NewQ2 	r[Q_AddrReg, 32]<1>:ub
-
-// Filter one luma edge
-FILTER_Y:
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x1111:w
-#endif
-	//---------- Derive filterSampleflag in AVC spec, equition (8-469) ----------
-	// bS is in MaskA
-
-	// Src copy of the p3, p2, p1, p0, q0, q1, q2, q3
-//	mov (16) p0123_W(0)<1>		r[P_AddrReg]<16;16,1>:uw
-//	mov (16) p0123_W(1)<1>		r[P_AddrReg, 32]<16;16,1>:uw
-//	mov (16) q0123_W(0)<1>		r[Q_AddrReg]<16;16,1>:uw
-//	mov (16) q0123_W(1)<1>		r[Q_AddrReg, 32]<16;16,1>:uw
-
-	mov (2)	f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	add (16) q0_p0(0)<1>		Q0		-P0				// q0-p0
-	add (16) TempRow0(0)<1>		P1		-P0				// p1-p0
-	add (16) TempRow1(0)<1>		Q1		-Q0				// q1-q0
-
-	// Build FilterSampleFlag
-	// abs(q0-p0) < alpha
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)q0_p0(0)			alpha:w
-	// abs(p1-p0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow0(0)		beta:w
-	// abs(q1-q0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow1(0)		beta:w
-
-	//-----------------------------------------------------------------------------------------
-
-    (f0.0)	if	(16)		Y_ENDIF1
-		// For channels whose edge control map1 = 1 ---> perform de-blocking
-
-//		mov (1)		f0.1:uw		MaskB:uw	{NoMask}		// Now check for which algorithm to apply
-
-		// (abs)ap = |p2-p0|
-		add (16) ap(0)<1>		P2		-P0		// ap = p2-p0
-		// (abs)aq = |q2-q0|
-		add (16) aq(0)<1>		Q2		-Q0		// aq = q2-q0
-
-		// Make a copy of unmodified p0 and p1 for use in q0'and q1' calculation
-		mov (16) p0123_W(1)<1>		r[P_AddrReg, 32]<16;16,1>:uw		{NoMask}
-
-		(f0.1)	if	(16)		Y_ELSE2
-
-			// For channels whose edge control map2 = 1 ---> bS = 4 algorithm
-
-			// Compute q0', q1' and q2'
-			//-----------------------------------------------------------------------------
-			// bS = 4 Algorithm :			
-			//
-			// gama = |p0-q0| < ((alpha >> 2) + 2) 
-			// deltap = (ap<beta) && gama;  		// deep filter flag
-			//	if (deltap) {
-			//		p0' = (        p2 +2*p1 +2*p0 +2*q0 + q1 + 4) >> 3; 
-			// 		p1' = (        p2 +  p1 +  p0 +  q0      + 2) >> 2;
-			// 		p2' = (2*p3 +3*p2 +  p1 +  p0 +  q0      + 4) >> 3;
-			//	} else {  
-			//		p0' = (            2*p1 +  p0 +  q1      + 2) >> 2;
-			//	}
-			//-----------------------------------------------------------------------------
-
-			// gama = |p0-q0| < ((alpha >> 2) + 2) = |p0-q0| < alpha2  
-			cmp.l.f0.1 (16) null:w	(abs)q0_p0(0)	alpha2:w
-
-			// Common P01 = p0 + p1
-			add (16)	P0_plus_P1(0)<1>	P0			P1	
-
-			// Common Q01 = q0 + q1
-			add (16)	Q0_plus_Q1(0)<1>	Q0			Q1
-
-//			mov (1)	CTemp1_W:w		f0.1:uw						{NoMask}
-			mov (1)	f0.0:uw			f0.1:uw						{NoMask}
-	
-			// deltap = ((abs)ap < beta) && gama
-			(f0.1) cmp.l.f0.1 (16) null:w	(abs)ap(0)		beta<0;1,0>:w							// (abs)ap < beta ?
-
-			// deltaq = ((abs)aq < beta) && gama
-			(f0.0) cmp.l.f0.0 (16) null:w	(abs)aq(0)		beta<0;1,0>:w							// (abs)aq < beta ?
-
-
-//			mov (1)	CTemp1_W:w		f0.0:uw						{NoMask}					// gama = |p0-q0| < ((alpha >> 2) + 2) for each channel	
-//			and (1)		f0.1:w		f0.1:uw		CTemp1_W:w		{NoMask}					// deltap = (ap<beta) && gama
-
-
-			(f0.1)	if	(16)		Y_ELSE3			// for channels its deltap = true
-
-			add (16)	P2_plus_P3(0)<1>	P2		P3
-			
-			// A =  (p1 + p0) + q0 = P01 + q0
-			add (16)	A(0)<1>			P0_plus_P1(0)		Q0							// A =  P01 + q0
-
-			// Now acc0 = A
-
-			// B =  p2 + (p1 + p0 + q0) + 4 = p2 + A + 4
-//			add (16)	acc0.0<1>:w		P2				4:w								// p2 + 4 
-//			add (16)	BB(0)<1>			acc0.0<16;16,1>:w		A(0)					// B = p2 + A + 4
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		4:w								// p2 + 4 
-			add (16)	BB(0)<1>			acc0.0<16;16,1>:w		P2					// B = p2 + A + 4
-			
-			// Now acc0 = B
-
-			// p2' = (2*p3 +3*p2 + A + 4) >> 3 = (2*(p3+p2) + B) >> 3
-//			mov	(16)	acc0.0<1>:w		BB(0)
-			mac (16)	acc0.0<1>:w		P2_plus_P3(0)		2:w		
-			shr.sat (16) TempRow3B(0)<2>	acc0.0<16;16,1>:w		3:w
-			
-			// p1' = (p2 + A + 2) >> 2 = (B - 2) >> 2
-			add (16)	acc0.0<1>:w		BB(0)			-2:w
-			shr.sat (16) TempRow1B(0)<2>	acc0.0<16;16,1>:w		2:w
-	
-			// p0' = (p2 +2*A + q1 + 4) >> 3 = (B + A + q1) >> 3
-			add (16)	acc0.0<1>:w		Q1				A(0)							// B + A
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		BB(0)							// B + A + q1
-			shr.sat (16) TempRow0B(0)<2>	acc0.0<16;16,1>:w		3:w								// (B + A + q1) >> 3
-
-			// p2' = (2*p3 +3*p2 + A + 4) >> 3 = (2*(p3+p2) + B) >> 3
-//			mov	(16)	acc0.0<1>:w		BB(0)
-//			mac (16)	acc0.0<1>:w		P2_plus_P3(0)		2:w		
-//			shr.sat (16) TempRow3B(0)<2>	acc0.0<16;16,1>:w		3:w
-
-			mov (16) 	NewP2		TempRow3B(0)						// p2'
-			mov (16) 	NewP1		TempRow1B(0)						// p1'			
-			mov (16) 	NewP0		TempRow0B(0)						// p0'
-
-Y_ELSE3:
-			else (16)		Y_ENDIF3		// for channels its deltap = false
-
-			// p0' = (2*p1 + p0 + q1 + 2) >> 2 =  (p1 + P01 + q1 + 2) >> 2
-			add (16)	acc0.0<1>:w		P1			P0_plus_P1(0)			// p1 + P01 (TempRow1(0) = P01)
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	Q1				
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	2:w			// p1 + P01 + q1 + 2
-
-			shr.sat (16) TempRow0B(0)<2>	acc0.0<16;16,1>:w		2:w	// >> 2
-			mov (16) 	NewP0		TempRow0B(0)						// p0'
-
-			endif
-Y_ENDIF3:
-			// Compute q0', q1' and q2'
-			//-----------------------------------------------------------------------------
-			// bS = 4 Algorithm (cont):			
-			//
-			//	deltaq = (aq<beta) && gama;  		// deep filter flag
-			//	if (deltaq) {
-			//		q0' = (        q2 +2*q1 +2*q0 +2*p0 + p1 + 4) >> 3; 
-			//		q1' = (        q2 +  q1 +  q0 +  p0      + 2) >> 2;
-			//		q2' = (2*q3 +3*q2 +  q1 +  q0 +  p0      + 4) >> 3;
-			//	} else {
-			//		q0' = (            2*q1 +  q0 +  p1      + 2) >> 2;
-			//	}
-			
-			// deltaq = ((abs)aq < beta) && gama
-//			cmp.l.f0.1 (16) null:w	(abs)aq(0)		beta<0;1,0>:w							// (abs)aq < beta ?
-
-			// Common Q01 = q0 + q1
-//			add (16)	Q0_plus_Q1(0)<1>	Q0			Q1
-			
-//			and (1)		f0.1:w		f0.1:uw		CTemp1_W:w		{NoMask}				// deltaq = ((abs)ap < beta) && gama
-
-			(f0.0)	if	(16)		Y_ELSE4			// for channels its deltaq = true
-			
-			add (16)	Q2_plus_Q3(0)<1>	Q2			Q3
-
-			// A =  (q1 + q0) + p0 = Q01 + p0
-			add (16)	A(0)<1>			Q0_plus_Q1(0)		p0(0)							// A =  q1+q0 + p0
-
-			// Acc0 = A
-
-			// B =  q2 + q1 + q0 + p0 + 4 = q2 + A + 4
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		4:w							// q2 + 4 
-			add (16)	BB(0)<1>			acc0.0<16;16,1>:w		Q2								// B = q2 + A + 4
-
-			// Acc0 = B
-			
-			// q2' = (2*q3 +3*q2 + A + 4) >> 3 = (2*(q3+q2) + B) >> 3
-//			mov (16)	acc0.0<1>:w		BB(0)	
-			mac (16)	acc0.0<1>:w		Q2_plus_Q3(0)	2:w
-			shr.sat (16) TempRow3B(0)<2>	acc0.0<16;16,1>:w		3:w
-
-			// q1' = (q2 + A + 2) >> 2 = (B - 2) >> 2
-			add (16)	acc0.0<1>:w		BB(0)			-2:w
-			shr.sat (16) TempRow1B(0)<2>	acc0.0<16;16,1>:w	2:w
-			
-			// q0' = (q2 +2*A + p1 + 4) >> 3 = (B + A + p1) >> 3
-			add (16)	acc0.0<1>:w		p1(0)					A(0)
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		BB(0)
-			shr.sat (16) TempRow0B(0)<2>	acc0.0<16;16,1>:w	3:w
-			
-			mov (16) 	NewQ2		TempRow3B(0)						// q2'
-			mov (16) 	NewQ1		TempRow1B(0)						// q1'
-			mov (16) 	NewQ0		TempRow0B(0)						// q0'
-
-Y_ELSE4:
-			else (16)		Y_ENDIF4		// for channels its deltaq = false
-
-			// q0' = (2*q1 + q0 + p1 + 2) >> 2 =  (q1 + Q01 + p1 + 2) >> 2
-			// Use original p1 values in p1(0)
-			add (16)	acc0.0<1>:w		p1(0)			Q0_plus_Q1(0)			// p1 + P01 (TempRow1(0) = P01)
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	Q1				
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	2:w			// p1 + P01 + q1 + 2
-
-			shr.sat (16)	TempRow0B(0)<2>		acc0.0<16;16,1>:w		2:w								// >> 2
-			mov (16) 	NewQ0		TempRow0B(0)						// q0'
-
-			endif
-Y_ENDIF4:
-
-			
-			// Done with bS = 4 algorithm
-			
-Y_ELSE2: 
-		else 	(16)		Y_ENDIF2
-			// For channels whose edge control map2 = 0 ---> bS < 4 algorithm
-
-			//-----------------------------------------------------------------------------
-			// bS < 4 Algorithm :
-			// tc = tc0 + (|p2-p0|<Beta ? 1 : 0) + (|q2-q0|<Beta ? 1 : 0)
-			// delta = Clip3(-tc, tc, ((((q0-p0)<<2) + (p1-q1) + 4) >> 3))
-			// p0' = Clip1(p0 + delta) = Clip3(0, 0xFF, p0 + delta)
-			// q0' = Clip1(q0 - delta) = Clip3(0, 0xFF, q0 - delta)
-			// if (|p2-p0|<Beta)
-			// 		p1' = p1 + Clip3(-tc0, tc0, (p2 + ((p0+q0+1)>>1) - (p1<<1)) >> 1 )
-			// if (|q2-q0|<Beta)
-			// 		q1' = q1 + Clip3(-tc0, tc0, (q2 + ((p0+q0+1)>>1) - (q1<<1)) >> 1 )
-			//-----------------------------------------------------------------------------
-			
-			// Expand tc0
-			mov (16)	tc_exp(0)<1>	tc0<1;4,0>:ub	{NoMask}
-			mov (16)	tc0_exp(0)<1>	tc0<1;4,0>:ub	{NoMask}					// tc0_exp = tc0, each tc0 is duplicated 4 times for 4 adjcent 4 pixels	
-						
-			// tc_exp = tc0_exp + (|p2-p0|<Beta ? 1 : 0) + (|q2-q0|<Beta ? 1 : 0)			
-//			mov (16)	tc_exp(0)<1>		tc0_exp(0)									// tc = tc0_exp first
-			
-
-			cmp.l.f0.0 (16)	null:w		(abs)ap(0)			beta:w						// |p2-p0|< Beta ? ---> (abs)ap < Beta ?
-			cmp.l.f0.1 (16)	null:w		(abs)aq(0)			beta:w						// |q2-q0|< Beta ? ---> (abs)aq < Beta ?
-			
-			//--- Use free cycles here ---
-			// delta = Clip3(-tc, tc, ((((q0-p0)<<2) + (p1-q1) + 4) >> 3))
-			// 4 * (q0-p0) + p1 - q1 + 4
-			add (16) acc0<1>:w		P1			4:w							// p1 + 4
-			mac (16) acc0<1>:w		q0_p0(0)	4:w							// 4 * (q0-p0) + p1 + 4
-			add (16) acc0<1>:w		acc0<16;16,1>:w		-Q1					// 4 * (q0-p0) + p1 - q1 + 4
-			shr (16) TempRow0(0)<1> acc0<16;16,1>:w		3:w
-						
-			// Continue on getting tc_exp
-			(f0.0) add (16)	tc_exp(0)<1>	tc_exp(0)	1:w							// tc0_exp + (|p2-p0|<Beta ? 1 : 0)
-			mov (2)	CTemp1_W<1>:w		f0.0<2;2,1>:w			{NoMask}					// Save	|p2-p0|<Beta flag			
-			(f0.1) add (16)	tc_exp(0)<1>	tc_exp(0)	1:w							// tc_exp = tc0_exp + (|p2-p0|<Beta ? 1 : 0) + (|q2-q0|<Beta ? 1 : 0)
-			
-
-			// Continue on cliping tc to get delta
-			cmp.g.f0.0	(16) null:w		TempRow0(0)		tc_exp(0)					// Clip if delta' > tc
-			cmp.l.f0.1	(16) null:w		TempRow0(0)		-tc_exp(0)					// Clip if delta' < -tc
-
-			//--- Use free cycles here ---
-			// common = (p0+q0+1) >> 1 	  --->  TempRow2(0)
-			// Same as avg of p0 and q0
-			avg (16) TempRow2(0)<1>		P0			Q0
-
-			// Continue on cliping tc to get delta
-			(f0.0) mov (16) TempRow0(0)<1>				tc_exp(0)
-			(f0.1) mov (16) TempRow0(0)<1>				-tc_exp(0)
-
-			//--- Use free cycles here ---
-			mov (2)	f0.0<1>:w		CTemp1_W<2;2,1>:w	{NoMask}			// CTemp1_W = (|p2-p0|<Beta)
-																			// CTemp2_W = (|q2-q0|<Beta)		
-			//-----------------------------------------------------------------------
-
-			// p0' = Clip1(p0 + delta) = Clip3(0, 0xFF, p0 + delta)
-			// q0' = Clip1(q0 - delta) = Clip3(0, 0xFF, q0 - delta)
-			add.sat (16) TempRow1B(0)<2>		P0			TempRow0(0)					// p0+delta
-			add.sat (16) TempRow0B(0)<2>		Q0			-TempRow0(0) 				// q0-delta
-			mov (16) NewP0		TempRow1B(0)					// p0'
-			mov (16) NewQ0		TempRow0B(0)					// q0'
-			//-----------------------------------------------------------------------
-
-			// Now compute p1' and q1'
-
-			// if (|p2-p0|<Beta)
-//			mov (1)	f0.0:w		CTemp1_W:w				{NoMask}			// CTemp1_W = (|p2-p0|<Beta)
-			(f0.0)	if	(16)		Y_ENDIF6
-		
-			// p1' = p1 + Clip3(-tc0, tc0, adj)
-			// adj = (p2 + common - (p1<<1)) >> 1 = (p2 + common - (p1*2)) >> 1
-			add (16) acc0<1>:w	P2		TempRow2(0)							// TempRow2(0) = common = (p0+q0+1) >> 1
-			mac (16) acc0<1>:w	P1		-2:w
-			shr (16) TempRow1(0)<1>		acc0<16;16,1>:w		1:w
-
-			// tc clip to get tc_adj
-			cmp.g.f0.0	(16) null:w		TempRow1(0)		tc0_exp(0)					// Clip if delta' > tc
-			cmp.l.f0.1	(16) null:w		TempRow1(0)		-tc0_exp(0)					// Clip if delta' < -tc
-			
-			(f0.0) mov (16) TempRow1(0)<1>				tc0_exp(0)
-			(f0.1) mov (16) TempRow1(0)<1>				-tc0_exp(0)
-
-			//--- Use free cycles here ---
-			mov (1)	f0.1:w		CTemp2_W:w				{NoMask}			// CTemp2_W = (|q2-q0|<Beta)
-
-			// p1' = p1 + tc_adj
-			add.sat (16) TempRow1B(0)<2>		P1			TempRow1(0)					// p1+tc_adj
-			mov (16) NewP1			TempRow1B(0)				// p1'
-
-			//------------------------------------------------------------------------
-Y_ENDIF6:
-			endif
-			
-			// if (|q2-q0|<Beta)
-//			mov (1)	f0.1:w		CTemp2_W:w				{NoMask}			// CTemp2_W = (|q2-q0|<Beta)
-			(f0.1)	if	(16)		Y_ENDIF7
-					
-			// q1' = q1 + Clip3(-tc0, tc0, adj)
-			// adj = (q2 + common - (q1<<1)) >> 1 
-			// same as q2 + common - (q1 * 2)
-			add (16) acc0<1>:w	Q2		TempRow2(0)
-			mac (16) acc0<1>:w	Q1		-2:w
-			shr (16) TempRow1(0)<1>		acc0<16;16,1>:w		1:w	
-
-			// tc clip to get tc_adj
-			cmp.g.f0.0	(16) null:w		TempRow1(0)		tc0_exp(0)					// Clip if delta' > tc
-			cmp.l.f0.1	(16) null:w		TempRow1(0)		-tc0_exp(0)					// Clip if delta' < -tc
-
-			(f0.0) mov (16) TempRow1(0)<1>				tc0_exp(0)
-			(f0.1) mov (16) TempRow1(0)<1>				-tc0_exp(0)
-
-			// q1' = q1 + tc_adj
-			add.sat (16) TempRow1B(0)<2>		Q1			TempRow1(0)					// q1+tc_adj
-			mov (16) NewQ1			TempRow1B(0)				// q1'
-
-			//------------------------------------------------------------------------			
-Y_ENDIF7:
-			endif
-
-		endif
-Y_ENDIF2:
-Y_ENDIF1:
-	endif
-
-RETURN
-
-#endif	// !defined(__AVC_ILDB_LUMA_CORE__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Luma_Core_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,391 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__AVC_ILDB_LUMA_CORE_MBAFF__)	// Make sure this file is only included once
-#define __AVC_ILDB_LUMA_CORE_MBAFF__
-
-////////// AVC ILDB Luma Core Mbaff /////////////////////////////////////////////////////////////////////////////////
-//
-//	This core performs AVC LUMA ILDB filtering on one horizontal edge (16 pixels) of a MB.  
-//	If data is transposed, it can also de-block a vertical edge.
-//
-//	Bafore calling this subroutine, caller needs to set the following parameters.
-//
-//	- EdgeCntlMap1				//	Edge control map A
-//	- EdgeCntlMap2				//	Edge control map B
-//	- P_AddrReg					//	Src and dest address register for P pixels
-//	- Q_AddrReg					//	Src and dest address register for Q pixels 	
-//	- alpha						//  alpha corresponding to the edge to be filtered
-//	- beta						//  beta corresponding to the edge to be filtered
-//	- tc0						// 	tc0  corresponding to the edge to be filtered
-//
-//
-//	+----+----+----+----+----+----+----+----+
-//	| p3 | p2 | P1 | p0 | q0 | q1 | q2 | q3 |
-//	+----+----+----+----+----+----+----+----+
-//
-//	p3 = r[P_AddrReg, 0]<16;16,1>  
-//	p2 = r[P_AddrReg, 16]<16;16,1> 
-//	p1 = r[P_AddrReg, 32]<16;16,1> 
-//	p0 = r[P_AddrReg, 48]<16;16,1> 
-// 	q0 = r[Q_AddrReg, 0]<16;16,1>  
-//	q1 = r[Q_AddrReg, 16]<16;16,1> 
-//	q2 = r[Q_AddrReg, 32]<16;16,1> 
-//	q3 = r[Q_AddrReg, 48]<16;16,1> 
-//
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// The region is both src and dest
-// P0-P3 and Q0-Q3 should be only used if they have not been modified to new values  
-#undef 	P3
-#undef 	P2
-#undef 	P1
-#undef 	P0
-#undef 	Q0
-#undef 	Q1
-#undef 	Q2
-#undef 	Q3
-
-#define P3 		r[P_AddrReg,  0]<16;16,1>:ub
-#define P2 		r[P_AddrReg, 16]<16;16,1>:ub
-#define P1 		r[P_AddrReg, 32]<16;16,1>:ub
-#define P0 		r[P_AddrReg, 48]<16;16,1>:ub
-#define Q0 		r[Q_AddrReg,  0]<16;16,1>:ub
-#define Q1 		r[Q_AddrReg, 16]<16;16,1>:ub
-#define Q2 		r[Q_AddrReg, 32]<16;16,1>:ub
-#define Q3 		r[Q_AddrReg, 48]<16;16,1>:ub
-
-// New region as dest
-#undef 	NewP2
-#undef 	NewP1
-#undef 	NewP0
-#undef 	NewQ0
-#undef 	NewQ1
-#undef 	NewQ2
-
-#define NewP2 	r[P_AddrReg, 16]<1>:ub
-#define NewP1 	r[P_AddrReg, 32]<1>:ub
-#define NewP0 	r[P_AddrReg, 48]<1>:ub
-#define NewQ0 	r[Q_AddrReg,  0]<1>:ub
-#define NewQ1 	r[Q_AddrReg, 16]<1>:ub
-#define NewQ2 	r[Q_AddrReg, 32]<1>:ub
-
-
-
-// Filter one luma edge - mbaff
-FILTER_Y_MBAFF:
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x1111:w
-#endif
-	//---------- Derive filterSampleflag in AVC spec, equition (8-469) ----------
-	// bS is in MaskA
-
-	// Src copy of the p3, p2, p1, p0, q0, q1, q2, q3
-//	mov (16) p0123_W(0)<1>		r[P_AddrReg]<16;16,1>:uw
-//	mov (16) p0123_W(1)<1>		r[P_AddrReg, 32]<16;16,1>:uw
-//	mov (16) q0123_W(0)<1>		r[Q_AddrReg]<16;16,1>:uw
-//	mov (16) q0123_W(1)<1>		r[Q_AddrReg, 32]<16;16,1>:uw
-
-	// Move MaskA and MaskB to flag regs
-	mov (2)	f0.0<1>:uw		MaskA<2;2,1>:uw
-
-	add (16) q0_p0(0)<1>		Q0			-P0				// q0-p0
-	add (16) TempRow0(0)<1>		P1			-P0				// p1-p0
-	add (16) TempRow1(0)<1>		Q1			-Q0				// q1-q0
-
-	// abs(q0-p0) < alpha
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)q0_p0(0)		Mbaff_ALPHA(0)
-	// abs(p1-p0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow0(0)	Mbaff_BETA(0)
-	// abs(q1-q0) < Beta
-	(f0.0) cmp.l.f0.0 (16) null:w		(abs)TempRow1(0)	Mbaff_BETA(0)
-
-	//-----------------------------------------------------------------------------------------
-
-    (f0.0)	if	(16)		MBAFF_Y_ENDIF1
-		// For channels whose edge control map1 = 1 ---> perform de-blocking
-
-//		mov (1)		f0.1:uw		MaskB:uw	{NoMask}		// Now check for which algorithm to apply
-
-		// (abs)ap = |p2-p0|
-		add (16) ap(0)<1>		P2		-P0
-
-		// (abs)aq = |q2-q0|
-		add (16) aq(0)<1>		Q2		-Q0
-
-		// Make a copy of unmodified p0 and p1 for use in q0'and q1' calculation
-		mov (16) p0123_W(1)<1>		r[P_AddrReg, 32]<16;16,1>:uw		{NoMask}
-			
-		(f0.1)	if	(16)		MBAFF_Y_ELSE2
-
-			// For channels whose edge control map2 = 1 ---> bS = 4 algorithm
-
-			// Compute q0', q1' and q2'
-			//-----------------------------------------------------------------------------
-			// bS = 4 Algorithm :			
-			//
-			// gama = |p0-q0| < ((alpha >> 2) + 2) 
-			// deltap = (ap<beta) && gama;  		// deep filter flag
-			//	if (deltap) {
-			//		p0' = (        p2 +2*p1 +2*p0 +2*q0 + q1 + 4) >> 3; 
-			// 		p1' = (        p2 +  p1 +  p0 +  q0      + 2) >> 2;
-			// 		p2' = (2*p3 +3*p2 +  p1 +  p0 +  q0      + 4) >> 3;
-			//	} else {  
-			//		p0' = (            2*p1 +  p0 +  q1      + 2) >> 2;
-			//	}
-			//-----------------------------------------------------------------------------
-
-			// gama = |p0-q0| < ((alpha >> 2) + 2) = |p0-q0| < alpha2  
-			cmp.l.f0.1 (16) null:w	(abs)q0_p0(0)	Mbaff_ALPHA2(0)
-
-			// Common P01 = p0 + p1
-			add (16)	P0_plus_P1(0)<1>	P0			P1	
-
-			// Common Q01 = q0 + q1
-			add (16)	Q0_plus_Q1(0)<1>	Q0			Q1
-
-			mov (1)	f0.0:uw			f0.1:uw						{NoMask}
-
-			// deltap = ((abs)ap < beta) && gama
-			(f0.1) cmp.l.f0.1 (16) null:w	(abs)ap(0)		Mbaff_BETA(0)							// (abs)ap < beta ?
-
-			// deltaq = ((abs)aq < beta) && gama
-			(f0.0) cmp.l.f0.0 (16) null:w	(abs)aq(0)		Mbaff_BETA(0)							// (abs)aq < beta ?
-
-
-			(f0.1)	if	(16)		MBAFF_Y_ELSE3			// for channels its deltap = true
-	
-			add (16)	P2_plus_P3(0)<1>	P2		P3
-			
-			// A =  p1 + p0 + q0 = P01 + q0
-			add (16)	A(0)<1>			P0_plus_P1(0)		Q0							// A =  P01 + q0
-
-			// Now acc0 = A
-
-			// B =  p2 + p1 + p0 + q0 + 4 = p2 + A + 4
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		4:w								// p2 + 4 
-			add (16)	BB(0)<1>			acc0.0<16;16,1>:w		P2					// B = p2 + A + 4
-
-			// Now acc0 = B
-
-			// p2' = (2*p3 +3*p2 + A + 4) >> 3 = (2*(p3+p2) + B) >> 3
-			mac (16)	acc0.0<1>:w		P2_plus_P3(0)		2:w		
-			shr.sat (16) TempRow3B(0)<2>	acc0.0<16;16,1>:w		3:w
-
-			// p1' = (p2 + A + 2) >> 2 = (B - 2) >> 2
-			add (16)	acc0.0<1>:w		BB(0)			-2:w
-			shr.sat (16) TempRow1B(0)<2>	acc0.0<16;16,1>:w		2:w
-	
-			// p0' = (p2 +2*A + q1 + 4) >> 3 = (B + A + q1) >> 3
-			add (16)	acc0.0<1>:w		Q1				A(0)							// B + A
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		BB(0)							// B + A + q1
-			shr.sat (16) TempRow0B(0)<2>	acc0.0<16;16,1>:w		3:w								// (B + A + q1) >> 3
-
-			mov (16) 	NewP2		TempRow3B(0)						// p2'
-			mov (16) 	NewP1		TempRow1B(0)						// p1'			
-			mov (16) 	NewP0		TempRow0B(0)						// p0'
-
-MBAFF_Y_ELSE3:
-			else (16)		MBAFF_Y_ENDIF3		// for channels its deltap = false
-
-			// p0' = (2*p1 + p0 + q1 + 2) >> 2 =  (p1 + P01 + q1 + 2) >> 2
-			add (16)	acc0.0<1>:w		P1			P0_plus_P1(0)			// p1 + P01 (TempRow1(0) = P01)
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	Q1				
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	2:w			// p1 + P01 + q1 + 2
-
-			shr.sat (16) TempRow0B(0)<2>	acc0.0<16;16,1>:w		2:w	// >> 2
-			mov (16) 	NewP0		TempRow0B(0)						// p0'
-
-			endif
-
-MBAFF_Y_ENDIF3:
-			// Compute q0', q1' and q2'
-			//-----------------------------------------------------------------------------
-			// bS = 4 Algorithm (cont):			
-			//
-			//	deltaq = (aq<beta) && gama;  		// deep filter flag
-			//	if (deltaq) {
-			//		q0' = (        q2 +2*q1 +2*q0 +2*p0 + p1 + 4) >> 3; 
-			//		q1' = (        q2 +  q1 +  q0 +  p0      + 2) >> 2;
-			//		q2' = (2*q3 +3*q2 +  q1 +  q0 +  p0      + 4) >> 3;
-			//	} else {
-			//		q0' = (            2*q1 +  q0 +  p1      + 2) >> 2;
-			//	}
-			
-			(f0.0)	if	(16)		MBAFF_Y_ELSE4			// for channels its deltaq = true
-			
-			add (16)	Q2_plus_Q3(0)<1>	Q2			Q3
-
-			// A =  q1 + q0 + p0 = Q01 + p0
-			add (16)	A(0)<1>			Q0_plus_Q1(0)		p0(0)							// A =  q1+q0 + p0
-
-			// B =  q2 + q1 + q0 + p0 + 4 = q2 + A + 4
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		4:w							// q2 + 4 
-			add (16)	BB(0)<1>			acc0.0<16;16,1>:w		Q2								// B = q2 + A + 4
-			
-			// Acc0 = B
-
-			// q2' = (2*q3 +3*q2 + A + 4) >> 3 = (2*(q3+q2) + B) >> 3
-			mac (16)	acc0.0<1>:w		Q2_plus_Q3(0)	2:w
-			shr.sat (16) TempRow3B(0)<2>	acc0.0<16;16,1>:w		3:w
-
-			// q1' = (q2 + A + 2) >> 2 = (B - 2) >> 2
-			add (16)	acc0.0<1>:w		BB(0)			-2:w
-			shr.sat (16) TempRow1B(0)<2>	acc0.0<16;16,1>:w	2:w
-			
-			// q0' = (q2 +2*A + p1 + 4) >> 3 = (B + A + p1) >> 3
-			add (16)	acc0.0<1>:w		p1(0)					A(0)
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w		BB(0)
-			shr.sat (16) TempRow0B(0)<2>	acc0.0<16;16,1>:w	3:w
-			
-			mov (16) 	NewQ2		TempRow3B(0)						// q2'
-			mov (16) 	NewQ1		TempRow1B(0)						// q1'
-			mov (16) 	NewQ0		TempRow0B(0)						// q0'
-
-MBAFF_Y_ELSE4:
-			else (16)		MBAFF_Y_ENDIF4		// for channels its deltaq = false
-
-			// q0' = (2*q1 + q0 + p1 + 2) >> 2 =  (q1 + Q01 + p1 + 2) >> 2
-			// Use original p1 values in p1(0)
-			add (16)	acc0.0<1>:w		p1(0)			Q0_plus_Q1(0)			// p1 + P01 (TempRow1(0) = P01)
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	Q1				
-			add (16)	acc0.0<1>:w		acc0.0<16;16,1>:w	2:w			// p1 + P01 + q1 + 2
-
-			shr.sat (16)	TempRow0B(0)<2>		acc0.0<16;16,1>:w		2:w								// >> 2
-			mov (16) 	NewQ0		TempRow0B(0)						// q0'
-
-			endif
-MBAFF_Y_ENDIF4:
-
-			
-			// Done with bS = 4 algorithm
-			
-MBAFF_Y_ELSE2: 
-		else 	(16)		MBAFF_Y_ENDIF2
-			// For channels whose edge control map2 = 0 ---> bS < 4 algorithm
-
-			//-----------------------------------------------------------------------------
-			// bS < 4 Algorithm :
-			// tc = tc0 + (|p2-p0|<Beta ? 1 : 0) + (|q2-q0|<Beta ? 1 : 0)
-			// delta = Clip3(-tc, tc, ((((q0-p0)<<2) + (p1-q1) + 4) >> 3))
-			// p0' = Clip1(p0 + delta) = Clip3(0, 0xFF, p0 + delta)
-			// q0' = Clip1(q0 - delta) = Clip3(0, 0xFF, q0 - delta)
-			// if (|p2-p0|<Beta)
-			// 		p1' = p1 + Clip3(-tc0, tc0, (p2 + ((p0+q0+1)>>1) - (p1<<1)) >> 1 )
-			// if (|q2-q0|<Beta)
-			// 		q1' = q1 + Clip3(-tc0, tc0, (q2 + ((p0+q0+1)>>1) - (q1<<1)) >> 1 )
-			//-----------------------------------------------------------------------------
-			
-			mov (16)	tc_exp(0)<1>		Mbaff_TC0(0)								// tc = tc0_exp first
-			
-			cmp.l.f0.0 (16)	null:w		(abs)ap(0)			Mbaff_BETA(0)				// |p2-p0|<Beta ?
-			cmp.l.f0.1 (16)	null:w		(abs)aq(0)			Mbaff_BETA(0)				// |q2-q0|<Beta ?
-				
-			//--- Use free cycles here ---
-			// delta = Clip3(-tc, tc, ((((q0-p0)<<2) + (p1-q1) + 4) >> 3))
-			// 4 * (q0-p0) + p1 - q1 + 4
-			add (16) acc0<1>:w		P1			4:w							// p1 + 4
-			mac (16) acc0<1>:w		q0_p0(0)	4:w							// 4 * (q0-p0) + p1 + 4
-			add (16) acc0<1>:w		acc0<16;16,1>:w		-Q1					// 4 * (q0-p0) + p1 - q1 + 4
-			shr (16) TempRow0(0)<1> acc0<16;16,1>:w		3:w
-						
-			// Continue on getting tc_exp
-			(f0.0) add (16)	tc_exp(0)<1>	tc_exp(0)	1:w							// tc0_exp + (|p2-p0|<Beta ? 1 : 0)
-			mov (2)	CTemp1_W<1>:w		f0.0<2;2,1>:w			{NoMask}					// Save	|p2-p0|<Beta flag			
-			(f0.1) add (16)	tc_exp(0)<1>	tc_exp(0)	1:w							// tc_exp = tc0_exp + (|p2-p0|<Beta ? 1 : 0) + (|q2-q0|<Beta ? 1 : 0)
-				
-			// Continue on cliping tc to get delta
-			cmp.g.f0.0	(16) null:w		TempRow0(0)		tc_exp(0)					// Clip if delta' > tc
-			cmp.l.f0.1	(16) null:w		TempRow0(0)		-tc_exp(0)					// Clip if delta' < -tc
-
-			//--- Use free cycles here ---
-			// common = (p0+q0+1) >> 1 	  --->  TempRow2(0)
-			// Same as avg of p0 and q0
-			avg (16) TempRow2(0)<1>		P0			Q0
-
-			// Continue on cliping tc to get delta
-			(f0.0) mov (16) TempRow0(0)<1>				tc_exp(0)
-			(f0.1) mov (16) TempRow0(0)<1>				-tc_exp(0)
-
-			//--- Use free cycles here ---
-			mov (2)	f0.0<1>:w		CTemp1_W<2;2,1>:w	{NoMask}			// CTemp1_W = (|p2-p0|<Beta)
-																			// CTemp2_W = (|q2-q0|<Beta)		
-
-			// p0' = Clip1(p0 + delta) = Clip3(0, 0xFF, p0 + delta)
-			// q0' = Clip1(q0 - delta) = Clip3(0, 0xFF, q0 - delta)
-			add.sat (16) TempRow1B(0)<2>		P0			TempRow0(0)					// p0+delta
-			add.sat (16) TempRow0B(0)<2>		Q0			-TempRow0(0) 				// q0-delta
-			
-			mov (16) NewP0		TempRow1B(0)					// p0'
-			mov (16) NewQ0		TempRow0B(0)					// q0'
-
-			//-----------------------------------------------------------------------
-
-			// Now compute p1' and q1'
-
-			// if (|p2-p0|<Beta)
-			(f0.0)	if	(16)		MBAFF_Y_ENDIF6
-
-			// p1' = p1 + Clip3(-tc0, tc0, adj)
-			// adj = (p2 + common - (p1<<1)) >> 1 = (p2 + common - (p1*2)) >> 1
-			add (16) acc0<1>:w	P2		TempRow2(0)							// TempRow2(0) = common = (p0+q0+1) >> 1
-			mac (16) acc0<1>:w	P1		-2:w
-			shr (16) TempRow1(0)<1>		acc0<16;16,1>:w		1:w
-
-			// tc clip to get tc_adj
-			cmp.g.f0.0	(16) null:w		TempRow1(0)		Mbaff_TC0(0)					// Clip if delta' > tc
-			cmp.l.f0.1	(16) null:w		TempRow1(0)		-Mbaff_TC0(0)					// Clip if delta' < -tc
-			
-			(f0.0) mov (16) TempRow1(0)<1>				Mbaff_TC0(0)
-			(f0.1) mov (16) TempRow1(0)<1>				-Mbaff_TC0(0)
-
-			//--- Use free cycles here ---
-			mov (1)	f0.1:w		CTemp2_W:w				{NoMask}			// CTemp2_W = (|q2-q0|<Beta)
-
-			// p1' = p1 + tc_adj
-			add.sat (16) TempRow1B(0)<2>		P1			TempRow1(0)					// p1+tc_adj
-			mov (16) NewP1			TempRow1B(0)				// p1'
-			//------------------------------------------------------------------------
-
-MBAFF_Y_ENDIF6:
-			endif
-			
-			// if (|q2-q0|<Beta)
-			(f0.1)	if	(16)		MBAFF_Y_ENDIF7
-
-			// q1' = q1 + Clip3(-tc0, tc0, adj)
-			// adj = (q2 + common - (q1<<1)) >> 1 
-			// same as q2 + common - (q1 * 2)
-			add (16) acc0<1>:w	Q2		TempRow2(0)
-			mac (16) acc0<1>:w	Q1		-2:w
-			shr (16) TempRow1(0)<1>		acc0<16;16,1>:w		1:w	
-					
-			// tc clip to get tc_adj
-			cmp.g.f0.0	(16) null:w		TempRow1(0)		Mbaff_TC0(0)					// Clip if delta' > tc
-			cmp.l.f0.1	(16) null:w		TempRow1(0)		-Mbaff_TC0(0)					// Clip if delta' < -tc
-
-			(f0.0) mov (16) TempRow1(0)<1>				Mbaff_TC0(0)
-			(f0.1) mov (16) TempRow1(0)<1>				-Mbaff_TC0(0)
-			
-			// q1' = q1 + tc_adj
-			add.sat (16) TempRow1B(0)<2>		Q1			TempRow1(0)					// q1+tc_adj
-			mov (16) NewQ1			TempRow1B(0)				// q1'
-			
-			//------------------------------------------------------------------------			
-MBAFF_Y_ENDIF7:
-			endif
-
-		endif
-MBAFF_Y_ENDIF2:
-MBAFF_Y_ENDIF1:
-	endif
-
-RETURN
-
-#endif	// !defined(__AVC_ILDB_LUMA_CORE_MBAFF__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_LumaThrdLimit.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_LumaThrdLimit.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_LumaThrdLimit.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_LumaThrdLimit.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//========== Forward message to root thread through gateway ==========
-
-// Chroma root kenrel updates luma thread limit.
-
-#if defined(_DEBUG) 
-mov		(1)		EntrySignatureC:w			0x7788:w
-#endif
-
-// Init payload to r0
-mov (8) 	GatewayPayload<1>:ud 	0:w								{ NoDDClr } 
-
-// Forward a message:
-// Offset = x relative to r50 (defiend in open gataway), x = ORIX >> 4 [bit 28:16]
-// Need to shift left 16
-
-mov	(1)		Offset_Length:ud		THREAD_LIMIT_OFFSET:ud	 			{ NoDDClr, NoDDChk }
-
-// Length = 1 byte,	[bit 10:8 = 000]
-//000 xxxxxxxxxxxxx 00000 000 00000000 ==> 000x xxxx xxxx xxxx 0000 0000 0000 0000
-
-//mov (1) 	DispatchID:ub 			r0.20:ub		// Dispatch ID
-
-//  Copy EUid and Thread ID that we received from the PARENT thread
-mov (1) 	EUID_TID:uw 			r0.6:uw								{ NoDDClr, NoDDChk }
-
-mov (1) 	GatewayPayloadKey:uw 	0x1212:uw							{ NoDDChk }	// Key
-
-//mov	(4)		GatewayPayload<1>:ud	0:ud								{ NoDDClr, NoDDChk }	// Init payload low 4 dword
-
-// Write back one byte (value = 0xFF) to root thread GRF to indicate this child thread is finished
-// All lower 4 bytes must be assigned to the same byte value.
-add	(1)		Temp1_W:w				MaxThreads:uw	-OutstandingThreads:uw
-mov	(4)		GatewayPayload<1>:ub	Temp1_B<0;1,0>:ub 
-
-send (8)  	GatewayResponse:ud 		m0	  		GatewayPayload<8;8,1>:ud    MSG_GW	FWDMSGDSC
-
-//========== Forward Msg Done ========================================
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_OpenGateway.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_OpenGateway.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_OpenGateway.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_OpenGateway.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//----- Open a Message Gateway -----
-// The parent thread is the recipient thread
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignature:w			0x1111:w
-#endif
-
-mov (8) 	GatewayPayload<1>:ud 		r0.0<8;8,1>:ud			// Init payload to r0
-
-// r50- (16 GRFs) are the GRFs child thread can wtite to. 
-
-// Reg base is at bit 28:21, Gateway size is at [bit 10:8]
-// r6: 6 = 00000110
-//000 00000110 0000000000 100 00000000 ==> 0000 0000 1100 0000 0000 0100 0000 0000
-mov (1) 	RegBase_GatewaySize:ud 	0x00C00400:ud	// Reg base + Gateway size (16 GRFs)
-
-
-//000 00110010 0000000000 100 00000000 ==> 0000 0110 0100 0000 0000 0100 0000 0000
-//mov (1) 	RegBase_GatewaySize:ud 	0x06400400:ud	// Reg base (r50 = 0x640 byte offset) + Gateway size (16 GRFs)
-
-//mov (1) 	DispatchID:ub 			r0.20:ub		// Dispatch ID
-mov (1) 	GatewayPayloadKey:uw 	0x1212:uw		// Key=0x1212
-
-// Message descriptor
-// bit 31	EOD
-// 27:24	FFID = 0x0011 for msg gateway
-// 23:20	msg length = 1 MRF
-// 19:16	Response length	= 0
-// 14		AckReg = 1
-// 1:0		SubFuncID = 00 for OpenGateway
-// Message descriptor: 0 000 0011 0001 0000 + 0 1 000000000000 00 ==> 0000 0011 0001 0000 0100 0000 0000 0000
-// Send message to gateway: the ack message is put into response GRF r49 ==> Good for debugging
-send (8)  	GatewayResponse:ud	m7	  GatewayPayload<8;8,1>:ud    MSG_GW	OGWMSGDSC
-
-//----- End of Open a Message Gateway -----
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#include "AVC_ILDB_Root_UV.asm"
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Field_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#include "AVC_ILDB_Root_Y.asm"
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-/////////////////////////////////////////////////////////////////////////////////////
-// Kernel name: AVC_ILDB_Root_Mbaff.asm
-//
-//  Root kernel serves as a scheduler for child threads.
-//
-//
-//	***** Note *****
-//	Initial design bundle MB pair for each thread, and share AVC_ILDB_MB_Dep_Check.asm
-//	with non mbaff kernels.
-//
-//	Optimization will be done later, putting top and bottom MBs on separate threads.
-//
-//
-/////////////////////////////////////////////////////////////////////////////////////
-//
-//  $Revision: 1 $
-//  $Date: 10/19/06 5:06p $
-//
-
-// ----------------------------------------------------
-//  AVC_ILDB_ROOT_MBAFF_UV
-// ----------------------------------------------------
-#define AVC_ILDB
-
-.kernel AVC_ILDB_ROOT_MBAFF_UV
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_ROOT_UV):
-#endif
-
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-
-#if defined(_DEBUG) 
-
-/////////////////////////////////////////////////////////////////////////////////////
-// Init URB space for running on RTL.  It satisfies reading an unwritten URB entries.  
-// Will remove it for production release.
-
-
-//mov (8) m1:ud 		0x11111111:ud
-//mov (8) m2:ud 		0x22222222:ud 
-//mov (8) m3:ud 		0x33333333:ud
-//mov (8) m4:ud 		0x44444444:ud 
-
-//mov (1)	Temp1_W:w	0:w
-
-//ILDB_INIT_URB:
-//mul (1)	URBOffset:w				Temp1_W:w		4:w
-//shl (1) URBWriteMsgDescLow:uw 	URBOffset:w		4:w		// Msg descriptor: URB write dest offset (9:4)
-//mov (1) URBWriteMsgDescHigh:uw 	0x0650:uw				// Msg descriptor: URB write 5 MRFs (m0 - m4)
-//#include "writeURB.asm"
-
-//add		(1)		Temp1_W:w	Temp1_W:w	1:w				// Increase block count
-//cmp.l.f0.0 (1) 	null		Temp1_W:w	MBsCntY:w		// Check the block count limit
-//(f0.0) jmpi		ILDB_INIT_URB							// Loop back
-
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-
-mov		(1)		EntrySignature:w			0xEFF0:w
-
-#endif
-//----------------------------------------------------------------------------------------------------------------
-
-// Set global variable
-mov (32) 	ChildParam:uw			0:uw								// Reset local variables
-//mul	(1)	 	TotalBlocks:w			MBsCntX:w		MBsCntY:w			// Total # of MB pairs
-//add	(1)	 	GatewayApertureE:w		MBsCntY:w 		GatewayApertureB:w	// Aperture End = aperture Head + BlockCntY
-
-
-// 2 URB entries for Y:
-// Entry 0 - Child thread R0Hdr
-// Entry 1 - input parameter to child kernel (child r1)
-
-#define 	URB_ENTRIES_PER_MB 	2
-
-// URB_ENTRIES_PER_MB in differnt form, the final desired format is (URB_ENTRIES_PER_MB-1) << 10
-mov (1) URB_EntriesPerMB_2:w		URB_ENTRIES_PER_MB-1:w
-shl (1) URB_EntriesPerMB_2:w		URB_EntriesPerMB_2:w	10:w
-
-#define 	CHROMA_ROOT														// Compiling flag for chroma only
-//mul (1)		URBOffsetUVBase:w		MBsCntY:w		URB_ENTRIES_PER_MB:w	// Right after Y entries
-
-// URB base for UV kernels
-#if defined(DEV_CL)	
-	mov (1)		URBOffsetUVBase:w		240:w
-#else
-	mov (1)		URBOffsetUVBase:w		320:w
-#endif
-
-
-mov	(1)		ChildThreadsID:uw		3:uw
-
-shr (1)		ThreadLimit:w		MaxThreads:w		1:w		// Initial luma thread limit to 50%
-mul	(1)	 	TotalBlocks:w		MBsCntX:w		MBsCntY:w	// MBs to be processed count down from TotalBlocks
-
-//***** Init CT_R0Hdr fields that are common to all threads *************************
-mov (8)	CT_R0Hdr.0:ud			r0.0<8;8,1>:ud				// Init to root R0 header
-mov (1)	CT_R0Hdr.7:ud			r0.6:ud						// Copy Parent Thread Cnt; JJ did the change on 06/20/2006
-mov (1) CT_R0Hdr.31:ub			0:w							// Reset the highest byte
-mov (1) CT_R0Hdr.3:ud 			0x00000000	 
-mov (1) CT_R0Hdr.6:uw 			sr0.0:uw					// sr0.0: state reg contains general thread states, e.g. EUID/TID.
-
-//***** Init ChildParam fields that are common to all threads ***********************
-mov (8) 	ChildParam<1>:ud	RootParam<8;8,1>:ud		// Copy all root parameters
-mov (4)		CurCol<1>:w			0:w						// Reset CurCol, CurRow
-add	(2)		LastCol<1>:w		MBsCntX<2;2,1>:w		-1:w	// Get LastCol and LastRow
-
-mov (1) URBWriteMsgDesc:ud		MSG_LEN(2)+URBWMSGDSC:ud
-
-//===================================================================================
-
-#include "AVC_ILDB_OpenGateway.asm"		// Open root thread gateway for receiving notification 
-
-#include "AVC_ILDB_Dep_Check.asm"  	// Check dependency and spawn all MBs
-
-//#include "AVC_ILDB_UpdateThrdLimit.asm"	// Update thread limit in luma root thread via gateway
-
-#include "AVC_ILDB_CloseGateway.asm"	// Close root thread gateway 
-
-// Chroma root EOT = child send EOT : Request type = 1
-	END_CHILD_THREAD
-
-#undef 	CHROMA_ROOT
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Mbaff_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-/////////////////////////////////////////////////////////////////////////////////////
-// Kernel name: AVC_ILDB_Root_Mbaff.asm
-//
-//  Root kernel serves as a scheduler for child threads.
-//
-//
-//	***** Note *****
-//	Initial design bundle MB pair for each thread, and share AVC_ILDB_MB_Dep_Check.asm
-//	with non mbaff kernels.
-//
-//	Optimization will be done later, putting top and bottom MBs on separate threads.
-//
-//
-/////////////////////////////////////////////////////////////////////////////////////
-//
-//  $Revision: 1 $
-//  $Date: 10/19/06 5:06p $
-//
-
-// ----------------------------------------------------
-//  AVC_ILDB_ROOT_MBAFF_Y
-// ----------------------------------------------------
-#define AVC_ILDB
-
-.kernel AVC_ILDB_ROOT_MBAFF_Y
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_ROOT_Y):
-#endif
-
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-
-#if defined(_DEBUG) 
-
-/////////////////////////////////////////////////////////////////////////////////////
-// Init URB space for running on RTL.  It satisfies reading an unwritten URB entries.  
-// Will remove it for production release.
-
-
-//mov (8) m1:ud 		0x11111111:ud
-//mov (8) m2:ud 		0x22222222:ud 
-//mov (8) m3:ud 		0x33333333:ud
-//mov (8) m4:ud 		0x44444444:ud 
-
-//mov (1)	Temp1_W:w	0:w
-
-//ILDB_INIT_URB:
-//mul (1)	URBOffset:w				Temp1_W:w		4:w
-//shl (1) URBWriteMsgDescLow:uw 	URBOffset:w		4:w		// Msg descriptor: URB write dest offset (9:4)
-//mov (1) URBWriteMsgDescHigh:uw 	0x0650:uw				// Msg descriptor: URB write 5 MRFs (m0 - m4)
-//#include "writeURB.asm"
-
-//add		(1)		Temp1_W:w	Temp1_W:w	1:w				// Increase block count
-//cmp.l.f0.0 (1) 	null		Temp1_W:w	MBsCntY:w		// Check the block count limit
-//(f0.0) jmpi		ILDB_INIT_URB							// Loop back
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-
-mov		(1)		EntrySignature:w			0xEFF0:w
-
-#endif
-//----------------------------------------------------------------------------------------------------------------
-
-// Set global variable
-mov (32) 	ChildParam:uw			0:uw								// Reset local variables
-//mul	(1)	 	TotalBlocks:w			MBsCntX:w		MBsCntY:w			// Total # of MB pairs
-//add	(1)	 	GatewayApertureE:w		MBsCntY:w 		GatewayApertureB:w	// Aperture End = aperture Head + BlockCntY
-
-
-// 2 URB entries for Y:
-// Entry 0 - Child thread R0Hdr
-// Entry 1 - input parameter to child kernel (child r1)
-
-#undef 		URB_ENTRIES_PER_MB
-#define 	URB_ENTRIES_PER_MB	 	2
-
-// URB_ENTRIES_PER_MB in differnt form, the final desired format is (URB_ENTRIES_PER_MB-1) << 10
-mov (1) 	URB_EntriesPerMB_2:w		URB_ENTRIES_PER_MB-1:w
-shl (1) 	URB_EntriesPerMB_2:w		URB_EntriesPerMB_2:w	10:w
-
-mov	(1)		ChildThreadsID:uw		1:uw					// ChildThreadsID for chroma root
-
-shr (1)		ThreadLimit:w		MaxThreads:w		1:w		// Initial luma thread limit to 50%
-mul	(1)	 	TotalBlocks:w		MBsCntX:w		MBsCntY:w	// MBs to be processed count down from TotalBlocks
-
-//***** Init CT_R0Hdr fields that are common to all threads *************************
-mov (8)		CT_R0Hdr.0:ud			r0.0<8;8,1>:ud				// Init to root R0 header
-mov (1)		CT_R0Hdr.7:ud			r0.6:ud						// Copy Parent Thread Cnt; JJ did the change on 06/20/2006
-mov (1) 	CT_R0Hdr.31:ub			0:w							// Reset the highest byte
-mov (1) 	CT_R0Hdr.3:ud 			0x00000000	 
-mov (1) 	CT_R0Hdr.6:uw 			sr0.0:uw					// sr0.0: state reg contains general thread states, e.g. EUID/TID.
-
-//***** Init ChildParam fields that are common to all threads ***********************
-mov (8) 	ChildParam<1>:ud	RootParam<8;8,1>:ud		// Copy all root parameters
-mov (4)		CurCol<1>:w			0:w						// Reset CurCol, CurRow
-add	(2)		LastCol<1>:w		MBsCntX<2;2,1>:w		-1:w	// Get LastCol and LastRow
-
-mov (1) 	URBWriteMsgDesc:ud		MSG_LEN(2)+URBWMSGDSC:ud
-
-//===================================================================================
-
-#include "AVC_ILDB_OpenGateway.asm"		// Open root thread gateway for receiving notification 
-
-#if defined(DEV_CL)	
-	mov	(1)		URBOffset:uw		240:uw	// Use chroma URB offset to spawn chroma root
-#else
-	mov	(1)		URBOffset:uw		320:uw	// Use chroma URB offset to spawn chroma root
-#endif
-
-#include "AVC_ILDB_SpawnChromaRoot.asm"	// Spawn chroma root
-
-mov	(1)		URBOffset:uw		0:uw	// Use luma URB offset to spawn luma child 
-mov	(1)		ChildThreadsID:uw	2:uw	// Starting ChildThreadsID for luma child threads
-
-#include "AVC_ILDB_Dep_Check.asm"  	// Check dependency and spawn all MBs
-
-// Wait for UV root thread to finish
-ILDB_LABEL(WAIT_FOR_UV):
-cmp.l.f0.0 (1) null:w	ThreadLimit:w		MaxThreads:w
-(f0.0) 	jmpi 	ILDB_LABEL(WAIT_FOR_UV)
-
-#include "AVC_ILDB_CloseGateway.asm"	// Close root thread gateway 
-
-END_THREAD								// End of root thread
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: AVC_ILDB_Root_UV.asm
-//
-//  Root kernel serves as a scheduler for child threads
-//
-//  $Revision: 1 $
-//  $Date: 10/19/06 5:06p $
-//
-
-// ----------------------------------------------------
-//  AVC_ILDB_ROOT_UV
-// ----------------------------------------------------
-#define AVC_ILDB
-
-.kernel AVC_ILDB_ROOT_UV
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_ROOT_UV):
-#endif
- 
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-#if defined(_DEBUG) 
-mov		(1)		EntrySignature:w			0xFF11:w
-#endif
-
-/////////////////////////////////////////////////////////////////////////////////////
-#if defined(_DEBUG) 
-
-// Init URB space for running on RTL.  It satisfies reading an unwritten URB entries.  
-// Will remove it for production release.
-
-mov (8) m1:ud 		0x55555555:ud
-mov (8) m2:ud 		0x66666666:ud 
-mov (8) m3:ud 		0x77777777:ud
-mov (8) m4:ud 		0x88888888:ud 
-
-mov (1)	Temp1_W:w	MBsCntY:w
-shl (1)	Temp2_W:w	MBsCntY:w		1:w
-
-ILDB_LABEL(ILDB_INIT_URB_UV):
-mul (1)	URBOffset:uw			Temp1_W:uw		4:w		// Each thread uses 4 URB entries (1 r0 + 1 inline + 2 data)
-mov (1) URBWriteMsgDesc:ud		MSG_LEN(4)+URBWMSGDSC:ud			// Msg descriptor: URB write msg length = 5
-#include "writeURB.asm"
-
-add		(1)		Temp1_W:w	Temp1_W:w	1:w				// Increase block count
-cmp.l.f0.0 (1) 	null		Temp1_W:w	Temp2_W:w		// Check the block count limit
-(f0.0) jmpi		ILDB_LABEL(ILDB_INIT_URB_UV)			// Loop back
-
-mov		(1)		EntrySignature:w			0xFFF0:w
-
-#endif
-/////////////////////////////////////////////////////////////////////////////////////
-
-// Set global variable
-mov (32) 	ChildParam:uw			0:uw								// Reset local variables, 2 GRFs
-//mul	(1)	 	TotalBlocks:w			MBsCntX:w		MBsCntY:w			// Total # of blocks
-//add	(1)	 	GatewayApertureE:w		MBsCntY:w 		GatewayApertureB:w	// Aperture End = aperture Head + BlockCntY
-
-// 4 URB entries for Y:
-// Entry 0 - Child thread R0Hdr
-// Entry 1 - input parameter to child kernel (child r1)
-// Entry 2 - Prev MB data UV 2x8
-// Entry 3 - Unused
-
-#define 	URB_ENTRIES_PER_MB 	4
-
-// URB_ENTRIES_PER_MB in differnt form, the final desired format is (URB_ENTRIES_PER_MB-1) << 10
-mov (1) 	URB_EntriesPerMB_2:w		URB_ENTRIES_PER_MB-1:w
-shl (1) 	URB_EntriesPerMB_2:w		URB_EntriesPerMB_2:w	10:w
-
-#define 	CHROMA_ROOT													// Compiling flag for chroma only
-
-// URB base for UV kernels
-#if defined(DEV_CL)	
-	mov (1)		URBOffsetUVBase:w		240:w
-#else
-	mov (1)		URBOffsetUVBase:w		320:w
-#endif
-
-
-mov	(1)		ChildThreadsID:uw		3:uw
-
-shr (1)		ThreadLimit:w		MaxThreads:w		1:w		// Initial luma thread limit to 50%
-mul	(1)	 	TotalBlocks:w		MBsCntX:w		MBsCntY:w	// MBs to be processed count down from TotalBlocks
-
-//***** Init CT_R0Hdr fields that are common to all threads *************************
-mov (8)		CT_R0Hdr.0:ud		r0.0<8;8,1>:ud				// Init to root R0 header
-mov (1) 	CT_R0Hdr.7:ud		r0.6:ud						// Copy Parent Thread Cnt; JJ did the change on 06/20/2006
-mov (1) 	CT_R0Hdr.31:ub		0:w							// Reset the highest byte
-mov (1) 	CT_R0Hdr.3:ud 		0x00000000	 
-mov (1) 	CT_R0Hdr.6:uw 		sr0.0:uw					// sr0.0: state reg contains general thread states, e.g. EUID/TID.
-
-//***** Init ChildParam fields that are common to all threads ***********************
-mov (8) 	ChildParam<1>:ud	RootParam<8;8,1>:ud		// Copy all root parameters
-mov (4)		CurCol<1>:w			0:w						// Reset CurCol, CurRow, 
-add	(2)		LastCol<1>:w		MBsCntX<2;2,1>:w		-1:w	// Get LastCol and LastRow
-
-mov (1) 	URBWriteMsgDesc:ud		MSG_LEN(2)+URBWMSGDSC:ud
-
-//===================================================================================
-
-#include "AVC_ILDB_OpenGateway.asm"		// Open gateway for receiving notification 
-
-#include "AVC_ILDB_Dep_Check.asm"  		// Check dependency and spawn all luma child threads in parallel with chroma root
-
-//#include "AVC_ILDB_LumaThrdLimit.asm"	// Update thread limit in luma root thread via gateway
-
-#include "AVC_ILDB_CloseGateway.asm"	// Close root thread gateway 
-
-// Chroma root EOT = child send EOT : Request type = 1
-	END_CHILD_THREAD
-	
-#undef 	CHROMA_ROOT
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Root_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: AVC_ILDB_Root_Y.asm
-//
-//  Root kernel serves as a scheduler for child threads
-//
-//  $Revision: 1 $
-//  $Date: 10/19/06 5:06p $
-//
-
-// ----------------------------------------------------
-//  AVC_ILDB_ROOT_Y
-// ----------------------------------------------------
-#define AVC_ILDB
-
-.kernel AVC_ILDB_ROOT_Y
-#if defined(COMBINED_KERNEL)
-ILDB_LABEL(AVC_ILDB_ROOT_Y):
-#endif
-
-#include "SetupVPKernel.asm"
-#include "AVC_ILDB.inc"
-
-/////////////////////////////////////////////////////////////////////////////////////
-#if defined(_DEBUG) 
-
-// Init URB space for running on RTL.  It satisfies reading an unwritten URB entries.  
-// Will remove it for production release.
-
-mov (8) m1:ud 		0x11111111:ud
-mov (8) m2:ud 		0x22222222:ud 
-mov (8) m3:ud 		0x33333333:ud
-mov (8) m4:ud 		0x44444444:ud 
-
-mov (1)	Temp1_W:w	0:w
-
-ILDB_LABEL(ILDB_INIT_URB_Y):
-//mul (1)	Temp2_W:w				Temp1_W:w		4:w		// URBOffset
-//shl (1) URBWriteMsgDescLow:uw 	Temp2_W:w		4:w		// Msg descriptor: URB write dest offset (9:4)
-//mov (1) URBWriteMsgDescHigh:uw 	0x0650:uw				// Msg descriptor: URB write 5 MRFs (m0 - m4)
-
-//mul (1)	URBOffset:uw			Temp1_W:uw		4:w		// Each thread uses 4 URB entries (1 r0 + 1 inline + 2 data)
-mul (1)	URBOffset:uw			Temp1_W:uw		2:w		// Each thread uses 2 URB entries (1 r0 + 1 inline)
-mov (1) URBWriteMsgDesc:ud		MSG_LEN(2)+URBWMSGDSC:ud			// Msg descriptor: URB write msg length = 3
-#include "writeURB.asm"
-
-add		(1)		Temp1_W:w	Temp1_W:w	1:w				// Increase block count
-cmp.l.f0.0 (1) 	null		Temp1_W:w	MBsCntY:w		// Check the block count limit
-(f0.0) jmpi		ILDB_LABEL(ILDB_INIT_URB_Y)							// Loop back
-
-mov		(1)		EntrySignature:w			0xFFF0:w
-
-#endif
-/////////////////////////////////////////////////////////////////////////////////////
-
-
-// Set global variable
-mov (32) 	ChildParam:uw			0:uw								// Reset local variables, 2 GRFs
-//mul	(1)	 	TotalBlocks:w			MBsCntX:w		MBsCntY:w			// Total # of blocks
-//add	(1)	 	GatewayApertureE:w		MBsCntY:w 		GatewayApertureB:w	// Aperture End = aperture Head + BlockCntY
-
-// 4 URB entries for Y:
-// Entry 0 - Child thread R0Hdr
-// Entry 1 - input parameter to child kernel (child r1)
-// Entry 2 - Prev MB data Y 4x16, col 1 and col 0
-// Entry 3 - Prev MB data Y 4x16, col 3 and col 2
-
-#undef 		URB_ENTRIES_PER_MB
-#define 	URB_ENTRIES_PER_MB		4
-
-// URB_ENTRIES_PER_MB in differnt form, the final desired format is (URB_ENTRIES_PER_MB-1) << 10
-mov (1) 	URB_EntriesPerMB_2:w		URB_ENTRIES_PER_MB-1:w
-shl (1) 	URB_EntriesPerMB_2:w		URB_EntriesPerMB_2:w	10:w
-
-shr (1)		ThreadLimit:w		MaxThreads:w	1:w			// Initial luma thread limit to 50%
-mul	(1)	 	TotalBlocks:w		MBsCntX:w		MBsCntY:w	// MBs to be processed count down from TotalBlocks
-
-//***** Init CT_R0Hdr fields that are common to all threads *************************
-mov (8)		CT_R0Hdr.0:ud		r0.0<8;8,1>:ud				// Init to root R0 header
-mov (1) 	CT_R0Hdr.7:ud		r0.6:ud						// Copy Parent Thread Cnt; JJ did the change on 06/20/2006
-mov (1) 	CT_R0Hdr.31:ub		0:w							// Reset the highest byte
-mov (1) 	CT_R0Hdr.3:ud 		0x00000000	 
-mov (1) 	CT_R0Hdr.6:uw 		sr0.0:uw					// sr0.0: state reg contains general thread states, e.g. EUID/TID.
-
-//***** Init ChildParam fields that are common to all threads ***********************
-mov (8) 	ChildParam<1>:ud	RootParam<8;8,1>:ud		// Copy all root parameters
-mov (4)		CurCol<1>:w			0:w						// Reset CurCol, CurRow, 
-add	(2)		LastCol<1>:w		MBsCntX<2;2,1>:w		-1:w	// Get LastCol and LastRow
-	
-mov (1) 	URBWriteMsgDesc:ud		MSG_LEN(2)+URBWMSGDSC:ud
-
-//===================================================================================
-
-#include "AVC_ILDB_OpenGateway.asm"		// Open gateway for receiving notification 
-
-#if defined(DEV_CL)	
-	mov	(1)		URBOffset:uw		240:uw	// Use chroma URB offset to spawn chroma root
-#else
-	mov	(1)		URBOffset:uw		320:uw	// Use chroma URB offset to spawn chroma root
-#endif
-
-#include "AVC_ILDB_SpawnChromaRoot.asm"	// Spawn chroma root
-
-mov	(1)		URBOffset:uw		0:uw	// Use luma URB offset to spawn luma child 
-mov	(1)		ChildThreadsID:uw	2:uw	// Starting ChildThreadsID for luma child threads
-
-#include "AVC_ILDB_Dep_Check.asm"  		// Check dependency and spawn all luma child threads in parallel with chroma root
-
-
-// Wait for UV root thread to finish
-ILDB_LABEL(WAIT_FOR_UV):
-cmp.l.f0.0 (1) null:w	ThreadLimit:w		MaxThreads:w
-(f0.0) 	jmpi 	ILDB_LABEL(WAIT_FOR_UV)
-
-
-#include "AVC_ILDB_CloseGateway.asm"	// Close root thread gateway 
-
-END_THREAD								// End of root thread
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Spawn.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Spawn.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Spawn.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_Spawn.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//=============== Spawn a child thread for a vertical child ===============
-
-#if defined(_DEBUG) 
-	mov	(1)		EntrySignature:w	0x6666:w
-#endif
-	
-	mul	(1)		URBOffset:uw		CurRow:uw		2:w // 5:w			// Each row uses 5 URB entries (R0, child R0, 3 GRFs of data from left MB)
-
-	mov (8)		CT_R0Hdr.0:ud		r0.0<8;8,1>:ud				// Init to root R0 header
-	
-	// R0.2: Interface Discriptor Ptr.  Add offset 16 for next Interface Discriptor for child kernel
-	add (1) 	CT_R0Hdr.2:ud 		r0.2:ud 		IDesc_Child_Offset:w
-	
-	#include "AVC_ILDB_SpawnChild.asm"
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChild.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChild.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChild.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChild.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//=============== Spawn a child thread for Luma or Chroma ===============
-
-	//----- Create child thread R0 header -----
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignature:w			0xAAAA:w
-#endif
-
-	//***** Set CT_R0Hdr fields that change for every thread 
-	
-	// Restore CT_R0Hdr.4:ud to r0.4:ud 
-	mov (1) CT_R0Hdr.4:ud		r0.4:ud
-
-	// R0.2: Interface Discriptor Ptr.  Add a child offset for child kernel
-//	add (1) CT_R0Hdr.2:ud 		r0.2:ud 		CHILD_OFFSET:w
-
-	// Assign a new Thread Count for this child
-	mov (1) CT_R0Hdr.6:ud 		ChildThreadsID:uw
-
-	//----- Prepare URB for launching a child thread -----
-	mov (16) m2.0:w		ChildParam<16;16,1>:w
-
-	shr (1)	 MRF0.0:uw	URBOffset:uw	1:w
-
-	add	(1)	ChildThreadsID:uw		ChildThreadsID:uw	2:uw	// Luma child=even, chroma child=odd
-		
-	//--------------------------------------------------
-//	#include "writeURB.asm"
-	send  null:uw 	MRF0	 null:ud	URBWRITE	URBWriteMsgDesc:ud		// URB write	
-
-	//--------------------------------------------------
-	// Set URB handle for child thread launching:
-	// URB handle Length	 	(bit 15:10) - 0000 0000 0000 0000  yyyy yy00 0000 0000
-	// URB handle offset  		(bit 9:0) 	- 0000 0000 0000 0000  0000 00xx xxxx xxxx
-
-	or  (1) CT_R0Hdr.4:ud		URB_EntriesPerMB_2:w	URBOffset:uw
-	
-	// 2 URB entries:
-	// Entry 0 - CT_R0Hdr
-	// Entry 1 - input parameter to child kernel
-
-	//----- Spawn a child now -----
-	send (8) null:ud 	CT_R0Hdr	  null:ud    TS	TSMSGDSC
-//	send (8) null:ud 	CT_Spawn_Reg	null:ud    0x07100001
-
-
-	// Restore CT_R0Hdr.4:ud to r0.4:ud for next use
-//	mov (1) CT_R0Hdr.4:ud		r0.4:ud
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChromaRoot.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChromaRoot.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChromaRoot.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/AVC_ILDB_SpawnChromaRoot.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//=============== Spawn a chroma root thread ===============
-
-	//----- Create chroma root thread R0 header -----
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignature:w			0xAABA:w
-#endif
-
-
-
-	// Restore CT_R0Hdr.4:ud to r0.4:ud 
-//	mov (1) CT_R0Hdr.4:ud		r0.4:ud
-
-	// R0.2: Interface Discriptor Ptr.  Add child offset for child kernel
-	add (1) CT_R0Hdr.2:ud 		r0.2:ud 		CHROMA_ROOT_OFFSET:w
-
-	// Assign a new Thread Count for this child
-	mov (1) CT_R0Hdr.6:ud 		1:w		// ThreadID=1 for chroma root
-
-	//----- Copy luma root r1 for launching chroma root thread -----
-	mov (16) m2.0:w		RootParam<16;16,1>:w
-
-	#include "writeURB.asm"
-
-	//--------------------------------------------------
-	// Set URB handle for child thread launching:
-	// URB handle Length	 	(bit 15:10) - 0000 0000 0000 0000  yyyy yy00 0000 0000
-	// URB handle offset  		(bit 9:0) 	- 0000 0000 0000 0000  0000 00xx xxxx xxxx
-
-	or  (1) CT_R0Hdr.4:ud		URB_EntriesPerMB_2:w	URBOffset:uw
-	
-	// 2 URB entries:
-	// Entry 0 - CT_R0Hdr
-	// Entry 1 - input parameter to child kernel
-
-	//----- Spawn a child now -----
-	send (8) null:ud 	CT_R0Hdr	null:ud    TS	TSMSGDSC
-
-	// Restore CT_R0Hdr.4:ud to r0.4:ud for next use 
-	mov (1) CT_R0Hdr.4:ud		r0.4:ud
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Child_Undefs.inc libva-1.0.1/i965_drv_video/shaders/h264/ildb/Child_Undefs.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Child_Undefs.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Child_Undefs.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Modual name: Child_Undefs.inc
-//
-// Undefine global symbols for new process in child thread
-//
-
-#undef		P1	
-#undef		P2	
-#undef		P3	
-#undef		P4
-#undef		P5
-#undef		P6
-#undef		P7
-#undef		P8
-#undef		EDGECNTLMAP
-#undef		CLIP_NEGATIVE
-#undef		CLIP_DONE
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/ILDB_header.inc libva-1.0.1/i965_drv_video/shaders/h264/ildb/ILDB_header.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/ILDB_header.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/ILDB_header.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,306 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__ILDB_HEADER__)	// Make sure this file is only included once
-#define __ILDB_HEADER__
-
-// Module name: ILDB_header.inc
-//
-
-.default_execution_size	(16)
-.default_register_type	:ub
-
-#undef NULLREG
-#undef RETURN_REG
-#undef EOTMSGDSC
-#undef MSGSRC
-#undef END_THREAD
-#undef TSMSGDSC
-
-//  ----------- Common constant definitions ------------
-//
-//  Bit position constants
-//
-#define BIT0	0x01
-#define BIT1	0x02
-#define BIT2	0x04
-#define BIT3	0x08
-#define BIT4	0x10
-#define BIT5	0x20
-#define BIT6	0x40
-#define BIT7	0x80
-#define BIT8	0x0100
-#define BIT9	0x0200
-#define BIT10	0x0400
-#define BIT11	0x0800
-#define BIT12	0x1000
-#define BIT13	0x2000
-#define BIT14	0x4000
-#define BIT15	0x8000
-#define BIT16	0x00010000
-#define BIT17	0x00020000
-#define BIT18	0x00040000
-#define BIT19	0x00080000
-#define BIT20	0x00100000
-#define BIT21	0x00200000
-#define BIT22	0x00400000
-#define BIT23	0x00800000
-#define BIT24	0x01000000
-#define BIT25	0x02000000
-#define BIT26	0x04000000
-#define BIT27	0x08000000
-#define BIT28	0x10000000
-#define BIT29	0x20000000
-#define BIT30	0x40000000
-#define BIT31	0x80000000
-
-// Common constants
-//
-#define	INST_SIZE	16	// Instruction size in byte
-
-#define	GRFWIB	32		// GRF register width in byte
-#define	GRFWIW	16		// GRF register width in word
-#define	GRFWID	8		// GRF register width in dword
-
-#define TOP_FIELD	0
-#define BOTTOM_FIELD	1
-
-#define PREVIOUS_FRAME	0	// Previous frame
-#define CURRENT_FRAME	1	// Current frame
-#define NEXT_FRAME	2	// Next frame
-
-#define Y_ROW_WIDTH		16	// in bytes
-#define UV_ROW_WIDTH	8
-
-//  Useful macros
-//
-#define REGION(Width,HStride) <Width*HStride;Width,HStride>	// Region definition when ExecSize = Width
-
-#define NULLREG		null<1>:d
-#define NULLREGW	null<1>:w
-
-#define RETURN_REG	r62		// Return pointer for all sub-routine calls (type DWORD)
-
-#define CALL(subFunc, skipInst)	add (1) RETURN_REG<1>:ud   ip:ud	(1+skipInst)*INST_SIZE \n\
-				jmpi (1) subFunc
-
-#define	RETURN		mov (1)	ip:ud	RETURN_REG<0;1,0>:ud		// Return to calling module
-
-#define PRED_CALL(flag, subFunc, skipInst)	add (1) RETURN_REG<1>:ud   ip:ud	(1+skipInst)*INST_SIZE \n\
-			(flag)	jmpi (1) subFunc
-
-
-//  Definitions for surface states, GRF regions, and common data fields
-//
-//  Note: Each kernel needs to define a specific symbol before including this
-//  header file to ensure correct definitions.
-//
-
-
-
-#if defined(AVC_ILDB)	
-
-.reg_count_total    64
-.reg_count_payload  4
-
-    // Binding Table Index
-	#define	BI_CNTRL_DATA		0			// Control data map  
-    #define	BI_SRC_Y			1
-    #define	BI_SRC_UV			2
-    #define	BI_DEST_Y			3
-    #define	BI_DEST_UV			4
-	
-
-	//========== Left MB, 4x16 in r2 and r3 ==========
-	#define		PREV_MB_Y_BASE	64		//2*GRFWIB												// Byte offset to r2
-	.declare    PREV_MB_YD  Base=r2 	ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-	.declare    PREV_MB_YW  Base=r2 	ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-    .declare    PREV_MB_YB  Base=r2 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-    
-    #define		PREV_MB_U_BASE	64		//2*GRFWIB		// seperate thread from Y				// Byte offset to r2
-	.declare	PREV_MB_UD	Base=r2 	ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-    .declare    PREV_MB_UW  Base=r2 	ElementSize=2 SrcRegion=REGION(16,1) Type=uw
-    .declare    PREV_MB_UB  Base=r2 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-    
-	#define		PREV_MB_V_BASE	65		//2*GRFWIB+1		// NV12									// Byte offset to r2.1
-    .declare    PREV_MB_VB	Base=r2.1 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-
-	//========== Top MB, 16x4 in r4 and r5 ==========	
-	#define		TOP_MB_Y_BASE	128		//4*GRFWIB												// Byte offset to r4
-	.declare    TOP_MB_YD	Base=r4		ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-	.declare    TOP_MB_YW	Base=r4		ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-    .declare    TOP_MB_YB	Base=r4		ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-    
-    #define		TOP_MB_U_BASE	128		//4*GRFWIB		// seperate thread from Y				// Byte offset to r4
-	.declare	TOP_MB_UD	Base=r4 	ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-    .declare    TOP_MB_UW	Base=r4		ElementSize=2 SrcRegion=REGION(16,1) Type=uw
-    .declare    TOP_MB_UB	Base=r4 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-    
-	#define		TOP_MB_V_BASE	129		//4*GRFWIB+1		// NV12									// Byte offset to r4.1
-    .declare    TOP_MB_VB  Base=r4.1 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-
-    
-    //========== Current MB, 16x16 in r6-r13 ==========
-	#define		SRC_MB_Y_BASE	192 	//6*GRFWIB												// Byte offset to r6
-    .declare    SRC_YD  	Base=r6 	ElementSize=4 SrcRegion=REGION(8,1) Type=ud		// For read and write, 8 GRFs
-    .declare    SRC_YW  	Base=r6 	ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-    .declare    SRC_YB  	Base=r6 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 8 GRFs	
-
-	#define		SRC_MB_U_BASE	192		//6*GRFWIB		// seperate thread from Y				// Byte offset to r6
-    .declare    SRC_UD  	Base=r6 	ElementSize=4 SrcRegion=REGION(8,1) Type=ud		// For read and write, 2 GRFs
-    .declare    SRC_UW  	Base=r6 	ElementSize=2 SrcRegion=REGION(16,1) Type=uw	// For read and write, 4 GRFs
-    .declare    SRC_UB  	Base=r6 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 2 GRFs
-          
-	#define		SRC_MB_V_BASE	193		// 6*GRFWIB+1		// NV12									// Byte offset to r6.1
-    .declare    SRC_VD  	Base=r6.1 	ElementSize=4 SrcRegion=REGION(8,1) Type=ud		// For read and write, 2 GRFs
-    .declare    SRC_VW  	Base=r6.1 	ElementSize=2 SrcRegion=REGION(16,1) Type=uw	// For read and write, 4 GRFs
-    .declare    SRC_VB  	Base=r6.1 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 2 GRFs
-
-#else				// No kernel specified, define nothing.
-
-.reg_count_total    64
-.reg_count_payload  2
-
-	#define	SRCAOFF	r1.0:ud		// Offset into alpha data
-	#define	SRCOFF	r1.1:ud		// Offset into source YUV data
-	#define ORIX	r1.4		// :w, H. origin of the destination block in pel
-	#define ORIY	r1.5		// :w, V. origin of the destination block in pel
-
-#endif
-
-//  ----------- Message Payload Header fields------------
-//
-#define IDP		r0.2:ud		// Interface Descriptor Pointer
-#define	BTP		r0.4:ud		// Binding Table Pointer
-
-//  ----------- Common Message Descriptor ------------
-//
-#ifdef DEV_ILK
-#define GW_DCN				// Should be enabled only for ILK-B0 and beyond
-#define MSG_GW		0x03		// Message Gateway
-#define MSG_GW_EOT	0x23		// Message Gateway plus EOT bit set (For ILK only)
-#define DAPREAD		0x04		// Data Port Read Extended Message Descriptor,
-#define DAPWRITE	0x05		// Data Port Write Extended Message Descriptor,
-#define URBWRITE	0x06		// URB
-#define TS			0x07		// Thread Spawner Extended Message Descriptor
-#define TS_EOT		0x27		// End of Thread Extended Message Descriptor
-
-#define EOTMSGDSC	0x02000000	// End of Thread Message Descriptor /w URB handle dereferenced (used by root kernel)
-#define CHILD_EOTMSGDSC	0x02000012	// End of Child Thread Message Descriptor w/o URB handle dereferenced
-
-// Data Port Message Descriptor
-#define DWBRMSGDSC_RC	 0x02086000	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_TF 0x02086600	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_BF 0x02086700	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_SC	 0x0208A000	// DWORD Block Read Message Descriptor, reading from sampler cache = A.
-#define DWBRMSGDSC_SC_TF 0x0208E600	// DWORD Block Read Message Descriptor, reading top field from field mode sampler cache.
-#define DWBRMSGDSC_SC_BF 0x0208E700	// DWORD Block Read Message Descriptor, reading bottom field from field mode sampler cache.
-
-#define ILDBRMSGDSC		 0x02085800	// AVC ILDB Control Data Read Msg Desc on Bearlake-C
-
-#define DWBWMSGDSC		 0x02082000	// DWORD Block Write Message Descriptor
-#define DWBWMSGDSC_WC 	 0x0218A000	// DWORD Block Write Message Descriptor + write commit
-
-// URB Message Descriptor
-#define	URBWMSGDSC	0x02080000		// URB Write Message Descriptor
-
-// Thread Spawner Message Descriptor
-#define	TSMSGDSC	0x02000001
-
-// Message Gateway Message Descriptors
-#define OGWMSGDSC	0x02000000	// OpenGateway Message Descriptor
-#define CGWMSGDSC	0x02000001	// CloseGateway Message Descriptor
-#define FWDMSGDSC	0x02000002	// ForwardMsg Message Descriptor
-#define	NOTIFYMSG	0x00008000	// Send notification with ForwardMsg message
-
-#define	RESP_LEN(len)	0x100000*len
-#define MSG_LEN(len)	0x2000000*len
-
-#else	// Pre DEV_ILK
-
-#define MSG_GW
-#define MSG_GW_EOT
-#define DAPREAD
-#define DAPWRITE
-#define URBWRITE
-#define TS
-#define TS_EOT
-
-#define EOTMSGDSC	0x87100000		// End of Thread Message Descriptor /w URB handle dereferenced (used by root kernel) 
-#define CHILD_EOTMSGDSC	0x87100012	// End of Child Thread Message Descriptor w/o URB handle dereferenced
-
-// Data Port Message Descriptor
-#define DWBRMSGDSC_RC	 0x04106000	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_TF 0x04106600	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_BF 0x04106700	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_SC	 0x0410A000	// DWORD Block Read Message Descriptor, reading from sampler cache = A.
-#define DWBRMSGDSC_SC_TF 0x0410A600	// DWORD Block Read Message Descriptor, reading top field from field mode sampler cache.
-#define DWBRMSGDSC_SC_BF 0x0410A700	// DWORD Block Read Message Descriptor, reading bottom field from field mode sampler cache.
-
-#define ILDBRMSGDSC		 0x04105800	// AVC ILDB Control Data Read Msg Desc on Bearlake-C
-
-#define DWBWMSGDSC		 0x05102000	// DWORD Block Write Message Descriptor
-#define DWBWMSGDSC_WC 	 0x0511A000	// DWORD Block Write Message Descriptor + write commit
-
-// URB Message Descriptor
-#define	URBWMSGDSC	0x06100000		// URB Write Message Descriptor
-
-// Thread Spawner Message Descriptor
-#define	TSMSGDSC	0x07100001
-
-// Message Gateway Message Descriptors
-#define OGWMSGDSC	0x03100000	// OpenGateway Message Descriptor
-#define CGWMSGDSC	0x03100001	// CloseGateway Message Descriptor
-#define FWDMSGDSC	0x03100002	// ForwardMsg Message Descriptor
-#define	NOTIFYMSG	0x00008000	// Send notification with ForwardMsg message
-
-#define	RESP_LEN(len)	0x10000*len
-#define MSG_LEN(len)	0x100000*len
-
-//	bits 15 - 0 = 01 011 000 00000000 = 0101 1000 0000 0000 = 5800
-// Render cache, AVC loop rd, 				  			
-#endif	// DEV_ILK
-				
-//	Enable frame/field selection in message descriptor
-#define ENMSGDSCFM	0x400		// Enable MSGDSC to select frame surface
-#define ENMSGDSCTF	0x600		// Enable MSGDSC to select top field surface
-#define ENMSGDSCBF	0x700		// Enable MSGDSC to select bottom field surface
-
-#define END_THREAD      send (8) NULLREG MSGHDR r0:ud TS_EOT	EOTMSGDSC
-#define END_CHILD_THREAD	send (8) NULLREG MSGHDR r0:ud TS_EOT	CHILD_EOTMSGDSC
-
-//  ----------- Message related register ------------
-//
-#define MSGHDR		m1		// Message Payload Header
-#define MSGHDRY		m1		// Message Payload Header register for Y data
-#define MSGHDRU		m2		// Message Payload Header register for U data
-#define MSGHDRV		m3		// Message Payload Header register for V data
-
-#define MSGHDRC		m1		// Message Payload Header register for CUR MB
-#define MSGHDRL		m2		// Message Payload Header register for LEFT MB
-#define MSGHDRT		m3		// Message Payload Header register for TOP MB
-
-#define MSGHDRYA	m4		// Second Message Payload Header register for Y data
-#define MSGSRC		r63		// Message source register
-#define MSGDSC		a0.0:ud		// Message Descriptor register (type DWORD)
-
-#define MH_ORI		MSGSRC.0	// DWORD block R/W message header block offset
-#define MH_ORIX		MSGSRC.0	// DWORD block R/W message header X offset
-#define MH_ORIY		MSGSRC.1	// DWORD block R/W message header Y offset
-#define MH_SIZE		MSGSRC.2	// DWORD block R/W message header block width & height
-
-
-//  M2 - M9 for message data payload
-.declare    MSGPAYLOADB	Base=m2 ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-.declare    MSGPAYLOADW	Base=m2 ElementSize=2 SrcRegion=REGION(16,1) Type=uw
-.declare    MSGPAYLOADD	Base=m2 ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-.declare    MSGPAYLOADF	Base=m2 ElementSize=4 SrcRegion=REGION(8,1) Type=f
-
-// End of ILDB_header.inc
-
-#endif	// !defined(__ILDB_HEADER__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_Cur_UV_8x8T.asm
-//
-// Load and transpose UV 8x8 block (NV12: 8x8U and 8x8V mixed)
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud   (U+V for NV12) 	// 4 GRFs
-//
-//	Binding table index: 
-//	BI_SRC_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD1:w
-#endif
-
-	// Read U+V blk
-#if defined(_PROGRESSIVE) 
-    mov (1)	MSGSRC.0:ud		ORIX_CUR:w				{ NoDDClr } 		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_CUR:w		1:w		{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0007000F:ud			{ NoDDChk }			// NV12 U+V block width and height (16x8 bytes)
-
-    //send (8) SRC_UD(0)<1>	MSGHDRU		MSGSRC<8;8,1>:ud	DWBRMSGDSC_SC+0x00040000+BI_SRC_UV
-    mov (1)	MSGDSC	RESP_LEN(4)+DWBRMSGDSC_SC+BI_SRC_UV:ud	
-#endif
-
-#if defined(_FIELD)
-//    cmp.z.f0.0 (1)  NULLREGW 	PicTypeC:w  	0:w						// Get pic type flag
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-	// they are used later in this file
-
-    mov (1)	MSGSRC.0:ud		ORIX_CUR:w				{ NoDDClr } 		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_CUR:w		1:w		{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0007000F:ud			{ NoDDChk }			// NV12 U+V block width and height (16x8 bytes)
-
-    // Set message descriptor
-
-    // Frame picture
-//    (f0.0) mov (1)	MSGDSC	RESP_LEN(4)+DWBRMSGDSC_SC+BI_SRC_UV:ud			// Read 4 GRFs from SRC_UV
-//	(f0.0) jmpi		load_UV_8x8T
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(4)+DWBRMSGDSC_SC_BF+BI_SRC_UV:ud  // Read 4 GRFs from SRC_UV bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(4)+DWBRMSGDSC_SC_TF+BI_SRC_UV:ud  // Read 4 GRFs from SRC_UV top field
-
-//load_UV_8x8T:
-
-#endif
-
-    send (8) SRC_UD(0)<1>	MSGHDRU		MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-//	#include "Transpose_Cur_UV_8x8.asm"
-
-// End of load_UV_8x8T
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_UV_8x8T_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_Cur_UV_8x8T.asm
-//
-// Load and transpose UV 8x8 block (NV12: 8x8U and 8x8V mixed)
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud   (U+V for NV12) 	// 4 GRFs
-//
-//	Binding table index: 
-//	BI_SRC_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD1:w
-#endif
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 	BitFields:w  	BotFieldFlag:w					// Get bottom field flag
-
-	// Read U+V
-    mov (1)	MSGSRC.0:ud		ORIX_CUR:w						{ NoDDClr } 		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_CUR:w			1:w			{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0007000F:ud					{ NoDDChk }			// NV12 U+V block width and height (16x8 bytes)
-
-    // Set message descriptor
-
-	(f0.0)	if	(1)		ILDB_LABEL(ELSE_UV_8X8T)
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(4)+DWBRMSGDSC_SC+BI_SRC_UV:ud			// Read 4 GRFs from SRC_UV
-
-	(f0.1) add (1)	MSGSRC.1:d	MSGSRC.1:d		8:w		// Add vertical offset 8 for bot MB in MBAFF mode
-    
-ILDB_LABEL(ELSE_UV_8X8T): 
-	else 	(1)		ILDB_LABEL(ENDIF_UV_8X8T)
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(4)+DWBRMSGDSC_SC_BF+BI_SRC_UV:ud  // Read 4 GRFs from SRC_UV bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(4)+DWBRMSGDSC_SC_TF+BI_SRC_UV:ud  // Read 4 GRFs from SRC_UV top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ILDB_LABEL(ENDIF_UV_8X8T):
-
-    send (8) SRC_UD(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-//	#include "Transpose_Cur_UV_8x8.asm"
-
-// End of load_UV_8x8T
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_UV_Right_Most_2x8.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_UV_Right_Most_2x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_UV_Right_Most_2x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_UV_Right_Most_2x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Load_Cur_UV_Right_Most_2X8.Asm
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD0:w
-#endif
-
-#if defined(_PROGRESSIVE) 
-	// Read U+V, (UV MB size = 16x8)
-    add (1)	MSGSRC.0:ud		ORIX_CUR:w			12:w			{ NoDDClr }		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_CUR:w			1:w				{ NoDDClr, NoDDChk }		// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x00070003:ud						{ NoDDChk }		// NV12 U+V block width and height (4x8)
-	send (8) LEFT_TEMP_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV	
-#endif
-
-#if defined(_FIELD) || defined(_MBAFF)
-
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w				// Get bottom field flag
-
-	// Read U+V
-    add (1)	MSGSRC.0:ud		ORIX_CUR:w			12:w				{ NoDDClr }		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_CUR:w			1:w				{ NoDDClr, NoDDChk }		// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x00070003:ud						{ NoDDChk }		// NV12 U+V block width and height (4x8)
-
-	// Load NV12 U+V 
-	
-    // Set message descriptor
-
-	(f0.0)	if	(1)		ILDB_LABEL(ELSE_Y_2x8T)
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV:ud			// Read 1 GRF from SRC_UV
-
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		8:w		// Add vertical offset 8 for bot MB in MBAFF mode
-
-ILDB_LABEL(ELSE_Y_2x8T): 
-	else 	(1)		ILDB_LABEL(ENDIF_Y_2x8T)
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_BF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_TF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y top field
-
-	endif
-ILDB_LABEL(ENDIF_Y_2x8T):
-
-	// Read 1 GRF from DEST surface as the above MB has been deblocked.
-//	send (8) BUF_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	MSGDSC	
-	send (8) LEFT_TEMP_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC	
-
-#endif
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_Y_16x16T.asm
-//
-// Load and transpose Y 16x16 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD1:w
-#endif
-	// Read Y
-	
-#if defined(_PROGRESSIVE) 
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:w		{ NoDDClr }			// Block origin
-	mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud			{ NoDDChk }			// Block width and height (16x16)
-
-    //send (8) SRC_YD(0)<1>	MSGHDRC		MSGSRC<8;8,1>:ud	DWBRMSGDSC_SMPLR+0x00080000+BI_SRC_Y
-	mov (1)	MSGDSC	RESP_LEN(8)+DWBRMSGDSC_SC+BI_SRC_Y:ud    	
-#endif
-
-    
-#if defined(_FIELD)
-//    cmp.z.f0.0 (1)  NULLREGW 	PicTypeC:w  	0:w						// Get pic type flag
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-	// they are used later in this file
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:w		{ NoDDClr }			// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud			{ NoDDChk }			// Block width and height (16x16)
-    
-    // Set message descriptor
-    // Frame picture
-//	(f0.0) mov (1)	MSGDSC	RESP_LEN(8)+DWBRMSGDSC_SC+BI_SRC_Y:ud			// Read 8 GRFs from SRC_Y
-//	(f0.0) jmpi		load_Y_16x16T
-
-	// Non frame picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(8)+DWBRMSGDSC_SC_BF+BI_SRC_Y:ud  // Read 8 GRFs from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(8)+DWBRMSGDSC_SC_TF+BI_SRC_Y:ud  // Read 8 GRFs from SRC_Y top field
-
-//load_Y_16x16T:
-
-#endif
-
-    send (8) SRC_YD(0)<1>	MSGHDRC		MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-    	
-//	#include "Transpose_Cur_Y_16x16.asm"
-
-// End of load_Y_16x16T
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_Y_16x16T_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_Y_16x16T.asm
-//
-// Load and transpose Y 16x16 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD1:w
-#endif
-
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-	
-    and.nz.f0.1 (1)	NULLREGW 	BitFields:w  	BotFieldFlag:w		// Get bottom field flag
-
-	// Read Y
-    mov (2)	MSGSRC.0<1>:d	ORIX_CUR<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud			{ NoDDChk }		// Block width and height (16x16)
-    
-    // Set message descriptor, etc.
-    
-	(f0.0)	if	(1)		ILDB_LABEL(ELSE_Y_16x16T)
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(8)+DWBRMSGDSC_SC+BI_SRC_Y:ud			// Read 8 GRFs from SRC_Y
-    
-	(f0.1) add (1)	MSGSRC.1:d	MSGSRC.1:d		16:w		// Add vertical offset 16 for bot MB in MBAFF mode
-    
-ILDB_LABEL(ELSE_Y_16x16T): 
-	else 	(1)		ILDB_LABEL(ENDIF_Y_16x16T)
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(8)+DWBRMSGDSC_SC_BF+BI_SRC_Y:ud  // Read 8 GRFs from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(8)+DWBRMSGDSC_SC_TF+BI_SRC_Y:ud  // Read 8 GRFs from SRC_Y top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ILDB_LABEL(ENDIF_Y_16x16T):
-
-    send (8) SRC_YD(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-//	#include "Transpose_Cur_Y_16x16.asm"
-
-// End of load_Y_16x16T
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_Y_Right_Most_4x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_Y_Right_Most_4x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Cur_Y_Right_Most_4x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Cur_Y_Right_Most_4x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_Cur_Y_Right_Most_4x16.asm
-//
-// Load luma cur MB right most 4x16 into LEFT_TEMP_B
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD0:w
-#endif
-
-
-#if defined(_PROGRESSIVE) 
-	// Read Y 
-    add (1)	MSGSRC.0<1>:ud	ORIX_CUR:w		12:w	{ NoDDClr }				// Block origin, move right 12 bytes
-    mov (1)	MSGSRC.1<1>:ud	ORIY_CUR:w				{ NoDDClr, NoDDChk }	// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			{ NoDDChk }				// Block width and height (4x16)
-    send (8) LEFT_TEMP_D(0)<1>	MSGHDRL		MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(2)+DWBRMSGDSC_RC+BI_DEST_Y	
-#endif
-
-
-#if defined(_FIELD) || defined(_MBAFF)
-
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w	// Get bottom field flag
-
-	// Read Y
-    add (1)	MSGSRC.0<1>:ud	ORIX_CUR:w		12:w	{ NoDDClr }				// Block origin, move right 12 bytes
-    mov (1)	MSGSRC.1<1>:ud	ORIY_CUR:w				{ NoDDClr, NoDDChk }	// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			{ NoDDChk }				// Block width and height (4x16)
-    
-    // Set message descriptor, etc.
-    
-	(f0.0)	if	(1)		ILDB_LABEL(ELSE_Y_4x16T)
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC+BI_DEST_Y:ud			// Read 2 GRFs from DEST_Y
-    
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		16:w		// Add vertical offset 16 for bot MB in MBAFF mode
-    
-ILDB_LABEL(ELSE_Y_4x16T): 
-	else 	(1)		ILDB_LABEL(ENDIF_Y_4x16T)
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_BF+BI_DEST_Y:ud  // Read 2 GRFs from DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_TF+BI_DEST_Y:ud  // Read 2 GRFs from DEST_Y top field
-
-	endif
-ILDB_LABEL(ENDIF_Y_4x16T):
-
-//    send (8) BUF_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	MSGDSC
-    send (8) LEFT_TEMP_D(0)<1>	MSGHDRL		MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-#endif
-
-//	Transpose 4x16 to 16x4
-
-//	Input received from dport:
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//	Output of transpose:		<1>	<= <32;8,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-/*
-	// Transpose the data, also occupy 2 GRFs
-	mov (16)	PREV_MB_YB(0)<1>			BUF_B(0, 0)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(0, 16)<1>		BUF_B(0, 1)<32;8,4>		{ NoDDChk }
-	mov (16)	PREV_MB_YB(1)<1>			BUF_B(0, 2)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(1, 16)<1>		BUF_B(0, 3)<32;8,4>		{ NoDDChk }
-*/
-// End of load_Y_4x16T
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_16DW.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_16DW.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_16DW.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_16DW.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_ILDB_Cntrl_Data_16DW.asm
-//
-// This module loads AVC ILDB 64DW control data for one MB CTG. 
-// Dataport expands from 16DW to 64DW.
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	CNTRL_DATA_D:	CNTRL_DATA_D Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//
-//	Binding table index: 
-//	BI_CNTRL_DATA:	Binding table index of control data surface
-//
-//----------------------------------------------------------------
-
-// On CTG, MB control data in memory occupy 16 DWs. Data port returns 8 GRFs with expanded control data.
-
-#if defined(_MBAFF) 
-	// We need to get control data offset for the bottom MB in mbaff mode.
-	// That is, get f0.1=1 if MbaffFlag==1 && BotFieldFlag==1
-//	and (1)	CTemp1_W:uw 		BitFields:uw  	MbaffFlag+BotFieldFlag:uw	// Mute all other bits
-//	cmp.e.f0.1 (1) NULLREGW 	CTemp1_W:uw  	MbaffFlag+BotFieldFlag:uw	// Check mbaff and bot flags
-		
-	and.ne.f0.1 (1)	NULLREGW 	BitFields:uw  	BotFieldFlag:uw
-
-	// Global offset
-	mov (1)	MSGSRC.2:ud		CntrlDataOffsetY:ud
-		
-	(f0.1) add (1) MSGSRC.2:ud		MSGSRC.2:ud		64:w	// +64 to the next MB control data (bot MB)
-#endif
-
-    send (8) CNTRL_DATA_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(8)+ILDBRMSGDSC+BI_CNTRL_DATA	// Receive 8 GRFs
-
-// End of load_ILDB_Cntrl_Data_16DW.asm
-
-
-
-// AVC ILDB control data message header format
-
-//DWord	Bit	Description
-//M0.7	31:0	Debug 
-//M0.6	31:0	Debug
-//M0.5	31:8	Ignored
-//		7:0		Dispatch ID. // This ID is assigned by the fixed function unit and is a unique identifier for the thread.  It is used to free up resources used by the thread upon thread completion.
-//M0.4	31:0	Ignored
-//M0.3	31:0	Ignored
-//M0.2	31:0	Global Offset. Specifies the global byte offset into the buffer.
-				//	This offset must be OWord aligned (bits 3:0 MBZ) Format = U32 Range = [0,FFFFFFF0h]
-//M0.1	31:0	Ignored
-//M0.0	31:0	Ignored
-
-
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_22DW.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_22DW.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_22DW.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_22DW.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_ILDB_Cntrl_Data_22DW.asm
-//
-// ********** Apple only module **********
-//
-// This module loads AVC ILDB 22DW control data for one MB for CLN.
-// The reduced control data set is for progressive picture ONLY.
-//
-// Control data memory layout for each MB is 8x11 = 88 bytes.  
-// It ocuppies 3 GRFs after reading in.
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	CNTRL_DATA_D:	CNTRL_DATA_D Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 3 GRFs
-//
-//	Binding table index: 
-//	BI_CNTRL_DATA:	Binding table index of control data surface
-//
-//----------------------------------------------------------------
-
-    mul (1)	MSGSRC.0<1>:ud	ORIX:uw			8:uw		{ NoDDClr }				// Block origin X
-    mul (1)	MSGSRC.1<1>:ud	ORIY:uw			11:uw		{ NoDDClr, NoDDChk }	// Block origin Y
-    mov (1)	MSGSRC.2<1>:ud	0x000A0007:ud				{ NoDDChk }				// Block width and height (8x11=88 bytes)
-
-    send (8) CNTRL_DATA_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(3)+DWBRMSGDSC_SC+BI_CNTRL_DATA	// Receive 3 GRFs
-	
-// End of load_ILDB_Cntrl_Data_22DW.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_64DW.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_64DW.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_64DW.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data_64DW.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_ILDB_Cntrl_Data_64DW.asm
-//
-// This module loads AVC ILDB 64DW control data for one MB for CLN.  
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	CNTRL_DATA_D:	CNTRL_DATA_D Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//
-//	Binding table index: 
-//	BI_CNTRL_DATA:	Binding table index of control data surface
-//
-//----------------------------------------------------------------
-
-// On CLN, MB control data in memory occupy 64 DWs.
-
-#if defined(_MBAFF) 
-	// We need to get control data offset for the bottom MB in mbaff mode.
-	// That is, set f0.1=1 if MbaffFlag==1 && BotFieldFlag==1
-	and (1)	acc0.0:uw 		BitFields:uw  	MbaffFlag+BotFieldFlag:uw	// Mute all other bits
-	cmp.e.f0.1 (1) NULLREGW 	acc0.0:uw  	MbaffFlag+BotFieldFlag:uw	// Check mbaff and bot flags
-#endif		// CTemp1_W
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:uw			{ NoDDClr }				// Block origin X,Y
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud				{ NoDDChk }				// Block width and height (16x16=256 bytes)
-
-#if defined(_MBAFF) 
-	(f0.1) add (1) MSGSRC.1:ud	MSGSRC.1:ud		16:w	// +16 to the bottom MB control data (bot MB)
-#endif
-
-    send (8) CNTRL_DATA_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(8)+DWBRMSGDSC_SC+BI_CNTRL_DATA	// Receive 8 GRFs
-	
-// End of load_ILDB_Cntrl_Data_64DW.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Load_ILDB_Cntrl_Data.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_ILDB_Cntrl_Data.asm
-//
-// This module loads AVC ILDB control data for one MB.  
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	CNTRL_DATA_D:	CNTRL_DATA_D Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//
-//	Binding table index: 
-//	BI_CNTRL_DATA:	Binding table index of control data surface
-//
-//----------------------------------------------------------------
-
-	// We need to get control data offset for the bottom MB in mbaff mode.
-	// That is, get f0.1=1 if MbaffFlag==1 && BotFieldFlag==1
-	and (1)	CTemp1_W:uw 		BitFields:uw  	MbaffFlag+BotFieldFlag:uw	// Mute all other bits
-
-	and.nz.f0.0	(1)	null:w		BitFields:w		CntlDataExpFlag:w			// Get CntlDataExpFlag
-
-	cmp.e.f0.1 (1) NULLREGW 	CTemp1_W:uw  	MbaffFlag+BotFieldFlag:uw	// Check mbaff and bot flags
-
-	(f0.0)  jmpi	ILDB_LABEL(READ_BLC_CNTL_DATA) 
-
-	// On Crestline, MB control data in memory occupy 64 DWs (expanded).  
-//    mov (1)	MSGSRC.0<1>:ud	0:w						{ NoDDClr }				// Block origin X
-//    mov (1)	MSGSRC.1<1>:ud	CntrlDataOffsetY:ud		{ NoDDClr, NoDDChk }	// Block origin Y
-//    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud			{ NoDDChk }				// Block width and height (16x16=256 bytes)
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:uw			{ NoDDClr }				// Block origin X,Y
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud				{ NoDDChk }				// Block width and height (16x16=256 bytes)
-
-	(f0.1) add (1)  MSGSRC.1:ud		MSGSRC.1:ud		16:w	// +16 to for bottom MB in a pair
-
-    send (8) CNTRL_DATA_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	DWBRMSGDSC_SC+0x00080000+BI_CNTRL_DATA	// Receive 8 GRFs
-	jmpi	ILDB_LABEL(READ_CNTL_DATA_DONE)
-	
-	
-ILDB_LABEL(READ_BLC_CNTL_DATA):
-	// On Bearlake-C, MB control data in memory occupy 16 DWs. Data port returns 8 GRFs with expanded control data.
-
-	// Global offset
-	mov (1)	MSGSRC.2:ud		CntrlDataOffsetY:ud	// CntrlDataOffsetY is the global offset
-
-	(f0.1) add (1) MSGSRC.2:ud		MSGSRC.2:ud		64:w	// +64 to the next MB control data (bot MB)
-
-    send (8) CNTRL_DATA_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(8)+ILDBRMSGDSC+BI_CNTRL_DATA	// Receive 8 GRFs
-
-ILDB_LABEL(READ_CNTL_DATA_DONE):
-
-// End of load_ILDB_Cntrl_Data.asm
-
-
-
-
-// AVC ILDB control data message header format
-
-//DWord	Bit	Description
-//M0.7	31:0	Debug 
-//M0.6	31:0	Debug
-//M0.5	31:8	Ignored
-//		7:0		Dispatch ID. // This ID is assigned by the fixed function unit and is a unique identifier for the thread.  It is used to free up resources used by the thread upon thread completion.
-//M0.4	31:0	Ignored
-//M0.3	31:0	Ignored
-//M0.2	31:0	Global Offset. Specifies the global byte offset into the buffer.
-				//	This offset must be OWord aligned (bits 3:0 MBZ) Format = U32 Range = [0,FFFFFFF0h]
-//M0.1	31:0	Ignored
-//M0.0	31:0	Ignored
-
-
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Load_Left_UV_2X8T.Asm
-//
-// Load UV 8X2 Block 
-//
-//----------------------------------------------------------------
-//  Symbols ceed To be defined before including this module
-//
-//	Source Region Is :UB
-//	BUF_D:			BUF_D Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=UD
-
-//	Binding Table Index: 
-//	BI_SRC_UV:		Binding Table Index Of UV Surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD0:w
-#endif
-
-#if defined(_PROGRESSIVE) 
-	// Read U+V
-    mov (1)	MSGSRC.0:ud		ORIX_LEFT:w							{ NoDDClr }		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_LEFT:w			1:w				{ NoDDClr, NoDDChk }		// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x00070003:ud						{ NoDDChk }		// NV12 U+V block width and height (4x8)
-
-	send (8) LEFT_TEMP_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV	
-#endif
-
-#if defined(_FIELD) || defined(_MBAFF)
-
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w				// Get bottom field flag
-
-	// Read U+V
-    mov (1)	MSGSRC.0:ud		ORIX_LEFT:w							{ NoDDClr }		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_LEFT:w			1:w				{ NoDDClr, NoDDChk }		// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x00070003:ud						{ NoDDChk }		// NV12 U+V block width and height (4x8)
-
-	// Load NV12 U+V 
-	
-    // Set message descriptor
-
-	(f0.0)	if	(1)		ILDB_LABEL(ELSE_Y_2x8T)
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV:ud			// Read 1 GRF from SRC_UV
-
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		8:w		// Add vertical offset 8 for bot MB in MBAFF mode
-
-ILDB_LABEL(ELSE_Y_2x8T): 
-	else 	(1)		ILDB_LABEL(ENDIF_Y_2x8T)
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_BF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_TF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y top field
-
-	endif
-ILDB_LABEL(ENDIF_Y_2x8T):
-
-	// Read 1 GRF from DEST surface as the above MB has been deblocked.
-//	send (8) BUF_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	MSGDSC	
-	send (8) LEFT_TEMP_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC	
-
-#endif
-
-// End of load_Left_UV_2x8T.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_UV_2x8T_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Load_Left_UV_2X8T.Asm
-//
-// Load UV 8X2 Block 
-//
-//----------------------------------------------------------------
-//  Symbols ceed To be defined before including this module
-//
-//	Source Region Is :UB
-//	BUF_D:			BUF_D Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=UD
-
-//	Binding Table Index: 
-//	BI_SRC_UV:		Binding Table Index Of UV Surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD0:w
-#endif
-
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w				// Get bottom field flag
-
-	// Read U+V
-    mov (1)	MSGSRC.0:ud		ORIX_LEFT:w							{ NoDDClr }		// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_LEFT:w			1:w				{ NoDDClr, NoDDChk }		// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x00070003:ud						{ NoDDChk }		// NV12 U+V block width and height (4x8)
-
-	// Load NV12 U+V 
-	
-    // Set message descriptor
-
-	(f0.0)	if	(1)		ILDB_LABEL(ELSE_Y_2x8T)
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV:ud			// Read 1 GRF from SRC_UV
-
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		8:w		// Add vertical offset 8 for bot MB in MBAFF mode
-
-ILDB_LABEL(ELSE_Y_2x8T): 
-	else 	(1)		ILDB_LABEL(ENDIF_Y_2x8T)
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_BF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_TF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ILDB_LABEL(ENDIF_Y_2x8T):
-
-	// Read 1 GRF from DEST surface as the above MB has been deblocked.
-//	send (8) BUF_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	MSGDSC	
-	send (8) LEFT_TEMP_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC	
-
-
-//	Input from dport for transpose:	
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 70 70 61 61 60 60 51 51 50 50 41 41 40 40 31 31 30 30 21 21 20 20 11 11 10 10 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//	Output of transpose:	<1>	<=== <16;8,2>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-/*
-	mov (8)	PREV_MB_UW(0,0)<1>		BUF_W(0,0)<16;8,2>		{ NoDDClr }
-	mov (8)	PREV_MB_UW(0,8)<1>		BUF_W(0,1)<16;8,2>		{ NoDDChk }
-*/
-// End of load_Left_UV_2x8T.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_Y_4x16T.asm
-//
-// Load luma left MB 4x16 and transpose 4x16 to 16x4.
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	PREV_MB_YD:		PREV_MB_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 2 GRFs
-//
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD0:w
-#endif
-
-
-#if defined(_PROGRESSIVE) 
-	// Read Y
-    mov (2)	MSGSRC.0<1>:ud	ORIX_LEFT<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			{ NoDDChk }		// Block width and height (4x16)
-    
-//    mov (1)	MSGDSC	DWBRMSGDSC_RC+0x00020000+BI_DEST_Y:ud			// Read 2 GRFs from DEST_Y
-    send (8) LEFT_TEMP_D(0)<1>	MSGHDRL		MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(2)+DWBRMSGDSC_RC+BI_DEST_Y	
-#endif
-
-
-#if defined(_FIELD) || defined(_MBAFF)
-
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w	// Get bottom field flag
-
-	// Read Y
-    mov (2)	MSGSRC.0<1>:ud	ORIX_LEFT<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			{ NoDDChk }		// Block width and height (4x16)
-    
-    // Set message descriptor, etc.
-    
-	(f0.0)	if	(1)		ILDB_LABEL(ELSE_Y_4x16T)
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC+BI_DEST_Y:ud			// Read 2 GRFs from DEST_Y
-    
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		16:w		// Add vertical offset 16 for bot MB in MBAFF mode
-    
-ILDB_LABEL(ELSE_Y_4x16T): 
-	else 	(1)		ILDB_LABEL(ENDIF_Y_4x16T)
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_BF+BI_DEST_Y:ud  // Read 2 GRFs from DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_TF+BI_DEST_Y:ud  // Read 2 GRFs from DEST_Y top field
-
-	endif
-ILDB_LABEL(ENDIF_Y_4x16T):
-
-//    send (8) BUF_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	MSGDSC
-    send (8) LEFT_TEMP_D(0)<1>	MSGHDRL		MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-#endif
-
-//	Transpose 4x16 to 16x4
-
-//	Input received from dport:
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//	Output of transpose:		<1>	<= <32;8,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-/*
-	// Transpose the data, also occupy 2 GRFs
-	mov (16)	PREV_MB_YB(0)<1>			BUF_B(0, 0)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(0, 16)<1>		BUF_B(0, 1)<32;8,4>		{ NoDDChk }
-	mov (16)	PREV_MB_YB(1)<1>			BUF_B(0, 2)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(1, 16)<1>		BUF_B(0, 3)<32;8,4>		{ NoDDChk }
-*/
-// End of load_Y_4x16T
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Left_Y_4x16T_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: load_Y_4x16T.asm
-//
-// Load luma left MB 4x16 and transpose 4x16 to 16x4.
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	PREV_MB_YD:		PREV_MB_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 2 GRFs
-//
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD0:w
-#endif
-
-    // FieldModeCurrentMbFlag determines how to access left MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w	// Get bottom field flag
-
-	// Read Y
-    mov (2)	MSGSRC.0<1>:ud	ORIX_LEFT<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			{ NoDDChk }		// Block width and height (4x16)
-    
-    // Set message descriptor, etc.
-    
-	(f0.0)	if	(1)		ELSE_Y_4x16T
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC+BI_DEST_Y:ud			// Read 2 GRFs from DEST_Y
-    
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		16:w		// Add vertical offset 16 for bot MB in MBAFF mode
-    
-ELSE_Y_4x16T: 
-	else 	(1)		ENDIF_Y_4x16T
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_BF+BI_DEST_Y:ud  // Read 2 GRFs from DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_TF+BI_DEST_Y:ud  // Read 2 GRFs from DEST_Y top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ENDIF_Y_4x16T:
-
-//    send (8) BUF_D(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	MSGDSC
-    send (8) LEFT_TEMP_D(0)<1>	MSGHDRL		MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-
-//	Transpose 4x16 to 16x4
-
-//	Input received from dport:
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//	Output of transpose:		<1>	<= <32;8,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-/*
-	// Transpose the data, also occupy 2 GRFs
-	mov (16)	PREV_MB_YB(0)<1>			BUF_B(0, 0)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(0, 16)<1>		BUF_B(0, 1)<32;8,4>		{ NoDDChk }
-	mov (16)	PREV_MB_YB(1)<1>			BUF_B(0, 2)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(1, 16)<1>		BUF_B(0, 3)<32;8,4>		{ NoDDChk }
-*/
-// End of load_Y_4x16T
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/loadNV12_16x16T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/loadNV12_16x16T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/loadNV12_16x16T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/loadNV12_16x16T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: loadNV12_16x16T.asm
-//
-// Load and transpose NV12 16x16 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud   (U+V for NV12) 	// 4 GRFs
-//
-//	Source region is :ub.  The same region as :ud region
-//	SRC_YB:			SRC_YB Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// 8 GRFs
-//	SRC_UB:			SRC_UB Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// 2 GRFs
-//	SRC_VB:			SRC_VB Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// 2 GRFs
-//
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//	BI_SRC_UV:		Binding table index of UV surface (NV12)
-//
-//	Temp buffer:
-//	BUF_B:			BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD1:w
-#endif
-
-	// Read Y
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:w		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud		// Block width and height (16x16)
-    send (8) SRC_YD(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(8)+DWBRMSGDSC_RC+BI_SRC_Y	// Read 8 GRFs
-
-	// Read U+V
-    asr (1)	MSGSRC.1:ud		MSGSRC.1:ud			1:w						// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2<1>:ud	0x0007000F:ud		// NV12 U+V block width and height (16x8)
-    send (8) SRC_UD(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(4)+DWBRMSGDSC_RC+BI_SRC_UV	// Read 4 GRFs
-
-	#include "TransposeNV12_16x16.asm"
-
-//	#include "Transpose_Y_16x16.asm"	
-//	#include "Transpose_NV12_UV_16x8.asm"	
-		
-// End of loadNV12_16x16T
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/loadNV12_16x4.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/loadNV12_16x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/loadNV12_16x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/loadNV12_16x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Loadnv12_16X4.Asm
-//
-// Load Nv12 16X4 Block 
-//
-//----------------------------------------------------------------
-//  Symbols Need To Be Defined Before Including This Module
-//
-//	Source Region In :Ud
-//	Src_Yd:			Src_Yd Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=Ud			// 3 Grfs (2 For Y, 1 For U+V)
-//
-//	Source Region Is :Ub.  The Same Region As :Ud Region
-//	Src_Yb:			Src_Yb Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub		// 2 Grfs
-//	Src_Ub:			Src_Ub Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub		// 0.5 Grf
-//	Src_Vb:			Src_Vb Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub		// 0.5 Grf
-//
-//	Binding Table Index: 
-//	Bi_Src_Y:		Binding Table Index Of Y Surface
-//	Bi_Src_UV:		Binding Table Index Of UV Surface (Nv12)
-//
-//	Temp Buffer:
-//	Buf_D:			Buf_D Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=Ud
-//	Buf_B:			Buf_B Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD2:w
-#endif
-
-	// Read Y
-    mov (2)	MSGSRC.0<1>:ud	ORIX<2;2,1>:w		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x0003000F:ud		// Block width and height (16x4)
-    send (8) PREV_MB_YD(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(2)+DWBRMSGDSC_RC+BI_SRC_Y	// Read 2 GRFs
-
-	// Read U+V
-    asr (1)	MSGSRC.1:ud		MSGSRC.1:ud			1:w						// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2<1>:ud	0x0001000F:ud		// NV12 U+V block width and height (16x2)
-
-	// Load NV12 U+V tp a temp buf  
-	send (8) BUF_D(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	RESP_LEN(1)+DWBRMSGDSC_RC+BI_SRC_UV	// Read 1 GRF
-
-	// Convert NV12 U+V to internal planar U and V and place them right after Y.
-//	mov (16)	SRC_UB(0,0)<1>		BUF_B(0,0)<32;16,2>
-//	mov (16)	SRC_VB(0,0)<1>		BUF_B(0,1)<32;16,2>	
-	
-// End of loadNV12_16x4.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Load_Top_UV_8X2.Asm
-//
-// Load UV 8X2 Block 
-//
-//----------------------------------------------------------------
-//  Symbols ceed To be defined before including this module
-//
-//	Source Region Is :UB
-//	BUF_D:			BUF_D Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=UD
-
-//	Binding Table Index: 
-//	BI_SRC_UV:		Binding Table Index Of UV Surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD2:w
-#endif
-
-#if defined(_PROGRESSIVE) 
-	// Read U+V
-    mov (1)	MSGSRC.0:ud		ORIX_TOP:w						{ NoDDClr }			// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_TOP:w			1:w			{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0001000F:ud					{ NoDDChk }			// NV12 U+V block width and height (16x2)
-
-	// Read 1 GRF from DEST surface as the above MB has been deblocked.
-	//send (8) TOP_MB_UD(0)<1>	MSGHDRU		MSGSRC<8;8,1>:ud	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV	
-	mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV:ud	
-#endif
-
-#if defined(_FIELD)
-
-//    cmp.z.f0.0 (1)  NULLREGW PicTypeC:w  	0:w							// Get pic type flag
-    and.nz.f0.1 (1)  NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-	// They are used later in this file
-
-	// Read U+V
-    mov (1)	MSGSRC.0:ud		ORIX_TOP:w						{ NoDDClr }			// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_TOP:w			1:w			{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0001000F:ud					{ NoDDChk }			// NV12 U+V block width and height (16x2)
-
-	// Load NV12 U+V 
-	
-    // Set message descriptor
-    // Frame picture
-//    (f0.0) mov (1)	MSGDSC	DWBRMSGDSC_RC+0x00010000+BI_DEST_UV:ud			// Read 1 GRF from SRC_UV
-//	(f0.0) jmpi		Load_Top_UV_8x2
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_BF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_TF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y top field
-
-//Load_Top_UV_8x2:
-
-	// Read 1 GRF from DEST surface as the above MB has been deblocked.
-//	send (8) PREV_MB_UD(0)<1>	MSGHDRU		MSGSRC<8;8,1>:ud	MSGDSC	
-
-#endif
-
-	send (8) TOP_MB_UD(0)<1>	MSGHDRU		MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC	
-		
-// End of load_Top_UV_8x2.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_UV_8x2_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Load_Top_UV_8X2.Asm
-//
-// Load UV 8X2 Block 
-//
-//----------------------------------------------------------------
-//  Symbols ceed To be defined before including this module
-//
-//	Source Region Is :UB
-//	BUF_D:			BUF_D Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=UD
-
-//	Binding Table Index: 
-//	BI_SRC_UV:		Binding Table Index Of UV Surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD2:w
-#endif
-
-    // FieldModeCurrentMbFlag determines how to access above MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w   	BotFieldFlag:w
-
-	// Read U+V
-    mov (1)	MSGSRC.0:ud		ORIX_TOP:w						{ NoDDClr }			// Block origin
-    asr (1)	MSGSRC.1:d		ORIY_TOP:w			1:w			{ NoDDClr, NoDDChk } 	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0001000F:ud					{ NoDDChk }			// NV12 U+V block width and height (16x2)
-
-	// Load NV12 U+V 
-	
-    // Set message descriptor
-    
-	(f0.0)	if	(1)		ELSE_UV_8X2
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC+BI_DEST_UV:ud			// Read 1 GRF from SRC_UV
-
-	// Add vertical offset 8 for bot MB in MBAFF mode
-	(f0.1) add (1)	MSGSRC.1:d	MSGSRC.1:d		8:w		
-    
-	// Dual field mode setup
-	and.z.f0.1 (1) NULLREGW		DualFieldMode:w		1:w
-	(f0.1) jmpi NOT_DUAL_FIELD_UV
-
-    add (1)	MSGSRC.1:d		MSGSRC.1:d		-2:w			{ NoDDClr }			// Load 4 lines in stead of 2
-	mov (1)	MSGSRC.2:ud		0x0003000F:ud					{ NoDDChk }			// New block width and height (16x8)
-
-	add (1) MSGDSC			MSGDSC			RESP_LEN(1):ud	// 1 more GRF to receive
-
-NOT_DUAL_FIELD_UV:    
-    
-ELSE_UV_8X2: 
-	else 	(1)		ENDIF_UV_8X2
-
-	// Field picture
-	asr (1)	MSGSRC.1:d		ORIY_CUR:w		2:w			// asr 1: NV12 U+V block origin y = half of Y comp
-														// asr 1: Reduce y by half in field access mode
-	
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_BF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC_TF+BI_DEST_UV:ud  // Read 1 GRF from SRC_Y top field
-
-	add (1) MSGSRC.1:d		MSGSRC.1:d		-2:w				// for last 2 rows of above MB
-
-	endif
-ENDIF_UV_8X2:
-
-	// Read 1 GRF from DEST surface as the above MB has been deblocked.
-	send (8) PREV_MB_UD(0)<1>	MSGHDRU	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC	
-
-// End of load_Top_UV_8x2.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Load_Y_16X4.asm
-//
-// Load Y 16X4 Block to PREV_MB_YD
-//
-//----------------------------------------------------------------
-//  Symbols Need To Be Defined Before Including This Module
-//
-//	Source Region In :Ud
-//	Src_YD:			Src_Yd Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=Ud			// 3 Grfs (2 For Y, 1 For U+V)
-//
-//	Source Region Is :Ub.  The Same Region As :Ud Region
-//	Src_YB:			Src_Yb Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub		// 2 Grfs
-//
-//	Binding Table Index: 
-//	Bi_Src_Y:		Binding Table Index Of Y Surface
-//
-//	Temp Buffer:
-//	Buf_D:			Buf_D Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=Ud
-//	Buf_B:			Buf_B Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD2:w
-#endif
-
-#if defined(_PROGRESSIVE) 
-	// Read Y
-    mov (2)	MSGSRC.0<1>:ud	ORIX_TOP<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x0003000F:ud			{ NoDDChk }		// Block width and height (16x4)
-
-    mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC+BI_DEST_Y:ud			// Read 2 GRFs from SRC_Y
-#endif
-
-#if defined(_FIELD)
-
-//    cmp.z.f0.0 (1)  NULLREGW 	PicTypeC:w  	0:w						// Get pic type flag
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-	// they are used later in this file
-	
-    mov (2)	MSGSRC.0<1>:ud	ORIX_TOP<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x0003000F:ud			{ NoDDChk }		// Block width and height (16x4)
-   
-    // Set message descriptor
-
-    // Frame picture
-//	(f0.0) mov (1)	MSGDSC	DWBRMSGDSC_RC+0x00020000+BI_DEST_Y:ud			// Read 2 GRFs from SRC_Y
-//	(f0.0) jmpi		load_Y_16x4
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_BF+BI_DEST_Y:ud  // Read 2 GRFs from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_TF+BI_DEST_Y:ud  // Read 2 GRFs from SRC_Y top field
-
-//load_Y_16x4:
-    // Read 2 GRFs from DEST surface, as the above MB has been deblocked
-//    send (8) PREV_MB_YD(0)<1>	MSGHDRY		MSGSRC<8;8,1>:ud	MSGDSC
-    
-#endif
-    
-    send (8) TOP_MB_YD(0)<1>	MSGHDRT		MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-    	    
-// End of load_Y_16x4.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/load_Top_Y_16x4_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module Name: Load_Y_16X4.asm
-//
-// Load Y 16X4 Block to PREV_MB_YD
-//
-//----------------------------------------------------------------
-//  Symbols Need To Be Defined Before Including This Module
-//
-//	Source Region In :Ud
-//	Src_YD:			Src_Yd Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=Ud			// 3 Grfs (2 For Y, 1 For U+V)
-//
-//	Source Region Is :Ub.  The Same Region As :Ud Region
-//	Src_YB:			Src_Yb Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub		// 2 Grfs
-//
-//	Binding Table Index: 
-//	Bi_Src_Y:		Binding Table Index Of Y Surface
-//
-//	Temp Buffer:
-//	Buf_D:			Buf_D Base=Rxx Elementsize=4 Srcregion=Region(8,1) Type=Ud
-//	Buf_B:			Buf_B Base=Rxx Elementsize=1 Srcregion=Region(16,1) Type=Ub
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD2:w
-#endif
-    // FieldModeCurrentMbFlag determines how to access above MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w   BotFieldFlag:w
-
-	// Read Y
-    mov (2)	MSGSRC.0<1>:ud	ORIX_TOP<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x0003000F:ud			{ NoDDChk }		// Block width and height (16x4)
-   
-    // Set message descriptor
-
-	(f0.0)	if	(1)		ELSE_Y_16x4
-
-    // Frame picture
-    mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC+BI_DEST_Y:ud			// Read 2 GRFs from SRC_Y
-
-	// Add vertical offset 16 for bot MB in MBAFF mode
-	(f0.1) add (1)	MSGSRC.1:d	MSGSRC.1:d		16:w		
-	
-	// Dual field mode setup
-	and.z.f0.1 (1) NULLREGW		DualFieldMode:w		1:w
-	(f0.1) jmpi NOT_DUAL_FIELD
-
-    add (1)	MSGSRC.1:d		MSGSRC.1:d		-4:w	{ NoDDClr }		// Load 8 lines in above MB
-	mov (1)	MSGSRC.2:ud		0x0007000F:ud			{ NoDDChk }		// New block width and height (16x8)
-	
-	add (1) MSGDSC			MSGDSC			RESP_LEN(2):ud	// 2 more GRF to receive
-
-NOT_DUAL_FIELD:
-
-ELSE_Y_16x4: 
-	else 	(1)		ENDIF_Y_16x4
-
-	asr (1)	MSGSRC.1:d		ORIY_CUR:w		1:w		// Reduce y by half in field access mode
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_BF+BI_DEST_Y:ud  // Read 2 GRFs from SRC_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	RESP_LEN(2)+DWBRMSGDSC_RC_TF+BI_DEST_Y:ud  // Read 2 GRFs from SRC_Y top field
-
-	add (1)	MSGSRC.1:d		MSGSRC.1:d		-4:w	// for last 4 rows of above MB
-
-	endif
-ENDIF_Y_16x4:
-        
-    // Read 2 GRFs from DEST surface, as the above MB has been deblocked
-    send (8) PREV_MB_YD(0)<1>	MSGHDRY	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-// End of load_Y_16x4.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Root_Undefs.inc libva-1.0.1/i965_drv_video/shaders/h264/ildb/Root_Undefs.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Root_Undefs.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Root_Undefs.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Modual name: Root_Undefs.inc
-//
-// Undefine global symbols for new process in root thread
-//
-
-#undef 		READ_BI
-#undef 		WRITE_BI
-
-#undef		ILDB_H_INDEPENDENT
-#undef		ILDB_H_INDEPENDENT_CONT
-#undef		ILDB_H_DEPENDENT
-#undef		ILDB_H_DEPENDENT_SCAN
-#undef		ILDB_H_NO_DEPENDENT
-
-#undef		ILDB_V_INDEPENDENT
-#undef		ILDB_V_INDEPENDENT_CONT
-#undef		ILDB_V_DEPENDENT
-#undef		ILDB_V_DEPENDENT_SCAN
-#undef		ILDB_V_NO_DEPENDENT
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Cur_UV_8x8.asm
-//
-// Save UV 8x8 block (8x8U + 8x8V in NV12)
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 4 GRF
-//
-//	Binding table index: 
-//	BI_DEST_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD4:w
-#endif
-
-#if defined(_FIELD)
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-#endif
-
-    mov (1)	MSGSRC.0:ud		ORIX_CUR:w					{ NoDDClr } 	// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_CUR:w			1:w		{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0007000F:ud				{ NoDDChk }		// NV12 U+V block width and height (16x8)
-
-	mov (16)	MSGPAYLOADD(0)<1>		SRC_UD(0) 		// Compressed inst
-	mov (16)	MSGPAYLOADD(2)<1>		SRC_UD(2) 
-	
-#if defined(_PROGRESSIVE) 
-	mov (1)		MSGDSC	MSG_LEN(4)+DWBWMSGDSC+BI_DEST_UV:ud
-//    send (8)	NULLREG		MSGHDR		MSGSRC<8;8,1>:ud	DWBWMSGDSC+0x00400000+BI_DEST_UV
-#endif
-
-#if defined(_FIELD)
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(4)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_UV:ud  // Write 4 GRFs to DEST_UV bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(4)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_UV:ud  // Write 4 GRFs to DEST_UV top field
-
-#endif
-
-    send (8)	null:ud		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-// End of save_Cur_UV_8x8.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_UV_8x8_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Cur_UV_8x8.asm
-//
-// Save UV 8x8 block (8x8U + 8x8V in NV12)
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 4 GRF
-//
-//	Binding table index: 
-//	BI_DEST_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD4:w
-#endif
-
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 	BitFields:w  	BotFieldFlag:w
-
-    mov (1)	MSGSRC.0:ud		ORIX_CUR:w					{ NoDDClr } 	// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_CUR:w			1:w		{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0007000F:ud				{ NoDDChk }		// NV12 U+V block width and height (16x8)
-
-	mov (16)	MSGPAYLOADD(0)<1>		SRC_UD(0)		// Compressed inst
-	mov (16)	MSGPAYLOADD(2)<1>		SRC_UD(2)
-
-    // Set message descriptor
-    
-	(f0.0)	if	(1)		ELSE_UV_8X8
-    
-    // Frame picture
-    mov (1)	MSGDSC	MSG_LEN(4)+DWBWMSGDSC+BI_DEST_UV:ud			// Write 4 GRFs to DEST_UV
-
-	(f0.1) add (1)	MSGSRC.1:d	MSGSRC.1:d		8:w		// Add vertical offset 8 for bot MB in MBAFF mode
-
-ELSE_UV_8X8: 
-	else 	(1)		ENDIF_UV_8X8
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(4)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_UV:ud  // Write 4 GRFs to DEST_UV bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(4)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_UV:ud  // Write 4 GRFs to DEST_UV top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ENDIF_UV_8X8:
-    
-    send (8)	null:ud		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-// End of save_Cur_UV_8x8.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Cur_Y_16x16.asm
-//
-// Save a Y 16x16 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//
-//	Binding table index: 
-//	BI_DEST_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD4:w
-#endif
-
-#if defined(_FIELD)
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-#endif
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:w	{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud		{ NoDDChk }		// Block width and height (16x16)
-
-	// Pack Y    
-	mov	(16)	MSGPAYLOADD(0)<1>		SRC_YD(0)		// Compressed inst
-	mov (16)	MSGPAYLOADD(2)<1>		SRC_YD(2)       
-	mov (16)	MSGPAYLOADD(4)<1>		SRC_YD(4)       
-	mov (16)	MSGPAYLOADD(6)<1>		SRC_YD(6)       
-    
-
-#if defined(_PROGRESSIVE) 
-	mov (1)	MSGDSC	MSG_LEN(8)+DWBWMSGDSC+BI_DEST_Y:ud	
-//    send (8)	NULLREG		MSGHDR		MSGSRC<8;8,1>:ud	DWBWMSGDSC+0x00800000+BI_DEST_Y
-#endif
-
-#if defined(_FIELD)
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(8)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_Y:ud  // Write 8 GRFs to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(8)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_Y:ud  // Write 8 GRFs to DEST_Y top field
-
-#endif
-
-    send (8)	null:ud		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-    	
-// End of save_Cur_Y_16x16.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Cur_Y_16x16_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Cur_Y_16x16.asm
-//
-// Save a Y 16x16 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//
-//	Binding table index: 
-//	BI_DEST_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD4:w
-#endif
-
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud			{ NoDDChk }		// Block width and height (16x16 or 12x16)
-
-	// Pack Y    
-	mov	(16)	MSGPAYLOADD(0)<1>		SRC_YD(0)		// Compressed inst
-	mov (16)	MSGPAYLOADD(2)<1>		SRC_YD(2)
-	mov (16)	MSGPAYLOADD(4)<1>		SRC_YD(4)
-	mov (16)	MSGPAYLOADD(6)<1>		SRC_YD(6)
-    
-    // Set message descriptor
-
-	(f0.0)	if	(1)		ELSE_Y_16x16
-    
-    // Frame picture
-    mov (1)	MSGDSC	MSG_LEN(8)+DWBWMSGDSC+BI_DEST_Y:ud			// Write 8 GRFs to DEST_Y
-
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		16:w		// Add vertical offset 16 for bot MB in MBAFF mode
-
-ELSE_Y_16x16: 
-	else 	(1)		ENDIF_Y_16x16
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(8)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_Y:ud  // Write 8 GRFs to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(8)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_Y:ud  // Write 8 GRFs to DEST_Y top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ENDIF_Y_16x16:
-    
-    send (8)	null:ud		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-// End of save_Cur_Y_16x16.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Left_UV_8x2T.asm
-//
-// Transpose 8x2 to 2x8 UV data and write to memory 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Left MB region:
-//	PREV_MB_UW: 	Base=ryy 	ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-
-//	Binding table index: 
-//	BI_SRC_UV:		Binding table index of UV surface (NV12)
-//
-//	Temp buffer:
-//	BUF_W:			BUF_W Base=rxx ElementSize=1 SrcRegion=REGION(8,1) Type=uw
-//
-//
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD6:w
-#endif
-
-#if defined(_FIELD)
-    and.nz.f0.1 (1)  NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-#endif
-
-	// Transpose U/V, save them to MRFs in NV12 format
-    mov (1)	MSGSRC.0:ud		ORIX_LEFT:w						{ NoDDClr }			// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_LEFT:w			1:w			{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x00070003:ud					{ NoDDChk }			// NV12 U+V block width and height (4x8)
-
-
-//	16x2 UV src in GRF (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//	First step		(8)		<1>	<=== <8;4,1>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 70 70 60 60 50 50 40 40 31 31 21 21 11 11 01 01 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-	mov (8)	LEFT_TEMP_W(0,0)<1>		PREV_MB_UW(0,0)<8;4,1>		{ NoDDClr }
-	mov (8)	LEFT_TEMP_W(0,8)<1>		PREV_MB_UW(0,4)<8;4,1>		{ NoDDChk }
-
-//	Second step		(8)		<1>	<=== <1;2,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 70 70 61 61 60 60 51 51 50 50 41 41 40 40 31 31 30 30 21 21 20 20 11 11 10 10 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-	mov (8)	MSGPAYLOADW(0,0)<1>		LEFT_TEMP_W(0,0)<1;2,4>
-	mov (8)	MSGPAYLOADW(0,8)<1>		LEFT_TEMP_W(0,8)<1;2,4>
-
-//  Transposed U+V in NV12 in 4x8 is ready for writting to dataport.
- 
-#if defined(_PROGRESSIVE) 
-	mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC+BI_DEST_UV:ud
-//    send (8)	NULLREG		MSGHDR		MSGSRC<8;8,1>:ud	DWBWMSGDSC+0x00100000+BI_DEST_UV
-#endif
-
-#if defined(_FIELD)
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_UV:ud  // Write 1 GRF to DEST_UV bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_UV:ud  // Write 1 GRF to DEST_UV top field
-
-#endif
-    send (8)	null:ud		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_UV_8x2T_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Left_UV_8x2T.asm
-//
-// Transpose 8x2 to 2x8 UV data and write to memory 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Left MB region:
-//	PREV_MB_UW: 	Base=ryy 	ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-
-//	Binding table index: 
-//	BI_SRC_UV:		Binding table index of UV surface (NV12)
-//
-//	Temp buffer:
-//	BUF_W:			BUF_W Base=rxx ElementSize=1 SrcRegion=REGION(8,1) Type=uw
-//
-//
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD6:w
-#endif
-
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-   
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w
-
-	// Transpose U/V, save them to MRFs in NV12 format
-    mov (1)	MSGSRC.0:ud		ORIX_LEFT:w					{ NoDDClr } 			// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_LEFT:w			1:w		{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x00070003:ud				{ NoDDChk }				// NV12 U+V block width and height (4x8)
-
-
-//	16x2 UV src in GRF (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//	First step		(8)		<1>	<=== <8;4,1>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 70 70 60 60 50 50 40 40 31 31 21 21 11 11 01 01 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-	mov (8)	BUF_W(0,0)<1>		PREV_MB_UW(0,0)<8;4,1>	{ NoDDClr }
-	mov (8)	BUF_W(0,8)<1>		PREV_MB_UW(0,4)<8;4,1>	{ NoDDChk }
-
-//	Second step		(8)		<1>	<=== <1;2,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 70 70 61 61 60 60 51 51 50 50 41 41 40 40 31 31 30 30 21 21 20 20 11 11 10 10 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-	mov (8)	MSGPAYLOADW(0,0)<1>		BUF_W(0,0)<1;2,4>
-	mov (8)	MSGPAYLOADW(0,8)<1>		BUF_W(0,8)<1;2,4>
-
-//  Transposed U+V in NV12 in 4x8 is ready for writting to dataport.
- 
-    // Set message descriptor
-    
-	(f0.0)	if	(1)		ELSE_UV_8X2T
-    
-    // Frame picture
-    mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC+BI_DEST_UV:ud			// Write 1 GRF to DEST_UV
-
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		8:w		// Add vertical offset 8 for bot MB in MBAFF mode
-
-ELSE_UV_8X2T: 
-	else 	(1)		ENDIF_UV_8X2T
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_UV:ud  // Write 1 GRF to DEST_UV bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_UV:ud  // Write 1 GRF to DEST_UV top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ENDIF_UV_8X2T:
-
-    send (8)	null:ud		MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Left_Y_16x4T.asm
-//
-// Transpose 16x4 to 4x16 Y data and write to memory 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Left MB region:
-//	PREV_MB_YB:	  	Base=rxx 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//
-//	Temp buffer:
-//	BUF_B:			BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-//
-//
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD6:w
-#endif
-
-#if defined(_FIELD)
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-#endif
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_LEFT<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			{ NoDDChk }		// 4x16
-    
-// Transpose Y, save them to MRFs
-
-//	16x4 Y src in GRF (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//  First step		(16)	<1>	<=== <16;4,1>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 63 53 43 72 62 52 42 71 61 51 41 70 60 50 40 33 23 13 03 32 22 12 02 31 21 11 01 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 f2 e2 d2 c2 f1 e1 d1 c1 f0 e0 d0 c0 b3 a3 93 83 b2 a2 92 82 b1 a1 91 81 b0 a0 90 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-	// The first step
-	mov (16)	LEFT_TEMP_B(0,0)<1>			PREV_MB_YB(0,0)<16;4,1>		{ NoDDClr }	
-	mov (16)	LEFT_TEMP_B(0,16)<1>		PREV_MB_YB(0,4)<16;4,1>		{ NoDDChk }
-	mov (16)	LEFT_TEMP_B(1,0)<1>			PREV_MB_YB(0,8)<16;4,1>		{ NoDDClr }
-	mov (16)	LEFT_TEMP_B(1,16)<1>		PREV_MB_YB(0,12)<16;4,1>	{ NoDDChk }
-
-//
-//  Second step		(16)	<1>	<=== <1;4,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-	// The second step
-	mov	(16)	MSGPAYLOADB(0,0)<1>		LEFT_TEMP_B(0,0)<1;4,4>
-	mov (16)	MSGPAYLOADB(0,16)<1>	LEFT_TEMP_B(0,16)<1;4,4>
-	mov (16)	MSGPAYLOADB(1,0)<1>		LEFT_TEMP_B(1,0)<1;4,4>
-	mov (16)	MSGPAYLOADB(1,16)<1>	LEFT_TEMP_B(1,16)<1;4,4>
-
-//  Transposed Y in 4x16 is ready for writting to dataport.
-
-
-#if defined(_PROGRESSIVE) 
-	mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC+BI_DEST_Y:ud
-//    send (8)	NULLREG		MSGHDR		MSGSRC<8;8,1>:ud	DWBWMSGDSC+0x00200000+BI_DEST_Y
-#endif
-
-#if defined(_FIELD)
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y top field
-
-#endif
-
-    send (8)	null:ud		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Left_Y_16x4T_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Left_Y_16x4T.asm
-//
-// Transpose 16x4 to 4x16 Y data and write to memory 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Left MB region:
-//	PREV_MB_YB:	  	Base=rxx 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//
-//	Temp buffer:
-//	BUF_B:			BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-//
-//
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD6:w
-#endif
-
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    and.nz.f0.1 (1)	NULLREGW 		BitFields:w  	BotFieldFlag:w
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_LEFT<2;2,1>:w		{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			{ NoDDChk }		// 4x16
-    
-// Transpose Y, save them to MRFs
-
-//	16x4 Y src in GRF (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//  First step		(16)	<1>	<=== <16;4,1>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 63 53 43 72 62 52 42 71 61 51 41 70 60 50 40 33 23 13 03 32 22 12 02 31 21 11 01 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 f2 e2 d2 c2 f1 e1 d1 c1 f0 e0 d0 c0 b3 a3 93 83 b2 a2 92 82 b1 a1 91 81 b0 a0 90 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-	// The first step
-	mov (16)	BUF_B(0,0)<1>			PREV_MB_YB(0,0)<16;4,1>		{ NoDDClr }
-	mov (16)	BUF_B(0,16)<1>			PREV_MB_YB(0,4)<16;4,1>		{ NoDDChk }
-	mov (16)	BUF_B(1,0)<1>			PREV_MB_YB(0,8)<16;4,1>		{ NoDDClr }
-	mov (16)	BUF_B(1,16)<1>			PREV_MB_YB(0,12)<16;4,1>	{ NoDDChk }	
-
-//
-//  Second step		(16)	<1>	<=== <1;4,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-	// The second step
-	mov	(16)	MSGPAYLOADB(0,0)<1>		BUF_B(0,0)<1;4,4>
-	mov (16)	MSGPAYLOADB(0,16)<1>	BUF_B(0,16)<1;4,4>
-	mov (16)	MSGPAYLOADB(1,0)<1>		BUF_B(1,0)<1;4,4>
-	mov (16)	MSGPAYLOADB(1,16)<1>	BUF_B(1,16)<1;4,4>
-
-//  Transposed Y in 4x16 is ready for writting to dataport.
-
-	//***** Left MB is loaded the same as indicated by FieldModeCurrentMbFlag.
-
-    // Set message descriptor
- 
-	(f0.0)	if	(1)		ELSE_Y_16x4T
-    
-    // Frame picture
-    mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC+BI_DEST_Y:ud			// Write 2 GRFs to DEST_Y
-
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		16:w		// Add vertical offset 16 for bot MB in MBAFF mode
-
-ELSE_Y_16x4T: 
-	else 	(1)		ENDIF_Y_16x4T
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC+ENMSGDSCBF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC+ENMSGDSCTF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y top field
-
-	asr (1)	MSGSRC.1:d		MSGSRC.1:d		1:w					// Reduce y by half in field access mode
-
-	endif
-ENDIF_Y_16x4T:
-
-    send (8)	null:ud		MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/saveNV12_16x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/saveNV12_16x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/saveNV12_16x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/saveNV12_16x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: saveNV12_16x16.asm
-//
-// Save a NV12 16x16 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 8 GRFs
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 4 GRF
-//
-//	Binding table index: 
-//	BI_DEST_Y:		Binding table index of Y surface
-//	BI_DEST_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD4:w
-#endif
-
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_CUR<2;2,1>:w		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F000F:ud		// Block width and height (16x16)
-
-	// Pack Y    
-	mov	(16)	MSGPAYLOADD(0)<1>		SRC_YD(0)		// Compressed inst
-	mov (16)	MSGPAYLOADD(2)<1>		SRC_YD(2)
-	mov (16)	MSGPAYLOADD(4)<1>		SRC_YD(4)
-	mov (16)	MSGPAYLOADD(6)<1>		SRC_YD(6)
-    
-    send (8)	NULLREG	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSG_LEN(8)+DWBWMSGDSC+BI_DEST_Y		// Write 8 GRFs
-
-
-
-    asr (1)	MSGSRC.1:ud		MSGSRC.1:ud			1:w						// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2<1>:ud	0x0007000F:ud								// NV12 U+V block width and height (16x8)
-
-	mov (16)	MSGPAYLOADD(0)<1>		SRC_UD(0)		// Compressed inst
-	mov (16)	MSGPAYLOADD(2)<1>		SRC_UD(2)
-
-    send (8)	NULLREG	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSG_LEN(4)+DWBWMSGDSC+BI_DEST_UV		// Write 4 GRFs
-
-
-// End of saveNV12_16x16.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/saveNV12_16x4.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/saveNV12_16x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/saveNV12_16x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/saveNV12_16x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: saveNV12_16x4.asm
-//
-// Save a NV12 16x4 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 2 GRFs
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 1 GRF
-//
-//	Binding table index: 
-//	BI_DEST_Y:		Binding table index of Y surface
-//	BI_DEST_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD5:w
-#endif
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_TOP<2;2,1>:w							// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x0003000F:ud								// Block width and height (16x4)
-
-	// Pack Y    
-	mov	(16)	MSGPAYLOADD(0)<1>		SRC_YD(0)						// Compressed inst
-    
-    send (8)	NULLREG	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSG_LEN(2)+DWBWMSGDSC+BI_DEST_Y		// Write 2 GRFs
-
-
-    asr (1)	MSGSRC.1:ud		MSGSRC.1:ud			1:w						// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2<1>:ud	0x0001000F:ud								// NV12 U+V block width and height (16x2)
-
-	// Pack U and V
-//	mov (16)	MSGPAYLOADB(0,0)<2>		SRC_UB(0,0)
-//	mov (16)	MSGPAYLOADB(0,1)<2>		SRC_VB(0,0)
-	
-	mov (8)	MSGPAYLOADD(0,0)<1>		SRC_UD(0)	
-	
-    send (8)	NULLREG	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSG_LEN(1)+DWBWMSGDSC+BI_DEST_UV	// Write 1 GRF
-
-// End of saveNV12_16x4.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/saveNV12_16x4T.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/saveNV12_16x4T.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/saveNV12_16x4T.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/saveNV12_16x4T.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,113 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: saveNV12_16x4T.asm
-//
-// Transpose 16x4 to 4x16 YNV12 data and write to memory 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Left MB region:
-//	PREV_MB_YB:	  	Base=rxx 	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-//	PREV_MB_UW: 	Base=ryy 	ElementSize=2 SrcRegion=REGION(8,1) Type=uw
-
-//	Binding table index: 
-//	BI_SRC_Y:		Binding table index of Y surface
-//	BI_SRC_UV:		Binding table index of UV surface (NV12)
-//
-//	Temp buffer:
-//	BUF_B:			BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-//	BUF_W:			BUF_W Base=rxx ElementSize=1 SrcRegion=REGION(8,1) Type=uw
-//
-//
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD6:w
-#endif
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_LEFT<2;2,1>:w		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x000F0003:ud			// 4x16
-    
-// Transpose Y, save them to MRFs
-
-//	16x4 Y src in GRF (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//  First step		(16)	<1>	<=== <16;4,1>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 63 53 43 72 62 52 42 71 61 51 41 70 60 50 40 33 23 13 03 32 22 12 02 31 21 11 01 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 f2 e2 d2 c2 f1 e1 d1 c1 f0 e0 d0 c0 b3 a3 93 83 b2 a2 92 82 b1 a1 91 81 b0 a0 90 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-	// The first step
-	mov (16)	BUF_B(0,0)<1>			PREV_MB_YB(0,0)<16;4,1>
-	mov (16)	BUF_B(0,16)<1>			PREV_MB_YB(0,4)<16;4,1>
-	mov (16)	BUF_B(1,0)<1>			PREV_MB_YB(0,8)<16;4,1>
-	mov (16)	BUF_B(1,16)<1>			PREV_MB_YB(0,12)<16;4,1>
-
-//
-//  Second step		(16)	<1>	<=== <1;4,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-	// The second step
-//	mov	(16)	MSGPAYLOADB(0,0)<1>		BUF_B(0,0)<32;8,4> 			// Read 2 rows, write 1 row
-//	mov (16)	MSGPAYLOADB(0,16)<1>	BUF_B(0,1)<32;8,4>
-//	mov (16)	MSGPAYLOADB(1,0)<1>		BUF_B(0,2)<32;8,4>
-//	mov (16)	MSGPAYLOADB(1,16)<1>	BUF_B(0,3)<32;8,4>
-
-	mov	(16)	MSGPAYLOADB(0,0)<1>		BUF_B(0,0)<1;4,4>
-	mov (16)	MSGPAYLOADB(0,16)<1>	BUF_B(0,16)<1;4,4>
-	mov (16)	MSGPAYLOADB(1,0)<1>		BUF_B(1,0)<1;4,4>
-	mov (16)	MSGPAYLOADB(1,16)<1>	BUF_B(1,16)<1;4,4>
-
-//  Transposed Y in 4x16 is ready for writting to dataport.
-//
-    send (8)	NULLREG	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSG_LEN(2)+DWBWMSGDSC+BI_DEST_Y				// Write 2 GRFs
-
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	// Transpose U/V, save them to MRFs in NV12 format
-    asr (1)	MSGSRC.1:ud		MSGSRC.1:ud			1:w						// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2<1>:ud	0x00070003:ud								// NV12 U+V block width and height (4x8)
-
-
-//	16x2 UV src in GRF (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//	First step		(8)		<1>	<=== <8;4,1>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 70 70 60 60 50 50 40 40 31 31 21 21 11 11 01 01 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-	mov (8)	BUF_W(0,0)<1>		PREV_MB_UW(0,0)<8;4,1>
-	mov (8)	BUF_W(0,8)<1>		PREV_MB_UW(0,4)<8;4,1>
-
-//	Second step		(8)		<1>	<=== <1;2,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 70 70 61 61 60 60 51 51 50 50 41 41 40 40 31 31 30 30 21 21 20 20 11 11 10 10 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-	mov (8)	MSGPAYLOADW(0,0)<1>		BUF_W(0,0)<1;2,4>
-	mov (8)	MSGPAYLOADW(0,8)<1>		BUF_W(0,8)<1;2,4>
-
-//  Transposed U+V in NV12 in 4x8 is ready for writting to dataport.
- 
-    send (8)	NULLREG	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSG_LEN(1)+DWBWMSGDSC+BI_DEST_UV		// Write 1 GRF
-    
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Top_UV_8x2.asm
-//
-// Save UV 8x2 block (8x2U + 8x2V in NV12)
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 1 GRF
-//
-//	Binding table index: 
-//	BI_DEST_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD5:w
-#endif
-	
-#if defined(_FIELD)
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-#endif
-
-    mov (1)	MSGSRC.0:ud		ORIX_TOP:w					{ NoDDClr }				// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_TOP:w			1:w		{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0001000F:ud				{ NoDDChk }				// NV12 U+V block width and height (16x2)
-
-	mov (8)	MSGPAYLOADD(0,0)<1>		TOP_MB_UD(0)	
-	
-
-#if defined(_PROGRESSIVE) 
-	mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC_WC+BI_DEST_UV:ud
-//    send (8)	NULLREG		MSGHDR		MSGSRC<8;8,1>:ud	DWBWMSGDSC+0x00100000+BI_DEST_UV
-#endif
-
-#if defined(_FIELD)
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC_WC+ENMSGDSCBF+BI_DEST_UV:ud  // Write 1 GRF to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC_WC+ENMSGDSCTF+BI_DEST_UV:ud  // Write 1 GRF to DEST_Y top field
-
-#endif
-
-    send (8)	WritebackResponse(0)<1>		MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-// End of save_Top_UV_8x2.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_UV_8x2_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Top_UV_8x2.asm
-//
-// Save UV 8x2 block (8x2U + 8x2V in NV12)
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_UD:			SRC_UD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 1 GRF
-//
-//	Binding table index: 
-//	BI_DEST_UV:		Binding table index of UV surface (NV12)
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD5:w
-#endif
-	and.z.f0.1 (8) NULLREGW		DualFieldMode<0;1,0>:w		1:w
-
-    // FieldModeCurrentMbFlag determines how to access above MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-    
-	// Pack U and V
-    mov (1)	MSGSRC.0:ud		ORIX_TOP:w					{ NoDDClr } 			// Block origin
-    asr (1)	MSGSRC.1:ud		ORIY_TOP:w			1:w		{ NoDDClr, NoDDChk }	// NV12 U+V block origin y = half of Y comp
-    mov (1)	MSGSRC.2:ud		0x0001000F:ud				{ NoDDChk }				// NV12 U+V block width and height (16x2)
-
-	// Dual field mode
-	(f0.1) mov (8)	MSGPAYLOADD(0)<1>		PREV_MB_UD(0)
-    (-f0.1) mov (8) MSGPAYLOADD(0)<1>		PREV_MB_UD(1)	// for dual field mode, write last 2 rows
-	
-    // Set message descriptor
-
-    and.nz.f0.1 (1) NULLREGW 		BitFields:w   BotFieldFlag:w
-    
-	(f0.0)	if	(1)		ELSE_UV_8X2_SAVE
-
-    // Frame picture
-    mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC_WC+BI_DEST_UV:ud			// Write 1 GRFs to DEST_UV
-
-	// Add vertical offset 8 for bot MB in MBAFF mode
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		8:w		
-
-ELSE_UV_8X2_SAVE: 
-	else 	(1)		ENDIF_UV_8X2_SAVE
-
-	asr (1)	MSGSRC.1:d		ORIY_CUR:w		2:w			// asr 1: NV12 U+V block origin y = half of Y comp
-														// asr 1: Reduce y by half in field access mode
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC_WC+ENMSGDSCBF+BI_DEST_UV:ud  // Write 1 GRF to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(1)+DWBWMSGDSC_WC+ENMSGDSCTF+BI_DEST_UV:ud  // Write 1 GRF to DEST_Y top field
-
-	add (1)	MSGSRC.1:d		MSGSRC.1:d		-2:w		// for last 4 rows of above MB
-
-	endif
-ENDIF_UV_8X2_SAVE:
-
-    send (8)	WritebackResponse(0)<1>		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-// End of save_Top_UV_8x2.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Top_Y_16x4.asm
-//
-// Save a Y 16x4 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 2 GRFs
-//
-//	Binding table index: 
-//	BI_DEST_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD5:w
-#endif
-
-#if defined(_FIELD)
-    and.nz.f0.1 (1) NULLREGW 	BitFields:w  	BotFieldFlag:w			// Get bottom field flag
-#endif
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_TOP<2;2,1>:w			{ NoDDClr }		// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x0003000F:ud				{ NoDDChk }		// Block width and height (16x4)
-
-	// Pack Y    
-	mov	(16)	MSGPAYLOADD(0)<1>		TOP_MB_YD(0)					// Compressed inst
-    
-
-#if defined(_PROGRESSIVE) 
-	mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC_WC+BI_DEST_Y:ud
-//    send (8)	NULLREG		MSGHDR		MSGSRC<8;8,1>:ud	DWBWMSGDSC+0x00200000+BI_DEST_Y
-#endif
-
-#if defined(_FIELD)
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC_WC+ENMSGDSCBF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC_WC+ENMSGDSCTF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y top field
-
-#endif
-
-    send (8)	WritebackResponse(0)<1>		MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-// End of save_Top_Y_16x4.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4_Mbaff.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4_Mbaff.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4_Mbaff.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/save_Top_Y_16x4_Mbaff.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_Top_Y_16x4.asm
-//
-// Save a Y 16x4 block 
-//
-//----------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region in :ud
-//	SRC_YD:			SRC_YD Base=rxx ElementSize=4 SrcRegion=REGION(8,1) Type=ud			// 2 GRFs
-//
-//	Binding table index: 
-//	BI_DEST_Y:		Binding table index of Y surface
-//
-//----------------------------------------------------------------
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDD5:w
-#endif
-
-	and.z.f0.1 (16) NULLREGW		DualFieldMode<0;1,0>:w		1:w
-
-    // FieldModeCurrentMbFlag determines how to access above MB
-	and.z.f0.0 (1) 	null:w		r[ECM_AddrReg, BitFlags]:ub		FieldModeCurrentMbFlag:w		
-
-    mov (2)	MSGSRC.0<1>:ud	ORIX_TOP<2;2,1>:w		{ NoDDClr }			// Block origin
-    mov (1)	MSGSRC.2<1>:ud	0x0003000F:ud			{ NoDDChk }			// Block width and height (16x4)
-
-	// Pack Y
-	// Dual field mode
-	(f0.1) mov	(16) MSGPAYLOADD(0)<1>		PREV_MB_YD(0)				// Compressed inst
-    (-f0.1)  mov (16) MSGPAYLOADD(0)<1>		PREV_MB_YD(2)				// for dual field mode, write last 4 rows
-    
-    // Set message descriptor
-
-    and.nz.f0.1 (1) NULLREGW 		BitFields:w   BotFieldFlag:w
-
-	(f0.0)	if	(1)		ELSE_Y_16x4_SAVE
-    
-    // Frame picture
-    mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC_WC+BI_DEST_Y:ud			// Write 2 GRFs to DEST_Y
-
-	// Add vertical offset 16 for bot MB in MBAFF mode
-	(f0.1) add (1)	MSGSRC.1:d		MSGSRC.1:d		16:w		
-
-ELSE_Y_16x4_SAVE: 
-	else 	(1)		ENDIF_Y_16x4_SAVE
-
-	asr (1)	MSGSRC.1:d		ORIY_CUR:w		1:w					// Reduce y by half in field access mode
-
-	// Field picture
-    (f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC_WC+ENMSGDSCBF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y bottom field
-    (-f0.1) mov (1)	MSGDSC	MSG_LEN(2)+DWBWMSGDSC_WC+ENMSGDSCTF+BI_DEST_Y:ud  // Write 2 GRFs to DEST_Y top field
-
-	add (1)	MSGSRC.1:d		MSGSRC.1:d		-4:w	// for last 4 rows of above MB
-
-	endif
-ENDIF_Y_16x4_SAVE:
-    
-    send (8)	WritebackResponse(0)<1>		MSGHDR		MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-// End of save_Top_Y_16x4.asm
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/SetupVPKernel.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/SetupVPKernel.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/SetupVPKernel.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/SetupVPKernel.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Modual name: SetupVPKernel.asm
-//
-// Initial setup for running video-processing kernels
-//
-
-#include "ILDB_header.inc"
-
-//
-//  Now, begin source code....
-//
-
-.code
-
-    mov (8)	MSGSRC.0<1>:ud	r0.0<8;8,1>:ud	// Initialize message payload header with R0
-
-// End of SetupVPKernel
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_2x8.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_2x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_2x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_2x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////
-//	Module name: Transpose_UV_2x8.asm
-//	
-//	Transpose UV 2x8 to 8x2 block (2x8U + 2x8V in NV12)
-//
-//----------------------------------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region is :ub
-//	SRC_UW:			SRC_UB Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// 4 GRFs
-//
-//  Temp buffer:
-//	BUF_W:			BUF_W Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// 4 GRFs
-//
-//////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDDB:w
-#endif
-
-// Transpose UV (4x8),  right most 2 columns in word
-// Use BUF_W(0) as temp buf
-
-// Src U 8x8 and V 8x8 are mixed. (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|17 17 16 16 15 15 14 14 13 13 12 12 11 11 10 10 07 07 06 06 05 05 04 04 03 03 02 02 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|37 37 36 36 35 35 34 34 33 33 32 32 31 31 30 30 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|57 57 56 56 55 55 54 54 53 53 52 52 51 51 50 50 47 47 46 46 45 45 44 44 43 43 42 42 41 41 40 40|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 76 76 75 75 74 74 73 73 72 72 71 71 70 70 67 67 66 66 65 65 64 64 63 63 62 62 61 61 60 60|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//  First step 		(8)	<1>:w <==== <8;2,1>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 76 76 67 67 66 66 57 57 56 56 47 47 46 46 37 37 36 36 27 27 26 26 17 17 16 16 07 07 06 06|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-mov (8)		LEFT_TEMP_W(0,0)<1>		SRC_UW(0,6)<8;2,1>		{ NoDDClr }
-mov (8)		LEFT_TEMP_W(0,8)<1>		SRC_UW(2,6)<8;2,1>		{ NoDDChk }
-
-//	Second step		(16) <1>:w <==== <1;8,2>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 67 67 57 57 47 47 37 37 27 27 17 17 07 07 76 76 66 66 56 56 46 46 36 36 26 26 16 16 06 06|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-mov (16)	LEFT_TEMP_W(1,0)<1>		LEFT_TEMP_W(0,0)<1;8,2>
-
-// UV are now transposed.  the result is in BUF_W(1)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_8x8.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_8x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_8x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_8x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////
-//	Module name: Transpose_UV_8x8.asm
-//	
-//	Transpose a 8x8 UV block. (8x8U + 8x8V)  The output is also in NV12
-//
-//----------------------------------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region is :ub
-//	SRC_UW:			SRC_UW Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw	// 4 GRFs
-//
-//  Temp buffer:
-//	BUF_W:			BUF_W Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// 4 GRFs
-//
-//////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDDA:w
-#endif
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Src U and V are mixed in NV12 format. U on even bytes, V on odd bytes.
-// Transpose by treating UV pair as a word.
-
-
-// Src U 8x8 and V 8x8 are mixed. (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|17 17 16 16 15 15 14 14 13 13 12 12 11 11 10 10 07 07 06 06 05 05 04 04 03 03 02 02 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|37 37 36 36 35 35 34 34 33 33 32 32 31 31 30 30 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|57 57 56 56 55 55 54 54 53 53 52 52 51 51 50 50 47 47 46 46 45 45 44 44 43 43 42 42 41 41 40 40|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 76 76 75 75 74 74 73 73 72 72 71 71 70 70 67 67 66 66 65 65 64 64 63 63 62 62 61 61 60 60|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//  First step 		(16)	<1>:w <==== <8;4,1>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|33 33 32 32 31 31 30 30 23 23 22 22 21 21 20 20 13 13 12 12 11 11 10 10 03 03 02 02 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 73 72 72 71 71 70 70 63 63 62 62 61 61 60 60 53 53 52 52 51 51 50 50 43 43 42 42 41 41 40 40|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|37 37 36 36 35 35 34 34 27 27 26 26 25 25 24 24 17 17 16 16 15 15 14 14 07 07 06 06 05 05 04 04|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 76 76 75 75 74 74 67 67 66 66 65 65 64 64 57 57 56 56 55 55 54 54 47 47 46 46 45 45 44 44|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-// Transpose UV (8x8 words), The first step
-mov (16)	CUR_TEMP_W(0,0)<1>		SRC_UW(0,0)<8;4,1>
-mov (16)	CUR_TEMP_W(1,0)<1>		SRC_UW(2,0)<8;4,1>
-mov (16)	CUR_TEMP_W(2,0)<1>		SRC_UW(0,4)<8;4,1>
-mov (16)	CUR_TEMP_W(3,0)<1>		SRC_UW(2,4)<8;4,1>
-
-
-//	Second step		(16)	<1>:w <=== <16;4,4>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 73 63 63 53 53 43 43 33 33 23 23 13 13 03 03 72 72 62 62 52 52 42 42 32 32 22 22 12 12 02 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|75 75 65 65 55 55 45 45 35 35 25 25 15 15 05 05 74 74 64 64 54 54 44 44 34 34 24 24 14 14 04 04|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 67 67 57 57 47 47 37 37 27 27 17 17 07 07 76 76 66 66 56 56 46 46 36 36 26 26 16 16 06 06|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-// Transpose UV (8x8 words), The second step
-mov (8)		SRC_UW(0,0)<1>		CUR_TEMP_W(0,0)<16;4,4>		{ NoDDClr }
-mov (8)		SRC_UW(0,8)<1>		CUR_TEMP_W(0,1)<16;4,4>		{ NoDDChk }
-mov (8)		SRC_UW(1,0)<1>		CUR_TEMP_W(0,2)<16;4,4>		{ NoDDClr }
-mov (8)		SRC_UW(1,8)<1>		CUR_TEMP_W(0,3)<16;4,4>		{ NoDDChk }
-mov (8)		SRC_UW(2,0)<1>		CUR_TEMP_W(2,0)<16;4,4>		{ NoDDClr }
-mov (8)		SRC_UW(2,8)<1>		CUR_TEMP_W(2,1)<16;4,4>		{ NoDDChk }
-mov (8)		SRC_UW(3,0)<1>		CUR_TEMP_W(2,2)<16;4,4>		{ NoDDClr }
-mov (8)		SRC_UW(3,8)<1>		CUR_TEMP_W(2,3)<16;4,4>		{ NoDDChk }
-
-// U and V are now transposed and separated.
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_Right_Most_2x8.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_Right_Most_2x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_Right_Most_2x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_UV_Right_Most_2x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	Transpose Cur MB Right Most 2x8 to 8x2
-//  Assume source is LEFT_TEMP_W(0), and detination is LEFT_TEMP_W(1)
-
-//	Input from dport for transpose:	
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 70 70 61 61 60 60 51 51 50 50 41 41 40 40 31 31 30 30 21 21 20 20 11 11 10 10 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//	Output of transpose:	<1>	<=== <16;8,2>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//	mov (8)	LEFT_TEMP_W(1,0)<1>		LEFT_TEMP_W(0,0)<16;8,2>		{ NoDDClr }
-//	mov (8)	LEFT_TEMP_W(1,8)<1>		LEFT_TEMP_W(0,1)<16;8,2>		{ NoDDChk }
-
-	mov (16)	LEFT_TEMP_W(1,0)<1>		LEFT_TEMP_W(0,0)<1;8,2>
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_16x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_16x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_16x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_16x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////
-//	Module name: Transpose_Y_16x16.asm
-//	
-//	Transpose Y 16x16 block.
-//
-//----------------------------------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region is :ub
-//	SRC_YB:			SRC_YB Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 8 GRFs
-//
-//  Temp buffer:
-//	CUR_TEMP_B:		BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// 8 GRFs
-//
-//////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDDA:w
-#endif
-
-
-// Transpose Y (16x16 bytes)
-
-// The first step
-mov (16)	CUR_TEMP_B(0,0)<1>		SRC_YB(0,0)<16;4,1>		{ NoDDClr } 
-mov (16)	CUR_TEMP_B(0,16)<1>		SRC_YB(2,0)<16;4,1>		{ NoDDChk }
-mov (16)	CUR_TEMP_B(1,0)<1>		SRC_YB(4,0)<16;4,1>		{ NoDDClr }
-mov (16)	CUR_TEMP_B(1,16)<1>		SRC_YB(6,0)<16;4,1>		{ NoDDChk }
-
-mov (16)	CUR_TEMP_B(2,0)<1>		SRC_YB(0,4)<16;4,1>		{ NoDDClr }
-mov (16)	CUR_TEMP_B(2,16)<1>		SRC_YB(2,4)<16;4,1>		{ NoDDChk }
-mov (16)	CUR_TEMP_B(3,0)<1>		SRC_YB(4,4)<16;4,1>		{ NoDDClr }
-mov (16)	CUR_TEMP_B(3,16)<1>		SRC_YB(6,4)<16;4,1>		{ NoDDChk }
-
-mov (16)	CUR_TEMP_B(4,0)<1>		SRC_YB(0,8)<16;4,1>		{ NoDDClr }
-mov (16)	CUR_TEMP_B(4,16)<1>		SRC_YB(2,8)<16;4,1>		{ NoDDChk }
-mov (16)	CUR_TEMP_B(5,0)<1>		SRC_YB(4,8)<16;4,1>		{ NoDDClr }
-mov (16)	CUR_TEMP_B(5,16)<1>		SRC_YB(6,8)<16;4,1>		{ NoDDChk }
-
-mov (16)	CUR_TEMP_B(6,0)<1>		SRC_YB(0,12)<16;4,1>	{ NoDDClr }
-mov (16)	CUR_TEMP_B(6,16)<1>		SRC_YB(2,12)<16;4,1>	{ NoDDChk }
-mov (16)	CUR_TEMP_B(7,0)<1>		SRC_YB(4,12)<16;4,1>	{ NoDDClr }
-mov (16)	CUR_TEMP_B(7,16)<1>		SRC_YB(6,12)<16;4,1>	{ NoDDChk }
-
-// The second step
-mov (16)	SRC_YB(0,0)<1>		CUR_TEMP_B(0,0)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(0,16)<1>		CUR_TEMP_B(0,1)<32;8,4>		{ NoDDChk }
-mov (16)	SRC_YB(1,0)<1>		CUR_TEMP_B(0,2)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(1,16)<1>		CUR_TEMP_B(0,3)<32;8,4>		{ NoDDChk }
-
-mov (16)	SRC_YB(2,0)<1>		CUR_TEMP_B(2,0)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(2,16)<1>		CUR_TEMP_B(2,1)<32;8,4>		{ NoDDChk }
-mov (16)	SRC_YB(3,0)<1>		CUR_TEMP_B(2,2)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(3,16)<1>		CUR_TEMP_B(2,3)<32;8,4>		{ NoDDChk }
-
-mov (16)	SRC_YB(4,0)<1>		CUR_TEMP_B(4,0)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(4,16)<1>		CUR_TEMP_B(4,1)<32;8,4>		{ NoDDChk }
-mov (16)	SRC_YB(5,0)<1>		CUR_TEMP_B(4,2)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(5,16)<1>		CUR_TEMP_B(4,3)<32;8,4>		{ NoDDChk }
-
-mov (16)	SRC_YB(6,0)<1>		CUR_TEMP_B(6,0)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(6,16)<1>		CUR_TEMP_B(6,1)<32;8,4>		{ NoDDChk }
-mov (16)	SRC_YB(7,0)<1>		CUR_TEMP_B(6,2)<32;8,4>		{ NoDDClr }
-mov (16)	SRC_YB(7,16)<1>		CUR_TEMP_B(6,3)<32;8,4>		{ NoDDChk }
-
-// Y is transposed.
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_4x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_4x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_4x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_4x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////
-//	Module name: Transpose_Y_4x16.asm
-//	
-//	Transpose a 4x16 internal planar to 16x4 internal planar block.
-//	The src block is 16x16.  Right moft 4 columns are transposed.
-//
-//----------------------------------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region is :ub
-//	SRC_YB:			SRC_YB Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 8 GRFs
-//
-//  Temp buffer:
-//	BUF_B:			BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// 8 GRFs
-//
-//////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDDB:w
-#endif
-
-// Transpose Y (4x16) right most 4 columns
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|1f 1e 1d 1c 1b 1a 19 18 17 16 15 14 13 12 11 10 0f 0e 0d 0c 0b 0a 09 08 07 06 05 04 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|3f 3e 3d 3c 3b 3a 39 38 37 36 35 34 33 32 31 30 2f 2e 2d 2c 2b 2a 29 28 27 26 25 24 23 22 21 20|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|5f 5e 5d 5c 5b 5a 59 58 57 56 55 54 53 52 51 50 4f 4e 4d 4c 4b 4a 49 48 47 46 45 44 43 42 41 40|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|7f 7e 7d 7c 7b 7a 79 78 77 76 75 74 73 72 71 70 6f 6e 6d 6c 6b 6a 69 68 67 66 65 64 63 62 61 60|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|9f 9e 9d 9c 9b 9a 99 98 97 96 95 94 93 92 91 90 8f 8e 8d 8c 8b 8a 89 88 87 86 85 84 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|bf be bd bc bb ba b9 b8 b7 b6 b5 b4 b3 b2 b1 b0 af ae ad ac ab aa a9 a8 a7 a6 a5 a4 a3 a2 a1 a0|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|df de dd dc db da d9 d8 d7 d6 d5 d4 d3 d2 d1 d0 cf ce cd cc cb ca c9 c8 c7 c6 c5 c4 c3 c2 c1 c0|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|ff fe fd fc fb fa f9 f8 f7 f6 f5 f4 f3 f2 f1 f0 ef ee ed ec eb ea e9 e8 e7 e6 e5 e4 e3 e2 e1 e0|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-// The first step
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|7f 7e 7d 7c 6f 6e 6d 6c 5f 5e 5d 5c 4f 4e 4d 4c 3f 3e 3d 3c 2f 2e 2d 2c 1f 1e 1d 1c 0f 0e 0d 0c|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|ff fe fd fc ef ee ed ec df de dd dc cf ce cd cc bf be bd bc af ae ad ac 9f 9e 9d 9c 8f 8e 8d 8c|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-// The second step
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|fd ed dd cd bd ad 9d 8d 7d 6d 5d 4d 3d 2d 1d 0d fc ec dc cc bc ac 9c 8c 7c 6c 5c 4c 3c 2c 1c 0c|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|ff ef df cf bf af 9f 8f 7f 6f 5f 4f 3f 2f 1f 0f fe ee de ce be ae 9e 8e 7e 6e 5e 4e 3e 2e 1e 0e|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-
-mov (16)	LEFT_TEMP_B(0,0)<1>		SRC_YB(0,12)<16;4,1>		{ NoDDClr }	
-mov (16)	LEFT_TEMP_B(0,16)<1>	SRC_YB(2,12)<16;4,1>		{ NoDDChk }
-mov (16)	LEFT_TEMP_B(1,0)<1>		SRC_YB(4,12)<16;4,1>		{ NoDDClr }
-mov (16)	LEFT_TEMP_B(1,16)<1>	SRC_YB(6,12)<16;4,1>		{ NoDDChk }
-
-// The second step
-mov (16)	LEFT_TEMP_B(2,0)<1>		LEFT_TEMP_B(0,0)<32;8,4> 		{ NoDDClr }	
-mov (16)	LEFT_TEMP_B(2,16)<1>	LEFT_TEMP_B(0,1)<32;8,4>		{ NoDDChk }
-mov (16)	LEFT_TEMP_B(3,0)<1>		LEFT_TEMP_B(0,2)<32;8,4>		{ NoDDClr }
-mov (16)	LEFT_TEMP_B(3,16)<1>	LEFT_TEMP_B(0,3)<32;8,4>		{ NoDDChk }
-
-// Y is now transposed. the result is in LEFT_TEMP_B(2) and LEFT_TEMP_B(3).
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_Right_Most_4x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_Right_Most_4x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_Right_Most_4x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Cur_Y_Right_Most_4x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	Transpose cur Y right most 4x16 to 16x4
-//  Assume source is LEFT_TEMP_B(0), and detination is LEFT_TEMP_B(2)
-
-
-//	Input received from dport:
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//	Output of transpose:		<1>	<= <32;8,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-	// Transpose the data, also occupy 2 GRFs
-	mov (16)	LEFT_TEMP_B(2)<1>			LEFT_TEMP_B(0, 0)<32;8,4>		{ NoDDClr }
-	mov (16)	LEFT_TEMP_B(2, 16)<1>		LEFT_TEMP_B(0, 1)<32;8,4>		{ NoDDChk }
-	mov (16)	LEFT_TEMP_B(3)<1>			LEFT_TEMP_B(0, 2)<32;8,4>		{ NoDDClr }
-	mov (16)	LEFT_TEMP_B(3, 16)<1>		LEFT_TEMP_B(0, 3)<32;8,4>		{ NoDDChk }
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Left_UV_2x8.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Left_UV_2x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Left_UV_2x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Left_UV_2x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	Transpose left MB 2x8 to 8x2
-//  Assume source is LEFT_TEMP_W, and detination is PREV_MB_UW
-
-//	Input from dport for transpose:	
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 70 70 61 61 60 60 51 51 50 50 41 41 40 40 31 31 30 30 21 21 20 20 11 11 10 10 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-//	Output of transpose:	<1>	<=== <16;8,2>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//	mov (8)	PREV_MB_UW(0,0)<1>		BUF_W(0,0)<16;8,2>		{ NoDDClr }
-//	mov (8)	PREV_MB_UW(0,8)<1>		BUF_W(0,1)<16;8,2>		{ NoDDChk }
-	
-//	mov (8)	PREV_MB_UW(0,0)<1>		LEFT_TEMP_W(0,0)<16;8,2>		{ NoDDClr }
-//	mov (8)	PREV_MB_UW(0,8)<1>		LEFT_TEMP_W(0,1)<16;8,2>		{ NoDDChk }
-
-	mov (16)	PREV_MB_UW(0,0)<1>		LEFT_TEMP_W(0,0)<1;8,2>
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Left_Y_4x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Left_Y_4x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/Transpose_Left_Y_4x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/Transpose_Left_Y_4x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	Transpose left MB 4x16 to 16x4
-//  Assume source is LEFT_TEMP_B, and detination is PREV_MB_YB
-
-
-//	Input received from dport:
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 72 71 70 63 62 61 60 53 52 51 50 43 42 41 40 33 32 31 30 23 22 21 20 13 12 11 10 03 02 01 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 f2 f1 f0 e3 e2 e1 e0 d3 d2 d1 d0 c3 c2 c1 c0 b3 b2 b1 b0 a3 a2 a1 a0 93 92 91 90 83 82 81 80|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//	Output of transpose:		<1>	<= <32;8,4>
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f1 e1 d1 c1 b1 a1 91 81 71 61 51 41 31 21 11 01 f0 e0 d0 c0 b0 a0 90 80 70 60 50 40 30 20 10 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|f3 e3 d3 c3 b3 a3 93 83 73 63 53 43 33 23 13 03 f2 e2 d2 c2 b2 a2 92 82 72 62 52 42 32 22 12 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-	// Transpose the data, also occupy 2 GRFs
-	mov (16)	PREV_MB_YB(0)<1>			LEFT_TEMP_B(0, 0)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(0, 16)<1>		LEFT_TEMP_B(0, 1)<32;8,4>		{ NoDDChk }
-	mov (16)	PREV_MB_YB(1)<1>			LEFT_TEMP_B(0, 2)<32;8,4>		{ NoDDClr }
-	mov (16)	PREV_MB_YB(1, 16)<1>		LEFT_TEMP_B(0, 3)<32;8,4>		{ NoDDChk }
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/TransposeNV12_16x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/TransposeNV12_16x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/TransposeNV12_16x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/TransposeNV12_16x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,135 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////
-//	Module name: TransposeNV12_16x16.asm
-//	
-//	Transpose a 16x16 NV12 MB.  The output is also in NV12
-//
-//----------------------------------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region is :ub
-//	SRC_YB:			SRC_YB Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 8 GRFs
-//	SRC_UW:			SRC_UW Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw	// 4 GRFs
-//
-//  Temp buffer:
-//	BUF_B:			BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// 8 GRFs
-//	BUF_W:			BUF_W Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// 4 GRFs
-//
-//////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDDA:w
-#endif
-
-
-// Transpose Y (16x16 bytes)
-
-// The first step
-mov (16)	BUF_B(0,0)<1>		SRC_YB(0,0)<16;4,1>
-mov (16)	BUF_B(0,16)<1>		SRC_YB(2,0)<16;4,1>
-mov (16)	BUF_B(1,0)<1>		SRC_YB(4,0)<16;4,1>
-mov (16)	BUF_B(1,16)<1>		SRC_YB(6,0)<16;4,1>
-
-mov (16)	BUF_B(2,0)<1>		SRC_YB(0,4)<16;4,1>
-mov (16)	BUF_B(2,16)<1>		SRC_YB(2,4)<16;4,1>
-mov (16)	BUF_B(3,0)<1>		SRC_YB(4,4)<16;4,1>
-mov (16)	BUF_B(3,16)<1>		SRC_YB(6,4)<16;4,1>
-
-mov (16)	BUF_B(4,0)<1>		SRC_YB(0,8)<16;4,1>
-mov (16)	BUF_B(4,16)<1>		SRC_YB(2,8)<16;4,1>
-mov (16)	BUF_B(5,0)<1>		SRC_YB(4,8)<16;4,1>
-mov (16)	BUF_B(5,16)<1>		SRC_YB(6,8)<16;4,1>
-
-mov (16)	BUF_B(6,0)<1>		SRC_YB(0,12)<16;4,1>
-mov (16)	BUF_B(6,16)<1>		SRC_YB(2,12)<16;4,1>
-mov (16)	BUF_B(7,0)<1>		SRC_YB(4,12)<16;4,1>
-mov (16)	BUF_B(7,16)<1>		SRC_YB(6,12)<16;4,1>
-
-// The second step
-mov (16)	SRC_YB(0,0)<1>		BUF_B(0,0)<32;8,4>
-mov (16)	SRC_YB(0,16)<1>		BUF_B(0,1)<32;8,4>
-mov (16)	SRC_YB(1,0)<1>		BUF_B(0,2)<32;8,4>
-mov (16)	SRC_YB(1,16)<1>		BUF_B(0,3)<32;8,4>
-
-mov (16)	SRC_YB(2,0)<1>		BUF_B(2,0)<32;8,4>
-mov (16)	SRC_YB(2,16)<1>		BUF_B(2,1)<32;8,4>
-mov (16)	SRC_YB(3,0)<1>		BUF_B(2,2)<32;8,4>
-mov (16)	SRC_YB(3,16)<1>		BUF_B(2,3)<32;8,4>
-
-mov (16)	SRC_YB(4,0)<1>		BUF_B(4,0)<32;8,4>
-mov (16)	SRC_YB(4,16)<1>		BUF_B(4,1)<32;8,4>
-mov (16)	SRC_YB(5,0)<1>		BUF_B(4,2)<32;8,4>
-mov (16)	SRC_YB(5,16)<1>		BUF_B(4,3)<32;8,4>
-
-mov (16)	SRC_YB(6,0)<1>		BUF_B(6,0)<32;8,4>
-mov (16)	SRC_YB(6,16)<1>		BUF_B(6,1)<32;8,4>
-mov (16)	SRC_YB(7,0)<1>		BUF_B(6,2)<32;8,4>
-mov (16)	SRC_YB(7,16)<1>		BUF_B(6,3)<32;8,4>
-
-// Y is transposed.
-
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Src U and V are mixed in NV12 format. U on even bytes, V on odd bytes.
-// Transpose by treating UV pair as a word.
-
-
-// Src U 8x8 and V 8x8 are mixed. (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|17 17 16 16 15 15 14 14 13 13 12 12 11 11 10 10 07 07 06 06 05 05 04 04 03 03 02 02 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|37 37 36 36 35 35 34 34 33 33 32 32 31 31 30 30 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|57 57 56 56 55 55 54 54 53 53 52 52 51 51 50 50 47 47 46 46 45 45 44 44 43 43 42 42 41 41 40 40|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 76 76 75 75 74 74 73 73 72 72 71 71 70 70 67 67 66 66 65 65 64 64 63 63 62 62 61 61 60 60|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//  First step 		(16)	<1>:w <==== <8;4,1>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|33 33 32 32 31 31 30 30 23 23 22 22 21 21 20 20 13 13 12 12 11 11 10 10 03 03 02 02 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 73 72 72 71 71 70 70 63 63 62 62 61 61 60 60 53 53 52 52 51 51 50 50 43 43 42 42 41 41 40 40|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|37 37 36 36 35 35 34 34 27 27 26 26 25 25 24 24 17 17 16 16 15 15 14 14 07 07 06 06 05 05 04 04|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 76 76 75 75 74 74 67 67 66 66 65 65 64 64 57 57 56 56 55 55 54 54 47 47 46 46 45 45 44 44|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-// Transpose UV (8x8 words), The first step
-mov (16)	BUF_W(0,0)<1>		SRC_UW(0,0)<8;4,1>
-mov (16)	BUF_W(1,0)<1>		SRC_UW(2,0)<8;4,1>
-mov (16)	BUF_W(2,0)<1>		SRC_UW(0,4)<8;4,1>
-mov (16)	BUF_W(3,0)<1>		SRC_UW(2,4)<8;4,1>
-
-
-//	Second step		(16)	<1>:w <=== <16;4,4>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|73 73 63 63 53 53 43 43 33 33 23 23 13 13 03 03 72 72 62 62 52 52 42 42 32 32 22 22 12 12 02 02|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|75 75 65 65 55 55 45 45 35 35 25 25 15 15 05 05 74 74 64 64 54 54 44 44 34 34 24 24 14 14 04 04|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 67 67 57 57 47 47 37 37 27 27 17 17 07 07 76 76 66 66 56 56 46 46 36 36 26 26 16 16 06 06|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//
-// Transpose UV (8x8 words), The second step
-mov (8)		SRC_UW(0,0)<1>		BUF_W(0,0)<16;4,4>
-mov (8)		SRC_UW(0,8)<1>		BUF_W(0,1)<16;4,4>
-mov (8)		SRC_UW(1,0)<1>		BUF_W(0,2)<16;4,4>
-mov (8)		SRC_UW(1,8)<1>		BUF_W(0,3)<16;4,4>
-mov (8)		SRC_UW(2,0)<1>		BUF_W(2,0)<16;4,4>
-mov (8)		SRC_UW(2,8)<1>		BUF_W(2,1)<16;4,4>
-mov (8)		SRC_UW(3,0)<1>		BUF_W(2,2)<16;4,4>
-mov (8)		SRC_UW(3,8)<1>		BUF_W(2,3)<16;4,4>
-
-// U and V are now transposed and separated.
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/TransposeNV12_4x16.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/TransposeNV12_4x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/TransposeNV12_4x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/TransposeNV12_4x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//////////////////////////////////////////////////////////////////////////////////////////
-//	Module name: TransposeNV12_4x16.asm
-//	
-//	Transpose a 4x16 internal planar to 16x4 internal planar block
-//
-//----------------------------------------------------------------------------------------
-//  Symbols need to be defined before including this module
-//
-//	Source region is :ub
-//	SRC_YB:			SRC_YB Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 8 GRFs
-//	SRC_UW:			SRC_UB Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// 4 GRFs
-//
-//  Temp buffer:
-//	BUF_B:			BUF_B Base=rxx ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// 8 GRFs
-//	BUF_W:			BUF_W Base=rxx ElementSize=2 SrcRegion=REGION(8,1) Type=uw		// 4 GRFs
-//
-//////////////////////////////////////////////////////////////////////////////////////////
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0xDDDB:w
-#endif
-
-// Transpose Y (4x16) right most 4 columns
-
-// The first step
-mov (16)	BUF_B(0,0)<1>		SRC_YB(0,0)<16;4,1>		// Read 2 rows, write 1 row
-mov (16)	BUF_B(0,16)<1>		SRC_YB(2,0)<16;4,1>
-mov (16)	BUF_B(1,0)<1>		SRC_YB(4,0)<16;4,1>
-mov (16)	BUF_B(1,16)<1>		SRC_YB(6,0)<16;4,1>
-
-// The second step
-mov (16)	BUF_B(2,0)<1>		BUF_B(0,0)<32;8,4> 		// Read 2 rows, write 1 row
-mov (16)	BUF_B(2,16)<1>		BUF_B(0,1)<32;8,4>
-mov (16)	BUF_B(3,0)<1>		BUF_B(0,2)<32;8,4>
-mov (16)	BUF_B(3,16)<1>		BUF_B(0,3)<32;8,4>
-
-// Y is now transposed. the result is in BUF_B(2) and BUF_B(3).
-
-
-
-// Transpose UV (4x8),  right most 2 columns in word
-// Use BUF_W(0) as temp buf
-
-// Src U 8x8 and V 8x8 are mixed. (each pix is specified as yx)
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|17 17 16 16 15 15 14 14 13 13 12 12 11 11 10 10 07 07 06 06 05 05 04 04 03 03 02 02 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|37 37 36 36 35 35 34 34 33 33 32 32 31 31 30 30 27 27 26 26 25 25 24 24 23 23 22 22 21 21 20 20|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|57 57 56 56 55 55 54 54 53 53 52 52 51 51 50 50 47 47 46 46 45 45 44 44 43 43 42 42 41 41 40 40|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|77 77 76 76 75 75 74 74 73 73 72 72 71 71 70 70 67 67 66 66 65 65 64 64 63 63 62 62 61 61 60 60|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-
-//  First step 		(8)	<1>:w <==== <8;2,1>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 70 70 61 61 60 60 51 51 50 50 41 41 40 40 31 31 30 30 21 21 20 20 11 11 10 10 01 01 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-mov (8)		BUF_W(0,0)<1>		SRC_UW(0,0)<8;2,1>
-mov (8)		BUF_W(0,8)<1>		SRC_UW(2,0)<8;2,1>
-
-//	Second step		(16) <1>:w <==== <1;8,2>:w
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-//	|71 71 61 61 51 51 41 41 31 31 21 21 11 11 01 01 70 70 60 60 50 50 40 40 30 30 20 20 10 10 00 00|
-//	+-----------------------+-----------------------+-----------------------+-----------------------+
-mov (16)	BUF_W(1,0)<1>		BUF_W(0,0)<1;8,2>
-
-// UV are now transposed.  the result is in BUF_W(1).
-
-
-
-//The first step
-//mov (16)	BUF_B(0,0)<1>		SRC_UW(0,0)<8;2,1>		// Read 2 rows, write 1 row
-// The second step
-//mov (8)		SRC_UB(4,0)<1>		BUF_B(0,0)<16;8,2> 		// Read 1 row, write 1 row
-//mov (8)		SRC_UB(4,8)<1>		BUF_B(0,1)<16;8,2> 		// Read 1 row, write 1 row
-
-// Transpose V (8x8),  right most 2 columns
-// The first step
-//mov (16)	BUF_B(0,0)<1>		SRC_VB(0,1)<8;2,1>		// Read 2 rows, write 1 row
-// The second step
-//mov (8)		SRC_UB(4,16)<1>		BUF_B(0,0)<16;8,2> 		// Read 1 row, write 1 row
-//mov (8)		SRC_UB(4,24)<1>		BUF_B(0,1)<16;8,2> 		// Read 1 row, write 1 row
-
-// U and V are now transposed.  the result is in BUF_B(4).
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/writeURB.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/writeURB.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/writeURB.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/writeURB.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: WriteURB.asm
-//
-// General purpose module to write data to URB using the URB handle/offset in r0
-//
-//----------------------------------------------------------------
-//	Assume:
-//	- a0.0 and a0.1 is meg desc, has been assign with URB offset and msg size
-//	- MRFs are alrady assigned with data.
-//----------------------------------------------------------------
-//
-//  16x16 byte pixel block can be saved using just 1 "send" instruction.
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignature:w			0x3535:w
-#endif
-
-// URB write header:
-//mov (8) MSGSRC.0:ud 	r0.0<8;8,1>:ud			// Copy parent R0 header
-
-//shr (1)	Temp2_W:uw	URBOffset:uw	1:w	// divide by 2, because URB entry is counted by 512bits.  Offset is counted by 256bits.
-//add (1) MSGSRC.0:uw		r0.0:uw		Temp2_W:uw	
-
-
-shr (1)	MSGSRC.0:uw		URBOffset:uw	1:w	// divide by 2, because URB entry is counted by 512bits.  Offset is counted by 256bits.
-//mov (1)	MSGSRC.0:uw		URBOffset_2:uw
-
-//mov (1) MSGSRC.1:ud 	0:ud					// Reset Handle 1
-
-send  null:uw 	m0	  MSGSRC<8;8,1>:uw		URBWRITE	URBWriteMsgDesc:ud // URB write
-//send  null:ud 	MRF0	 null:ud	URBWriteMsgDesc:ud		// URB write	
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/writeURB_UV_Child.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/writeURB_UV_Child.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/writeURB_UV_Child.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/writeURB_UV_Child.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: WriteURB_Child.asm
-//
-// General purpose module to write data to URB using the URB handle/offset in r0
-//
-//----------------------------------------------------------------
-//	Assume:
-//	- a0.0 and a0.1 is meg desc, has been assign with URB offset and msg size
-//	- MRFs are alrady assigned with data.
-//----------------------------------------------------------------
-//
-//  16x16 byte pixel block can be saved using just 1 "send" instruction.
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x3535:w
-#endif
-
-// URB write header:
-//mov (8) MSGSRC.0:ud 	r0.0<8;8,1>:ud			// Copy parent R0 header
-
-//shr (1)	Temp2_W:uw	URBOffsetC:uw	1:w	// divide by 2, because URB entry is counted by 512bits.  Offset is counted by 256bits.
-//add (1) MSGSRC.0:uw		r0.0:uw		Temp2_W:uw	
-
-shr (1)	MSGSRC.0:uw		URBOffsetC:uw	1:w	// divide by 2, because URB entry is counted by 512bits.  Offset is counted by 256bits.
-
-//mov (1) MSGSRC.1:ud 	0:ud					// Reset Handle 1
-
-	// URB write 1 MRFs, 
-	// Current MB offset is in URBOffset, use it as write origin
-	// Add 2 to offset to store data be be passed to the right MB
-
-send  null:uw 	m0	  MSGSRC<8;8,1>:uw		URBWRITE	MSG_LEN(1)+URBWMSGDSC+0x20 // URB write
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/ildb/writeURB_Y_Child.asm libva-1.0.1/i965_drv_video/shaders/h264/ildb/writeURB_Y_Child.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/ildb/writeURB_Y_Child.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/ildb/writeURB_Y_Child.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: WriteURB_Child.asm
-//
-// General purpose module to write data to URB using the URB handle/offset in r0
-//
-//----------------------------------------------------------------
-//	Assume:
-//	- a0.0 and a0.1 is meg desc, has been assign with URB offset and msg size
-//	- MRFs are alrady assigned with data.
-//----------------------------------------------------------------
-//
-//  16x16 byte pixel block can be saved using just 1 "send" instruction.
-
-#if defined(_DEBUG) 
-	mov		(1)		EntrySignatureC:w			0x3535:w
-#endif
-
-// URB write header:
-//mov (8) MSGSRC.0:ud 	r0.0<8;8,1>:ud			// Copy parent R0 header
-
-//shr (1)	Temp2_W:uw	URBOffsetC:uw	1:w	// divide by 2, because URB entry is counted by 512bits.  Offset is counted by 256bits.
-//add (1) MSGSRC.0:uw		r0.0:uw		Temp2_W:uw	
-
-shr (1)	MSGSRC.0:uw		URBOffsetC:uw	1:w	// divide by 2, because URB entry is counted by 512bits.  Offset is counted by 256bits.
-
-//mov (1) MSGSRC.1:ud 	0:ud					// Reset Handle 1
-
-	// URB write 2 MRFs, 
-	// Current MB offset is in URBOffset, use it as write origin
-	// Add 2 to offset to store data be be passed to the right MB
-	//mov (1) URBWriteMsgDesc:ud		0x06300020:ud
-
-send  null:uw 	m0	  MSGSRC<8;8,1>:uw		URBWRITE	MSG_LEN(2)+URBWMSGDSC+0x20 // URB write
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/Makefile.am libva-1.0.1/i965_drv_video/shaders/h264/Makefile.am
--- libva-1.0.4/i965_drv_video/shaders/h264/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-SUBDIRS = mc
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/Makefile.in libva-1.0.1/i965_drv_video/shaders/h264/Makefile.in
--- libva-1.0.4/i965_drv_video/shaders/h264/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,579 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = i965_drv_video/shaders/h264
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
-GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
-LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
-LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
-LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
-LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
-LIBVA_VERSION = @LIBVA_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XFIXES_CFLAGS = @XFIXES_CFLAGS@
-XFIXES_LIBS = @XFIXES_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libvabackendlib = @libvabackendlib@
-libvacorelib = @libvacorelib@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = mc
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu i965_drv_video/shaders/h264/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu i965_drv_video/shaders/h264/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/add_Error_16x16_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/add_Error_16x16_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/add_Error_16x16_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/add_Error_16x16_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * Add macroblock correction Y data blocks to predicted picture
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-        
-// Module name: add_Error_16x16_Y.asm
-//
-// Add macroblock correction Y data blocks to predicted picture
-//
-
-//  Every line of predicted Y data is added to Y error data if CBP bit is set
-
-    mov (1) PERROR_UD<1>:ud	0x10001*ERRBUF*GRFWIB+0x00100000:ud	// Pointers to first and second row of error block
-
-    and.z.f0.1 (1)	NULLREG    REG_CBPCY	CBP_Y_MASK
-    (f0.1) jmpi (1) End_add_Error_16x16_Y	// Skip all blocks
-
-//  Block Y0
-//
-    $for(0,0; <8; 2,1) {
-	add.sat (16)	DEC_Y(%1)<2>	r[PERROR,%2*GRFWIB]REGION(8,1):w	PRED_Y(%1)REGION(8,2) {Compr}
-    }
-
-//  Block Y1
-//
-    $for(0,0; <8; 2,1) {
-	add.sat (16)	DEC_Y(%1,16)<2>		r[PERROR,%2*GRFWIB+0x80]REGION(8,1):w	PRED_Y(%1,16)REGION(8,2) {Compr}
-    }
-
-//  Block Y2
-//
-    $for(8,0; <16; 2,1) {
-	add.sat (16)	DEC_Y(%1)<2>	r[PERROR,%2*GRFWIB+0x100]REGION(8,1):w	PRED_Y(%1)REGION(8,2) {Compr}
-    }
-
-//  Block Y3
-//
-    $for(8,0; <16; 2,1) {
-	add.sat (16)	DEC_Y(%1,16)<2>		r[PERROR,%2*GRFWIB+0x180]REGION(8,1):w	PRED_Y(%1,16)REGION(8,2) {Compr}
-    }
-
-End_add_Error_16x16_Y:
-    add (1) PERROR_UD<1>:ud	PERROR_UD:ud	0x01800180:ud	// Pointers to Y3 error block
-
-//  End of add_Error_16x16_Y
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/add_Error_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/add_Error_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/add_Error_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/add_Error_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * Add macroblock correction UV data blocks to predicted picture        
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-
-#if !defined(__ADD_ERROR_UV__)		// Make sure this is only included once
-#define __ADD_ERROR_UV__
-
-// Module name: add_Error_UV.asm
-//
-// Add macroblock correction UV data blocks to predicted picture
-
-// PERROR points to error block Y3 after decoding Y component
-
-//	Update address register used in instruction compression
-//
-
-//  U component
-//
-    add (1) PERROR1<1>:w	PERROR:w	0x00010:w	// Pointers to next error row
-    $for(0,0; <8; 2,1) {
-	add.sat (16)	DEC_UV(%1)<4>	r[PERROR,%2*GRFWIB+0x80]REGION(8,1):w	PRED_UV(%1)REGION(8,4) {Compr}
-    }
-
-//  V component
-//
-    $for(0,0; <8; 2,1) {
-	add.sat (16)	DEC_UV(%1,2)<4>	r[PERROR,%2*GRFWIB+0x100]REGION(8,1):w	PRED_UV(%1,2)REGION(8,4) {Compr}
-    }
-
-//  End of add_Error_UV
-
-#endif	// !defined(__ADD_ERROR_UV__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVC.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVC.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVC.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVC.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,426 +0,0 @@
-/*
- * All HWMC kernels 
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-
-// Kernel name: AllAVC.asm
-//
-// All HWMC kernels merged into this file
-//
-//  $Revision: 2 $
-//  $Date: 9/10/06 2:02a $
-//
-
-// Note: To enable SW scoreboard for ILK AVC kernels, simply toggle the HW_SCOREBOARD 
-//		 and SW_SCOREBOARD definition as described below.
-//
-// ----------------------------------------------------
-//  Main: ALLINTRA
-// ----------------------------------------------------
-
-#define	COMBINED_KERNEL
-#define	ENABLE_ILDB
-
-//	WA for *Stim tool issue, should be removed later
-
-#ifdef DEV_ILK
-#define INSTFACTOR	2	// 128-bit count as 2 instructions
-#else
-#define INSTFACTOR	1	// 128-bit is 1 instruction
-#endif	// DEV_ILK
-
-#ifdef DEV_CTG
-  #define SW_SCOREBOARD		// SW Scoreboard should be enabled for CTG and earlier
-  #undef HW_SCOREBOARD		// HW Scoreboard should be disabled for CTG and earlier
-#else
-  #define HW_SCOREBOARD		// HW Scoreboard should be enabled for ILK and beyond
-  #undef SW_SCOREBOARD		// SW Scoreboard should be disabled for ILK and beyond
-#endif	// DEV_CTG
-#include "export.inc"
-#if defined(_EXPORT)
-	#include "AllAVC_Export.inc"
-#elif defined(_BUILD)
-	#include "AllAVC.ich"			// ISAasm dumped .exports
-	#include "AllAVC_Export.inc"	// Keep jumping targets aligned, only for CTG and beyond
-	#include "AllAVC_Build.inc"
-#else
-#endif
-
-.kernel AllAVC
-
-// Build all intra prediction kernels
-//
-#ifdef INTRA_16x16_PAD_NENOP
-    $for(0; <INTRA_16x16_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef INTRA_16x16_PAD_NOP
-    $for(0; <INTRA_16x16_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "Intra_16x16.asm"
-
-#ifdef INTRA_8x8_PAD_NENOP
-    $for(0; <INTRA_8x8_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef INTRA_8x8_PAD_NOP
-    $for(0; <INTRA_8x8_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "Intra_8x8.asm"
-
-#ifdef INTRA_4x4_PAD_NENOP
-    $for(0; <INTRA_4x4_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef INTRA_4x4_PAD_NOP
-    $for(0; <INTRA_4x4_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "Intra_4x4.asm"
-
-#ifdef INTRA_PCM_PAD_NENOP
-    $for(0; <INTRA_PCM_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef INTRA_PCM_PAD_NOP
-    $for(0; <INTRA_PCM_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "Intra_PCM.asm"
-
-// Build FrameMB_Motion kernel
-//
-#define FRAME
-
-  #ifdef FRAME_MB_PAD_NENOP
-    $for(0; <FRAME_MB_PAD_NENOP; 1) {
-	nenop
-	}
-  #endif
-  #ifdef FRAME_MB_PAD_NOP
-    $for(0; <FRAME_MB_PAD_NOP; 1) {
-	nop
-	}
-  #endif
-    #include "AVCMCInter.asm"
-#undef  FRAME
-
-// Build FieldMB_Motion kernel
-//
-#define FIELD
-
-  #ifdef FIELD_MB_PAD_NENOP
-    $for(0; <FIELD_MB_PAD_NENOP; 1) {
-	nenop
-	}
-  #endif
-  #ifdef FIELD_MB_PAD_NOP
-    $for(0; <FIELD_MB_PAD_NOP; 1) {
-	nop
-	}
-  #endif
-    #include "AVCMCInter.asm"
-#undef  FIELD
-
-// Build MBAff_Motion kernel
-//
-#define MBAFF
-
-  #ifdef MBAFF_MB_PAD_NENOP
-    $for(0; <MBAFF_MB_PAD_NENOP; 1) {
-	nenop
-	}
-  #endif
-  #ifdef MBAFF_MB_PAD_NOP
-    $for(0; <MBAFF_MB_PAD_NOP; 1) {
-	nop
-	}
-  #endif
-    #include "AVCMCInter.asm"
-#undef  MBAFF
-
-#ifdef SW_SCOREBOARD    
-
-// SW scoreboard kernel for non-MBAFF
-//
-#ifdef SCOREBOARD_PAD_NENOP
-    $for(0; <SCOREBOARD_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef SCOREBOARD_PAD_NOP
-    $for(0; <SCOREBOARD_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "scoreboard.asm"
-
-//	SW scoreboard kernel for MBAFF
-
-#ifdef SCOREBOARD_MBAFF_PAD_NENOP
-    $for(0; <SCOREBOARD_MBAFF_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef SCOREBOARD_MBAFF_PAD_NOP
-    $for(0; <SCOREBOARD_MBAFF_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "scoreboard_MBAFF.asm"
-
-#elif defined(HW_SCOREBOARD)
- 
-// SetHWscoreboard kernel for non-MBAFF
-//
-#ifdef SETHWSCOREBOARD_PAD_NENOP
-    $for(0; <SETHWSCOREBOARD_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef SETHWSCOREBOARD_PAD_NOP
-    $for(0; <SETHWSCOREBOARD_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "SetHWScoreboard.asm"
-
-//	SetHWscoreboard kernel for MBAFF
-
-#ifdef SETHWSCOREBOARD_MBAFF_PAD_NENOP
-    $for(0; <SETHWSCOREBOARD_MBAFF_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef SETHWSCOREBOARD_MBAFF_PAD_NOP
-    $for(0; <SETHWSCOREBOARD_MBAFF_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "SetHWScoreboard_MBAFF.asm"
-
-#endif	// SW_SCOREBOARD
-
-#ifdef BSDRESET_PAD_NENOP
-    $for(0; <BSDRESET_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef BSDRESET_PAD_NOP
-    $for(0; <BSDRESET_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "BSDReset.asm"
-
-#ifdef DCRESETDUMMY_PAD_NENOP
-    $for(0; <DCRESETDUMMY_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef DCRESETDUMMY_PAD_NOP
-    $for(0; <DCRESETDUMMY_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "DCResetDummy.asm"
-
-#ifdef ENABLE_ILDB
-
-// Build all ILDB kernels
-//
-//	Undefine some previous defined symbols since they will be re-defined/re-declared in ILDB kernels
-#undef	A
-#undef	B
-#undef	p0
-#undef	p1
-
-#define MSGPAYLOADB MSGPAYLOADB_ILDB
-#define MSGPAYLOADW MSGPAYLOADW_ILDB
-#define MSGPAYLOADD MSGPAYLOADD_ILDB
-#define MSGPAYLOADF MSGPAYLOADF_ILDB
-
-//				< Frame ILDB >
-#define _PROGRESSIVE
-#define ILDB_LABEL(x)	x##_ILDB_FRAME
-#ifdef AVC_ILDB_ROOT_Y_ILDB_FRAME_PAD_NENOP
-    $for(0; <AVC_ILDB_ROOT_Y_ILDB_FRAME_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_ROOT_Y_ILDB_FRAME_PAD_NOP
-    $for(0; <AVC_ILDB_ROOT_Y_ILDB_FRAME_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Root_Y.asm"
-
-#ifdef AVC_ILDB_CHILD_Y_ILDB_FRAME_PAD_NENOP
-    $for(0; <AVC_ILDB_CHILD_Y_ILDB_FRAME_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_CHILD_Y_ILDB_FRAME_PAD_NOP
-    $for(0; <AVC_ILDB_CHILD_Y_ILDB_FRAME_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Child_Y.asm"
-
-#ifdef AVC_ILDB_ROOT_UV_ILDB_FRAME_PAD_NENOP
-    $for(0; <AVC_ILDB_ROOT_UV_ILDB_FRAME_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_ROOT_UV_ILDB_FRAME_PAD_NOP
-    $for(0; <AVC_ILDB_ROOT_UV_ILDB_FRAME_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Root_UV.asm"
-
-#ifdef AVC_ILDB_CHILD_UV_ILDB_FRAME_PAD_NENOP
-    $for(0; <AVC_ILDB_CHILD_UV_ILDB_FRAME_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_CHILD_UV_ILDB_FRAME_PAD_NOP
-    $for(0; <AVC_ILDB_CHILD_UV_ILDB_FRAME_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Child_UV.asm"
-#undef ILDB_LABEL
-#undef _PROGRESSIVE
-
-//				< Field ILDB >
-#define _FIELD
-#define ILDB_LABEL(x)	x##_ILDB_FIELD
-#ifdef AVC_ILDB_ROOT_Y_ILDB_FIELD_PAD_NENOP
-    $for(0; <AVC_ILDB_ROOT_Y_ILDB_FIELD_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_ROOT_Y_ILDB_FIELD_PAD_NOP
-    $for(0; <AVC_ILDB_ROOT_Y_ILDB_FIELD_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Root_Field_Y.asm"
-
-#ifdef AVC_ILDB_CHILD_Y_ILDB_FIELD_PAD_NENOP
-    $for(0; <AVC_ILDB_CHILD_Y_ILDB_FIELD_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_CHILD_Y_ILDB_FIELD_PAD_NOP
-    $for(0; <AVC_ILDB_CHILD_Y_ILDB_FIELD_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Child_Field_Y.asm"
-
-#ifdef AVC_ILDB_ROOT_UV_ILDB_FIELD_PAD_NENOP
-    $for(0; <AVC_ILDB_ROOT_UV_ILDB_FIELD_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_ROOT_UV_ILDB_FIELD_PAD_NOP
-    $for(0; <AVC_ILDB_ROOT_UV_ILDB_FIELD_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Root_Field_UV.asm"
-
-#ifdef AVC_ILDB_CHILD_UV_ILDB_FIELD_PAD_NENOP
-    $for(0; <AVC_ILDB_CHILD_UV_ILDB_FIELD_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_CHILD_UV_ILDB_FIELD_PAD_NOP
-    $for(0; <AVC_ILDB_CHILD_UV_ILDB_FIELD_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Child_Field_UV.asm"
-#undef ILDB_LABEL
-#undef _FIELD
-
-//				< MBAFF Frame ILDB >
-#define _MBAFF
-#define ILDB_LABEL(x)	x##_ILDB_MBAFF
-#ifdef AVC_ILDB_ROOT_Y_ILDB_MBAFF_PAD_NENOP
-    $for(0; <AVC_ILDB_ROOT_Y_ILDB_MBAFF_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_ROOT_Y_ILDB_MBAFF_PAD_NOP
-    $for(0; <AVC_ILDB_ROOT_Y_ILDB_MBAFF_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Root_Mbaff_Y.asm"
-
-#ifdef AVC_ILDB_CHILD_Y_ILDB_MBAFF_PAD_NENOP
-    $for(0; <AVC_ILDB_CHILD_Y_ILDB_MBAFF_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_CHILD_Y_ILDB_MBAFF_PAD_NOP
-    $for(0; <AVC_ILDB_CHILD_Y_ILDB_MBAFF_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Child_Mbaff_Y.asm"
-
-#ifdef AVC_ILDB_ROOT_UV_ILDB_MBAFF_PAD_NENOP
-    $for(0; <AVC_ILDB_ROOT_UV_ILDB_MBAFF_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_ROOT_UV_ILDB_MBAFF_PAD_NOP
-    $for(0; <AVC_ILDB_ROOT_UV_ILDB_MBAFF_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Root_Mbaff_UV.asm"
-
-#ifdef AVC_ILDB_CHILD_UV_ILDB_MBAFF_PAD_NENOP
-    $for(0; <AVC_ILDB_CHILD_UV_ILDB_MBAFF_PAD_NENOP; 1) {
-	nenop
-	}
-#endif
-#ifdef AVC_ILDB_CHILD_UV_ILDB_MBAFF_PAD_NOP
-    $for(0; <AVC_ILDB_CHILD_UV_ILDB_MBAFF_PAD_NOP; 1) {
-	nop
-	}
-#endif
-    #include "AVC_ILDB_Child_Mbaff_UV.asm"
-#undef ILDB_LABEL
-#undef _MBAFF
-
-#endif		// ENABLE_ILDB
-
-AllAVC_END:
-nop
-// End of AllAVC
-
-.end_code
-
-.end_kernel
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVC_Build.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVC_Build.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVC_Build.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVC_Build.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-$table {
-AllAVC_END_IP/INSTFACTOR    // Total instruction count
-#if (defined(SW_SCOREBOARD) || defined(HW_SCOREBOARD)) && defined(ENABLE_ILDB)
-//    23    // Total kernel count
-#elif defined(SW_SCOREBOARD) || defined(HW_SCOREBOARD)
-//    11    // Total kernel count
-#elif defined(ENABLE_ILDB)
-//    21    // Total kernel count
-#else
-//    11    // Total kernel count
-#endif
-INTRA_16x16_ENTRY/INSTFACTOR    // Instruction offset to 'Intra_16x16'
-INTRA_8x8_ENTRY/INSTFACTOR    // Instruction offset to 'Intra_8x8'
-INTRA_4x4_ENTRY/INSTFACTOR    // Instruction offset to 'Intra_4x4'
-INTRA_PCM_ENTRY/INSTFACTOR    // Instruction offset to 'Intra_PCM'
-FRAME_MB_ENTRY/INSTFACTOR    // Instruction offset to 'FrameMB_Motion'
-FIELD_MB_ENTRY/INSTFACTOR    // Instruction offset to 'FieldMB_Motion'
-MBAFF_MB_ENTRY/INSTFACTOR    // Instruction offset to 'MBAff_Motion'
-#ifdef SW_SCOREBOARD    
-SCOREBOARD_ENTRY/INSTFACTOR			// Instruction offset to 'scoreboard'
-SCOREBOARD_MBAFF_ENTRY/INSTFACTOR	// Instruction offset to 'scoreboard_MBAFF'
-#elif defined(HW_SCOREBOARD)
-SETHWSCOREBOARD_ENTRY/INSTFACTOR		// Instruction offset to 'AVC_SetIntraDepend'
-SETHWSCOREBOARD_MBAFF_ENTRY/INSTFACTOR	// Instruction offset to 'AVC_SetIntraDependMBAFF'
-#endif	// SW_SCOREBOARD
-#ifdef ENABLE_ILDB
-AVC_ILDB_ROOT_Y_ILDB_FRAME_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Root_Y'
-AVC_ILDB_CHILD_Y_ILDB_FRAME_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Child_Y'
-AVC_ILDB_ROOT_UV_ILDB_FRAME_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Root_UV'
-AVC_ILDB_CHILD_UV_ILDB_FRAME_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Child_UV'
-AVC_ILDB_ROOT_Y_ILDB_FIELD_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Root_Field_Y'
-AVC_ILDB_CHILD_Y_ILDB_FIELD_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Child_Field_Y'
-AVC_ILDB_ROOT_UV_ILDB_FIELD_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Root_Field_UV'
-AVC_ILDB_CHILD_UV_ILDB_FIELD_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Child_Field_UV'
-AVC_ILDB_ROOT_Y_ILDB_MBAFF_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Root_Mbaff_Y'
-AVC_ILDB_CHILD_Y_ILDB_MBAFF_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Child_Mbaff_Y'
-AVC_ILDB_ROOT_UV_ILDB_MBAFF_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Root_Mbaff_UV'
-AVC_ILDB_CHILD_UV_ILDB_MBAFF_ENTRY/INSTFACTOR    // Instruction offset to 'AVC_ILDB_Child_Mbaff_UV'
-#endif	// ENABLE_ILDB
-BSDRESET_ENTRY/INSTFACTOR    // Instruction offset to 'BSDReset'
-DCRESETDUMMY_ENTRY/INSTFACTOR    // Instruction offset to 'DCResetDummy'
-
-//    0    // Instruction offset to Intra_4x4_luma_prediction_mode_0
-INTRA_4X4_HORIZONTAL_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_1
-INTRA_4X4_DC_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_2
-INTRA_4X4_DIAG_DOWN_LEFT_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_3
-INTRA_4X4_DIAG_DOWN_RIGHT_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_4
-INTRA_4X4_VERT_RIGHT_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_5
-INTRA_4X4_HOR_DOWN_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_6
-INTRA_4X4_VERT_LEFT_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_7
-INTRA_4X4_HOR_UP_IP-INTRA_4X4_VERTICAL_IP    // Instruction offset to Intra_4x4_luma_prediction_mode_8
-
-//    0    // Instruction offset to Intra_8x8_luma_prediction_mode_0
-INTRA_8X8_HORIZONTAL_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_1
-INTRA_8X8_DC_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_2
-INTRA_8X8_DIAG_DOWN_LEFT_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_3
-INTRA_8X8_DIAG_DOWN_RIGHT_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_4
-INTRA_8X8_VERT_RIGHT_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_5
-INTRA_8X8_HOR_DOWN_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_6
-INTRA_8X8_VERT_LEFT_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_7
-INTRA_8X8_HOR_UP_IP-INTRA_8X8_VERTICAL_IP    // Instruction offset to Intra_8x8_luma_prediction_mode_8
-
-//    0    // Instruction offset to Intra_16x16_luma_prediction_mode_0
-INTRA_16x16_HORIZONTAL_IP-INTRA_16x16_VERTICAL_IP    // Instruction offset to Intra_16x16_luma_prediction_mode_1
-INTRA_16x16_DC_IP-INTRA_16x16_VERTICAL_IP    // Instruction offset to Intra_16x16_luma_prediction_mode_2
-INTRA_16x16_PLANE_IP-INTRA_16x16_VERTICAL_IP    // Instruction offset to Intra_16x16_luma_prediction_mode_3
-
-//    0    // Instruction offset to intra_chroma_prediction_mode_0
-INTRA_CHROMA_HORIZONTAL_IP-INTRA_CHROMA_DC_IP    // Instruction offset to intra_chroma_prediction_mode_1
-INTRA_CHROMA_VERTICAL_IP-INTRA_CHROMA_DC_IP    // Instruction offset to intra_chroma_prediction_mode_2
-INTRA_Chroma_PLANE_IP-INTRA_CHROMA_DC_IP    // Instruction offset to intra_chroma_prediction_mode_3
-
-intra_Pred_4x4_Y_IP-ADD_ERROR_SB3_IP*0x100+intra_Pred_4x4_Y_IP-ADD_ERROR_SB2_IP*0x100+intra_Pred_4x4_Y_IP-ADD_ERROR_SB1_IP*0x100+intra_Pred_4x4_Y_IP-ADD_ERROR_SB0_IP	// Instruction offset to intra_4x4_pred_module
-}
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVC_Export.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVC_Export.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVC_Export.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVC_Export.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-.export entry_point INTRA_16x16
-.export entry_point INTRA_8x8
-.export entry_point INTRA_4x4
-.export entry_point INTRA_PCM
-.export entry_point FRAME_MB
-.export entry_point FIELD_MB
-.export entry_point MBAFF_MB
-#ifdef SW_SCOREBOARD    
-.export entry_point SCOREBOARD
-.export entry_point SCOREBOARD_MBAFF
-#elif defined(HW_SCOREBOARD)
-.export entry_point SETHWSCOREBOARD
-.export entry_point SETHWSCOREBOARD_MBAFF
-#endif	// SW_SCOREBOARD
-
-#ifdef ENABLE_ILDB
-.export entry_point AVC_ILDB_ROOT_Y_ILDB_FRAME
-.export entry_point AVC_ILDB_CHILD_Y_ILDB_FRAME
-.export entry_point AVC_ILDB_ROOT_UV_ILDB_FRAME
-.export entry_point AVC_ILDB_CHILD_UV_ILDB_FRAME
-.export entry_point AVC_ILDB_ROOT_Y_ILDB_FIELD
-.export entry_point AVC_ILDB_CHILD_Y_ILDB_FIELD
-.export entry_point AVC_ILDB_ROOT_UV_ILDB_FIELD
-.export entry_point AVC_ILDB_CHILD_UV_ILDB_FIELD
-.export entry_point AVC_ILDB_ROOT_Y_ILDB_MBAFF
-.export entry_point AVC_ILDB_CHILD_Y_ILDB_MBAFF
-.export entry_point AVC_ILDB_ROOT_UV_ILDB_MBAFF
-.export entry_point AVC_ILDB_CHILD_UV_ILDB_MBAFF
-#endif	// ENABLE_ILDB
-
-.export entry_point BSDRESET
-.export entry_point DCRESETDUMMY
-
-.export label INTRA_16x16_VERTICAL
-.export label INTRA_16x16_HORIZONTAL
-.export label INTRA_16x16_DC
-.export label INTRA_16x16_PLANE
-
-.export label INTRA_8X8_VERTICAL
-.export label INTRA_8X8_HORIZONTAL
-.export label INTRA_8X8_DC
-.export label INTRA_8X8_DIAG_DOWN_LEFT
-.export label INTRA_8X8_DIAG_DOWN_RIGHT
-.export label INTRA_8X8_VERT_RIGHT
-.export label INTRA_8X8_HOR_DOWN
-.export label INTRA_8X8_VERT_LEFT
-.export label INTRA_8X8_HOR_UP
-
-.export label INTRA_4X4_VERTICAL
-.export label INTRA_4X4_HORIZONTAL
-.export label INTRA_4X4_DC
-.export label INTRA_4X4_DIAG_DOWN_LEFT
-.export label INTRA_4X4_DIAG_DOWN_RIGHT
-.export label INTRA_4X4_VERT_RIGHT
-.export label INTRA_4X4_HOR_DOWN
-.export label INTRA_4X4_VERT_LEFT
-.export label INTRA_4X4_HOR_UP
-
-.export label INTRA_CHROMA_DC
-.export label INTRA_CHROMA_HORIZONTAL
-.export label INTRA_CHROMA_VERTICAL
-.export label INTRA_Chroma_PLANE
-
-.export label intra_Pred_4x4_Y
-.export label ADD_ERROR_SB0
-.export label ADD_ERROR_SB1
-.export label ADD_ERROR_SB2
-.export label ADD_ERROR_SB3
-
-.export label AllAVC_END
-
-#ifdef SW_SCOREBOARD    
-.export label MB_Loop
-.export label No_Message
-.export label Dependency_Check
-.export label Notify_MSG
-.export label Update_CurMB
-.export label MBAFF_MB_Loop
-.export label MBAFF_No_Message
-.export label MBAFF_Dependency_Check
-.export label MBAFF_Notify_MSG
-.export label MBAFF_Update_CurMB
-
-//.export label 
-
-// Definitions for first pass MC kernel building
-#ifndef No_Message_IP
-#define No_Message_IP	0
-#endif
-
-#ifndef Dependency_Check_IP
-#define Dependency_Check_IP	0
-#endif
-
-#ifndef Notify_MSG_IP
-#define Notify_MSG_IP	0
-#endif
-
-#ifndef Update_CurMB_IP
-#define Update_CurMB_IP	0
-#endif
-
-#ifndef MBAFF_No_Message_IP
-#define MBAFF_No_Message_IP	0
-#endif
-
-#ifndef MBAFF_Dependency_Check_IP
-#define MBAFF_Dependency_Check_IP	0
-#endif
-
-#ifndef MBAFF_Notify_MSG_IP
-#define MBAFF_Notify_MSG_IP	0
-#endif
-
-#ifndef	AS_ENABLED
- #ifndef MBAFF_MB_Loop_IP
- #define MBAFF_MB_Loop_IP	0
- #endif
-
- #ifndef MB_Loop_IP
- #define MB_Loop_IP	0
- #endif
-#endif	// End AS_ENABLED
-
-#ifndef MBAFF_Update_CurMB_IP
-#define MBAFF_Update_CurMB_IP	0
-#endif
-
-#endif	// SW_SCOREBOARD
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-
-#ifdef ENABLE_ILDB
-.export label	ALL_SPAWNED_UV_ILDB_FRAME
-.export label	SLEEP_ENTRY_UV_ILDB_FRAME
-.export label	POST_SLEEP_UV_ILDB_FRAME
-.export label	ALL_SPAWNED_Y_ILDB_FRAME
-.export label	SLEEP_ENTRY_Y_ILDB_FRAME
-.export label	POST_SLEEP_Y_ILDB_FRAME
-
-// Definitions for first pass ILDB kernel building
-#ifndef	ALL_SPAWNED_UV_ILDB_FRAME_IP
-#define	ALL_SPAWNED_UV_ILDB_FRAME_IP	0
-#endif
-
-#ifndef	SLEEP_ENTRY_UV_ILDB_FRAME_IP
-#define	SLEEP_ENTRY_UV_ILDB_FRAME_IP	0
-#endif
-
-#ifndef	POST_SLEEP_UV_ILDB_FRAME_IP
-#define	POST_SLEEP_UV_ILDB_FRAME_IP	0
-#endif
-
-#ifndef	ALL_SPAWNED_Y_ILDB_FRAME_IP
-#define	ALL_SPAWNED_Y_ILDB_FRAME_IP	0
-#endif
-
-#ifndef	SLEEP_ENTRY_Y_ILDB_FRAME_IP
-#define	SLEEP_ENTRY_Y_ILDB_FRAME_IP	0
-#endif
-
-#ifndef	POST_SLEEP_Y_ILDB_FRAME_IP
-#define	POST_SLEEP_Y_ILDB_FRAME_IP	0
-#endif
-
-#endif	// ENABLE_ILDB
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVCField.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVCField.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVCField.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVCField.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/*
- * All field picture HWMC kernels 
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	2857702934	// 0xAA551616 - GUID for Intra_16x16 luma prediction mode offsets
-//    0    // Offset to Intra_16x16 luma prediction mode 0
-//    9    // Offset to Intra_16x16 luma prediction mode 1
-//   19    // Offset to Intra_16x16 luma prediction mode 2
-//   42    // Offset to Intra_16x16 luma prediction mode 3
-//	2857699336	// 0xAA550808 - GUID for Intra_8x8 luma prediction mode offsets
-//    0    // Offset to Intra_8x8 luma prediction mode 0
-//    5    // Offset to Intra_8x8 luma prediction mode 1
-//   10    // Offset to Intra_8x8 luma prediction mode 2
-//   26    // Offset to Intra_8x8 luma prediction mode 3
-//   36    // Offset to Intra_8x8 luma prediction mode 4
-//   50    // Offset to Intra_8x8 luma prediction mode 5
-//   68    // Offset to Intra_8x8 luma prediction mode 6
-//   85    // Offset to Intra_8x8 luma prediction mode 7
-//   95    // Offset to Intra_8x8 luma prediction mode 8
-//	2857698308	// 0xAA550404 - GUID for Intra_4x4 luma prediction mode offsets
-//    0    // Offset to Intra_4x4 luma prediction mode 0
-//    2    // Offset to Intra_4x4 luma prediction mode 1
-//    4    // Offset to Intra_4x4 luma prediction mode 2
-//   16    // Offset to Intra_4x4 luma prediction mode 3
-//   23    // Offset to Intra_4x4 luma prediction mode 4
-//   32    // Offset to Intra_4x4 luma prediction mode 5
-//   45    // Offset to Intra_4x4 luma prediction mode 6
-//   59    // Offset to Intra_4x4 luma prediction mode 7
-//   66    // Offset to Intra_4x4 luma prediction mode 8
-//	2857700364	// 0xAA550C0C - GUID for intra chroma prediction mode offsets
-//    0    // Offset to intra chroma prediction mode 0
-//   30    // Offset to intra chroma prediction mode 1
-//   36    // Offset to intra chroma prediction mode 2
-//   41    // Offset to intra chroma prediction mode 3
-
-// Kernel name: AllAVCField.asm
-//
-// All field picture HWMC kernels merged into this file
-//
-//  $Revision: 1 $
-//  $Date: 4/13/06 4:35p $
-//
-
-// ----------------------------------------------------
-//  Main: AllAVCField
-// ----------------------------------------------------
-
-#define	ALLHWMC
-#define	COMBINED_KERNEL
-
-.kernel AllAVCField
-
-    #include "Intra_PCM.asm"
-    #include "Intra_16x16.asm"
-    #include "Intra_8x8.asm"
-    #include "Intra_4x4.asm"
-    #include "scoreboard.asm"
-
-	#define FIELD
-	#include "AVCMCInter.asm"
-
-// End of AllAVCField
-
-.end_kernel
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVCFrame.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVCFrame.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVCFrame.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVCFrame.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,69 +0,0 @@
-/*
- * All frame picture HWMC kernels 
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	2857702934	// 0xAA551616 - GUID for Intra_16x16 luma prediction mode offsets
-//    0    // Offset to Intra_16x16 luma prediction mode 0
-//    9    // Offset to Intra_16x16 luma prediction mode 1
-//   19    // Offset to Intra_16x16 luma prediction mode 2
-//   42    // Offset to Intra_16x16 luma prediction mode 3
-//	2857699336	// 0xAA550808 - GUID for Intra_8x8 luma prediction mode offsets
-//    0    // Offset to Intra_8x8 luma prediction mode 0
-//    5    // Offset to Intra_8x8 luma prediction mode 1
-//   10    // Offset to Intra_8x8 luma prediction mode 2
-//   26    // Offset to Intra_8x8 luma prediction mode 3
-//   36    // Offset to Intra_8x8 luma prediction mode 4
-//   50    // Offset to Intra_8x8 luma prediction mode 5
-//   68    // Offset to Intra_8x8 luma prediction mode 6
-//   85    // Offset to Intra_8x8 luma prediction mode 7
-//   95    // Offset to Intra_8x8 luma prediction mode 8
-//	2857698308	// 0xAA550404 - GUID for Intra_4x4 luma prediction mode offsets
-//    0    // Offset to Intra_4x4 luma prediction mode 0
-//    2    // Offset to Intra_4x4 luma prediction mode 1
-//    4    // Offset to Intra_4x4 luma prediction mode 2
-//   16    // Offset to Intra_4x4 luma prediction mode 3
-//   23    // Offset to Intra_4x4 luma prediction mode 4
-//   32    // Offset to Intra_4x4 luma prediction mode 5
-//   45    // Offset to Intra_4x4 luma prediction mode 6
-//   59    // Offset to Intra_4x4 luma prediction mode 7
-//   66    // Offset to Intra_4x4 luma prediction mode 8
-//	2857700364	// 0xAA550C0C - GUID for intra chroma prediction mode offsets
-//    0    // Offset to intra chroma prediction mode 0
-//   30    // Offset to intra chroma prediction mode 1
-//   36    // Offset to intra chroma prediction mode 2
-//   41    // Offset to intra chroma prediction mode 3
-
-// Kernel name: AllAVCFrame.asm
-//
-// All frame picture HWMC kernels merged into this file
-//
-//  $Revision: 1 $
-//  $Date: 4/13/06 4:35p $
-//
-
-// ----------------------------------------------------
-//  Main: AllAVCFrame
-// ----------------------------------------------------
-
-#define	ALLHWMC
-#define	COMBINED_KERNEL
-
-.kernel AllAVCFrame
-
-    #include "Intra_PCM.asm"
-    #include "Intra_16x16.asm"
-    #include "Intra_8x8.asm"
-    #include "Intra_4x4.asm"
-    #include "scoreboard.asm"
-
-	#include "AVCMCInter.asm"
-
-// End of AllAVCFrame
-
-.end_kernel
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVCMBAFF.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVCMBAFF.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AllAVCMBAFF.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AllAVCMBAFF.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-/*
- * All MBAFF frame picture HWMC kernels 
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	2857702934	// 0xAA551616 - GUID for Intra_16x16 luma prediction mode offsets
-//    0    // Offset to Intra_16x16 luma prediction mode 0
-//    9    // Offset to Intra_16x16 luma prediction mode 1
-//   19    // Offset to Intra_16x16 luma prediction mode 2
-//   42    // Offset to Intra_16x16 luma prediction mode 3
-//	2857699336	// 0xAA550808 - GUID for Intra_8x8 luma prediction mode offsets
-//    0    // Offset to Intra_8x8 luma prediction mode 0
-//    5    // Offset to Intra_8x8 luma prediction mode 1
-//   10    // Offset to Intra_8x8 luma prediction mode 2
-//   26    // Offset to Intra_8x8 luma prediction mode 3
-//   36    // Offset to Intra_8x8 luma prediction mode 4
-//   50    // Offset to Intra_8x8 luma prediction mode 5
-//   68    // Offset to Intra_8x8 luma prediction mode 6
-//   85    // Offset to Intra_8x8 luma prediction mode 7
-//   95    // Offset to Intra_8x8 luma prediction mode 8
-//	2857698308	// 0xAA550404 - GUID for Intra_4x4 luma prediction mode offsets
-//    0    // Offset to Intra_4x4 luma prediction mode 0
-//    2    // Offset to Intra_4x4 luma prediction mode 1
-//    4    // Offset to Intra_4x4 luma prediction mode 2
-//   16    // Offset to Intra_4x4 luma prediction mode 3
-//   23    // Offset to Intra_4x4 luma prediction mode 4
-//   32    // Offset to Intra_4x4 luma prediction mode 5
-//   45    // Offset to Intra_4x4 luma prediction mode 6
-//   59    // Offset to Intra_4x4 luma prediction mode 7
-//   66    // Offset to Intra_4x4 luma prediction mode 8
-//	2857700364	// 0xAA550C0C - GUID for intra chroma prediction mode offsets
-//    0    // Offset to intra chroma prediction mode 0
-//   30    // Offset to intra chroma prediction mode 1
-//   36    // Offset to intra chroma prediction mode 2
-//   41    // Offset to intra chroma prediction mode 3
-
-// Kernel name: AllAVCMBAFF.asm
-//
-// All MBAFF frame picture HWMC kernels merged into this file
-//
-//  $Revision: 1 $
-//  $Date: 4/13/06 4:35p $
-//
-
-// ----------------------------------------------------
-//  Main: AllAVCMBAFF
-// ----------------------------------------------------
-
-#define	ALLHWMC
-#define	COMBINED_KERNEL
-
-.kernel AllAVCMBAFF
-
-    #include "Intra_PCM.asm"
-    #include "Intra_16x16.asm"
-    #include "Intra_8x8.asm"
-    #include "Intra_4x4.asm"
-    #include "scoreboard.asm"
-
-	#define MBAFF
-	#include "AVCMCInter.asm"
-
-// End of AllAVCMBAFF
-
-.end_kernel
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AllIntra.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/AllIntra.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AllIntra.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AllIntra.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
- * All intra-prediction macroblock kernels 
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	2857702934	// 0xAA551616 - GUID for Intra_16x16 luma prediction mode offsets
-//    0    // Offset to Intra_16x16 luma prediction mode 0
-//    9    // Offset to Intra_16x16 luma prediction mode 1
-//   19    // Offset to Intra_16x16 luma prediction mode 2
-//   42    // Offset to Intra_16x16 luma prediction mode 3
-//	2857699336	// 0xAA550808 - GUID for Intra_8x8 luma prediction mode offsets
-//    0    // Offset to Intra_8x8 luma prediction mode 0
-//    5    // Offset to Intra_8x8 luma prediction mode 1
-//   10    // Offset to Intra_8x8 luma prediction mode 2
-//   26    // Offset to Intra_8x8 luma prediction mode 3
-//   36    // Offset to Intra_8x8 luma prediction mode 4
-//   50    // Offset to Intra_8x8 luma prediction mode 5
-//   68    // Offset to Intra_8x8 luma prediction mode 6
-//   85    // Offset to Intra_8x8 luma prediction mode 7
-//   95    // Offset to Intra_8x8 luma prediction mode 8
-//	2857698308	// 0xAA550404 - GUID for Intra_4x4 luma prediction mode offsets
-//    0    // Offset to Intra_4x4 luma prediction mode 0
-//    2    // Offset to Intra_4x4 luma prediction mode 1
-//    4    // Offset to Intra_4x4 luma prediction mode 2
-//   16    // Offset to Intra_4x4 luma prediction mode 3
-//   23    // Offset to Intra_4x4 luma prediction mode 4
-//   32    // Offset to Intra_4x4 luma prediction mode 5
-//   45    // Offset to Intra_4x4 luma prediction mode 6
-//   59    // Offset to Intra_4x4 luma prediction mode 7
-//   66    // Offset to Intra_4x4 luma prediction mode 8
-//	2857700364	// 0xAA550C0C - GUID for intra chroma prediction mode offsets
-//    0    // Offset to intra chroma prediction mode 0
-//   30    // Offset to intra chroma prediction mode 1
-//   36    // Offset to intra chroma prediction mode 2
-//   41    // Offset to intra chroma prediction mode 3
-
-// Kernel name: AllIntra.asm
-//
-// All HWMC kernels merged into this file
-//
-//  $Revision: 1 $
-//  $Date: 4/13/06 4:35p $
-//
-
-// ----------------------------------------------------
-//  Main: ALLINTRA
-// ----------------------------------------------------
-
-#define	ALLHWMC
-#define	COMBINED_KERNEL
-
-.kernel ALLINTRA
-
-    // All frame destination HWMC kernels
-    //
-    #include "Intra_PCM.asm"
-    #include "Intra_16x16.asm"
-    #include "Intra_8x8.asm"
-    #include "Intra_4x4.asm"
-
-// End of ALLINTRA
-
-.end_kernel
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/avc_mc.g4b libva-1.0.1/i965_drv_video/shaders/h264/mc/avc_mc.g4b
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/avc_mc.g4b	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/avc_mc.g4b	1970-01-01 00:00:00.000000000 +0000
@@ -1,5251 +0,0 @@
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000d4 },
-   { 0x00000005, 0x220e3e2c, 0x00000070, 0x000f000f },
-   { 0x00000001, 0x26a00221, 0x00009c38, 0x00000000 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x00a02001, 0x24000229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25000229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25400229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25800229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25c00229, 0x00b10624, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x06440640 },
-   { 0x00a02001, 0x24000229, 0x00009003, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x0000900b, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00009013, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x0000901b, 0x00000000 },
-   { 0x00a02001, 0x25000229, 0x00009023, 0x00000000 },
-   { 0x00a02001, 0x25400229, 0x0000902b, 0x00000000 },
-   { 0x00a02001, 0x25800229, 0x00009033, 0x00000000 },
-   { 0x00a02001, 0x25c00229, 0x0000903b, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000072 },
-   { 0x02600005, 0x20000c20, 0x0000006c, 0x00000002 },
-   { 0x00600005, 0x24000c20, 0x0000006c, 0x00000011 },
-   { 0x01600007, 0x20000c00, 0x028d0400, 0x00000011 },
-   { 0x00780001, 0x26240169, 0x00000000, 0x80808080 },
-   { 0x00780001, 0x66430231, 0x028d0624, 0x00000000 },
-   { 0x00780001, 0x66630231, 0x028d062c, 0x00000000 },
-   { 0x00780001, 0x26240231, 0x00cf0643, 0x00000000 },
-   { 0x00780001, 0x262c0231, 0x00cf0663, 0x00000000 },
-   { 0x00800040, 0x25e04629, 0x00cf0643, 0x00b10624 },
-   { 0x00600040, 0x25e02529, 0x008d05e0, 0x008d05f0 },
-   { 0x00400040, 0x25e02529, 0x006905e0, 0x006905e8 },
-   { 0x00200040, 0x25e02529, 0x004505e0, 0x004505e4 },
-   { 0x00a02040, 0x2400252c, 0x000005e0, 0x000005e2 },
-   { 0x00a02040, 0x24003d8c, 0x00b10400, 0x00100010 },
-   { 0x00a02008, 0x24003d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x24403d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x24803d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x24c03d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25003d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25403d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25803d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25c03d89, 0x00b10400, 0x00050005 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00600041, 0x26806e2d, 0x008d062c, 0x89abcdef },
-   { 0x00600041, 0x26906e2d, 0x008d0623, 0xfedcba98 },
-   { 0x00600041, 0x26a06e2d, 0x00cf0663, 0x89abcdef },
-   { 0x00600041, 0x26b06e2d, 0x00cf0643, 0x0fedcba9 },
-   { 0x00000041, 0x26be3e2d, 0x00000623, 0xfff8fff8 },
-   { 0x00802040, 0x268035ad, 0x008d4680, 0x008d0690 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0688 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0684 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0682 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00200020 },
-   { 0x00200048, 0x24003dac, 0x00a00680, 0x00050005 },
-   { 0x00200008, 0x26e03d8d, 0x00450400, 0x00060006 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x00000633, 0x00100010 },
-   { 0x00800048, 0x26c03e2d, 0x0000067f, 0x00100010 },
-   { 0x00800048, 0x272055ad, 0x000006e0, 0x00b10040 },
-   { 0x00600041, 0x268055ad, 0x000006e2, 0x00ae0040 },
-   { 0x00600041, 0x26a055ad, 0x000006e2, 0x00ae0041 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00680 },
-   { 0x80a02008, 0x44003d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00682 },
-   { 0x80a02008, 0x44403d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00684 },
-   { 0x80a02008, 0x44803d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00686 },
-   { 0x80a02008, 0x44c03d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00688 },
-   { 0x80a02008, 0x45003d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b0068a },
-   { 0x80a02008, 0x45403d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b0068c },
-   { 0x80a02008, 0x45803d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b0068e },
-   { 0x80a02008, 0x45c03d91, 0x00b10400, 0x00050005 },
-   { 0x00000001, 0x22040060, 0x00000000, 0x00900080 },
-   { 0x01000005, 0x20000c20, 0x02000068, 0x00003c00 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000020 },
-   { 0x80802040, 0x440045b1, 0x008d8800, 0x00ae0400 },
-   { 0x80802040, 0x444045b1, 0x008d8820, 0x00ae0440 },
-   { 0x80802040, 0x448045b1, 0x008d8840, 0x00ae0480 },
-   { 0x80802040, 0x44c045b1, 0x008d8860, 0x00ae04c0 },
-   { 0x80802040, 0x441045b1, 0x008d8880, 0x00ae0410 },
-   { 0x80802040, 0x445045b1, 0x008d88a0, 0x00ae0450 },
-   { 0x80802040, 0x449045b1, 0x008d88c0, 0x00ae0490 },
-   { 0x80802040, 0x44d045b1, 0x008d88e0, 0x00ae04d0 },
-   { 0x80802040, 0x450045b1, 0x008d8900, 0x00ae0500 },
-   { 0x80802040, 0x454045b1, 0x008d8920, 0x00ae0540 },
-   { 0x80802040, 0x458045b1, 0x008d8940, 0x00ae0580 },
-   { 0x80802040, 0x45c045b1, 0x008d8960, 0x00ae05c0 },
-   { 0x80802040, 0x451045b1, 0x008d8980, 0x00ae0510 },
-   { 0x80802040, 0x455045b1, 0x008d89a0, 0x00ae0550 },
-   { 0x80802040, 0x459045b1, 0x008d89c0, 0x00ae0590 },
-   { 0x80802040, 0x45d045b1, 0x008d89e0, 0x00ae05d0 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x01800180 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000e2 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000018 },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00200440, 0x27c055a5, 0x004507fa, 0x0045002a },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x0000001b },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x02186000 },
-   { 0x01600031, 0x26200021, 0x408d07c0, 0x00000200 },
-   { 0x00000440, 0x27c43ca5, 0x000007c4, 0x00010001 },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x000f0003 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x00100000 },
-   { 0x02600031, 0x26400021, 0x408d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000008, 0x27fc3dad, 0x000007fc, 0x00010001 },
-   { 0x00200440, 0x27c055a5, 0x004507fa, 0x0045002a },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x00000013 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0xefffc001 },
-   { 0x01600031, 0x26200021, 0x408d07c0, 0x00000200 },
-   { 0x00000440, 0x27c43ca5, 0x000007c4, 0x00010001 },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x00070003 },
-   { 0x05600031, 0x26400021, 0x408d07c0, 0x00000200 },
-   { 0x00000008, 0x220e3e2c, 0x0000006c, 0x00060006 },
-   { 0x00000001, 0x26a002a5, 0x00009c3c, 0x00000000 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x02600005, 0x20000c20, 0x0000006c, 0x00000002 },
-   { 0x00780001, 0x26240169, 0x00000000, 0x80808080 },
-   { 0x02400005, 0x20000c20, 0x0200006c, 0x00000001 },
-   { 0x00560001, 0x46420129, 0x02690624, 0x00000000 },
-   { 0x02400005, 0x20000c20, 0x0200006c, 0x00000010 },
-   { 0x00560001, 0x46520129, 0x0269062c, 0x00000000 },
-   { 0x00780001, 0x26240129, 0x00ae0642, 0x00000000 },
-   { 0x00800040, 0x24004629, 0x00b10624, 0x00650642 },
-   { 0x00600040, 0x24002529, 0x00650400, 0x00650404 },
-   { 0x00600040, 0x25202529, 0x00050400, 0x00050404 },
-   { 0x00600040, 0x25702529, 0x00050408, 0x0005040c },
-   { 0x00560001, 0x26240169, 0x00000000, 0x80808080 },
-   { 0x00460001, 0x26240129, 0x028a0652, 0x00000000 },
-   { 0x00560001, 0x46520129, 0x02690624, 0x00000000 },
-   { 0x02400005, 0x20000c20, 0x0200006c, 0x00000001 },
-   { 0x00560001, 0x46420169, 0x02000000, 0x80808080 },
-   { 0x00460001, 0x46420129, 0x0069062c, 0x00000000 },
-   { 0x00560001, 0x262c0129, 0x008a0642, 0x00000000 },
-   { 0x00600040, 0x24004629, 0x008d0624, 0x00650652 },
-   { 0x00600040, 0x24104629, 0x00650642, 0x008d062c },
-   { 0x00600040, 0x24002529, 0x00650400, 0x00650404 },
-   { 0x00600040, 0x25302529, 0x00050408, 0x0005040c },
-   { 0x00600040, 0x25602529, 0x00050400, 0x00050404 },
-   { 0x00a02040, 0x24003d2c, 0x00b10520, 0x00040004 },
-   { 0x00a02008, 0x24003d89, 0x00b10400, 0x00030003 },
-   { 0x00a02008, 0x24403d89, 0x00b10400, 0x00030003 },
-   { 0x00a02040, 0x24003d2c, 0x00b10560, 0x00040004 },
-   { 0x00a02008, 0x24803d89, 0x00b10400, 0x00030003 },
-   { 0x00a02008, 0x24c03d89, 0x00b10400, 0x00030003 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000048 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x06440640 },
-   { 0x00a02001, 0x24000229, 0x00059002, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x0005900a, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00059012, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x0005901a, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000003c },
-   { 0x00a02001, 0x24000229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x00b10624, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000032 },
-   { 0x00600041, 0x26806e2d, 0x008d062c, 0x44332211 },
-   { 0x00600041, 0x26906e2d, 0x008d0622, 0xffeeddcc },
-   { 0x00600041, 0x26a06e2d, 0x00650652, 0x44332211 },
-   { 0x00600041, 0x26b06e2d, 0x00650642, 0x00ffeedd },
-   { 0x00200041, 0x26bc3e2d, 0x00450622, 0xfffcfffc },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0690 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0688 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0684 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00200020 },
-   { 0x00400048, 0x24003dac, 0x00a50680, 0x00220022 },
-   { 0x00400008, 0x26e03d8d, 0x00690400, 0x00060006 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x00050632, 0x00100010 },
-   { 0x00800048, 0x26c03e2d, 0x0005065e, 0x00100010 },
-   { 0x00800048, 0x272055ad, 0x000506e0, 0x00240044 },
-   { 0x00600041, 0x268055ad, 0x000506e4, 0x00440044 },
-   { 0x00600041, 0x26a055ad, 0x000506e4, 0x00440045 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00050680 },
-   { 0x80a02008, 0x44003d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00050684 },
-   { 0x80a02008, 0x44403d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00050688 },
-   { 0x80a02008, 0x44803d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x0005068c },
-   { 0x80a02008, 0x44c03d91, 0x00b10400, 0x00050005 },
-   { 0x00000040, 0x22063d8c, 0x00000204, 0x00100010 },
-   { 0x80802040, 0x640045b1, 0x008d8880, 0x00cf0400 },
-   { 0x80802040, 0x644045b1, 0x008d88a0, 0x00cf0440 },
-   { 0x80802040, 0x648045b1, 0x008d88c0, 0x00cf0480 },
-   { 0x80802040, 0x64c045b1, 0x008d88e0, 0x00cf04c0 },
-   { 0x80802040, 0x640245b1, 0x008d8900, 0x00cf0402 },
-   { 0x80802040, 0x644245b1, 0x008d8920, 0x00cf0442 },
-   { 0x80802040, 0x648245b1, 0x008d8940, 0x00cf0482 },
-   { 0x80802040, 0x64c245b1, 0x008d8960, 0x00cf04c2 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x0007000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x08004000 },
-   { 0x00800001, 0x20400232, 0x00d20400, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x00d20420, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x00d20440, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x00d20460, 0x00000000 },
-   { 0x00800001, 0x20800232, 0x00d20480, 0x00000000 },
-   { 0x00800001, 0x20900232, 0x00d204a0, 0x00000000 },
-   { 0x00800001, 0x20a00232, 0x00d204c0, 0x00000000 },
-   { 0x00800001, 0x20b00232, 0x00d204e0, 0x00000000 },
-   { 0x01600031, 0x27a00021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x0ff04000 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x04400400 },
-   { 0x00a02001, 0x20400232, 0x00d29000, 0x00000000 },
-   { 0x00a02001, 0x20500232, 0x00d29020, 0x00000000 },
-   { 0x00a02001, 0x20800232, 0x00d29080, 0x00000000 },
-   { 0x00a02001, 0x20900232, 0x00d290a0, 0x00000000 },
-   { 0x00a02001, 0x20c00232, 0x00d29100, 0x00000000 },
-   { 0x00a02001, 0x20d00232, 0x00d29120, 0x00000000 },
-   { 0x00a02001, 0x21000232, 0x00d29180, 0x00000000 },
-   { 0x00a02001, 0x21100232, 0x00d291a0, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffff04 },
-   { 0x00000001, 0x220401ec, 0x00000000, 0x00800080 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x04100400 },
-   { 0x00200008, 0x27006e2d, 0x0000006c, 0x00000040 },
-   { 0x00400001, 0x27400061, 0x00000000, 0x00000000 },
-   { 0x00800001, 0x272001a9, 0x00b10620, 0x00000000 },
-   { 0x02600005, 0x20001c20, 0x0000006c, 0x00000008 },
-   { 0x00110001, 0x27230231, 0x00000624, 0x00000000 },
-   { 0x00600001, 0x27420231, 0x00cf0643, 0x00000000 },
-   { 0x00110001, 0x27410231, 0x00000643, 0x00000000 },
-   { 0x00240001, 0x27400231, 0x00000623, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000002 },
-   { 0x00010001, 0x27400231, 0x02000624, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000001 },
-   { 0x00110001, 0x27420231, 0x02000623, 0x00000000 },
-   { 0x00000005, 0x26803e2d, 0x00000070, 0x000f000f },
-   { 0x00000001, 0x270801ad, 0x00000700, 0x00000000 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000084 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00800001, 0x27200231, 0x00b10628, 0x00000000 },
-   { 0x02600005, 0x20001c20, 0x0200006c, 0x00000004 },
-   { 0x00680001, 0x272c0231, 0x028d0634, 0x00000000 },
-   { 0x00780001, 0x272c0231, 0x02000633, 0x00000000 },
-   { 0x00400001, 0x27420231, 0x00a0040e, 0x00000000 },
-   { 0x00400001, 0x27460231, 0x00a0044e, 0x00000000 },
-   { 0x00200001, 0x27400231, 0x0000062b, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000002 },
-   { 0x00010001, 0x27400231, 0x0200062c, 0x00000000 },
-   { 0x00110001, 0x27410231, 0x0200040e, 0x00000000 },
-   { 0x00000008, 0x26803e2d, 0x00000070, 0x00040004 },
-   { 0x00200040, 0x22083d8c, 0x00450208, 0x00800080 },
-   { 0x00000006, 0x27083dad, 0x00000700, 0x00010001 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000064 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00a02001, 0xb3800231, 0x00d20400, 0x00000000 },
-   { 0x00a02001, 0xb3a00231, 0x00d20480, 0x00000000 },
-   { 0x00a02001, 0xb3c00231, 0x00d20440, 0x00000000 },
-   { 0x00a02001, 0xb3e00231, 0x00d204c0, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x00000060, 0x00000002 },
-   { 0x01000005, 0x20001c20, 0x0200006c, 0x00000001 },
-   { 0x01010005, 0x20001c20, 0x00000060, 0x00004000 },
-   { 0x02010005, 0x20001c20, 0x02000060, 0x00000010 },
-   { 0x00030001, 0x27230231, 0x0000065f, 0x00000000 },
-   { 0x00030220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02600005, 0x20001c20, 0x0000006c, 0x00000001 },
-   { 0x00460001, 0x27200231, 0x0069065c, 0x00000000 },
-   { 0x00110001, 0x27230231, 0x00000458, 0x00000000 },
-   { 0x00600001, 0x27240231, 0x008d0458, 0x00000000 },
-   { 0x00600001, 0x272c0231, 0x008d0478, 0x00000000 },
-   { 0x00600001, 0x27420231, 0x00cf0663, 0x00000000 },
-   { 0x00000001, 0x27400231, 0x00000458, 0x00000000 },
-   { 0x00010001, 0x27410231, 0x0000065f, 0x00000000 },
-   { 0x00110001, 0x27410231, 0x00000663, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000010 },
-   { 0x00110001, 0x27420231, 0x0200065f, 0x00000000 },
-   { 0x00000005, 0x26803e2d, 0x00000071, 0x000f000f },
-   { 0x00000006, 0x27083dad, 0x00000702, 0x00020002 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000030 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00400001, 0x27200231, 0x0069045c, 0x00000000 },
-   { 0x00600001, 0x27240231, 0x008d0478, 0x00000000 },
-   { 0x00800001, 0x272c0231, 0x0000047f, 0x00000000 },
-   { 0x00400001, 0x27420231, 0x00a0048e, 0x00000000 },
-   { 0x00400001, 0x27460231, 0x00a004ce, 0x00000000 },
-   { 0x00000001, 0x27400231, 0x00000478, 0x00000000 },
-   { 0x00000001, 0x27410231, 0x0000045f, 0x00000000 },
-   { 0x00000008, 0x26803e2d, 0x00000071, 0x00040004 },
-   { 0x00200040, 0x22083d8c, 0x00450208, 0x00800080 },
-   { 0x00000006, 0x27083dad, 0x00000700, 0x00030003 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00a02001, 0xb3800231, 0x00d20480, 0x00000000 },
-   { 0x00a02001, 0xb3a00231, 0x00d20500, 0x00000000 },
-   { 0x00a02001, 0xb3c00231, 0x00d204c0, 0x00000000 },
-   { 0x00a02001, 0xb3e00231, 0x00d20540, 0x00000000 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000100 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffe74 },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000001, 0x27340231, 0x00000733, 0x00000000 },
-   { 0x00600001, 0x274a0231, 0x00000749, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b10723, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10724, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10725, 0x00010001 },
-   { 0x00800008, 0x26c03d8d, 0x008d0400, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x00b10740, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10741, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10742, 0x00010001 },
-   { 0x00800008, 0x26a03d8d, 0x008d0400, 0x00020002 },
-   { 0x00800001, 0x27240231, 0x00d206c0, 0x00000000 },
-   { 0x00600001, 0x27400231, 0x00ae06a2, 0x00000000 },
-   { 0x00000001, 0x27230231, 0x000006a0, 0x00000000 },
-   { 0x00000005, 0x220e3dac, 0x00000680, 0x000f000f },
-   { 0x00000001, 0x26a00221, 0x00009c2c, 0x00000000 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x80800040, 0xd00045b1, 0x00b18800, 0x000d0724 },
-   { 0x80800040, 0xd02045b1, 0x00b18820, 0x000d0724 },
-   { 0x80800040, 0xd04045b1, 0x00b18840, 0x000d0724 },
-   { 0x80800040, 0xd06045b1, 0x00b18860, 0x000d0724 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x80800040, 0xd00045b1, 0x00b18800, 0x002c0740 },
-   { 0x80800040, 0xd02045b1, 0x00b18820, 0x002c0742 },
-   { 0x80800040, 0xd04045b1, 0x00b18840, 0x002c0744 },
-   { 0x80800040, 0xd06045b1, 0x00b18860, 0x002c0746 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x02802005, 0x20003da0, 0x00000708, 0x00020002 },
-   { 0x02600005, 0x20003da0, 0x02000708, 0x00010001 },
-   { 0x009a0001, 0x27200169, 0x00000000, 0x80808080 },
-   { 0x00780001, 0x27400231, 0x028d0724, 0x00000000 },
-   { 0x00780001, 0x27240231, 0x008d0740, 0x00000000 },
-   { 0x00600040, 0x25e04629, 0x008d0724, 0x008d0740 },
-   { 0x00400040, 0x25e02529, 0x006905e0, 0x006905e8 },
-   { 0x00200040, 0x25e02529, 0x004505e0, 0x004505e4 },
-   { 0x00800040, 0x2400252c, 0x000005e0, 0x000005e2 },
-   { 0x00800040, 0x24003d8c, 0x008d0400, 0x00080008 },
-   { 0x00800008, 0x26803d8d, 0x008d0400, 0x00040004 },
-   { 0x80800040, 0xd00035b1, 0x00b18800, 0x00b10680 },
-   { 0x80800040, 0xd02035b1, 0x00b18820, 0x00b10680 },
-   { 0x80800040, 0xd04035b1, 0x00b18840, 0x00b10680 },
-   { 0x80800040, 0xd06035b1, 0x00b18860, 0x00b10680 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27340231, 0x008d0733, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b10726, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10725, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10724, 0x00010001 },
-   { 0x00800008, 0x26803d8d, 0x00b10400, 0x00020002 },
-   { 0x80800040, 0xd00035b1, 0x00b18800, 0x002d0680 },
-   { 0x80800040, 0xd02035b1, 0x00b18820, 0x002d0684 },
-   { 0x80800040, 0xd04035b1, 0x00b18840, 0x002d0688 },
-   { 0x80800040, 0xd06035b1, 0x00b18860, 0x002d068c },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00400009, 0x26c05421, 0x00000744, 0x00690050 },
-   { 0x00400009, 0x26d05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26a00231, 0x00cf06c3, 0x00000000 },
-   { 0x00800001, 0x26a80231, 0x00b10723, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b106a2, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a1, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a0, 0x00010001 },
-   { 0x00800008, 0x26a03d8d, 0x00b10400, 0x00020002 },
-   { 0x00200040, 0x220c3eac, 0x00450056, 0x06a006a0 },
-   { 0x80800040, 0xd06035b1, 0x01ed9800, 0x00b18860 },
-   { 0x80800040, 0xd04035b1, 0x01ed9804, 0x00b18840 },
-   { 0x80800040, 0xd02035b1, 0x01ed9808, 0x00b18820 },
-   { 0x80800040, 0xd00035b1, 0x01ed980c, 0x00b18800 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00400009, 0x26c05421, 0x00000744, 0x00690050 },
-   { 0x00400009, 0x26d05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26a00231, 0x00cf06c3, 0x00000000 },
-   { 0x00800001, 0x26a80231, 0x00b10723, 0x00000000 },
-   { 0x00800042, 0x25c04629, 0x00b106a8, 0x00b106a9 },
-   { 0x00800040, 0x24003e2c, 0x00b106a3, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a2, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a1, 0x00010001 },
-   { 0x00800008, 0x26c03d8d, 0x008d0400, 0x00020002 },
-   { 0x00600001, 0x26a00231, 0x00ae06c0, 0x00000000 },
-   { 0x00600001, 0x46a60231, 0x00ae06cc, 0x00000000 },
-   { 0x00600001, 0x46a70231, 0x00ae05c0, 0x00000000 },
-   { 0x00200040, 0x220c3eac, 0x00450036, 0x06a006a0 },
-   { 0x80800040, 0xd0603631, 0x01ee9800, 0x00b18860 },
-   { 0x80800040, 0xd0403631, 0x01ee9802, 0x00b18840 },
-   { 0x80800040, 0xd0203631, 0x01ee9804, 0x00b18820 },
-   { 0x80800040, 0xd0003631, 0x01ee9806, 0x00b18800 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00400009, 0x26c05421, 0x00000744, 0x00690050 },
-   { 0x00400009, 0x26d05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26a00231, 0x00ab06c3, 0x00000000 },
-   { 0x00800001, 0x26a80231, 0x00b10723, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b106a2, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a1, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a0, 0x00010001 },
-   { 0x00800008, 0x25c03d89, 0x008d0400, 0x00020002 },
-   { 0x00800042, 0x26a0462d, 0x00b106a0, 0x00b106a1 },
-   { 0x00600001, 0x46a10231, 0x00ae05c0, 0x00000000 },
-   { 0x00600001, 0x26b00231, 0x00ae05d0, 0x00000000 },
-   { 0x00200040, 0x220c3eac, 0x00450056, 0x06a006a0 },
-   { 0x80800040, 0xd0603631, 0x01ed9800, 0x00b18860 },
-   { 0x80800040, 0xd0403631, 0x01ed9804, 0x00b18840 },
-   { 0x80800040, 0xd0203631, 0x01ed9808, 0x00b18820 },
-   { 0x80800040, 0xd0003631, 0x01ed980c, 0x00b18800 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00800042, 0x25c04629, 0x00b10724, 0x00b10725 },
-   { 0x00800040, 0x24003e2c, 0x00b10726, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10725, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10724, 0x00010001 },
-   { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
-   { 0x80800040, 0xd0003531, 0x00ad05c0, 0x00b18800 },
-   { 0x80800040, 0xd0203531, 0x00ad05c2, 0x00b18820 },
-   { 0x80800040, 0xd0403531, 0x00ad05c4, 0x00b18840 },
-   { 0x80800040, 0xd0603531, 0x00ad05c6, 0x00b18860 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27480231, 0x00000747, 0x00000000 },
-   { 0x00800042, 0x25c04629, 0x00b10740, 0x00b10741 },
-   { 0x00800040, 0x24003e2c, 0x00b10742, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10741, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10740, 0x00010001 },
-   { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
-   { 0x00800001, 0x45c10231, 0x00d205e0, 0x00000000 },
-   { 0x80800040, 0xd0003631, 0x004d05c0, 0x00b18800 },
-   { 0x80800040, 0xd0203631, 0x004d05c4, 0x00b18820 },
-   { 0x80800040, 0xd0403631, 0x004d05c8, 0x00b18840 },
-   { 0x80800040, 0xd0603631, 0x004d05cc, 0x00b18860 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x0ff04000 },
-   { 0x00800001, 0x20400232, 0x00cd0400, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x00cd0408, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x00cd0410, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x00cd0418, 0x00000000 },
-   { 0x00800001, 0x20800232, 0x00cd0440, 0x00000000 },
-   { 0x00800001, 0x20900232, 0x00cd0448, 0x00000000 },
-   { 0x00800001, 0x20a00232, 0x00cd0450, 0x00000000 },
-   { 0x00800001, 0x20b00232, 0x00cd0458, 0x00000000 },
-   { 0x00800001, 0x20c00232, 0x00cd0480, 0x00000000 },
-   { 0x00800001, 0x20d00232, 0x00cd0488, 0x00000000 },
-   { 0x00800001, 0x20e00232, 0x00cd0490, 0x00000000 },
-   { 0x00800001, 0x20f00232, 0x00cd0498, 0x00000000 },
-   { 0x00800001, 0x21000232, 0x00cd04c0, 0x00000000 },
-   { 0x00800001, 0x21100232, 0x00cd04c8, 0x00000000 },
-   { 0x00800001, 0x21200232, 0x00cd04d0, 0x00000000 },
-   { 0x00800001, 0x21300232, 0x00cd04d8, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffd34 },
-   { 0x00000001, 0x220401ec, 0x00000000, 0x00800080 },
-   { 0x00000001, 0x220601ec, 0x00000000, 0x04000400 },
-   { 0x00200008, 0x27006e2d, 0x0000006c, 0x00000040 },
-   { 0x02600005, 0x20003e20, 0x0000006c, 0x00040004 },
-   { 0x00780001, 0x26340231, 0x00000633, 0x00000000 },
-   { 0x00800001, 0x27200231, 0x00b10620, 0x00000000 },
-   { 0x00600001, 0x27400231, 0x00cf0643, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240070, 0x00004040 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000006a },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00000006, 0x27003dad, 0x00000700, 0x00010001 },
-   { 0x00800001, 0x27200231, 0x00b10628, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c26, 0x00000000 },
-   { 0x00400001, 0x27440231, 0x00808c66, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240072, 0x00004040 },
-   { 0x00000040, 0x22063d8c, 0x00000206, 0x00800080 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000058 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00000006, 0x27003dad, 0x00000702, 0x00020002 },
-   { 0x00800001, 0xaf800231, 0x00d28f80, 0x00000000 },
-   { 0x00800001, 0xaf900231, 0x00d28fa0, 0x00000000 },
-   { 0x00800001, 0xafc00231, 0x00d28fc0, 0x00000000 },
-   { 0x00800001, 0xafd00231, 0x00d28fe0, 0x00000000 },
-   { 0x00800001, 0xafa00231, 0x00d28c00, 0x00000000 },
-   { 0x00800001, 0xafb00231, 0x00d28c20, 0x00000000 },
-   { 0x00800001, 0xafe00231, 0x00d28c40, 0x00000000 },
-   { 0x00800001, 0xaff00231, 0x00d28c60, 0x00000000 },
-   { 0x00400001, 0x27200231, 0x0069065c, 0x00000000 },
-   { 0x00600001, 0x27240231, 0x00a98fcc, 0x00000000 },
-   { 0x00600001, 0x272c0231, 0x00a98fec, 0x00000000 },
-   { 0x00600001, 0x27340231, 0x00008fff, 0x00000000 },
-   { 0x00800001, 0x2620012d, 0x00b10720, 0x00000000 },
-   { 0x00600001, 0x27400231, 0x00cf0663, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240074, 0x00004040 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000032 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00000006, 0x27003dad, 0x00000700, 0x00010001 },
-   { 0x00800001, 0x27200231, 0x00b10628, 0x00000000 },
-   { 0x00600001, 0x27300231, 0x008d0638, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c26, 0x00000000 },
-   { 0x00400001, 0x27440231, 0x00808c66, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240076, 0x00004040 },
-   { 0x00000040, 0x22063d8c, 0x00000206, 0x00800080 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00800001, 0xaf800231, 0x00d28f80, 0x00000000 },
-   { 0x00800001, 0xaf900231, 0x00d28fa0, 0x00000000 },
-   { 0x00800001, 0xafc00231, 0x00d28fc0, 0x00000000 },
-   { 0x00800001, 0xafd00231, 0x00d28fe0, 0x00000000 },
-   { 0x00800001, 0xafa00231, 0x00d28c00, 0x00000000 },
-   { 0x00800001, 0xafb00231, 0x00d28c20, 0x00000000 },
-   { 0x00800001, 0xafe00231, 0x00d28c40, 0x00000000 },
-   { 0x00800001, 0xaff00231, 0x00d28c60, 0x00000000 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000e0 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffcce },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00600001, 0x27800231, 0x008d0740, 0x00000000 },
-   { 0x00400005, 0x22083dac, 0x00690680, 0x000f000f },
-   { 0x00400040, 0x26a04625, 0x01e09020, 0x00690058 },
-   { 0x00000001, 0x26d001ad, 0x00000700, 0x00000000 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x80600040, 0xcc0035b1, 0x00898800, 0x008d0760 },
-   { 0x80600040, 0xcc1035b1, 0x00898820, 0x008d0770 },
-   { 0x00800001, 0x27200231, 0x008d0724, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c06, 0x00000000 },
-   { 0x00000006, 0x26d03dad, 0x00000700, 0x00010001 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a4 },
-   { 0x80600040, 0xcc2035b1, 0x00898808, 0x008d0760 },
-   { 0x80600040, 0xcc3035b1, 0x00898828, 0x008d0770 },
-   { 0x00000001, 0x27230231, 0x00000783, 0x00000000 },
-   { 0x00400001, 0x27240231, 0x008a8c18, 0x00000000 },
-   { 0x00400001, 0x27280231, 0x008a8c38, 0x00000000 },
-   { 0x00400001, 0x272c0231, 0x00008c3e, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00690784, 0x00000000 },
-   { 0x00000006, 0x26d03dad, 0x00000700, 0x00020002 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a8 },
-   { 0x80600040, 0xcc4035b1, 0x00898840, 0x008d0760 },
-   { 0x80600040, 0xcc5035b1, 0x00898860, 0x008d0770 },
-   { 0x00800001, 0x27200231, 0x008d0724, 0x00000000 },
-   { 0x00600001, 0x27280231, 0x00000727, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c46, 0x00000000 },
-   { 0x00000006, 0x26d03dad, 0x00000700, 0x00030003 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006ac },
-   { 0x80600040, 0xcc6035b1, 0x00898848, 0x008d0760 },
-   { 0x80600040, 0xcc7035b1, 0x00898868, 0x008d0770 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00800001, 0x2760022d, 0x00090724, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00800001, 0x2760022d, 0x00280740, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x02802005, 0x20003da0, 0x000006d0, 0x00020002 },
-   { 0x02802005, 0x20003da0, 0x020006d0, 0x00010001 },
-   { 0x009a0001, 0x27200169, 0x00000000, 0x80808080 },
-   { 0x00780001, 0x27400231, 0x028d0724, 0x00000000 },
-   { 0x00780001, 0x27240231, 0x008d0740, 0x00000000 },
-   { 0x00400040, 0x25e04629, 0x00690724, 0x00690740 },
-   { 0x00200040, 0x25e02529, 0x004505e0, 0x004505e4 },
-   { 0x00800040, 0x2400252c, 0x000005e0, 0x000005e2 },
-   { 0x00800040, 0x24003d8c, 0x008d0400, 0x00040004 },
-   { 0x00800008, 0x27603d8d, 0x008d0400, 0x00030003 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00600001, 0x26c00231, 0x008d0724, 0x00000000 },
-   { 0x00400001, 0x26c80231, 0x0069072b, 0x00000000 },
-   { 0x00600040, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00020002 },
-   { 0x00600048, 0x25e03e29, 0x008d06c0, 0x00010001 },
-   { 0x00800008, 0x27603d2d, 0x002905e0, 0x00020002 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00400009, 0x26e05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26c40231, 0x008d0723, 0x00000000 },
-   { 0x00400001, 0x26c00231, 0x00ab06e3, 0x00000000 },
-   { 0x00600040, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00020002 },
-   { 0x00600048, 0x26c03e2d, 0x008d06c0, 0x00010001 },
-   { 0x00400040, 0x22083eac, 0x00690054, 0x06c006c0 },
-   { 0x00800008, 0x27603dad, 0x01e99000, 0x00020002 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00400009, 0x26e05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26c40231, 0x008d0723, 0x00000000 },
-   { 0x00400001, 0x26c00231, 0x00ab06e3, 0x00000000 },
-   { 0x00600042, 0x25c04629, 0x008d06c4, 0x008d06c5 },
-   { 0x00600040, 0x24003e2c, 0x008d06c3, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00010001 },
-   { 0x00600008, 0x26c03d8d, 0x008d0400, 0x00020002 },
-   { 0x00400001, 0x46c401ad, 0x006906c4, 0x00000000 },
-   { 0x00400001, 0x46c6012d, 0x006905c0, 0x00000000 },
-   { 0x00400040, 0x22083eac, 0x00690054, 0x06c006c0 },
-   { 0x00800001, 0x276001ad, 0x01ea9000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00400009, 0x26e05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26c40231, 0x008d0723, 0x00000000 },
-   { 0x00400001, 0x26c00231, 0x00ab06e3, 0x00000000 },
-   { 0x00600042, 0x25c04629, 0x008d06c0, 0x008d06c1 },
-   { 0x00600040, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00020002 },
-   { 0x00600048, 0x26e03e2d, 0x008d06c0, 0x00010001 },
-   { 0x00400008, 0x46c23dad, 0x006906e0, 0x00020002 },
-   { 0x00200008, 0x26d03dad, 0x004506e8, 0x00020002 },
-   { 0x00400001, 0x46c0012d, 0x006905c0, 0x00000000 },
-   { 0x00400009, 0x22083eac, 0x00690054, 0x00010001 },
-   { 0x00400040, 0x22083d8c, 0x00690208, 0x06c006c0 },
-   { 0x00800001, 0x276001ad, 0x01e99000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00600042, 0x45c04629, 0x008d0724, 0x008d0725 },
-   { 0x00600040, 0x24003e2c, 0x008d0726, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d0725, 0x00020002 },
-   { 0x00600048, 0x25e03e29, 0x008d0724, 0x00010001 },
-   { 0x00600008, 0x45c23d29, 0x008d05e0, 0x00020002 },
-   { 0x00800001, 0x2760012d, 0x002a05c0, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00600001, 0x27440231, 0x00000743, 0x00000000 },
-   { 0x00600042, 0x45c04629, 0x008d0740, 0x008d0741 },
-   { 0x00600040, 0x24003e2c, 0x008d0742, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d0741, 0x00020002 },
-   { 0x00600048, 0x25e03e29, 0x008d0740, 0x00010001 },
-   { 0x00600008, 0x45c23d29, 0x008d05e0, 0x00020002 },
-   { 0x00800001, 0x2760012d, 0x004905c0, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x0ff04000 },
-   { 0x00800001, 0x20400232, 0x00a90400, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x00a90404, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x00a90408, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x00a9040c, 0x00000000 },
-   { 0x00800001, 0x20800232, 0x00a90440, 0x00000000 },
-   { 0x00800001, 0x20900232, 0x00a90444, 0x00000000 },
-   { 0x00800001, 0x20a00232, 0x00a90448, 0x00000000 },
-   { 0x00800001, 0x20b00232, 0x00a9044c, 0x00000000 },
-   { 0x00800001, 0x20c00232, 0x00a90480, 0x00000000 },
-   { 0x00800001, 0x20d00232, 0x00a90484, 0x00000000 },
-   { 0x00800001, 0x20e00232, 0x00a90488, 0x00000000 },
-   { 0x00800001, 0x20f00232, 0x00a9048c, 0x00000000 },
-   { 0x00800001, 0x21000232, 0x00a904c0, 0x00000000 },
-   { 0x00800001, 0x21100232, 0x00a904c4, 0x00000000 },
-   { 0x00800001, 0x21200232, 0x00a904c8, 0x00000000 },
-   { 0x00800001, 0x21300232, 0x00a904cc, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200809, 0x27c03e21, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x1218a000 },
-   { 0x00a02401, 0x20400232, 0x00b10080, 0x00000000 },
-   { 0x00a02801, 0x20500232, 0x00b10090, 0x00000000 },
-   { 0x00a02401, 0x20800232, 0x00b100c0, 0x00000000 },
-   { 0x00a02801, 0x20900232, 0x00b100d0, 0x00000000 },
-   { 0x00a02401, 0x20c00232, 0x00b10100, 0x00000000 },
-   { 0x00a02801, 0x20d00232, 0x00b10110, 0x00000000 },
-   { 0x00a02401, 0x21000232, 0x00b10140, 0x00000000 },
-   { 0x00a02801, 0x21100232, 0x00b10150, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000401, 0x20280062, 0x00000000, 0x0007000f },
-   { 0x0000080c, 0x20243c22, 0x000007c4, 0x00010001 },
-   { 0x00000040, 0x22001c00, 0x00000200, 0xf8000001 },
-   { 0x00800001, 0x40400232, 0x00b10180, 0x00000000 },
-   { 0x00800001, 0x40410232, 0x00b101c0, 0x00000000 },
-   { 0x00800001, 0x40600232, 0x00b10190, 0x00000000 },
-   { 0x00800001, 0x40610232, 0x00b101d0, 0x00000000 },
-   { 0x00800001, 0x40800232, 0x00b101a0, 0x00000000 },
-   { 0x00800001, 0x40810232, 0x00b101e0, 0x00000000 },
-   { 0x00800001, 0x40a00232, 0x00b101b0, 0x00000000 },
-   { 0x00800001, 0x40a10232, 0x00b101f0, 0x00000000 },
-   { 0x01600031, 0x27a00001, 0x508d0000, 0x00000200 },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0000, 0x00000000 },
-   { 0x00000005, 0x20203e2d, 0x00000061, 0x001f001f },
-   { 0x00200009, 0x20643e2d, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00000000 },
-   { 0x01000010, 0x20003dac, 0x00000020, 0x00160016 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x01200010, 0x20003e2c, 0x0200006c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000024 },
-   { 0x00800009, 0x25403dad, 0x00050064, 0x00020002 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00180018 },
-   { 0x00200040, 0x45483dad, 0x00660548, 0x00100010 },
-   { 0x00200040, 0x45523dad, 0x00660552, 0x00100010 },
-   { 0x00400040, 0x25583dad, 0x00690558, 0x00100010 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0x00200020 },
-   { 0x00800040, 0x20a035ad, 0x00b100a0, 0x00b10540 },
-   { 0x00600040, 0x45423dad, 0x00ae0542, 0x00200020 },
-   { 0x00800040, 0x20e035ad, 0x00b100e0, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0xffe0ffe0 },
-   { 0x00800040, 0x20c035ad, 0x00b100c0, 0x00b10540 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000014 },
-   { 0x06600010, 0x20003dac, 0x02000020, 0x00030003 },
-   { 0x00000001, 0x206c0171, 0x00000000, 0x00000000 },
-   { 0x00610001, 0x208000a5, 0x02050080, 0x00000000 },
-   { 0x00610001, 0x212000a5, 0x02090100, 0x00000000 },
-   { 0x00410001, 0x211000a5, 0x02690100, 0x00000000 },
-   { 0x00200009, 0x25403dad, 0x00450064, 0x00020002 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00050540 },
-   { 0x00200040, 0x40883dad, 0x00660088, 0x00200020 },
-   { 0x00200040, 0x40923dad, 0x00660092, 0x00200020 },
-   { 0x00400040, 0x20983dad, 0x00690098, 0x00200020 },
-   { 0x00200401, 0x22080060, 0x00000000, 0x03400140 },
-   { 0x00000c01, 0x220c0060, 0x00000000, 0x04400080 },
-   { 0x00000801, 0x22040060, 0x00000000, 0x01000070 },
-   { 0x00000001, 0x20200169, 0x00000000, 0x00000000 },
-   { 0x0000000c, 0x2458262d, 0x0000006d, 0x00000020 },
-   { 0x00000001, 0x210e0169, 0x00000000, 0x00010001 },
-   { 0x00000005, 0x24583dad, 0x00000458, 0x00030003 },
-   { 0x01000010, 0x200035ac, 0x0000010e, 0x00000458 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000002fe },
-   { 0x01000010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00010401, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00010805, 0x245a3e2d, 0x02008800, 0x007f007f },
-   { 0x00110401, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00110805, 0x245a3e2d, 0x02008804, 0x007f007f },
-   { 0x0000000c, 0x211e362d, 0x0000006c, 0x00000020 },
-   { 0x00000040, 0x20780d21, 0x0000045a, 0x0208a002 },
-   { 0x02000005, 0x20003dac, 0x0200011e, 0x00030003 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000001be },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00700000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c000c },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x0007000c },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00110040, 0x20441da5, 0x02000442, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c0007 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00070007 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x01600006, 0x20003dac, 0x0000044a, 0x00000000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00010040, 0x22000c20, 0x00000078, 0x00200010 },
-   { 0x00110040, 0x22000c20, 0x00000078, 0x00300010 },
-   { 0x00010001, 0x20480061, 0x00000000, 0x00030009 },
-   { 0x00110001, 0x20480061, 0x00000000, 0x00040009 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001a },
-   { 0x00600001, 0x26220231, 0x008d05c0, 0x00000000 },
-   { 0x00600401, 0x26120231, 0x008d05b8, 0x00000000 },
-   { 0x00600801, 0x26020231, 0x008d05b0, 0x00000000 },
-   { 0x00600401, 0x25f20231, 0x008d05a8, 0x00000000 },
-   { 0x00600801, 0x25e20231, 0x008d05a0, 0x00000000 },
-   { 0x00600401, 0x25d20231, 0x008d0598, 0x00000000 },
-   { 0x00600801, 0x25c20231, 0x008d0590, 0x00000000 },
-   { 0x00600401, 0x25b20231, 0x008d0588, 0x00000000 },
-   { 0x00600801, 0x25a20231, 0x008d0580, 0x00000000 },
-   { 0x00600401, 0x25920231, 0x008d0578, 0x00000000 },
-   { 0x00600801, 0x25820231, 0x008d0570, 0x00000000 },
-   { 0x00600001, 0x25720231, 0x008d0568, 0x00000000 },
-   { 0x00600001, 0x25620231, 0x008d0560, 0x00000000 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00810001, 0xbc000229, 0x02ad8000, 0x00000000 },
-   { 0x00810001, 0xbc200229, 0x02ad8020, 0x00000000 },
-   { 0x00810001, 0xbc400229, 0x02ad8040, 0x00000000 },
-   { 0x00810001, 0xbc600229, 0x02ad8060, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000012a },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000066 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000064 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04a00480 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00a02040, 0x2400462c, 0x00ad8000, 0x00ad8005 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8001, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8002, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8003, 0x00140014 },
-   { 0x00a02048, 0xb8003e2d, 0x00ad8004, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8040, 0x00ad8045 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8041, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8042, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8043, 0x00140014 },
-   { 0x00a02048, 0xb8403e2d, 0x00ad8044, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8080, 0x00ad8085 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8081, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8082, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8083, 0x00140014 },
-   { 0x00a02048, 0xb8803e2d, 0x00ad8084, 0xfffbfffb },
-   { 0x00600040, 0x2400462c, 0x008d80c0, 0x008d80c5 },
-   { 0x00600048, 0x24003e2c, 0x008d80c1, 0xfffbfffb },
-   { 0x00600048, 0x24003e2c, 0x008d80c2, 0x00140014 },
-   { 0x00600048, 0x24003e2c, 0x008d80c3, 0x00140014 },
-   { 0x00600048, 0xb8c03e2d, 0x008d80c4, 0xfffbfffb },
-   { 0x00000401, 0x22000060, 0x00000000, 0x04a00480 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04a00490 },
-   { 0x00010802, 0x220c2d28, 0x00000454, 0x04800480 },
-   { 0x00a02040, 0x24003dac, 0x00b18000, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8800, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8820, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18020, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8820, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8840, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18040, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x000a000a },
-   { 0x00a02040, 0x24003dac, 0x00b18040, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18060, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8860, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8880, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18080, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8880, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed88a0, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000000b4 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000004c },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000004a },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010002, 0x220c2d28, 0x02000454, 0x04800480 },
-   { 0x00800040, 0x24003e2c, 0x01ed8000, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8001, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8021, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8002, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8022, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8003, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8023, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8004, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8024, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8005, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8025, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00800040, 0x24003e2c, 0x01ed8040, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8060, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8041, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8061, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8042, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8062, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8043, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8063, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8044, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8064, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8045, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8065, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000042 },
-   { 0x00200401, 0x22000128, 0x0066044c, 0x00000000 },
-   { 0x00200c01, 0x22040128, 0x0045044e, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x03400010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220c0168, 0x02000000, 0x04800480 },
-   { 0x00a02040, 0x24003e2c, 0x00ad83e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8be0, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8800, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8800, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8820, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00a02040, 0x24003e2c, 0x00ad8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8040, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8840, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8860, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8060, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8860, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8880, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000001c },
-   { 0x00200401, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x01200010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01200010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00210040, 0x22002d08, 0x00450200, 0x00010001 },
-   { 0x00210040, 0x22002d08, 0x02450200, 0x00100010 },
-   { 0x00800001, 0xb8000229, 0x01ed8000, 0x00000000 },
-   { 0x00800001, 0xb8200229, 0x01ed8020, 0x00000000 },
-   { 0x00800001, 0xb8400229, 0x01ed8040, 0x00000000 },
-   { 0x00800001, 0xb8600229, 0x01ed8060, 0x00000000 },
-   { 0x80800042, 0xd8004631, 0x00d29800, 0x00d20480 },
-   { 0x80800042, 0xd8204631, 0x00d29820, 0x00d204a0 },
-   { 0x80800042, 0xd8404631, 0x00d29840, 0x00d204c0 },
-   { 0x80800042, 0xd8604631, 0x00d29860, 0x00d204e0 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000c01, 0x220201e8, 0x00000000, 0x07100710 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00200040, 0x244c3d09, 0x00450200, 0x00100010 },
-   { 0x00800041, 0x24002628, 0x00ad8000, 0x00000540 },
-   { 0x00800041, 0x24202628, 0x00ad8020, 0x00000540 },
-   { 0x00800048, 0x24002628, 0x00ad8002, 0x00000542 },
-   { 0x00800048, 0x24202628, 0x00ad8022, 0x00000542 },
-   { 0x00200001, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00800048, 0x24002628, 0x01ed8000, 0x00000544 },
-   { 0x00800048, 0x24202628, 0x01ed8020, 0x00000544 },
-   { 0x00800048, 0xbc002629, 0x01ed8002, 0x00000546 },
-   { 0x00801048, 0xbc202629, 0x01ed8022, 0x00000546 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000126 },
-   { 0x00000001, 0x20220169, 0x00000000, 0x00040004 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00500000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x00080008 },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00030008 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0x22000c20, 0x00000078, 0x00100010 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00000001, 0x20480061, 0x00000000, 0x00020005 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00410001, 0xbc000229, 0x02698000, 0x00000000 },
-   { 0x00410001, 0xbc100229, 0x02698010, 0x00000000 },
-   { 0x00410001, 0xbc200229, 0x02698020, 0x00000000 },
-   { 0x00410001, 0xbc300229, 0x02698030, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000000be },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000042 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04d004c0 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00802040, 0x2400462c, 0x00a98000, 0x00a98005 },
-   { 0x00802048, 0x24003e2c, 0x00a98001, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98002, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98003, 0x00140014 },
-   { 0x00802048, 0xb8003e2d, 0x00a98004, 0xfffbfffb },
-   { 0x00802040, 0x2400462c, 0x00a98040, 0x00a98045 },
-   { 0x00802048, 0x24003e2c, 0x00a98041, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98042, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98043, 0x00140014 },
-   { 0x00802048, 0xb8203e2d, 0x00a98044, 0xfffbfffb },
-   { 0x00400040, 0x2400462c, 0x00698080, 0x00698085 },
-   { 0x00400048, 0x24003e2c, 0x00698081, 0xfffbfffb },
-   { 0x00400048, 0x24003e2c, 0x00698082, 0x00140014 },
-   { 0x00400048, 0x24003e2c, 0x00698083, 0x00140014 },
-   { 0x00400048, 0xb8403e2d, 0x00698084, 0xfffbfffb },
-   { 0x00000401, 0x220c0060, 0x00000000, 0x04e004d0 },
-   { 0x00000c01, 0x22000060, 0x00000000, 0x04d004c8 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04e004d8 },
-   { 0x00000801, 0x22080060, 0x00000000, 0x04f004e8 },
-   { 0x00800040, 0x24003dac, 0x00b104c0, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x00b104e0, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed9800, 0x00140014 },
-   { 0x00010001, 0x220c0168, 0x00000000, 0x05400540 },
-   { 0x00110001, 0x220c0168, 0x00000000, 0x04c004c0 },
-   { 0x00800048, 0x24003dac, 0x01e98000, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01e98020, 0x00010001 },
-   { 0x00800048, 0x24003dac, 0x01e98800, 0x00140014 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000060 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000022 },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010001, 0x220e0168, 0x02000000, 0x05400540 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x00800040, 0x24003e2c, 0x01e98000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98001, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98002, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98003, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98004, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98005, 0x00010001 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x03600010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x00400401, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x00400840, 0x22083d2c, 0x0069044c, 0x00100010 },
-   { 0x00610040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x01e983e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e993e0, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e99000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e99020, 0x00010001 },
-   { 0x00000001, 0x220e0168, 0x00000000, 0x05400540 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x00400001, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x01400010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01400010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00010001 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00100010 },
-   { 0x00800001, 0x25400229, 0x01e98000, 0x00000000 },
-   { 0x80800042, 0x45404631, 0x00d20540, 0x00d204c0 },
-   { 0x00000001, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x00400001, 0xd8000231, 0x008a0540, 0x00000000 },
-   { 0x00400001, 0xd8100231, 0x008a0548, 0x00000000 },
-   { 0x00400001, 0xd8200231, 0x008a0550, 0x00000000 },
-   { 0x00400001, 0xd8300231, 0x008a0558, 0x00000000 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00600041, 0x24002628, 0x00898000, 0x00000540 },
-   { 0x00600048, 0x24002628, 0x00898002, 0x00000542 },
-   { 0x00600048, 0x24002628, 0x00898008, 0x00000544 },
-   { 0x00600048, 0x2540262d, 0x0089800a, 0x00000546 },
-   { 0x00400401, 0xbc0001a9, 0x00690540, 0x00000000 },
-   { 0x00400801, 0xbc1001a9, 0x00690548, 0x00000000 },
-   { 0x01000010, 0x20003d2c, 0x00000022, 0x00030003 },
-   { 0x01000040, 0x20223d29, 0x02000022, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00080008 },
-   { 0x00110040, 0x24540c21, 0x00000454, 0x00080008 },
-   { 0x00010040, 0x24540c21, 0x00000454, 0x00180038 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffee6 },
-   { 0x01800010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0xffe0ffe0 },
-   { 0x00010001, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00110001, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00000001, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00800040, 0x24003dac, 0x00b19c00, 0x00200020 },
-   { 0x00800040, 0x24203dac, 0x00b19c20, 0x00200020 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00060006 },
-   { 0x8080000c, 0xdc203d91, 0x00b10420, 0x00060006 },
-   { 0x02000040, 0x210e3d29, 0x0200010e, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00040004 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffcf8 },
-   { 0x01000005, 0x25643e2d, 0x00000060, 0x00c000c0 },
-   { 0x01000010, 0x20003dac, 0x02000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00a02001, 0x46400231, 0x00d20780, 0x00000000 },
-   { 0x00a02001, 0x46800231, 0x00d207c0, 0x00000000 },
-   { 0x00a02001, 0x46c00231, 0x00d20480, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000007e },
-   { 0x80a02042, 0x46404631, 0x00d20640, 0x00d20780 },
-   { 0x80a02042, 0x46804631, 0x00d20680, 0x00d207c0 },
-   { 0x80a02042, 0x46c04631, 0x00d206c0, 0x00d20480 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000010, 0x20003dac, 0x02000564, 0x00800080 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffe4 },
-   { 0x00200401, 0x256801ed, 0x00000000, 0x00200020 },
-   { 0x00200801, 0x256c01ed, 0x00000000, 0x00060006 },
-   { 0x00400001, 0x258001ed, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x45a001ad, 0x00058c00, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000028 },
-   { 0x02600005, 0x20006e28, 0x02008c0c, 0x88848421 },
-   { 0x0220000c, 0x25663dad, 0x00000458, 0x00010001 },
-   { 0x0000000c, 0x25643dad, 0x00000564, 0x00060006 },
-   { 0x00310001, 0x25c401ad, 0x00000458, 0x00000000 },
-   { 0x00210001, 0x25c00061, 0x00000000, 0x00010001 },
-   { 0x00310040, 0x25c03dad, 0x004545c4, 0x00010001 },
-   { 0x00610001, 0x25a00061, 0x02000000, 0x00000080 },
-   { 0x00710001, 0x45a002ad, 0x02ae8c00, 0x00000000 },
-   { 0x00710001, 0x45a202ad, 0x02ae8c01, 0x00000000 },
-   { 0x00800041, 0x25a035ad, 0x00b105a0, 0x000905c0 },
-   { 0x01200010, 0x20003e2c, 0x0245006e, 0x00000000 },
-   { 0x00310009, 0x244c45ad, 0x02000564, 0x0045006e },
-   { 0x00210001, 0x244c01ed, 0x02000000, 0x00000000 },
-   { 0x0031000c, 0x244c3dad, 0x0245044c, 0x00010001 },
-   { 0x00200009, 0x256835ad, 0x0045044c, 0x00000566 },
-   { 0x00210040, 0x256835ad, 0x02450568, 0x00000566 },
-   { 0x00200040, 0x256c362d, 0x0045006e, 0x00000566 },
-   { 0x00400040, 0x240035ac, 0x00ab05a2, 0x00ab05a6 },
-   { 0x00400040, 0x2400358c, 0x00690400, 0x00000566 },
-   { 0x0040000c, 0x2580358d, 0x00690400, 0x00000566 },
-   { 0x00800041, 0x2400362c, 0x00d20640, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d20660, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d20780, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207a0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x464035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x466035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d20680, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d206a0, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d207c0, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207e0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x468035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x46a035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d206c0, 0x000705a8 },
-   { 0x00800041, 0x2420362c, 0x00d206e0, 0x000705a8 },
-   { 0x00800048, 0x2400362c, 0x00d20480, 0x000705ac },
-   { 0x00800048, 0x2420362c, 0x00d204a0, 0x000705ac },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x0000056a },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x0000056a },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056e },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056e },
-   { 0x80800040, 0x46c035b1, 0x00b104c0, 0x00050582 },
-   { 0x80800040, 0x46e035b1, 0x00b104e0, 0x00050582 },
-   { 0x01800005, 0x20003d2c, 0x02000020, 0x00020002 },
-   { 0x80800040, 0xd00045b1, 0x00b19000, 0x00d20640 },
-   { 0x80800040, 0xd02045b1, 0x00b19020, 0x00d20660 },
-   { 0x80800040, 0xd04045b1, 0x00b19040, 0x00d20680 },
-   { 0x80800040, 0xd06045b1, 0x00b19060, 0x00d206a0 },
-   { 0x00000040, 0x22083d8c, 0x00000208, 0x00800080 },
-   { 0x80400040, 0xd40045b1, 0x00699400, 0x00ab06c0 },
-   { 0x80400040, 0xd48045b1, 0x00699480, 0x00ab06c2 },
-   { 0x80400040, 0xd42045b1, 0x00699420, 0x00ab06e0 },
-   { 0x80400040, 0xd4a045b1, 0x006994a0, 0x00ab06e2 },
-   { 0x80400040, 0xd41045b1, 0x00699410, 0x00ab06d0 },
-   { 0x80400040, 0xd49045b1, 0x00699490, 0x00ab06d2 },
-   { 0x80400040, 0xd43045b1, 0x00699430, 0x00ab06f0 },
-   { 0x80400040, 0xd4b045b1, 0x006994b0, 0x00ab06f2 },
-   { 0x00000040, 0x220a3d8c, 0x0000020a, 0x00080008 },
-   { 0x00110040, 0x220a3d8c, 0x0200020a, 0x00300030 },
-   { 0x01000010, 0x20003d2c, 0x02000020, 0x00060006 },
-   { 0x00000040, 0x20203d29, 0x00000020, 0x00020002 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00100001 },
-   { 0x00000040, 0x220c358c, 0x0000020c, 0x0000003a },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffc36 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x220201ec, 0x00000000, 0x01c001c0 },
-   { 0x00800401, 0x20400236, 0x01ee8000, 0x00000000 },
-   { 0x00800801, 0x20500236, 0x01ee8010, 0x00000000 },
-   { 0x00800401, 0x20600236, 0x01ee8020, 0x00000000 },
-   { 0x00800801, 0x20700236, 0x01ee8030, 0x00000000 },
-   { 0x00800401, 0x20800236, 0x01ee8040, 0x00000000 },
-   { 0x00800801, 0x20900236, 0x01ee8050, 0x00000000 },
-   { 0x00800401, 0x20a00236, 0x01ee8060, 0x00000000 },
-   { 0x00800801, 0x20b00236, 0x01ee8070, 0x00000000 },
-   { 0x00800401, 0x20c00236, 0x01ee8100, 0x00000000 },
-   { 0x00800801, 0x20d00236, 0x01ee8110, 0x00000000 },
-   { 0x00800401, 0x20e00236, 0x01ee8120, 0x00000000 },
-   { 0x00800801, 0x20f00236, 0x01ee8130, 0x00000000 },
-   { 0x00800401, 0x21000236, 0x01ee8140, 0x00000000 },
-   { 0x00800801, 0x21100236, 0x01ee8150, 0x00000000 },
-   { 0x00800401, 0x21200236, 0x01ee8160, 0x00000000 },
-   { 0x00800801, 0x21300236, 0x01ee8170, 0x00000000 },
-   { 0x00200401, 0x204001a5, 0x00450064, 0x00000000 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x000f000f },
-   { 0x01600031, 0x21401c21, 0x508d0040, 0x1218a000 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x03400340 },
-   { 0x00800401, 0x41600236, 0x00d28000, 0x00000000 },
-   { 0x00800801, 0x41610236, 0x00d28080, 0x00000000 },
-   { 0x00800401, 0x41800236, 0x00d28020, 0x00000000 },
-   { 0x00800801, 0x41810236, 0x00d280a0, 0x00000000 },
-   { 0x00800401, 0x41a00236, 0x00d28040, 0x00000000 },
-   { 0x00800801, 0x41a10236, 0x00d280c0, 0x00000000 },
-   { 0x00800401, 0x41c00236, 0x00d28060, 0x00000000 },
-   { 0x00800801, 0x41c10236, 0x00d280e0, 0x00000000 },
-   { 0x0000040c, 0x20443ca5, 0x00000044, 0x00010001 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x0007000f },
-   { 0x0a600031, 0x21601c21, 0x508d0040, 0x0a18a001 },
-   { 0x00000001, 0x21400021, 0x00000140, 0x00000000 },
-   { 0x00000001, 0x21600021, 0x00000160, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00600001, 0x20400021, 0x008d0000, 0x00000000 },
-   { 0x00000005, 0x20203e2d, 0x00000061, 0x001f001f },
-   { 0x00200009, 0x20643e2d, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00000000 },
-   { 0x01000010, 0x20003dac, 0x00000020, 0x00160016 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x01200010, 0x20003e2c, 0x0200006c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000024 },
-   { 0x00800009, 0x25403dad, 0x00050064, 0x00020002 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00180018 },
-   { 0x00200040, 0x45483dad, 0x00660548, 0x00100010 },
-   { 0x00200040, 0x45523dad, 0x00660552, 0x00100010 },
-   { 0x00400040, 0x25583dad, 0x00690558, 0x00100010 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0x00200020 },
-   { 0x00800040, 0x20a035ad, 0x00b100a0, 0x00b10540 },
-   { 0x00600040, 0x45423dad, 0x00ae0542, 0x00200020 },
-   { 0x00800040, 0x20e035ad, 0x00b100e0, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0xffe0ffe0 },
-   { 0x00800040, 0x20c035ad, 0x00b100c0, 0x00b10540 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000014 },
-   { 0x06600010, 0x20003dac, 0x02000020, 0x00030003 },
-   { 0x00000001, 0x206c0171, 0x00000000, 0x00000000 },
-   { 0x00610001, 0x208000a5, 0x02050080, 0x00000000 },
-   { 0x00610001, 0x212000a5, 0x02090100, 0x00000000 },
-   { 0x00410001, 0x211000a5, 0x02690100, 0x00000000 },
-   { 0x00200009, 0x25403dad, 0x00450064, 0x00020002 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00050540 },
-   { 0x00200040, 0x40883dad, 0x00660088, 0x00200020 },
-   { 0x00200040, 0x40923dad, 0x00660092, 0x00200020 },
-   { 0x00400040, 0x20983dad, 0x00690098, 0x00200020 },
-   { 0x00200401, 0x22080060, 0x00000000, 0x03400140 },
-   { 0x00000c01, 0x220c0060, 0x00000000, 0x04400080 },
-   { 0x00000801, 0x22040060, 0x00000000, 0x01000070 },
-   { 0x00000005, 0x203e2e29, 0x00000063, 0x00010001 },
-   { 0x00000001, 0x20200169, 0x00000000, 0x00000000 },
-   { 0x0000000c, 0x2458262d, 0x0000006d, 0x00000020 },
-   { 0x00000001, 0x210e0169, 0x00000000, 0x00010001 },
-   { 0x00000005, 0x24583dad, 0x00000458, 0x00030003 },
-   { 0x01000010, 0x200035ac, 0x0000010e, 0x00000458 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000316 },
-   { 0x01000010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00010401, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00010805, 0x245a3e2d, 0x02008800, 0x007f007f },
-   { 0x00110401, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00110805, 0x245a3e2d, 0x02008804, 0x007f007f },
-   { 0x00010005, 0x245c3e2d, 0x02008800, 0x00800080 },
-   { 0x00110005, 0x245c3e2d, 0x02008804, 0x00800080 },
-   { 0x00000009, 0x245c3dad, 0x0000045c, 0x00010001 },
-   { 0x0000000c, 0x211e362d, 0x0000006c, 0x00000020 },
-   { 0x00000040, 0x240035ac, 0x0000003e, 0x0000045c },
-   { 0x01000010, 0x20003d8c, 0x00210400, 0x00010001 },
-   { 0x01000010, 0x20003d8c, 0x02210400, 0x01000100 },
-   { 0x00000001, 0x203c01ed, 0x00000000, 0x00000000 },
-   { 0x00010001, 0x203c01ed, 0x00000000, 0x00020002 },
-   { 0x00010001, 0x203c01ed, 0x02000000, 0xfffefffe },
-   { 0x00000040, 0x20780d21, 0x0000045a, 0x0208e602 },
-   { 0x00000040, 0x20782421, 0x00000078, 0x0000045c },
-   { 0x02000005, 0x20003dac, 0x0200011e, 0x00030003 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000001c0 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00700000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c000c },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x0007000c },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00110040, 0x20441da5, 0x02000442, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c0007 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00070007 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x01600006, 0x20003dac, 0x0000044a, 0x00000000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00010040, 0x22000c20, 0x00000078, 0x00200010 },
-   { 0x00110040, 0x22000c20, 0x00000078, 0x00300010 },
-   { 0x00010001, 0x20480061, 0x00000000, 0x00030009 },
-   { 0x00110001, 0x20480061, 0x00000000, 0x00040009 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001a },
-   { 0x00600001, 0x26220231, 0x008d05c0, 0x00000000 },
-   { 0x00600401, 0x26120231, 0x008d05b8, 0x00000000 },
-   { 0x00600801, 0x26020231, 0x008d05b0, 0x00000000 },
-   { 0x00600401, 0x25f20231, 0x008d05a8, 0x00000000 },
-   { 0x00600801, 0x25e20231, 0x008d05a0, 0x00000000 },
-   { 0x00600401, 0x25d20231, 0x008d0598, 0x00000000 },
-   { 0x00600801, 0x25c20231, 0x008d0590, 0x00000000 },
-   { 0x00600401, 0x25b20231, 0x008d0588, 0x00000000 },
-   { 0x00600801, 0x25a20231, 0x008d0580, 0x00000000 },
-   { 0x00600401, 0x25920231, 0x008d0578, 0x00000000 },
-   { 0x00600801, 0x25820231, 0x008d0570, 0x00000000 },
-   { 0x00600001, 0x25720231, 0x008d0568, 0x00000000 },
-   { 0x00600001, 0x25620231, 0x008d0560, 0x00000000 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00810001, 0xbc000229, 0x02ad8000, 0x00000000 },
-   { 0x00810001, 0xbc200229, 0x02ad8020, 0x00000000 },
-   { 0x00810001, 0xbc400229, 0x02ad8040, 0x00000000 },
-   { 0x00810001, 0xbc600229, 0x02ad8060, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000012a },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000066 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000064 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04a00480 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00a02040, 0x2400462c, 0x00ad8000, 0x00ad8005 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8001, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8002, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8003, 0x00140014 },
-   { 0x00a02048, 0xb8003e2d, 0x00ad8004, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8040, 0x00ad8045 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8041, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8042, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8043, 0x00140014 },
-   { 0x00a02048, 0xb8403e2d, 0x00ad8044, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8080, 0x00ad8085 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8081, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8082, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8083, 0x00140014 },
-   { 0x00a02048, 0xb8803e2d, 0x00ad8084, 0xfffbfffb },
-   { 0x00600040, 0x2400462c, 0x008d80c0, 0x008d80c5 },
-   { 0x00600048, 0x24003e2c, 0x008d80c1, 0xfffbfffb },
-   { 0x00600048, 0x24003e2c, 0x008d80c2, 0x00140014 },
-   { 0x00600048, 0x24003e2c, 0x008d80c3, 0x00140014 },
-   { 0x00600048, 0xb8c03e2d, 0x008d80c4, 0xfffbfffb },
-   { 0x00000401, 0x22000060, 0x00000000, 0x04a00480 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04a00490 },
-   { 0x00010802, 0x220c2d28, 0x00000454, 0x04800480 },
-   { 0x00a02040, 0x24003dac, 0x00b18000, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8800, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8820, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18020, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8820, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8840, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18040, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x000a000a },
-   { 0x00a02040, 0x24003dac, 0x00b18040, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18060, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8860, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8880, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18080, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8880, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed88a0, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000000b4 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000004c },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000004a },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010002, 0x220c2d28, 0x02000454, 0x04800480 },
-   { 0x00800040, 0x24003e2c, 0x01ed8000, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8001, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8021, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8002, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8022, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8003, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8023, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8004, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8024, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8005, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8025, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00800040, 0x24003e2c, 0x01ed8040, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8060, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8041, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8061, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8042, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8062, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8043, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8063, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8044, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8064, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8045, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8065, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000042 },
-   { 0x00200401, 0x22000128, 0x0066044c, 0x00000000 },
-   { 0x00200c01, 0x22040128, 0x0045044e, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x03400010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220c0168, 0x02000000, 0x04800480 },
-   { 0x00a02040, 0x24003e2c, 0x00ad83e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8be0, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8800, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8800, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8820, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00a02040, 0x24003e2c, 0x00ad8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8040, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8840, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8860, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8060, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8860, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8880, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000001c },
-   { 0x00200401, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x01200010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01200010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00210040, 0x22002d08, 0x00450200, 0x00010001 },
-   { 0x00210040, 0x22002d08, 0x02450200, 0x00100010 },
-   { 0x00800001, 0xb8000229, 0x01ed8000, 0x00000000 },
-   { 0x00800001, 0xb8200229, 0x01ed8020, 0x00000000 },
-   { 0x00800001, 0xb8400229, 0x01ed8040, 0x00000000 },
-   { 0x00800001, 0xb8600229, 0x01ed8060, 0x00000000 },
-   { 0x80800042, 0xd8004631, 0x00d29800, 0x00d20480 },
-   { 0x80800042, 0xd8204631, 0x00d29820, 0x00d204a0 },
-   { 0x80800042, 0xd8404631, 0x00d29840, 0x00d204c0 },
-   { 0x80800042, 0xd8604631, 0x00d29860, 0x00d204e0 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000c01, 0x220201e8, 0x00000000, 0x07100710 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00200040, 0x244c3d09, 0x00450200, 0x00100010 },
-   { 0x00800041, 0x24002628, 0x00ad8000, 0x00000540 },
-   { 0x00800041, 0x24202628, 0x00ad8020, 0x00000540 },
-   { 0x00800048, 0x24002628, 0x00ad8002, 0x00000542 },
-   { 0x00800048, 0x24202628, 0x00ad8022, 0x00000542 },
-   { 0x00200001, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00800048, 0x24002628, 0x01ed8000, 0x00000544 },
-   { 0x00800048, 0x24202628, 0x01ed8020, 0x00000544 },
-   { 0x00800048, 0xbc002629, 0x01ed8002, 0x00000546 },
-   { 0x00801048, 0xbc202629, 0x01ed8022, 0x00000546 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000128 },
-   { 0x00000001, 0x20220169, 0x00000000, 0x00040004 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00500000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x00080008 },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00030008 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x00000040, 0x22000c20, 0x00000078, 0x00100010 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00000001, 0x20480061, 0x00000000, 0x00020005 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00410001, 0xbc000229, 0x02698000, 0x00000000 },
-   { 0x00410001, 0xbc100229, 0x02698010, 0x00000000 },
-   { 0x00410001, 0xbc200229, 0x02698020, 0x00000000 },
-   { 0x00410001, 0xbc300229, 0x02698030, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000000be },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000042 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04d004c0 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00802040, 0x2400462c, 0x00a98000, 0x00a98005 },
-   { 0x00802048, 0x24003e2c, 0x00a98001, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98002, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98003, 0x00140014 },
-   { 0x00802048, 0xb8003e2d, 0x00a98004, 0xfffbfffb },
-   { 0x00802040, 0x2400462c, 0x00a98040, 0x00a98045 },
-   { 0x00802048, 0x24003e2c, 0x00a98041, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98042, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98043, 0x00140014 },
-   { 0x00802048, 0xb8203e2d, 0x00a98044, 0xfffbfffb },
-   { 0x00400040, 0x2400462c, 0x00698080, 0x00698085 },
-   { 0x00400048, 0x24003e2c, 0x00698081, 0xfffbfffb },
-   { 0x00400048, 0x24003e2c, 0x00698082, 0x00140014 },
-   { 0x00400048, 0x24003e2c, 0x00698083, 0x00140014 },
-   { 0x00400048, 0xb8403e2d, 0x00698084, 0xfffbfffb },
-   { 0x00000401, 0x220c0060, 0x00000000, 0x04e004d0 },
-   { 0x00000c01, 0x22000060, 0x00000000, 0x04d004c8 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04e004d8 },
-   { 0x00000801, 0x22080060, 0x00000000, 0x04f004e8 },
-   { 0x00800040, 0x24003dac, 0x00b104c0, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x00b104e0, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed9800, 0x00140014 },
-   { 0x00010001, 0x220c0168, 0x00000000, 0x05400540 },
-   { 0x00110001, 0x220c0168, 0x00000000, 0x04c004c0 },
-   { 0x00800048, 0x24003dac, 0x01e98000, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01e98020, 0x00010001 },
-   { 0x00800048, 0x24003dac, 0x01e98800, 0x00140014 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000060 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000022 },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010001, 0x220e0168, 0x02000000, 0x05400540 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x00800040, 0x24003e2c, 0x01e98000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98001, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98002, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98003, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98004, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98005, 0x00010001 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x03600010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x00400401, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x00400840, 0x22083d2c, 0x0069044c, 0x00100010 },
-   { 0x00610040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x01e983e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e993e0, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e99000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e99020, 0x00010001 },
-   { 0x00000001, 0x220e0168, 0x00000000, 0x05400540 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x00400001, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x01400010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01400010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00010001 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00100010 },
-   { 0x00800001, 0x25400229, 0x01e98000, 0x00000000 },
-   { 0x80800042, 0x45404631, 0x00d20540, 0x00d204c0 },
-   { 0x00000001, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x00400001, 0xd8000231, 0x008a0540, 0x00000000 },
-   { 0x00400001, 0xd8100231, 0x008a0548, 0x00000000 },
-   { 0x00400001, 0xd8200231, 0x008a0550, 0x00000000 },
-   { 0x00400001, 0xd8300231, 0x008a0558, 0x00000000 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00600041, 0x24002628, 0x00898000, 0x00000540 },
-   { 0x00600048, 0x24002628, 0x00898002, 0x00000542 },
-   { 0x00600048, 0x24002628, 0x00898008, 0x00000544 },
-   { 0x00600048, 0x2540262d, 0x0089800a, 0x00000546 },
-   { 0x00400401, 0xbc0001a9, 0x00690540, 0x00000000 },
-   { 0x00400801, 0xbc1001a9, 0x00690548, 0x00000000 },
-   { 0x01000010, 0x20003d2c, 0x00000022, 0x00030003 },
-   { 0x01000040, 0x20223d29, 0x02000022, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00080008 },
-   { 0x00110040, 0x24540c21, 0x00000454, 0x00080008 },
-   { 0x00010040, 0x24540c21, 0x00000454, 0x00180038 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffee4 },
-   { 0x01800010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0xffe0ffe0 },
-   { 0x00010001, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00110001, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00000001, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00800040, 0x24003dac, 0x00b19c00, 0x00200020 },
-   { 0x00800040, 0x24203dac, 0x00b19c20, 0x00200020 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00060006 },
-   { 0x8080000c, 0xdc203d91, 0x00b10420, 0x00060006 },
-   { 0x02000040, 0x210e3d29, 0x0200010e, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00040004 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffce0 },
-   { 0x01000005, 0x25643e2d, 0x00000060, 0x00c000c0 },
-   { 0x01000010, 0x20003dac, 0x02000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00a02001, 0x46400231, 0x00d20780, 0x00000000 },
-   { 0x00a02001, 0x46800231, 0x00d207c0, 0x00000000 },
-   { 0x00a02001, 0x46c00231, 0x00d20480, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000007e },
-   { 0x80a02042, 0x46404631, 0x00d20640, 0x00d20780 },
-   { 0x80a02042, 0x46804631, 0x00d20680, 0x00d207c0 },
-   { 0x80a02042, 0x46c04631, 0x00d206c0, 0x00d20480 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000010, 0x20003dac, 0x02000564, 0x00800080 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffe4 },
-   { 0x00200401, 0x256801ed, 0x00000000, 0x00200020 },
-   { 0x00200801, 0x256c01ed, 0x00000000, 0x00060006 },
-   { 0x00400001, 0x258001ed, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x45a001ad, 0x00058c00, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000028 },
-   { 0x02600005, 0x20006e28, 0x02008c0c, 0x88848421 },
-   { 0x0220000c, 0x25663dad, 0x00000458, 0x00010001 },
-   { 0x0000000c, 0x25643dad, 0x00000564, 0x00060006 },
-   { 0x00310001, 0x25c401ad, 0x00000458, 0x00000000 },
-   { 0x00210001, 0x25c00061, 0x00000000, 0x00010001 },
-   { 0x00310040, 0x25c03dad, 0x004545c4, 0x00010001 },
-   { 0x00610001, 0x25a00061, 0x02000000, 0x00000080 },
-   { 0x00710001, 0x45a002ad, 0x02ae8c00, 0x00000000 },
-   { 0x00710001, 0x45a202ad, 0x02ae8c01, 0x00000000 },
-   { 0x00800041, 0x25a035ad, 0x00b105a0, 0x000905c0 },
-   { 0x01200010, 0x20003e2c, 0x0245006e, 0x00000000 },
-   { 0x00310009, 0x244c45ad, 0x02000564, 0x0045006e },
-   { 0x00210001, 0x244c01ed, 0x02000000, 0x00000000 },
-   { 0x0031000c, 0x244c3dad, 0x0245044c, 0x00010001 },
-   { 0x00200009, 0x256835ad, 0x0045044c, 0x00000566 },
-   { 0x00210040, 0x256835ad, 0x02450568, 0x00000566 },
-   { 0x00200040, 0x256c362d, 0x0045006e, 0x00000566 },
-   { 0x00400040, 0x240035ac, 0x00ab05a2, 0x00ab05a6 },
-   { 0x00400040, 0x2400358c, 0x00690400, 0x00000566 },
-   { 0x0040000c, 0x2580358d, 0x00690400, 0x00000566 },
-   { 0x00800041, 0x2400362c, 0x00d20640, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d20660, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d20780, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207a0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x464035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x466035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d20680, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d206a0, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d207c0, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207e0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x468035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x46a035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d206c0, 0x000705a8 },
-   { 0x00800041, 0x2420362c, 0x00d206e0, 0x000705a8 },
-   { 0x00800048, 0x2400362c, 0x00d20480, 0x000705ac },
-   { 0x00800048, 0x2420362c, 0x00d204a0, 0x000705ac },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x0000056a },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x0000056a },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056e },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056e },
-   { 0x80800040, 0x46c035b1, 0x00b104c0, 0x00050582 },
-   { 0x80800040, 0x46e035b1, 0x00b104e0, 0x00050582 },
-   { 0x01800005, 0x20003d2c, 0x02000020, 0x00020002 },
-   { 0x80800040, 0xd00045b1, 0x00b19000, 0x00d20640 },
-   { 0x80800040, 0xd02045b1, 0x00b19020, 0x00d20660 },
-   { 0x80800040, 0xd04045b1, 0x00b19040, 0x00d20680 },
-   { 0x80800040, 0xd06045b1, 0x00b19060, 0x00d206a0 },
-   { 0x00000040, 0x22083d8c, 0x00000208, 0x00800080 },
-   { 0x80400040, 0xd40045b1, 0x00699400, 0x00ab06c0 },
-   { 0x80400040, 0xd48045b1, 0x00699480, 0x00ab06c2 },
-   { 0x80400040, 0xd42045b1, 0x00699420, 0x00ab06e0 },
-   { 0x80400040, 0xd4a045b1, 0x006994a0, 0x00ab06e2 },
-   { 0x80400040, 0xd41045b1, 0x00699410, 0x00ab06d0 },
-   { 0x80400040, 0xd49045b1, 0x00699490, 0x00ab06d2 },
-   { 0x80400040, 0xd43045b1, 0x00699430, 0x00ab06f0 },
-   { 0x80400040, 0xd4b045b1, 0x006994b0, 0x00ab06f2 },
-   { 0x00000040, 0x220a3d8c, 0x0000020a, 0x00080008 },
-   { 0x00110040, 0x220a3d8c, 0x0200020a, 0x00300030 },
-   { 0x01000010, 0x20003d2c, 0x02000020, 0x00060006 },
-   { 0x00000040, 0x20203d29, 0x00000020, 0x00020002 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00100001 },
-   { 0x00000040, 0x220c358c, 0x0000020c, 0x0000003a },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffc1e },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x220201ec, 0x00000000, 0x01c001c0 },
-   { 0x00800401, 0x20400236, 0x01ee8000, 0x00000000 },
-   { 0x00800801, 0x20500236, 0x01ee8010, 0x00000000 },
-   { 0x00800401, 0x20600236, 0x01ee8020, 0x00000000 },
-   { 0x00800801, 0x20700236, 0x01ee8030, 0x00000000 },
-   { 0x00800401, 0x20800236, 0x01ee8040, 0x00000000 },
-   { 0x00800801, 0x20900236, 0x01ee8050, 0x00000000 },
-   { 0x00800401, 0x20a00236, 0x01ee8060, 0x00000000 },
-   { 0x00800801, 0x20b00236, 0x01ee8070, 0x00000000 },
-   { 0x00800401, 0x20c00236, 0x01ee8100, 0x00000000 },
-   { 0x00800801, 0x20d00236, 0x01ee8110, 0x00000000 },
-   { 0x00800401, 0x20e00236, 0x01ee8120, 0x00000000 },
-   { 0x00800801, 0x20f00236, 0x01ee8130, 0x00000000 },
-   { 0x00800401, 0x21000236, 0x01ee8140, 0x00000000 },
-   { 0x00800801, 0x21100236, 0x01ee8150, 0x00000000 },
-   { 0x00800401, 0x21200236, 0x01ee8160, 0x00000000 },
-   { 0x00800801, 0x21300236, 0x01ee8170, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x1218a600 },
-   { 0x00200401, 0x204001a5, 0x00450064, 0x00000000 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x000f000f },
-   { 0x01600031, 0x21400021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x03400340 },
-   { 0x00800401, 0x41600236, 0x00d28000, 0x00000000 },
-   { 0x00800801, 0x41610236, 0x00d28080, 0x00000000 },
-   { 0x00800401, 0x41800236, 0x00d28020, 0x00000000 },
-   { 0x00800801, 0x41810236, 0x00d280a0, 0x00000000 },
-   { 0x00800401, 0x41a00236, 0x00d28040, 0x00000000 },
-   { 0x00800801, 0x41a10236, 0x00d280c0, 0x00000000 },
-   { 0x00800401, 0x41c00236, 0x00d28060, 0x00000000 },
-   { 0x00800801, 0x41c10236, 0x00d280e0, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x0a18a601 },
-   { 0x0000040c, 0x20443ca5, 0x00000044, 0x00010001 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x0007000f },
-   { 0x0a600031, 0x21600021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x21400021, 0x00000140, 0x00000000 },
-   { 0x00000001, 0x21600021, 0x00000160, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0000, 0x00000000 },
-   { 0x00000005, 0x20203e2d, 0x00000061, 0x001f001f },
-   { 0x00200009, 0x20643e2d, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00000000 },
-   { 0x01000010, 0x20003dac, 0x00000020, 0x00160016 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x01200010, 0x20003e2c, 0x0200006c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000024 },
-   { 0x00800009, 0x25403dad, 0x00050064, 0x00020002 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00180018 },
-   { 0x00200040, 0x45483dad, 0x00660548, 0x00100010 },
-   { 0x00200040, 0x45523dad, 0x00660552, 0x00100010 },
-   { 0x00400040, 0x25583dad, 0x00690558, 0x00100010 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0x00200020 },
-   { 0x00800040, 0x20a035ad, 0x00b100a0, 0x00b10540 },
-   { 0x00600040, 0x45423dad, 0x00ae0542, 0x00200020 },
-   { 0x00800040, 0x20e035ad, 0x00b100e0, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0xffe0ffe0 },
-   { 0x00800040, 0x20c035ad, 0x00b100c0, 0x00b10540 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000014 },
-   { 0x06600010, 0x20003dac, 0x02000020, 0x00030003 },
-   { 0x00000001, 0x206c0171, 0x00000000, 0x00000000 },
-   { 0x00610001, 0x208000a5, 0x02050080, 0x00000000 },
-   { 0x00610001, 0x212000a5, 0x02090100, 0x00000000 },
-   { 0x00410001, 0x211000a5, 0x02690100, 0x00000000 },
-   { 0x00200009, 0x25403dad, 0x00450064, 0x00020002 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00050540 },
-   { 0x00200040, 0x40883dad, 0x00660088, 0x00200020 },
-   { 0x00200040, 0x40923dad, 0x00660092, 0x00200020 },
-   { 0x00400040, 0x20983dad, 0x00690098, 0x00200020 },
-   { 0x00200401, 0x22080060, 0x00000000, 0x03400140 },
-   { 0x00000c01, 0x220c0060, 0x00000000, 0x04400080 },
-   { 0x00000801, 0x22040060, 0x00000000, 0x01000070 },
-   { 0x02000005, 0x20002e28, 0x00000061, 0x00400040 },
-   { 0x00010005, 0x203e2e29, 0x00000063, 0x00010001 },
-   { 0x00110001, 0x203e0169, 0x00000000, 0x00030003 },
-   { 0x00000001, 0x20200169, 0x00000000, 0x00000000 },
-   { 0x0000000c, 0x2458262d, 0x0000006d, 0x00000020 },
-   { 0x00000001, 0x210e0169, 0x00000000, 0x00010001 },
-   { 0x00000005, 0x24583dad, 0x00000458, 0x00030003 },
-   { 0x01000010, 0x200035ac, 0x0000010e, 0x00000458 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000031a },
-   { 0x01000010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00010401, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00010805, 0x245a3e2d, 0x02008800, 0x007f007f },
-   { 0x00110401, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00110805, 0x245a3e2d, 0x02008804, 0x007f007f },
-   { 0x00010005, 0x245c3e2d, 0x02008800, 0x00800080 },
-   { 0x00110005, 0x245c3e2d, 0x02008804, 0x00800080 },
-   { 0x00000009, 0x245c3dad, 0x0000045c, 0x00010001 },
-   { 0x0000000c, 0x211e362d, 0x0000006c, 0x00000020 },
-   { 0x00000040, 0x240035ac, 0x0000003e, 0x0000045c },
-   { 0x01000010, 0x20003d8c, 0x00210400, 0x00010001 },
-   { 0x01000010, 0x20003d8c, 0x02210400, 0x01000100 },
-   { 0x00000001, 0x203c01ed, 0x00000000, 0x00000000 },
-   { 0x00010001, 0x203c01ed, 0x00000000, 0x00020002 },
-   { 0x00010001, 0x203c01ed, 0x02000000, 0xfffefffe },
-   { 0x02000005, 0x20002e28, 0x00000061, 0x00400040 },
-   { 0x00010040, 0x244c0d21, 0x0000045a, 0x0208e602 },
-   { 0x00110040, 0x20780d21, 0x0000045a, 0x0208a002 },
-   { 0x00010040, 0x20782421, 0x0000044c, 0x0000045c },
-   { 0x02000005, 0x20003dac, 0x0200011e, 0x00030003 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000001c0 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00700000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c000c },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x0007000c },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00110040, 0x20441da5, 0x02000442, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c0007 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00070007 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x01600006, 0x20003dac, 0x0000044a, 0x00000000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00010040, 0x22000c20, 0x00000078, 0x00200010 },
-   { 0x00110040, 0x22000c20, 0x00000078, 0x00300010 },
-   { 0x00010001, 0x20480061, 0x00000000, 0x00030009 },
-   { 0x00110001, 0x20480061, 0x00000000, 0x00040009 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001a },
-   { 0x00600001, 0x26220231, 0x008d05c0, 0x00000000 },
-   { 0x00600401, 0x26120231, 0x008d05b8, 0x00000000 },
-   { 0x00600801, 0x26020231, 0x008d05b0, 0x00000000 },
-   { 0x00600401, 0x25f20231, 0x008d05a8, 0x00000000 },
-   { 0x00600801, 0x25e20231, 0x008d05a0, 0x00000000 },
-   { 0x00600401, 0x25d20231, 0x008d0598, 0x00000000 },
-   { 0x00600801, 0x25c20231, 0x008d0590, 0x00000000 },
-   { 0x00600401, 0x25b20231, 0x008d0588, 0x00000000 },
-   { 0x00600801, 0x25a20231, 0x008d0580, 0x00000000 },
-   { 0x00600401, 0x25920231, 0x008d0578, 0x00000000 },
-   { 0x00600801, 0x25820231, 0x008d0570, 0x00000000 },
-   { 0x00600001, 0x25720231, 0x008d0568, 0x00000000 },
-   { 0x00600001, 0x25620231, 0x008d0560, 0x00000000 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00810001, 0xbc000229, 0x02ad8000, 0x00000000 },
-   { 0x00810001, 0xbc200229, 0x02ad8020, 0x00000000 },
-   { 0x00810001, 0xbc400229, 0x02ad8040, 0x00000000 },
-   { 0x00810001, 0xbc600229, 0x02ad8060, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000012a },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000066 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000064 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04a00480 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00a02040, 0x2400462c, 0x00ad8000, 0x00ad8005 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8001, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8002, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8003, 0x00140014 },
-   { 0x00a02048, 0xb8003e2d, 0x00ad8004, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8040, 0x00ad8045 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8041, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8042, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8043, 0x00140014 },
-   { 0x00a02048, 0xb8403e2d, 0x00ad8044, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8080, 0x00ad8085 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8081, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8082, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8083, 0x00140014 },
-   { 0x00a02048, 0xb8803e2d, 0x00ad8084, 0xfffbfffb },
-   { 0x00600040, 0x2400462c, 0x008d80c0, 0x008d80c5 },
-   { 0x00600048, 0x24003e2c, 0x008d80c1, 0xfffbfffb },
-   { 0x00600048, 0x24003e2c, 0x008d80c2, 0x00140014 },
-   { 0x00600048, 0x24003e2c, 0x008d80c3, 0x00140014 },
-   { 0x00600048, 0xb8c03e2d, 0x008d80c4, 0xfffbfffb },
-   { 0x00000401, 0x22000060, 0x00000000, 0x04a00480 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04a00490 },
-   { 0x00010802, 0x220c2d28, 0x00000454, 0x04800480 },
-   { 0x00a02040, 0x24003dac, 0x00b18000, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8800, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8820, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18020, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8820, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8840, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18040, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x000a000a },
-   { 0x00a02040, 0x24003dac, 0x00b18040, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18060, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8860, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8880, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18080, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8880, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed88a0, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000000b4 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000004c },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000004a },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010002, 0x220c2d28, 0x02000454, 0x04800480 },
-   { 0x00800040, 0x24003e2c, 0x01ed8000, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8001, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8021, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8002, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8022, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8003, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8023, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8004, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8024, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8005, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8025, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00800040, 0x24003e2c, 0x01ed8040, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8060, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8041, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8061, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8042, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8062, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8043, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8063, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8044, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8064, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8045, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8065, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000042 },
-   { 0x00200401, 0x22000128, 0x0066044c, 0x00000000 },
-   { 0x00200c01, 0x22040128, 0x0045044e, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x03400010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220c0168, 0x02000000, 0x04800480 },
-   { 0x00a02040, 0x24003e2c, 0x00ad83e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8be0, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8800, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8800, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8820, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00a02040, 0x24003e2c, 0x00ad8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8040, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8840, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8860, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8060, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8860, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8880, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000001c },
-   { 0x00200401, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x01200010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01200010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00210040, 0x22002d08, 0x00450200, 0x00010001 },
-   { 0x00210040, 0x22002d08, 0x02450200, 0x00100010 },
-   { 0x00800001, 0xb8000229, 0x01ed8000, 0x00000000 },
-   { 0x00800001, 0xb8200229, 0x01ed8020, 0x00000000 },
-   { 0x00800001, 0xb8400229, 0x01ed8040, 0x00000000 },
-   { 0x00800001, 0xb8600229, 0x01ed8060, 0x00000000 },
-   { 0x80800042, 0xd8004631, 0x00d29800, 0x00d20480 },
-   { 0x80800042, 0xd8204631, 0x00d29820, 0x00d204a0 },
-   { 0x80800042, 0xd8404631, 0x00d29840, 0x00d204c0 },
-   { 0x80800042, 0xd8604631, 0x00d29860, 0x00d204e0 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000c01, 0x220201e8, 0x00000000, 0x07100710 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00200040, 0x244c3d09, 0x00450200, 0x00100010 },
-   { 0x00800041, 0x24002628, 0x00ad8000, 0x00000540 },
-   { 0x00800041, 0x24202628, 0x00ad8020, 0x00000540 },
-   { 0x00800048, 0x24002628, 0x00ad8002, 0x00000542 },
-   { 0x00800048, 0x24202628, 0x00ad8022, 0x00000542 },
-   { 0x00200001, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00800048, 0x24002628, 0x01ed8000, 0x00000544 },
-   { 0x00800048, 0x24202628, 0x01ed8020, 0x00000544 },
-   { 0x00800048, 0xbc002629, 0x01ed8002, 0x00000546 },
-   { 0x00801048, 0xbc202629, 0x01ed8022, 0x00000546 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000128 },
-   { 0x00000001, 0x20220169, 0x00000000, 0x00040004 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00500000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x00080008 },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00030008 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x00000040, 0x22000c20, 0x00000078, 0x00100010 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00000001, 0x20480061, 0x00000000, 0x00020005 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00410001, 0xbc000229, 0x02698000, 0x00000000 },
-   { 0x00410001, 0xbc100229, 0x02698010, 0x00000000 },
-   { 0x00410001, 0xbc200229, 0x02698020, 0x00000000 },
-   { 0x00410001, 0xbc300229, 0x02698030, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000000be },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000042 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04d004c0 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00802040, 0x2400462c, 0x00a98000, 0x00a98005 },
-   { 0x00802048, 0x24003e2c, 0x00a98001, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98002, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98003, 0x00140014 },
-   { 0x00802048, 0xb8003e2d, 0x00a98004, 0xfffbfffb },
-   { 0x00802040, 0x2400462c, 0x00a98040, 0x00a98045 },
-   { 0x00802048, 0x24003e2c, 0x00a98041, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98042, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98043, 0x00140014 },
-   { 0x00802048, 0xb8203e2d, 0x00a98044, 0xfffbfffb },
-   { 0x00400040, 0x2400462c, 0x00698080, 0x00698085 },
-   { 0x00400048, 0x24003e2c, 0x00698081, 0xfffbfffb },
-   { 0x00400048, 0x24003e2c, 0x00698082, 0x00140014 },
-   { 0x00400048, 0x24003e2c, 0x00698083, 0x00140014 },
-   { 0x00400048, 0xb8403e2d, 0x00698084, 0xfffbfffb },
-   { 0x00000401, 0x220c0060, 0x00000000, 0x04e004d0 },
-   { 0x00000c01, 0x22000060, 0x00000000, 0x04d004c8 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04e004d8 },
-   { 0x00000801, 0x22080060, 0x00000000, 0x04f004e8 },
-   { 0x00800040, 0x24003dac, 0x00b104c0, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x00b104e0, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed9800, 0x00140014 },
-   { 0x00010001, 0x220c0168, 0x00000000, 0x05400540 },
-   { 0x00110001, 0x220c0168, 0x00000000, 0x04c004c0 },
-   { 0x00800048, 0x24003dac, 0x01e98000, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01e98020, 0x00010001 },
-   { 0x00800048, 0x24003dac, 0x01e98800, 0x00140014 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000060 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000022 },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010001, 0x220e0168, 0x02000000, 0x05400540 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x00800040, 0x24003e2c, 0x01e98000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98001, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98002, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98003, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98004, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98005, 0x00010001 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x03600010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x00400401, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x00400840, 0x22083d2c, 0x0069044c, 0x00100010 },
-   { 0x00610040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x01e983e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e993e0, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e99000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e99020, 0x00010001 },
-   { 0x00000001, 0x220e0168, 0x00000000, 0x05400540 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x00400001, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x01400010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01400010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00010001 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00100010 },
-   { 0x00800001, 0x25400229, 0x01e98000, 0x00000000 },
-   { 0x80800042, 0x45404631, 0x00d20540, 0x00d204c0 },
-   { 0x00000001, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x00400001, 0xd8000231, 0x008a0540, 0x00000000 },
-   { 0x00400001, 0xd8100231, 0x008a0548, 0x00000000 },
-   { 0x00400001, 0xd8200231, 0x008a0550, 0x00000000 },
-   { 0x00400001, 0xd8300231, 0x008a0558, 0x00000000 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00600041, 0x24002628, 0x00898000, 0x00000540 },
-   { 0x00600048, 0x24002628, 0x00898002, 0x00000542 },
-   { 0x00600048, 0x24002628, 0x00898008, 0x00000544 },
-   { 0x00600048, 0x2540262d, 0x0089800a, 0x00000546 },
-   { 0x00400401, 0xbc0001a9, 0x00690540, 0x00000000 },
-   { 0x00400801, 0xbc1001a9, 0x00690548, 0x00000000 },
-   { 0x01000010, 0x20003d2c, 0x00000022, 0x00030003 },
-   { 0x01000040, 0x20223d29, 0x02000022, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00080008 },
-   { 0x00110040, 0x24540c21, 0x00000454, 0x00080008 },
-   { 0x00010040, 0x24540c21, 0x00000454, 0x00180038 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffee4 },
-   { 0x01800010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0xffe0ffe0 },
-   { 0x00010001, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00110001, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00000001, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00800040, 0x24003dac, 0x00b19c00, 0x00200020 },
-   { 0x00800040, 0x24203dac, 0x00b19c20, 0x00200020 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00060006 },
-   { 0x8080000c, 0xdc203d91, 0x00b10420, 0x00060006 },
-   { 0x02000040, 0x210e3d29, 0x0200010e, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00040004 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffcdc },
-   { 0x01000005, 0x25643e2d, 0x00000060, 0x00c000c0 },
-   { 0x01000010, 0x20003dac, 0x02000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00a02001, 0x46400231, 0x00d20780, 0x00000000 },
-   { 0x00a02001, 0x46800231, 0x00d207c0, 0x00000000 },
-   { 0x00a02001, 0x46c00231, 0x00d20480, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000007e },
-   { 0x80a02042, 0x46404631, 0x00d20640, 0x00d20780 },
-   { 0x80a02042, 0x46804631, 0x00d20680, 0x00d207c0 },
-   { 0x80a02042, 0x46c04631, 0x00d206c0, 0x00d20480 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000010, 0x20003dac, 0x02000564, 0x00800080 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffe4 },
-   { 0x00200401, 0x256801ed, 0x00000000, 0x00200020 },
-   { 0x00200801, 0x256c01ed, 0x00000000, 0x00060006 },
-   { 0x00400001, 0x258001ed, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x45a001ad, 0x00058c00, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000028 },
-   { 0x02600005, 0x20006e28, 0x02008c0c, 0x88848421 },
-   { 0x0220000c, 0x25663dad, 0x00000458, 0x00010001 },
-   { 0x0000000c, 0x25643dad, 0x00000564, 0x00060006 },
-   { 0x00310001, 0x25c401ad, 0x00000458, 0x00000000 },
-   { 0x00210001, 0x25c00061, 0x00000000, 0x00010001 },
-   { 0x00310040, 0x25c03dad, 0x004545c4, 0x00010001 },
-   { 0x00610001, 0x25a00061, 0x02000000, 0x00000080 },
-   { 0x00710001, 0x45a002ad, 0x02ae8c00, 0x00000000 },
-   { 0x00710001, 0x45a202ad, 0x02ae8c01, 0x00000000 },
-   { 0x00800041, 0x25a035ad, 0x00b105a0, 0x000905c0 },
-   { 0x01200010, 0x20003e2c, 0x0245006e, 0x00000000 },
-   { 0x00310009, 0x244c45ad, 0x02000564, 0x0045006e },
-   { 0x00210001, 0x244c01ed, 0x02000000, 0x00000000 },
-   { 0x0031000c, 0x244c3dad, 0x0245044c, 0x00010001 },
-   { 0x00200009, 0x256835ad, 0x0045044c, 0x00000566 },
-   { 0x00210040, 0x256835ad, 0x02450568, 0x00000566 },
-   { 0x00200040, 0x256c362d, 0x0045006e, 0x00000566 },
-   { 0x00400040, 0x240035ac, 0x00ab05a2, 0x00ab05a6 },
-   { 0x00400040, 0x2400358c, 0x00690400, 0x00000566 },
-   { 0x0040000c, 0x2580358d, 0x00690400, 0x00000566 },
-   { 0x00800041, 0x2400362c, 0x00d20640, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d20660, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d20780, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207a0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x464035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x466035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d20680, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d206a0, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d207c0, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207e0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x468035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x46a035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d206c0, 0x000705a8 },
-   { 0x00800041, 0x2420362c, 0x00d206e0, 0x000705a8 },
-   { 0x00800048, 0x2400362c, 0x00d20480, 0x000705ac },
-   { 0x00800048, 0x2420362c, 0x00d204a0, 0x000705ac },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x0000056a },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x0000056a },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056e },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056e },
-   { 0x80800040, 0x46c035b1, 0x00b104c0, 0x00050582 },
-   { 0x80800040, 0x46e035b1, 0x00b104e0, 0x00050582 },
-   { 0x01800005, 0x20003d2c, 0x02000020, 0x00020002 },
-   { 0x80800040, 0xd00045b1, 0x00b19000, 0x00d20640 },
-   { 0x80800040, 0xd02045b1, 0x00b19020, 0x00d20660 },
-   { 0x80800040, 0xd04045b1, 0x00b19040, 0x00d20680 },
-   { 0x80800040, 0xd06045b1, 0x00b19060, 0x00d206a0 },
-   { 0x00000040, 0x22083d8c, 0x00000208, 0x00800080 },
-   { 0x80400040, 0xd40045b1, 0x00699400, 0x00ab06c0 },
-   { 0x80400040, 0xd48045b1, 0x00699480, 0x00ab06c2 },
-   { 0x80400040, 0xd42045b1, 0x00699420, 0x00ab06e0 },
-   { 0x80400040, 0xd4a045b1, 0x006994a0, 0x00ab06e2 },
-   { 0x80400040, 0xd41045b1, 0x00699410, 0x00ab06d0 },
-   { 0x80400040, 0xd49045b1, 0x00699490, 0x00ab06d2 },
-   { 0x80400040, 0xd43045b1, 0x00699430, 0x00ab06f0 },
-   { 0x80400040, 0xd4b045b1, 0x006994b0, 0x00ab06f2 },
-   { 0x00000040, 0x220a3d8c, 0x0000020a, 0x00080008 },
-   { 0x00110040, 0x220a3d8c, 0x0200020a, 0x00300030 },
-   { 0x01000010, 0x20003d2c, 0x02000020, 0x00060006 },
-   { 0x00000040, 0x20203d29, 0x00000020, 0x00020002 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00100001 },
-   { 0x00000040, 0x220c358c, 0x0000020c, 0x0000003a },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffc1a },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x220201ec, 0x00000000, 0x01c001c0 },
-   { 0x00800401, 0x20400236, 0x01ee8000, 0x00000000 },
-   { 0x00800801, 0x20500236, 0x01ee8010, 0x00000000 },
-   { 0x00800401, 0x20600236, 0x01ee8020, 0x00000000 },
-   { 0x00800801, 0x20700236, 0x01ee8030, 0x00000000 },
-   { 0x00800401, 0x20800236, 0x01ee8040, 0x00000000 },
-   { 0x00800801, 0x20900236, 0x01ee8050, 0x00000000 },
-   { 0x00800401, 0x20a00236, 0x01ee8060, 0x00000000 },
-   { 0x00800801, 0x20b00236, 0x01ee8070, 0x00000000 },
-   { 0x00800401, 0x20c00236, 0x01ee8100, 0x00000000 },
-   { 0x00800801, 0x20d00236, 0x01ee8110, 0x00000000 },
-   { 0x00800401, 0x20e00236, 0x01ee8120, 0x00000000 },
-   { 0x00800801, 0x20f00236, 0x01ee8130, 0x00000000 },
-   { 0x00800401, 0x21000236, 0x01ee8140, 0x00000000 },
-   { 0x00800801, 0x21100236, 0x01ee8150, 0x00000000 },
-   { 0x00800401, 0x21200236, 0x01ee8160, 0x00000000 },
-   { 0x00800801, 0x21300236, 0x01ee8170, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x1218a000 },
-   { 0x00200401, 0x204001a5, 0x00450064, 0x00000000 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x000f000f },
-   { 0x01600031, 0x21400021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x03400340 },
-   { 0x00800401, 0x41600236, 0x00d28000, 0x00000000 },
-   { 0x00800801, 0x41610236, 0x00d28080, 0x00000000 },
-   { 0x00800401, 0x41800236, 0x00d28020, 0x00000000 },
-   { 0x00800801, 0x41810236, 0x00d280a0, 0x00000000 },
-   { 0x00800401, 0x41a00236, 0x00d28040, 0x00000000 },
-   { 0x00800801, 0x41a10236, 0x00d280c0, 0x00000000 },
-   { 0x00800401, 0x41c00236, 0x00d28060, 0x00000000 },
-   { 0x00800801, 0x41c10236, 0x00d280e0, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x0a18a001 },
-   { 0x0000040c, 0x20443ca5, 0x00000044, 0x00010001 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x0007000f },
-   { 0x0a600031, 0x21600021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x21400021, 0x00000140, 0x00000000 },
-   { 0x00000001, 0x21600021, 0x00000160, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x01000005, 0x20602d29, 0x02000042, 0x00070007 },
-   { 0x01000005, 0x20422d29, 0x00000042, 0xfff8fff8 },
-   { 0x00000001, 0x202001e9, 0x00000000, 0x100c100c },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00000009, 0x27e82d21, 0x00000040, 0x00060006 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000100 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x02600005, 0x20000c20, 0x02000090, 0x00002000 },
-   { 0x00000006, 0x20880c21, 0x00000088, 0x00200000 },
-   { 0x00200009, 0x20845529, 0x0000009c, 0x00450020 },
-   { 0x00200001, 0x40840231, 0x00450094, 0x00000000 },
-   { 0x00310001, 0x20840229, 0x02450094, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000095, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000094 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x20800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x020000d0, 0x00002000 },
-   { 0x00000006, 0x20c80c21, 0x000000c8, 0x00200000 },
-   { 0x00200009, 0x20c45529, 0x000000dc, 0x00450020 },
-   { 0x00200001, 0x40c40231, 0x004500d4, 0x00000000 },
-   { 0x00310001, 0x20c40229, 0x024500d4, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x000000d5, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x000000d4 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000110, 0x00002000 },
-   { 0x00000006, 0x21080c21, 0x00000108, 0x00200000 },
-   { 0x00200009, 0x21045529, 0x0000011c, 0x00450020 },
-   { 0x00200001, 0x41040231, 0x00450114, 0x00000000 },
-   { 0x00310001, 0x21040229, 0x02450114, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000115, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000114 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000150, 0x00002000 },
-   { 0x00000006, 0x21480c21, 0x00000148, 0x00200000 },
-   { 0x00200009, 0x21445529, 0x0000015c, 0x00450020 },
-   { 0x00200001, 0x41440231, 0x00450154, 0x00000000 },
-   { 0x00310001, 0x21440229, 0x02450154, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000155, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000154 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000190, 0x00002000 },
-   { 0x00000006, 0x21880c21, 0x00000188, 0x00200000 },
-   { 0x00200009, 0x21845529, 0x0000019c, 0x00450020 },
-   { 0x00200001, 0x41840231, 0x00450194, 0x00000000 },
-   { 0x00310001, 0x21840229, 0x02450194, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000195, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000194 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x020001d0, 0x00002000 },
-   { 0x00000006, 0x21c80c21, 0x000001c8, 0x00200000 },
-   { 0x00200009, 0x21c45529, 0x000001dc, 0x00450020 },
-   { 0x00200001, 0x41c40231, 0x004501d4, 0x00000000 },
-   { 0x00310001, 0x21c40229, 0x024501d4, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x000001d5, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x000001d4 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d01c0, 0x00000000 },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000210, 0x00002000 },
-   { 0x00000006, 0x22080c21, 0x00000208, 0x00200000 },
-   { 0x00200009, 0x22045529, 0x0000021c, 0x00450020 },
-   { 0x00200001, 0x42040231, 0x00450214, 0x00000000 },
-   { 0x00310001, 0x22040229, 0x02450214, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000215, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000214 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x22000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000250, 0x00002000 },
-   { 0x00000006, 0x22480c21, 0x00000248, 0x00200000 },
-   { 0x00200009, 0x22445529, 0x0000025c, 0x00450020 },
-   { 0x00200001, 0x42440231, 0x00450254, 0x00000000 },
-   { 0x00310001, 0x22440229, 0x02450254, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000255, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000254 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0240, 0x00000000 },
-   { 0x00802001, 0x22400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x01000040, 0x20423dad, 0x00000042, 0xfff8fff8 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d00c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000080 },
-   { 0x00802001, 0x20400022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0140, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x21680c22, 0x000007e8, 0x00000100 },
-   { 0x00802001, 0x21800022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d01c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000180 },
-   { 0x00802001, 0x20400022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0240, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000200 },
-   { 0x01000010, 0x20002da0, 0x02000060, 0x00000000 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffff00 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000040 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x00000001, 0x220400e0, 0x00000000, 0x00a00080 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02008810, 0x00002000 },
-   { 0x01000040, 0x20603dad, 0x00000060, 0xffffffff },
-   { 0x00000006, 0xa8080c21, 0x00008808, 0x00200000 },
-   { 0x00200009, 0xa8045529, 0x0000881c, 0x00450020 },
-   { 0x00200001, 0xc8040231, 0x00458814, 0x00000000 },
-   { 0x00310001, 0xa8040229, 0x02458814, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00008815, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00008814 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d8800, 0x00000000 },
-   { 0x00802001, 0xa8000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d8800, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000040 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00400040 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffda },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x01000005, 0x20602d29, 0x02000042, 0x00070007 },
-   { 0x01000005, 0x20422d29, 0x00000042, 0xfff8fff8 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00000009, 0x27e82d21, 0x00000040, 0x00060006 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000260 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x00200001, 0x20640229, 0x00450094, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000090, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000090, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000095, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000095, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000090, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x20881c21, 0x00000088, 0x00200000 },
-   { 0x00200001, 0x20840129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x20800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000090, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000009c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000009c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200009c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000090, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200009c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200009c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x20843d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x20862d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x40840231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x004500d4, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x020000d0, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x000000d0, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x000000d5, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x000000d5, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x000000d0, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x20c81c21, 0x000000c8, 0x00200000 },
-   { 0x00200001, 0x20c40129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x000000d0, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x000000dc, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x000000dc, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x020000dc, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x020000d0, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x020000dc, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x020000dc, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x20c43d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x20c62d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x40c40231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450114, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000110, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000110, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000115, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000115, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000110, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21081c21, 0x00000108, 0x00200000 },
-   { 0x00200001, 0x21040129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000110, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000011c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000011c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200011c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000110, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200011c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200011c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21043d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21062d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41040231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450154, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000150, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000150, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000155, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000155, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000150, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21481c21, 0x00000148, 0x00200000 },
-   { 0x00200001, 0x21440129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000150, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000015c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000015c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200015c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000150, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200015c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200015c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21443d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21462d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41440231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450194, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000190, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000190, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000195, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000195, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000190, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21881c21, 0x00000188, 0x00200000 },
-   { 0x00200001, 0x21840129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000190, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000019c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000019c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200019c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000190, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200019c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200019c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21843d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21862d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41840231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x004501d4, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x020001d0, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x000001d0, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x000001d5, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x000001d5, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x000001d0, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21c81c21, 0x000001c8, 0x00200000 },
-   { 0x00200001, 0x21c40129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d01c0, 0x00000000 },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x000001d0, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x000001dc, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x000001dc, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x020001dc, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x020001d0, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x020001dc, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x020001dc, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21c43d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21c62d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41c40231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450214, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000210, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000210, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000215, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000215, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000210, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x22081c21, 0x00000208, 0x00200000 },
-   { 0x00200001, 0x22040129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x22000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000210, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000021c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000021c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200021c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000210, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200021c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200021c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x22043d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x22062d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x42040231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450254, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000250, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000250, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000255, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000255, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000250, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x22481c21, 0x00000248, 0x00200000 },
-   { 0x00200001, 0x22440129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0240, 0x00000000 },
-   { 0x00802001, 0x22400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000250, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000025c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000025c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200025c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000250, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200025c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200025c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x22443d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x22462d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x42440231, 0x00660064, 0x00000000 },
-   { 0x01000040, 0x20423dad, 0x00000042, 0xfff8fff8 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d00c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000080 },
-   { 0x00802001, 0x20400022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0140, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x21680c22, 0x000007e8, 0x00000100 },
-   { 0x00802001, 0x21800022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d01c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000180 },
-   { 0x00802001, 0x20400022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0240, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000200 },
-   { 0x01000010, 0x20002da0, 0x02000060, 0x00000000 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffda0 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000006e },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x00000001, 0x220400e0, 0x00000000, 0x00a00080 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00458814, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02008810, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00008810, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00008815, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00008815, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00008810, 0x00002000 },
-   { 0x01000040, 0x20603dad, 0x02000060, 0xffffffff },
-   { 0x00000006, 0xa8080c21, 0x00008808, 0x00200000 },
-   { 0x00200001, 0xa8040129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d8800, 0x00000000 },
-   { 0x00802001, 0xa8000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000022 },
-   { 0x02600005, 0x20000d20, 0x02000066, 0x00000001 },
-   { 0x02600005, 0x20000c20, 0x00008810, 0x00004000 },
-   { 0x00000001, 0x20680129, 0x0000881c, 0x00000000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000881c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200881c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02008810, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200881c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200881c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x00000068, 0x000d0070 },
-   { 0x01000040, 0x20603dad, 0x02000060, 0x00000000 },
-   { 0x00000009, 0xa8043d09, 0x00000600, 0x000c000c },
-   { 0x00000005, 0xa8062d09, 0x00000600, 0xf000f000 },
-   { 0x00200001, 0xc8040231, 0x00660064, 0x00000000 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d8800, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000040 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00400040 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xffffffac },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x01400140 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00200020 },
-   { 0x00000001, 0x203801e2, 0x00000000, 0x00010001 },
-   { 0x00800001, 0x204001ae, 0x00b10020, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x000002a0, 0x00010001 },
-   { 0x00800031, 0x20000128, 0x608d07e0, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00020002 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc6 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffca },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00000041, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff4 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffff6 },
-   { 0x05000010, 0x200035ac, 0x00000240, 0x00000026 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffffc },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x20263d29, 0x00000036, 0x00040004 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000178 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000176 },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0288a001 },
-   { 0x01600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x03600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00000008, 0x25e83e2d, 0x00009080, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459080, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459050, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699060, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000134 },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009040, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699064, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000011e },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009042, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699068, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000110 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x00009044, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069906c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000102 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00800401, 0x23400231, 0x00a90040, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a90044, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a90048, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9004c, 0x00000000 },
-   { 0x00800001, 0x20400232, 0x002b0340, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x002b0350, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x002b0360, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x002b0370, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06082003 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000008, 0x25e83e2d, 0x00009082, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459082, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459054, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699070, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000096 },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009046, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699074, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000080 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009048, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699078, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000072 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x0000904a, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069907c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000064 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21000022, 0x008d0180, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x12082003 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00802001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0618a003 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c01, 0x27e401a1, 0x000005c2, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x02600031, 0x23401c25, 0x408d07e0, 0x02286003 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00800040, 0x2400462d, 0x00b19c00, 0x00b1d830 },
-   { 0x00800040, 0x2340462d, 0x00b19820, 0x00b1d830 },
-   { 0x00800040, 0x2360462d, 0x00b19c10, 0x00b1dc00 },
-   { 0x05810010, 0x200035ac, 0x008d2400, 0x000005d0 },
-   { 0x05810010, 0x200035ac, 0x008d2340, 0x000005d2 },
-   { 0x05810010, 0x200035ac, 0x008d2360, 0x000005d2 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x000000ca },
-   { 0x00800040, 0x2440462d, 0x00b19810, 0x00b1d830 },
-   { 0x00800040, 0x2460462d, 0x00b19c20, 0x00b1dc00 },
-   { 0x00800201, 0x24a00129, 0x00b19820, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000066 },
-   { 0x05800010, 0x200035ac, 0x028d2400, 0x000005e8 },
-   { 0x00800040, 0x2520462d, 0x00b19830, 0x00b19820 },
-   { 0x00800040, 0x2540462d, 0x00b19c00, 0x00b19c10 },
-   { 0x00000201, 0x26000108, 0x00000602, 0x00000000 },
-   { 0x05810010, 0x200035ac, 0x028d2440, 0x000005d2 },
-   { 0x05810010, 0x200035ac, 0x008d2460, 0x000005d2 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x0000001e },
-   { 0x00800040, 0x2560462d, 0x00b19810, 0x00b19800 },
-   { 0x00800040, 0x238045ad, 0x008d0520, 0x00b19c00 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19810 },
-   { 0x00800048, 0x24003dac, 0x008d0560, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x00b19c10, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xb8100231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x00b19820, 0x008d0520 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00800040, 0x2580462d, 0x00b19c20, 0x00b19c30 },
-   { 0x00800040, 0x238045ad, 0x008d0540, 0x008d04b0 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19c20 },
-   { 0x00800048, 0x24003dac, 0x008d0580, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xbc200231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x008d0540 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001005c },
-   { 0x00800201, 0x23e0022d, 0x002805d4, 0x00000000 },
-   { 0x00800201, 0x23c0022d, 0x002805d4, 0x00000000 },
-   { 0x05800010, 0x200035ac, 0x008d2440, 0x000005d2 },
-   { 0x05800010, 0x200035ac, 0x028d2460, 0x000005d2 },
-   { 0x00800040, 0x24003e2c, 0x00b19820, 0x00040004 },
-   { 0x00800048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b1dc10 },
-   { 0x00800008, 0x23403d8d, 0x00b10400, 0x00030003 },
-   { 0x00810040, 0x23e03dad, 0x008d03e0, 0x00010001 },
-   { 0x00200201, 0x25ec018d, 0x00450600, 0x00000000 },
-   { 0x00810040, 0x23e03dad, 0x028d03e0, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05800010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00800042, 0x24c0462d, 0x00b19830, 0x00b19c00 },
-   { 0x00810001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00810001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x00200201, 0x260001ac, 0x004505ec, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19830, 0x008d0340 },
-   { 0x80800040, 0x43403631, 0x00b19c00, 0x008d4340 },
-   { 0x00800001, 0xb8300231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00800040, 0x2400362c, 0x00b19810, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19820, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0360, 0x008d03c0 },
-   { 0x05800010, 0x200035ac, 0x028d0360, 0x008d43c0 },
-   { 0x00810001, 0x236001ad, 0x008d03c0, 0x00000000 },
-   { 0x00810001, 0x236001ad, 0x028d43c0, 0x00000000 },
-   { 0x00000201, 0x260201ac, 0x000005ee, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19820, 0x008d0360 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00800040, 0x2400362c, 0x00b19c20, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19c10, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0360, 0x008d03c0 },
-   { 0x05800010, 0x200035ac, 0x028d0360, 0x008d43c0 },
-   { 0x00810001, 0x236001ad, 0x008d03c0, 0x00000000 },
-   { 0x00810001, 0x236001ad, 0x028d43c0, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19c10, 0x008d0360 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x206801ed, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00030003 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc4 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffc8 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00800001, 0x240001ac, 0x00000068, 0x00000000 },
-   { 0x00000048, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff2 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00600401, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x26140061, 0x00000000, 0x01800000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000801, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00000040, 0x2078252d, 0x00000026, 0x00004280 },
-   { 0x00400001, 0x26000231, 0x00000078, 0x00000000 },
-   { 0x00600031, 0x26201c21, 0x308d0600, 0x02000002 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffffe8 },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000012 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x01400140 },
-   { 0x00000048, 0x20263dad, 0x00000036, 0x00040004 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00800001, 0x2220022d, 0x000d002c, 0x00000000 },
-   { 0x00600040, 0x22303dad, 0x008d0230, 0x00080008 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000126 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000124 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0248a002 },
-   { 0x02600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x02600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00800008, 0x2340352d, 0x00009050, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009052, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c0, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a0, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000fc },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590c8, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b0, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000ee },
-   { 0x00800008, 0x2340352d, 0x00009042, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a4, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000d8 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b4, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000ca },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00600401, 0x2340012d, 0x00890040, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x00890048, 0x00000000 },
-   { 0x00600001, 0x204001aa, 0x00270340, 0x00000000 },
-   { 0x00600001, 0x205001aa, 0x00270350, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x04082004 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00800008, 0x2340352d, 0x00009054, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009056, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c2, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00810081 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590ca, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000078 },
-   { 0x00800008, 0x2340352d, 0x00009048, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990ac, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990bc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000054 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0a082004 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00600001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0418a004 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00600401, 0x2340012d, 0x008500cc, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x0085010c, 0x00000000 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x02600031, 0x23401c25, 0x408d07e0, 0x02186004 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00600040, 0x2400462d, 0x00ae9c00, 0x00aed810 },
-   { 0x00600040, 0x2340462d, 0x00ae9800, 0x00aed810 },
-   { 0x00600040, 0x2360462d, 0x00ae9c10, 0x00aedc00 },
-   { 0x05810010, 0x200035ac, 0x008d2400, 0x000005d0 },
-   { 0x05810010, 0x200035ac, 0x008d2340, 0x000005d2 },
-   { 0x05810010, 0x200035ac, 0x008d2360, 0x000005d2 },
-   { 0x00618022, 0x34001c00, 0x00001400, 0x00000038 },
-   { 0x00618022, 0x34001c00, 0x02001400, 0x00000016 },
-   { 0x00600040, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9810 },
-   { 0x80600008, 0x43403d91, 0x008d0400, 0x00020002 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9c00 },
-   { 0x80600008, 0x43603d91, 0x008d0400, 0x00020002 },
-   { 0x00600001, 0xd8100231, 0x00ae0340, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0360, 0x00000000 },
-   { 0x00608024, 0x34001c00, 0x00001400, 0x00010020 },
-   { 0x00600201, 0x2400022c, 0x002405d4, 0x00000000 },
-   { 0x00600040, 0x23e03d8d, 0x008d0400, 0x00010001 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00040004 },
-   { 0x00600048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00aedc10 },
-   { 0x00600008, 0x23403d8d, 0x008d0400, 0x00030003 },
-   { 0x03600010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05600010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00610001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00610001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x80600040, 0x43603631, 0x00ae9810, 0x008d0340 },
-   { 0x80600040, 0x43403631, 0x00ae9c00, 0x008d4340 },
-   { 0x00600001, 0xd8100231, 0x00ae0360, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x01400140 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00200020 },
-   { 0x00000001, 0x203801e2, 0x00000000, 0x00010001 },
-   { 0x00800001, 0x204001ae, 0x00b10020, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x000002a0, 0x00010001 },
-   { 0x00800031, 0x20000128, 0x608d07e0, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00020002 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc6 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffca },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00000041, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff4 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffff6 },
-   { 0x05000010, 0x200035ac, 0x00000240, 0x00000026 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffffc },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x20263d29, 0x00000036, 0x00040004 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x0000018c },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000018a },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0288e701 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0288e601 },
-   { 0x01600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x03600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00000008, 0x25e83e2d, 0x00009080, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459080, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459050, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699060, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb8c },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009040, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699064, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb76 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009042, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699068, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb68 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x00009044, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069906c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb5a },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00800401, 0x23400231, 0x00a90040, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a90044, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a90048, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9004c, 0x00000000 },
-   { 0x00800001, 0x20400232, 0x002b0340, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x002b0350, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x002b0360, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x002b0370, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x06082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x06082603 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000008, 0x25e83e2d, 0x00009082, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459082, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459054, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699070, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffaea },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009046, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699074, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffad4 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009048, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699078, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffac6 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x0000904a, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069907c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffab8 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21000022, 0x008d0180, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x12082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x12082603 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00802001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0618a703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0618a603 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c01, 0x27e401a1, 0x000005c2, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x00010008 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x206801ed, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00030003 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc4 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffc8 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00800001, 0x240001ac, 0x00000068, 0x00000000 },
-   { 0x00000048, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff2 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00600401, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x26140061, 0x00000000, 0x01800000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000801, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00000040, 0x2078252d, 0x00000026, 0x00004280 },
-   { 0x00400001, 0x26000231, 0x00000078, 0x00000000 },
-   { 0x00600031, 0x26201c21, 0x308d0600, 0x02000002 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffffe8 },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000012 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x01400140 },
-   { 0x00000048, 0x20263dad, 0x00000036, 0x00040004 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00800001, 0x2220022d, 0x000d002c, 0x00000000 },
-   { 0x00600040, 0x22303dad, 0x008d0230, 0x00080008 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x0000013a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000138 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0248e702 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0248e602 },
-   { 0x02600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x02600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00800008, 0x2340352d, 0x00009050, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009052, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c0, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a0, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffc0c },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590c8, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b0, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffbfe },
-   { 0x00800008, 0x2340352d, 0x00009042, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a4, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffbe8 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b4, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffbda },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00600401, 0x2340012d, 0x00890040, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x00890048, 0x00000000 },
-   { 0x00600001, 0x204001aa, 0x00270340, 0x00000000 },
-   { 0x00600001, 0x205001aa, 0x00270350, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x04082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x04082604 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00800008, 0x2340352d, 0x00009054, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009056, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c2, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb92 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00810081 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590ca, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb84 },
-   { 0x00800008, 0x2340352d, 0x00009048, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990ac, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb6e },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990bc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb60 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0a082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0a082604 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00600001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0418a704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0418a604 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00600401, 0x2340012d, 0x008500cc, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x0085010c, 0x00000000 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x00010008 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00010001 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00010001 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x01400140 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00200020 },
-   { 0x00000001, 0x203801e2, 0x00000000, 0x00010001 },
-   { 0x00800001, 0x204001ae, 0x00b10020, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x000002a0, 0x00010001 },
-   { 0x00800031, 0x20000128, 0x608d07e0, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00020002 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc6 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffca },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00000041, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff4 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffff6 },
-   { 0x05000010, 0x200035ac, 0x00000240, 0x00000026 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffffc },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00400441, 0x45c03dad, 0x00000034, 0x00100010 },
-   { 0x00400841, 0x45c23dad, 0x00000036, 0x00200020 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x25e42c21, 0x000005e4, 0x00800080 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00000005, 0x202a3dad, 0x0000002a, 0xfffdfffd },
-   { 0x02000005, 0x20002d2c, 0x0200002a, 0x00020002 },
-   { 0x00000001, 0x27e80021, 0x000005e4, 0x00000000 },
-   { 0x00010040, 0x27e83c21, 0x020007e8, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000005, 0x25ec2e29, 0x00009002, 0x000a000a },
-   { 0x00000005, 0x25ea2e29, 0x00009002, 0x00060006 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000252 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000250 },
-   { 0x01000010, 0x20003d2c, 0x000005ec, 0x00080008 },
-   { 0x00000005, 0x25e03d8d, 0x00000600, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a5, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0288a001 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0288e701 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0288e601 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x00800401, 0x20400231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x20500231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x20600231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x20700231, 0x00cf0343, 0x00000000 },
-   { 0x01600010, 0x20003d2c, 0x000005ea, 0x00040004 },
-   { 0x01600010, 0x20003d2c, 0x020005ea, 0x00020002 },
-   { 0x00800001, 0x21c00229, 0x00009080, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009081, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289060, 0x00000000 },
-   { 0x00610401, 0x41c00229, 0x00009080, 0x00000000 },
-   { 0x00610801, 0x41c20229, 0x00009090, 0x00000000 },
-   { 0x00610401, 0x41e00229, 0x00009081, 0x00000000 },
-   { 0x00610801, 0x41e20229, 0x00009091, 0x00000000 },
-   { 0x00610401, 0x42000229, 0x00249060, 0x00000000 },
-   { 0x00610801, 0x42020229, 0x00249098, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00610401, 0x21c00229, 0x02009080, 0x00000000 },
-   { 0x00610801, 0x21d00229, 0x02009090, 0x00000000 },
-   { 0x00610401, 0x21e00229, 0x02009081, 0x00000000 },
-   { 0x00610801, 0x21f00229, 0x02009091, 0x00000000 },
-   { 0x00610401, 0x22000229, 0x02249060, 0x00000000 },
-   { 0x00610801, 0x22100229, 0x02249098, 0x00000000 },
-   { 0x00800008, 0x25a03d29, 0x008d01c0, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200001, 0x25d80129, 0x00459050, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x000001b4 },
-   { 0x00800008, 0x25a03e29, 0x00009084, 0x00020002 },
-   { 0x00800001, 0x21c00229, 0x00009084, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009085, 0x00000000 },
-   { 0x00000001, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000001, 0x25d80129, 0x00009040, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289064, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000019c },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x25d80129, 0x00009042, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289068, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000018e },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000001, 0x25d80129, 0x00009044, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x0028906c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000180 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00800401, 0x23400231, 0x00a90040, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a90044, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a90048, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9004c, 0x00000000 },
-   { 0x00800001, 0x20400232, 0x002b0340, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x002b0350, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x002b0360, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x002b0370, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06082003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x06082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x06082603 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000010 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x01000005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000440, 0x27e43ca5, 0x000007e4, 0xfffcfffc },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x00200000 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00010001 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffcfffc },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20400021, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000001, 0x260201ac, 0x000005e0, 0x00000000 },
-   { 0x00800008, 0x25a03e29, 0x00009082, 0x00020002 },
-   { 0x00200001, 0x25d80129, 0x00459054, 0x00000000 },
-   { 0x00800001, 0x21c00229, 0x00009082, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009083, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289070, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000050 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000a },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000d4 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05400540 },
-   { 0x00800001, 0x25000129, 0x00ad0040, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad0080, 0x00000000 },
-   { 0x00800001, 0x25400129, 0x00ad00c0, 0x00000000 },
-   { 0x00800001, 0x25600129, 0x00ad0100, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000c2 },
-   { 0x00600001, 0x20600129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20800129, 0x008d0520, 0x00000000 },
-   { 0x00600001, 0x20a00129, 0x008d0530, 0x00000000 },
-   { 0x00600001, 0x20c00129, 0x008d0540, 0x00000000 },
-   { 0x00600001, 0x20e00129, 0x008d0550, 0x00000000 },
-   { 0x00600001, 0x21000129, 0x008d0560, 0x00000000 },
-   { 0x00800008, 0x25a03e29, 0x00009092, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05400540 },
-   { 0x00800001, 0x25000129, 0x00ad0050, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad0090, 0x00000000 },
-   { 0x00800001, 0x25400129, 0x00ad00d0, 0x00000000 },
-   { 0x00800001, 0x25600129, 0x00ad0110, 0x00000000 },
-   { 0x00200001, 0x25d80129, 0x0045905c, 0x00000000 },
-   { 0x00800001, 0x21c00229, 0x00009092, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009093, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x0028909c, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000009a },
-   { 0x00600001, 0x20700129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20900129, 0x008d0520, 0x00000000 },
-   { 0x00600001, 0x20b00129, 0x008d0530, 0x00000000 },
-   { 0x00600001, 0x20d00129, 0x008d0540, 0x00000000 },
-   { 0x00600001, 0x20f00129, 0x008d0550, 0x00000000 },
-   { 0x00600001, 0x21100129, 0x008d0560, 0x00000000 },
-   { 0x00800008, 0x25a03e29, 0x00009084, 0x00020002 },
-   { 0x00800001, 0x21c00229, 0x00009084, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009085, 0x00000000 },
-   { 0x00000001, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000001, 0x25d80129, 0x00009046, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289074, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x25d80129, 0x00009048, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289078, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000068 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000001, 0x25d80129, 0x0000904a, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x0028907c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005a },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21000022, 0x008d0180, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x12082003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x12082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x12082603 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01800005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00812001, 0x20400022, 0x028d0040, 0x00000000 },
-   { 0x00912001, 0x20400022, 0x028d0080, 0x00000000 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0618a003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00010001 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0618a703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0618a603 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffcfffc },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x0000002a, 0x00020002 },
-   { 0x00000006, 0x202a3dad, 0x0000002a, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffd94 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00800040, 0x2400462d, 0x00b19c00, 0x00b1d830 },
-   { 0x00800040, 0x2340462d, 0x00b19820, 0x00b1d830 },
-   { 0x00800040, 0x2360462d, 0x00b19c10, 0x00b1dc00 },
-   { 0x05810010, 0x200025ac, 0x008d2400, 0x008d01c0 },
-   { 0x05810010, 0x200025ac, 0x008d2340, 0x008d01e0 },
-   { 0x05810010, 0x200025ac, 0x008d2360, 0x008d01e0 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x000000c8 },
-   { 0x00800040, 0x2440462d, 0x00b19810, 0x00b1d830 },
-   { 0x00800040, 0x2460462d, 0x00b19c20, 0x00b1dc00 },
-   { 0x00800201, 0x24a00129, 0x00b19820, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000066 },
-   { 0x05800010, 0x200025ac, 0x028d2400, 0x008d05a0 },
-   { 0x00800040, 0x2520462d, 0x00b19830, 0x00b19820 },
-   { 0x00800040, 0x2540462d, 0x00b19c00, 0x00b19c10 },
-   { 0x00000201, 0x26000108, 0x00000602, 0x00000000 },
-   { 0x05810010, 0x200025ac, 0x028d2440, 0x008d01e0 },
-   { 0x05810010, 0x200025ac, 0x008d2460, 0x008d01e0 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x0000001e },
-   { 0x00800040, 0x2560462d, 0x00b19810, 0x00b19800 },
-   { 0x00800040, 0x238045ad, 0x008d0520, 0x00b19c00 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19810 },
-   { 0x00800048, 0x24003dac, 0x008d0560, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x00b19c10, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xb8100231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x00b19820, 0x008d0520 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00800040, 0x2580462d, 0x00b19c20, 0x00b19c30 },
-   { 0x00800040, 0x238045ad, 0x008d0540, 0x008d04b0 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19c20 },
-   { 0x00800048, 0x24003dac, 0x008d0580, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xbc200231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x008d0540 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001005a },
-   { 0x00800001, 0x23e0012d, 0x008d0200, 0x00000000 },
-   { 0x05800010, 0x200025ac, 0x008d2440, 0x008d01e0 },
-   { 0x05800010, 0x200025ac, 0x028d2460, 0x008d01e0 },
-   { 0x00800040, 0x24003e2c, 0x00b19820, 0x00040004 },
-   { 0x00800048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b1dc10 },
-   { 0x00800008, 0x23403d8d, 0x00b10400, 0x00030003 },
-   { 0x00810040, 0x23e03dad, 0x008d03e0, 0x00010001 },
-   { 0x00200201, 0x25ec018d, 0x00450600, 0x00000000 },
-   { 0x00810040, 0x23e03dad, 0x028d03e0, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05800010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00800042, 0x24c0462d, 0x00b19830, 0x00b19c00 },
-   { 0x00810001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00810001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x00200201, 0x260001ac, 0x004505ec, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19830, 0x008d0340 },
-   { 0x80800040, 0x43403631, 0x00b19c00, 0x008d4340 },
-   { 0x00800001, 0xb8300231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00800040, 0x2400362c, 0x00b19810, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19820, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200025ac, 0x008d0360, 0x008d0200 },
-   { 0x05800010, 0x200025ac, 0x028d0360, 0x008d4200 },
-   { 0x00810001, 0x2360012d, 0x008d0200, 0x00000000 },
-   { 0x00810001, 0x2360012d, 0x028d4200, 0x00000000 },
-   { 0x00000201, 0x260201ac, 0x000005ee, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19820, 0x008d0360 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00800040, 0x2400362c, 0x00b19c20, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19c10, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200025ac, 0x008d0360, 0x008d0200 },
-   { 0x05800010, 0x200025ac, 0x028d0360, 0x008d4200 },
-   { 0x00810001, 0x2360012d, 0x008d0200, 0x00000000 },
-   { 0x00810001, 0x2360012d, 0x028d4200, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19c10, 0x008d0360 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00010001 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x206801ed, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00030003 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc4 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffc8 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00800001, 0x240001ac, 0x00000068, 0x00000000 },
-   { 0x00000048, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff2 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00600401, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x26140061, 0x00000000, 0x01800000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000801, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00000040, 0x2078252d, 0x00000026, 0x00004280 },
-   { 0x00400001, 0x26000231, 0x00000078, 0x00000000 },
-   { 0x00600031, 0x26201c21, 0x308d0600, 0x02000002 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffffe8 },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000012 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00400441, 0x45c03dad, 0x00000034, 0x00100010 },
-   { 0x00400841, 0x45c23dad, 0x00000036, 0x00200020 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x25e42c21, 0x000005e4, 0x00800080 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00000005, 0x202a3dad, 0x0000002a, 0xfffdfffd },
-   { 0x00800001, 0x2220022d, 0x000d002c, 0x00000000 },
-   { 0x00600040, 0x22303dad, 0x008d0230, 0x00080008 },
-   { 0x02000005, 0x20002d2c, 0x0200002a, 0x00020002 },
-   { 0x00000001, 0x27e80021, 0x000005e4, 0x00000000 },
-   { 0x00010040, 0x27e83c21, 0x020007e8, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000005, 0x25ec2e29, 0x00009002, 0x000a000a },
-   { 0x00000005, 0x25ea2e29, 0x00009002, 0x00060006 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000252 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000250 },
-   { 0x01000010, 0x20003d2c, 0x000005ec, 0x00080008 },
-   { 0x00000005, 0x25e03d8d, 0x00000600, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0248a002 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0248e702 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0248e602 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x00800001, 0x204001a9, 0x002e0340, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x01000010, 0x20003d2c, 0x020005ea, 0x00040004 },
-   { 0x00800008, 0x2340352d, 0x00009050, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009052, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000006a },
-   { 0x01000010, 0x20003d2c, 0x000005ea, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000012 },
-   { 0x02600005, 0x20003dac, 0x00650340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02650360, 0x00010001 },
-   { 0x00400401, 0x41c00229, 0x000090c0, 0x00000000 },
-   { 0x00400801, 0x41c20229, 0x000090e0, 0x00000000 },
-   { 0x00400401, 0x41e00229, 0x000090c1, 0x00000000 },
-   { 0x00400801, 0x41e20229, 0x000090e1, 0x00000000 },
-   { 0x00400401, 0x42000229, 0x006990a0, 0x00000000 },
-   { 0x00400801, 0x42020229, 0x006990e8, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00400401, 0x21c00229, 0x000090c0, 0x00000000 },
-   { 0x00400801, 0x21c80229, 0x000090e0, 0x00000000 },
-   { 0x00400401, 0x21e00229, 0x000090c1, 0x00000000 },
-   { 0x00400801, 0x21e80229, 0x000090e1, 0x00000000 },
-   { 0x00400401, 0x22000229, 0x006990a0, 0x00000000 },
-   { 0x00400801, 0x22080229, 0x006990e8, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000a },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00600001, 0x21c00229, 0x000090c0, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c1, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a0, 0x00000000 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000001c8 },
-   { 0x01400010, 0x20003d2c, 0x000005ea, 0x00040004 },
-   { 0x01400010, 0x20003d2c, 0x020005ea, 0x00020002 },
-   { 0x00600001, 0x21c00229, 0x000090c8, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c9, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b0, 0x00000000 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00410401, 0x41c00229, 0x000090c8, 0x00000000 },
-   { 0x00410801, 0x41c20229, 0x000090f0, 0x00000000 },
-   { 0x00410401, 0x41e00229, 0x000090c9, 0x00000000 },
-   { 0x00410801, 0x41e20229, 0x000090f1, 0x00000000 },
-   { 0x00410401, 0x42000229, 0x006990b0, 0x00000000 },
-   { 0x00410801, 0x42020229, 0x006990f8, 0x00000000 },
-   { 0x00410401, 0x21c00229, 0x020090c8, 0x00000000 },
-   { 0x00410801, 0x21c80229, 0x020090f0, 0x00000000 },
-   { 0x00410401, 0x21e00229, 0x020090c9, 0x00000000 },
-   { 0x00410801, 0x21e80229, 0x020090f1, 0x00000000 },
-   { 0x00410401, 0x22000229, 0x026990b0, 0x00000000 },
-   { 0x00410801, 0x22080229, 0x026990f8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000019c },
-   { 0x00800008, 0x2340352d, 0x00009042, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00600001, 0x21c00229, 0x000090c4, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c5, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a4, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000184 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00600001, 0x21c00229, 0x000090cc, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cd, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b4, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000174 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00600401, 0x2340012d, 0x00890040, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x00890048, 0x00000000 },
-   { 0x00600001, 0x204001aa, 0x00270340, 0x00000000 },
-   { 0x00600001, 0x205001aa, 0x00270350, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x04082004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x04082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x04082604 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da5, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000010 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x01000005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000440, 0x27e43ca5, 0x000007e4, 0xfffefffe },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x00100000 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00020002 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffefffe },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x20400021, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000001, 0x260201ac, 0x000005e0, 0x00000000 },
-   { 0x00800008, 0x2340352d, 0x00009054, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009056, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000084 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000026 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00600001, 0x21c00229, 0x000090c2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000f0 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00600001, 0x21c00229, 0x000090ca, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cb, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000e0 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05200520 },
-   { 0x00800001, 0x25000129, 0x00ad0040, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad00c0, 0x00000000 },
-   { 0x00600001, 0x21c00229, 0x000090c2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000c6 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05010501 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05210521 },
-   { 0x00600001, 0x21c00229, 0x000090ca, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cb, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000b6 },
-   { 0x00800008, 0x2340352d, 0x0000905c, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x0000905e, 0x008d0220 },
-   { 0x00600001, 0x20600129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20c00129, 0x008d0520, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05200520 },
-   { 0x00800001, 0x25000129, 0x00ad0050, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad00d0, 0x00000000 },
-   { 0x00600001, 0x21c00229, 0x000090e2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090e3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490ec, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000096 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05010501 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05210521 },
-   { 0x00600001, 0x21c00229, 0x000090f2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090f3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490fc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00600001, 0x20700129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20d00129, 0x008d0520, 0x00000000 },
-   { 0x00800008, 0x2340352d, 0x00009048, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00600001, 0x21c00229, 0x000090c4, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c5, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490ac, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000006a },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00600001, 0x21c00229, 0x000090cc, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cd, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490bc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000005a },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0a082004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0a082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0a082604 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01600005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00610001, 0x20400022, 0x028d0040, 0x00000000 },
-   { 0x00710001, 0x20400022, 0x028d0060, 0x00000000 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0418a004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00020002 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0418a704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0418a604 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffefffe },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x0000002a, 0x00020002 },
-   { 0x00000006, 0x202a3dad, 0x0000002a, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffd94 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00600040, 0x2400462d, 0x00ae9c00, 0x00aed810 },
-   { 0x00600040, 0x2340462d, 0x00ae9800, 0x00aed810 },
-   { 0x00600040, 0x2360462d, 0x00ae9c10, 0x00aedc00 },
-   { 0x05810010, 0x200025ac, 0x008d2400, 0x008d01c0 },
-   { 0x05810010, 0x200025ac, 0x008d2340, 0x008d01e0 },
-   { 0x05810010, 0x200025ac, 0x008d2360, 0x008d01e0 },
-   { 0x00618022, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00618022, 0x34001c00, 0x02001400, 0x00000016 },
-   { 0x00600040, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9810 },
-   { 0x80600008, 0x43403d91, 0x008d0400, 0x00020002 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9c00 },
-   { 0x80600008, 0x43603d91, 0x008d0400, 0x00020002 },
-   { 0x00600001, 0xd8100231, 0x00ae0340, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0360, 0x00000000 },
-   { 0x00608024, 0x34001c00, 0x00001400, 0x0001001e },
-   { 0x00600040, 0x23e03d2d, 0x008d0200, 0x00010001 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00040004 },
-   { 0x00600048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00aedc10 },
-   { 0x00600008, 0x23403d8d, 0x008d0400, 0x00030003 },
-   { 0x03600010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05600010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00610001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00610001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x80600040, 0x43603631, 0x00ae9810, 0x008d0340 },
-   { 0x80600040, 0x43403631, 0x00ae9c00, 0x008d4340 },
-   { 0x00600001, 0xd8100231, 0x00ae0360, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5 libva-1.0.1/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/avc_mc.g4b.gen5	1970-01-01 00:00:00.000000000 +0000
@@ -1,5251 +0,0 @@
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000d4 },
-   { 0x00000005, 0x220e3e2c, 0x00000070, 0x000f000f },
-   { 0x00000001, 0x26a00221, 0x00009c38, 0x00000000 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x00a02001, 0x24000229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25000229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25400229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25800229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x25c00229, 0x00b10624, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x06440640 },
-   { 0x00a02001, 0x24000229, 0x00009003, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x0000900b, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00009013, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x0000901b, 0x00000000 },
-   { 0x00a02001, 0x25000229, 0x00009023, 0x00000000 },
-   { 0x00a02001, 0x25400229, 0x0000902b, 0x00000000 },
-   { 0x00a02001, 0x25800229, 0x00009033, 0x00000000 },
-   { 0x00a02001, 0x25c00229, 0x0000903b, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000072 },
-   { 0x02600005, 0x20000c20, 0x0000006c, 0x00000002 },
-   { 0x00600005, 0x24000c20, 0x0000006c, 0x00000011 },
-   { 0x01600007, 0x20000c00, 0x028d0400, 0x00000011 },
-   { 0x00780001, 0x26240169, 0x00000000, 0x80808080 },
-   { 0x00780001, 0x66430231, 0x028d0624, 0x00000000 },
-   { 0x00780001, 0x66630231, 0x028d062c, 0x00000000 },
-   { 0x00780001, 0x26240231, 0x00cf0643, 0x00000000 },
-   { 0x00780001, 0x262c0231, 0x00cf0663, 0x00000000 },
-   { 0x00800040, 0x25e04629, 0x00cf0643, 0x00b10624 },
-   { 0x00600040, 0x25e02529, 0x008d05e0, 0x008d05f0 },
-   { 0x00400040, 0x25e02529, 0x006905e0, 0x006905e8 },
-   { 0x00200040, 0x25e02529, 0x004505e0, 0x004505e4 },
-   { 0x00a02040, 0x2400252c, 0x000005e0, 0x000005e2 },
-   { 0x00a02040, 0x24003d8c, 0x00b10400, 0x00100010 },
-   { 0x00a02008, 0x24003d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x24403d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x24803d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x24c03d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25003d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25403d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25803d89, 0x00b10400, 0x00050005 },
-   { 0x00a02008, 0x25c03d89, 0x00b10400, 0x00050005 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00600041, 0x26806e2d, 0x008d062c, 0x89abcdef },
-   { 0x00600041, 0x26906e2d, 0x008d0623, 0xfedcba98 },
-   { 0x00600041, 0x26a06e2d, 0x00cf0663, 0x89abcdef },
-   { 0x00600041, 0x26b06e2d, 0x00cf0643, 0x0fedcba9 },
-   { 0x00000041, 0x26be3e2d, 0x00000623, 0xfff8fff8 },
-   { 0x00802040, 0x268035ad, 0x008d4680, 0x008d0690 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0688 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0684 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0682 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00200020 },
-   { 0x00200048, 0x24003dac, 0x00a00680, 0x00050005 },
-   { 0x00200008, 0x26e03d8d, 0x00450400, 0x00060006 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x00000633, 0x00100010 },
-   { 0x00800048, 0x26c03e2d, 0x0000067f, 0x00100010 },
-   { 0x00800048, 0x272055ad, 0x000006e0, 0x00b10040 },
-   { 0x00600041, 0x268055ad, 0x000006e2, 0x00ae0040 },
-   { 0x00600041, 0x26a055ad, 0x000006e2, 0x00ae0041 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00680 },
-   { 0x80a02008, 0x44003d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00682 },
-   { 0x80a02008, 0x44403d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00684 },
-   { 0x80a02008, 0x44803d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00686 },
-   { 0x80a02008, 0x44c03d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b00688 },
-   { 0x80a02008, 0x45003d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b0068a },
-   { 0x80a02008, 0x45403d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b0068c },
-   { 0x80a02008, 0x45803d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00b0068e },
-   { 0x80a02008, 0x45c03d91, 0x00b10400, 0x00050005 },
-   { 0x00000001, 0x22040060, 0x00000000, 0x00900080 },
-   { 0x01000005, 0x20000c20, 0x02000068, 0x00003c00 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000020 },
-   { 0x80802040, 0x440045b1, 0x008d8800, 0x00ae0400 },
-   { 0x80802040, 0x444045b1, 0x008d8820, 0x00ae0440 },
-   { 0x80802040, 0x448045b1, 0x008d8840, 0x00ae0480 },
-   { 0x80802040, 0x44c045b1, 0x008d8860, 0x00ae04c0 },
-   { 0x80802040, 0x441045b1, 0x008d8880, 0x00ae0410 },
-   { 0x80802040, 0x445045b1, 0x008d88a0, 0x00ae0450 },
-   { 0x80802040, 0x449045b1, 0x008d88c0, 0x00ae0490 },
-   { 0x80802040, 0x44d045b1, 0x008d88e0, 0x00ae04d0 },
-   { 0x80802040, 0x450045b1, 0x008d8900, 0x00ae0500 },
-   { 0x80802040, 0x454045b1, 0x008d8920, 0x00ae0540 },
-   { 0x80802040, 0x458045b1, 0x008d8940, 0x00ae0580 },
-   { 0x80802040, 0x45c045b1, 0x008d8960, 0x00ae05c0 },
-   { 0x80802040, 0x451045b1, 0x008d8980, 0x00ae0510 },
-   { 0x80802040, 0x455045b1, 0x008d89a0, 0x00ae0550 },
-   { 0x80802040, 0x459045b1, 0x008d89c0, 0x00ae0590 },
-   { 0x80802040, 0x45d045b1, 0x008d89e0, 0x00ae05d0 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x01800180 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000e2 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000018 },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00200440, 0x27c055a5, 0x004507fa, 0x0045002a },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x0000001b },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x02186000 },
-   { 0x01600031, 0x26200021, 0x408d07c0, 0x00000200 },
-   { 0x00000440, 0x27c43ca5, 0x000007c4, 0x00010001 },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x000f0003 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x00100000 },
-   { 0x02600031, 0x26400021, 0x408d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000008, 0x27fc3dad, 0x000007fc, 0x00010001 },
-   { 0x00200440, 0x27c055a5, 0x004507fa, 0x0045002a },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x00000013 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0xefffc001 },
-   { 0x01600031, 0x26200021, 0x408d07c0, 0x00000200 },
-   { 0x00000440, 0x27c43ca5, 0x000007c4, 0x00010001 },
-   { 0x00000801, 0x27c80061, 0x00000000, 0x00070003 },
-   { 0x05600031, 0x26400021, 0x408d07c0, 0x00000200 },
-   { 0x00000008, 0x220e3e2c, 0x0000006c, 0x00060006 },
-   { 0x00000001, 0x26a002a5, 0x00009c3c, 0x00000000 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x02600005, 0x20000c20, 0x0000006c, 0x00000002 },
-   { 0x00780001, 0x26240169, 0x00000000, 0x80808080 },
-   { 0x02400005, 0x20000c20, 0x0200006c, 0x00000001 },
-   { 0x00560001, 0x46420129, 0x02690624, 0x00000000 },
-   { 0x02400005, 0x20000c20, 0x0200006c, 0x00000010 },
-   { 0x00560001, 0x46520129, 0x0269062c, 0x00000000 },
-   { 0x00780001, 0x26240129, 0x00ae0642, 0x00000000 },
-   { 0x00800040, 0x24004629, 0x00b10624, 0x00650642 },
-   { 0x00600040, 0x24002529, 0x00650400, 0x00650404 },
-   { 0x00600040, 0x25202529, 0x00050400, 0x00050404 },
-   { 0x00600040, 0x25702529, 0x00050408, 0x0005040c },
-   { 0x00560001, 0x26240169, 0x00000000, 0x80808080 },
-   { 0x00460001, 0x26240129, 0x028a0652, 0x00000000 },
-   { 0x00560001, 0x46520129, 0x02690624, 0x00000000 },
-   { 0x02400005, 0x20000c20, 0x0200006c, 0x00000001 },
-   { 0x00560001, 0x46420169, 0x02000000, 0x80808080 },
-   { 0x00460001, 0x46420129, 0x0069062c, 0x00000000 },
-   { 0x00560001, 0x262c0129, 0x008a0642, 0x00000000 },
-   { 0x00600040, 0x24004629, 0x008d0624, 0x00650652 },
-   { 0x00600040, 0x24104629, 0x00650642, 0x008d062c },
-   { 0x00600040, 0x24002529, 0x00650400, 0x00650404 },
-   { 0x00600040, 0x25302529, 0x00050408, 0x0005040c },
-   { 0x00600040, 0x25602529, 0x00050400, 0x00050404 },
-   { 0x00a02040, 0x24003d2c, 0x00b10520, 0x00040004 },
-   { 0x00a02008, 0x24003d89, 0x00b10400, 0x00030003 },
-   { 0x00a02008, 0x24403d89, 0x00b10400, 0x00030003 },
-   { 0x00a02040, 0x24003d2c, 0x00b10560, 0x00040004 },
-   { 0x00a02008, 0x24803d89, 0x00b10400, 0x00030003 },
-   { 0x00a02008, 0x24c03d89, 0x00b10400, 0x00030003 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000048 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x06440640 },
-   { 0x00a02001, 0x24000229, 0x00059002, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x0005900a, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00059012, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x0005901a, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000003c },
-   { 0x00a02001, 0x24000229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24400229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24800229, 0x00b10624, 0x00000000 },
-   { 0x00a02001, 0x24c00229, 0x00b10624, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000032 },
-   { 0x00600041, 0x26806e2d, 0x008d062c, 0x44332211 },
-   { 0x00600041, 0x26906e2d, 0x008d0622, 0xffeeddcc },
-   { 0x00600041, 0x26a06e2d, 0x00650652, 0x44332211 },
-   { 0x00600041, 0x26b06e2d, 0x00650642, 0x00ffeedd },
-   { 0x00200041, 0x26bc3e2d, 0x00450622, 0xfffcfffc },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0690 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0688 },
-   { 0x00802040, 0x268035ad, 0x008d0680, 0x008d0684 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00200020 },
-   { 0x00400048, 0x24003dac, 0x00a50680, 0x00220022 },
-   { 0x00400008, 0x26e03d8d, 0x00690400, 0x00060006 },
-   { 0x00800001, 0x240001ec, 0x00000000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x00050632, 0x00100010 },
-   { 0x00800048, 0x26c03e2d, 0x0005065e, 0x00100010 },
-   { 0x00800048, 0x272055ad, 0x000506e0, 0x00240044 },
-   { 0x00600041, 0x268055ad, 0x000506e4, 0x00440044 },
-   { 0x00600041, 0x26a055ad, 0x000506e4, 0x00440045 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00050680 },
-   { 0x80a02008, 0x44003d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00050684 },
-   { 0x80a02008, 0x44403d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x00050688 },
-   { 0x80a02008, 0x44803d91, 0x00b10400, 0x00050005 },
-   { 0x00a02040, 0x240035ac, 0x00b10720, 0x0005068c },
-   { 0x80a02008, 0x44c03d91, 0x00b10400, 0x00050005 },
-   { 0x00000040, 0x22063d8c, 0x00000204, 0x00100010 },
-   { 0x80802040, 0x640045b1, 0x008d8880, 0x00cf0400 },
-   { 0x80802040, 0x644045b1, 0x008d88a0, 0x00cf0440 },
-   { 0x80802040, 0x648045b1, 0x008d88c0, 0x00cf0480 },
-   { 0x80802040, 0x64c045b1, 0x008d88e0, 0x00cf04c0 },
-   { 0x80802040, 0x640245b1, 0x008d8900, 0x00cf0402 },
-   { 0x80802040, 0x644245b1, 0x008d8920, 0x00cf0442 },
-   { 0x80802040, 0x648245b1, 0x008d8940, 0x00cf0482 },
-   { 0x80802040, 0x64c245b1, 0x008d8960, 0x00cf04c2 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x0007000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x08004000 },
-   { 0x00800001, 0x20400232, 0x00d20400, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x00d20420, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x00d20440, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x00d20460, 0x00000000 },
-   { 0x00800001, 0x20800232, 0x00d20480, 0x00000000 },
-   { 0x00800001, 0x20900232, 0x00d204a0, 0x00000000 },
-   { 0x00800001, 0x20a00232, 0x00d204c0, 0x00000000 },
-   { 0x00800001, 0x20b00232, 0x00d204e0, 0x00000000 },
-   { 0x01600031, 0x27a00021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x0ff04000 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x04400400 },
-   { 0x00a02001, 0x20400232, 0x00d29000, 0x00000000 },
-   { 0x00a02001, 0x20500232, 0x00d29020, 0x00000000 },
-   { 0x00a02001, 0x20800232, 0x00d29080, 0x00000000 },
-   { 0x00a02001, 0x20900232, 0x00d290a0, 0x00000000 },
-   { 0x00a02001, 0x20c00232, 0x00d29100, 0x00000000 },
-   { 0x00a02001, 0x20d00232, 0x00d29120, 0x00000000 },
-   { 0x00a02001, 0x21000232, 0x00d29180, 0x00000000 },
-   { 0x00a02001, 0x21100232, 0x00d291a0, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffff04 },
-   { 0x00000001, 0x220401ec, 0x00000000, 0x00800080 },
-   { 0x00000001, 0x22080060, 0x00000000, 0x04100400 },
-   { 0x00200008, 0x27006e2d, 0x0000006c, 0x00000040 },
-   { 0x00400001, 0x27400061, 0x00000000, 0x00000000 },
-   { 0x00800001, 0x272001a9, 0x00b10620, 0x00000000 },
-   { 0x02600005, 0x20001c20, 0x0000006c, 0x00000008 },
-   { 0x00110001, 0x27230231, 0x00000624, 0x00000000 },
-   { 0x00600001, 0x27420231, 0x00cf0643, 0x00000000 },
-   { 0x00110001, 0x27410231, 0x00000643, 0x00000000 },
-   { 0x00240001, 0x27400231, 0x00000623, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000002 },
-   { 0x00010001, 0x27400231, 0x02000624, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000001 },
-   { 0x00110001, 0x27420231, 0x02000623, 0x00000000 },
-   { 0x00000005, 0x26803e2d, 0x00000070, 0x000f000f },
-   { 0x00000001, 0x270801ad, 0x00000700, 0x00000000 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000084 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00800001, 0x27200231, 0x00b10628, 0x00000000 },
-   { 0x02600005, 0x20001c20, 0x0200006c, 0x00000004 },
-   { 0x00680001, 0x272c0231, 0x028d0634, 0x00000000 },
-   { 0x00780001, 0x272c0231, 0x02000633, 0x00000000 },
-   { 0x00400001, 0x27420231, 0x00a0040e, 0x00000000 },
-   { 0x00400001, 0x27460231, 0x00a0044e, 0x00000000 },
-   { 0x00200001, 0x27400231, 0x0000062b, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000002 },
-   { 0x00010001, 0x27400231, 0x0200062c, 0x00000000 },
-   { 0x00110001, 0x27410231, 0x0200040e, 0x00000000 },
-   { 0x00000008, 0x26803e2d, 0x00000070, 0x00040004 },
-   { 0x00200040, 0x22083d8c, 0x00450208, 0x00800080 },
-   { 0x00000006, 0x27083dad, 0x00000700, 0x00010001 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000064 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00a02001, 0xb3800231, 0x00d20400, 0x00000000 },
-   { 0x00a02001, 0xb3a00231, 0x00d20480, 0x00000000 },
-   { 0x00a02001, 0xb3c00231, 0x00d20440, 0x00000000 },
-   { 0x00a02001, 0xb3e00231, 0x00d204c0, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x00000060, 0x00000002 },
-   { 0x01000005, 0x20001c20, 0x0200006c, 0x00000001 },
-   { 0x01010005, 0x20001c20, 0x00000060, 0x00004000 },
-   { 0x02010005, 0x20001c20, 0x02000060, 0x00000010 },
-   { 0x00030001, 0x27230231, 0x0000065f, 0x00000000 },
-   { 0x00030220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02600005, 0x20001c20, 0x0000006c, 0x00000001 },
-   { 0x00460001, 0x27200231, 0x0069065c, 0x00000000 },
-   { 0x00110001, 0x27230231, 0x00000458, 0x00000000 },
-   { 0x00600001, 0x27240231, 0x008d0458, 0x00000000 },
-   { 0x00600001, 0x272c0231, 0x008d0478, 0x00000000 },
-   { 0x00600001, 0x27420231, 0x00cf0663, 0x00000000 },
-   { 0x00000001, 0x27400231, 0x00000458, 0x00000000 },
-   { 0x00010001, 0x27410231, 0x0000065f, 0x00000000 },
-   { 0x00110001, 0x27410231, 0x00000663, 0x00000000 },
-   { 0x02000005, 0x20001c20, 0x0200006c, 0x00000010 },
-   { 0x00110001, 0x27420231, 0x0200065f, 0x00000000 },
-   { 0x00000005, 0x26803e2d, 0x00000071, 0x000f000f },
-   { 0x00000006, 0x27083dad, 0x00000702, 0x00020002 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000030 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00400001, 0x27200231, 0x0069045c, 0x00000000 },
-   { 0x00600001, 0x27240231, 0x008d0478, 0x00000000 },
-   { 0x00800001, 0x272c0231, 0x0000047f, 0x00000000 },
-   { 0x00400001, 0x27420231, 0x00a0048e, 0x00000000 },
-   { 0x00400001, 0x27460231, 0x00a004ce, 0x00000000 },
-   { 0x00000001, 0x27400231, 0x00000478, 0x00000000 },
-   { 0x00000001, 0x27410231, 0x0000045f, 0x00000000 },
-   { 0x00000008, 0x26803e2d, 0x00000071, 0x00040004 },
-   { 0x00200040, 0x22083d8c, 0x00450208, 0x00800080 },
-   { 0x00000006, 0x27083dad, 0x00000700, 0x00030003 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00a02001, 0xb3800231, 0x00d20480, 0x00000000 },
-   { 0x00a02001, 0xb3a00231, 0x00d20500, 0x00000000 },
-   { 0x00a02001, 0xb3c00231, 0x00d204c0, 0x00000000 },
-   { 0x00a02001, 0xb3e00231, 0x00d20540, 0x00000000 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000100 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffe74 },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000001, 0x27340231, 0x00000733, 0x00000000 },
-   { 0x00600001, 0x274a0231, 0x00000749, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b10723, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10724, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10725, 0x00010001 },
-   { 0x00800008, 0x26c03d8d, 0x008d0400, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x00b10740, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10741, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10742, 0x00010001 },
-   { 0x00800008, 0x26a03d8d, 0x008d0400, 0x00020002 },
-   { 0x00800001, 0x27240231, 0x00d206c0, 0x00000000 },
-   { 0x00600001, 0x27400231, 0x00ae06a2, 0x00000000 },
-   { 0x00000001, 0x27230231, 0x000006a0, 0x00000000 },
-   { 0x00000005, 0x220e3dac, 0x00000680, 0x000f000f },
-   { 0x00000001, 0x26a00221, 0x00009c2c, 0x00000000 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x80800040, 0xd00045b1, 0x00b18800, 0x000d0724 },
-   { 0x80800040, 0xd02045b1, 0x00b18820, 0x000d0724 },
-   { 0x80800040, 0xd04045b1, 0x00b18840, 0x000d0724 },
-   { 0x80800040, 0xd06045b1, 0x00b18860, 0x000d0724 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x80800040, 0xd00045b1, 0x00b18800, 0x002c0740 },
-   { 0x80800040, 0xd02045b1, 0x00b18820, 0x002c0742 },
-   { 0x80800040, 0xd04045b1, 0x00b18840, 0x002c0744 },
-   { 0x80800040, 0xd06045b1, 0x00b18860, 0x002c0746 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x02802005, 0x20003da0, 0x00000708, 0x00020002 },
-   { 0x02600005, 0x20003da0, 0x02000708, 0x00010001 },
-   { 0x009a0001, 0x27200169, 0x00000000, 0x80808080 },
-   { 0x00780001, 0x27400231, 0x028d0724, 0x00000000 },
-   { 0x00780001, 0x27240231, 0x008d0740, 0x00000000 },
-   { 0x00600040, 0x25e04629, 0x008d0724, 0x008d0740 },
-   { 0x00400040, 0x25e02529, 0x006905e0, 0x006905e8 },
-   { 0x00200040, 0x25e02529, 0x004505e0, 0x004505e4 },
-   { 0x00800040, 0x2400252c, 0x000005e0, 0x000005e2 },
-   { 0x00800040, 0x24003d8c, 0x008d0400, 0x00080008 },
-   { 0x00800008, 0x26803d8d, 0x008d0400, 0x00040004 },
-   { 0x80800040, 0xd00035b1, 0x00b18800, 0x00b10680 },
-   { 0x80800040, 0xd02035b1, 0x00b18820, 0x00b10680 },
-   { 0x80800040, 0xd04035b1, 0x00b18840, 0x00b10680 },
-   { 0x80800040, 0xd06035b1, 0x00b18860, 0x00b10680 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27340231, 0x008d0733, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b10726, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10725, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10724, 0x00010001 },
-   { 0x00800008, 0x26803d8d, 0x00b10400, 0x00020002 },
-   { 0x80800040, 0xd00035b1, 0x00b18800, 0x002d0680 },
-   { 0x80800040, 0xd02035b1, 0x00b18820, 0x002d0684 },
-   { 0x80800040, 0xd04035b1, 0x00b18840, 0x002d0688 },
-   { 0x80800040, 0xd06035b1, 0x00b18860, 0x002d068c },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00400009, 0x26c05421, 0x00000744, 0x00690050 },
-   { 0x00400009, 0x26d05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26a00231, 0x00cf06c3, 0x00000000 },
-   { 0x00800001, 0x26a80231, 0x00b10723, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b106a2, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a1, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a0, 0x00010001 },
-   { 0x00800008, 0x26a03d8d, 0x00b10400, 0x00020002 },
-   { 0x00200040, 0x220c3eac, 0x00450056, 0x06a006a0 },
-   { 0x80800040, 0xd06035b1, 0x01ed9800, 0x00b18860 },
-   { 0x80800040, 0xd04035b1, 0x01ed9804, 0x00b18840 },
-   { 0x80800040, 0xd02035b1, 0x01ed9808, 0x00b18820 },
-   { 0x80800040, 0xd00035b1, 0x01ed980c, 0x00b18800 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00400009, 0x26c05421, 0x00000744, 0x00690050 },
-   { 0x00400009, 0x26d05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26a00231, 0x00cf06c3, 0x00000000 },
-   { 0x00800001, 0x26a80231, 0x00b10723, 0x00000000 },
-   { 0x00800042, 0x25c04629, 0x00b106a8, 0x00b106a9 },
-   { 0x00800040, 0x24003e2c, 0x00b106a3, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a2, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a1, 0x00010001 },
-   { 0x00800008, 0x26c03d8d, 0x008d0400, 0x00020002 },
-   { 0x00600001, 0x26a00231, 0x00ae06c0, 0x00000000 },
-   { 0x00600001, 0x46a60231, 0x00ae06cc, 0x00000000 },
-   { 0x00600001, 0x46a70231, 0x00ae05c0, 0x00000000 },
-   { 0x00200040, 0x220c3eac, 0x00450036, 0x06a006a0 },
-   { 0x80800040, 0xd0603631, 0x01ee9800, 0x00b18860 },
-   { 0x80800040, 0xd0403631, 0x01ee9802, 0x00b18840 },
-   { 0x80800040, 0xd0203631, 0x01ee9804, 0x00b18820 },
-   { 0x80800040, 0xd0003631, 0x01ee9806, 0x00b18800 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00400009, 0x26c05421, 0x00000744, 0x00690050 },
-   { 0x00400009, 0x26d05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26a00231, 0x00ab06c3, 0x00000000 },
-   { 0x00800001, 0x26a80231, 0x00b10723, 0x00000000 },
-   { 0x00800040, 0x24003e2c, 0x00b106a2, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a1, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b106a0, 0x00010001 },
-   { 0x00800008, 0x25c03d89, 0x008d0400, 0x00020002 },
-   { 0x00800042, 0x26a0462d, 0x00b106a0, 0x00b106a1 },
-   { 0x00600001, 0x46a10231, 0x00ae05c0, 0x00000000 },
-   { 0x00600001, 0x26b00231, 0x00ae05d0, 0x00000000 },
-   { 0x00200040, 0x220c3eac, 0x00450056, 0x06a006a0 },
-   { 0x80800040, 0xd0603631, 0x01ed9800, 0x00b18860 },
-   { 0x80800040, 0xd0403631, 0x01ed9804, 0x00b18840 },
-   { 0x80800040, 0xd0203631, 0x01ed9808, 0x00b18820 },
-   { 0x80800040, 0xd0003631, 0x01ed980c, 0x00b18800 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00800042, 0x25c04629, 0x00b10724, 0x00b10725 },
-   { 0x00800040, 0x24003e2c, 0x00b10726, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10725, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10724, 0x00010001 },
-   { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
-   { 0x80800040, 0xd0003531, 0x00ad05c0, 0x00b18800 },
-   { 0x80800040, 0xd0203531, 0x00ad05c2, 0x00b18820 },
-   { 0x80800040, 0xd0403531, 0x00ad05c4, 0x00b18840 },
-   { 0x80800040, 0xd0603531, 0x00ad05c6, 0x00b18860 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27480231, 0x00000747, 0x00000000 },
-   { 0x00800042, 0x25c04629, 0x00b10740, 0x00b10741 },
-   { 0x00800040, 0x24003e2c, 0x00b10742, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10741, 0x00020002 },
-   { 0x00800048, 0x24003e2c, 0x00b10740, 0x00010001 },
-   { 0x00800008, 0x25e03d89, 0x002d0400, 0x00020002 },
-   { 0x00800001, 0x45c10231, 0x00d205e0, 0x00000000 },
-   { 0x80800040, 0xd0003631, 0x004d05c0, 0x00b18800 },
-   { 0x80800040, 0xd0203631, 0x004d05c4, 0x00b18820 },
-   { 0x80800040, 0xd0403631, 0x004d05c8, 0x00b18840 },
-   { 0x80800040, 0xd0603631, 0x004d05cc, 0x00b18860 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x0ff04000 },
-   { 0x00800001, 0x20400232, 0x00cd0400, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x00cd0408, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x00cd0410, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x00cd0418, 0x00000000 },
-   { 0x00800001, 0x20800232, 0x00cd0440, 0x00000000 },
-   { 0x00800001, 0x20900232, 0x00cd0448, 0x00000000 },
-   { 0x00800001, 0x20a00232, 0x00cd0450, 0x00000000 },
-   { 0x00800001, 0x20b00232, 0x00cd0458, 0x00000000 },
-   { 0x00800001, 0x20c00232, 0x00cd0480, 0x00000000 },
-   { 0x00800001, 0x20d00232, 0x00cd0488, 0x00000000 },
-   { 0x00800001, 0x20e00232, 0x00cd0490, 0x00000000 },
-   { 0x00800001, 0x20f00232, 0x00cd0498, 0x00000000 },
-   { 0x00800001, 0x21000232, 0x00cd04c0, 0x00000000 },
-   { 0x00800001, 0x21100232, 0x00cd04c8, 0x00000000 },
-   { 0x00800001, 0x21200232, 0x00cd04d0, 0x00000000 },
-   { 0x00800001, 0x21300232, 0x00cd04d8, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffd34 },
-   { 0x00000001, 0x220401ec, 0x00000000, 0x00800080 },
-   { 0x00000001, 0x220601ec, 0x00000000, 0x04000400 },
-   { 0x00200008, 0x27006e2d, 0x0000006c, 0x00000040 },
-   { 0x02600005, 0x20003e20, 0x0000006c, 0x00040004 },
-   { 0x00780001, 0x26340231, 0x00000633, 0x00000000 },
-   { 0x00800001, 0x27200231, 0x00b10620, 0x00000000 },
-   { 0x00600001, 0x27400231, 0x00cf0643, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240070, 0x00004040 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000006a },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00000006, 0x27003dad, 0x00000700, 0x00010001 },
-   { 0x00800001, 0x27200231, 0x00b10628, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c26, 0x00000000 },
-   { 0x00400001, 0x27440231, 0x00808c66, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240072, 0x00004040 },
-   { 0x00000040, 0x22063d8c, 0x00000206, 0x00800080 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000058 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00000006, 0x27003dad, 0x00000702, 0x00020002 },
-   { 0x00800001, 0xaf800231, 0x00d28f80, 0x00000000 },
-   { 0x00800001, 0xaf900231, 0x00d28fa0, 0x00000000 },
-   { 0x00800001, 0xafc00231, 0x00d28fc0, 0x00000000 },
-   { 0x00800001, 0xafd00231, 0x00d28fe0, 0x00000000 },
-   { 0x00800001, 0xafa00231, 0x00d28c00, 0x00000000 },
-   { 0x00800001, 0xafb00231, 0x00d28c20, 0x00000000 },
-   { 0x00800001, 0xafe00231, 0x00d28c40, 0x00000000 },
-   { 0x00800001, 0xaff00231, 0x00d28c60, 0x00000000 },
-   { 0x00400001, 0x27200231, 0x0069065c, 0x00000000 },
-   { 0x00600001, 0x27240231, 0x00a98fcc, 0x00000000 },
-   { 0x00600001, 0x272c0231, 0x00a98fec, 0x00000000 },
-   { 0x00600001, 0x27340231, 0x00008fff, 0x00000000 },
-   { 0x00800001, 0x2620012d, 0x00b10720, 0x00000000 },
-   { 0x00600001, 0x27400231, 0x00cf0663, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240074, 0x00004040 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000032 },
-   { 0x00000040, 0x22043d8c, 0x00000204, 0x00800080 },
-   { 0x00000006, 0x27003dad, 0x00000700, 0x00010001 },
-   { 0x00800001, 0x27200231, 0x00b10628, 0x00000000 },
-   { 0x00600001, 0x27300231, 0x008d0638, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c26, 0x00000000 },
-   { 0x00400001, 0x27440231, 0x00808c66, 0x00000000 },
-   { 0x00400008, 0x26806e2d, 0x00240076, 0x00004040 },
-   { 0x00000040, 0x22063d8c, 0x00000206, 0x00800080 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00800001, 0xaf800231, 0x00d28f80, 0x00000000 },
-   { 0x00800001, 0xaf900231, 0x00d28fa0, 0x00000000 },
-   { 0x00800001, 0xafc00231, 0x00d28fc0, 0x00000000 },
-   { 0x00800001, 0xafd00231, 0x00d28fe0, 0x00000000 },
-   { 0x00800001, 0xafa00231, 0x00d28c00, 0x00000000 },
-   { 0x00800001, 0xafb00231, 0x00d28c20, 0x00000000 },
-   { 0x00800001, 0xafe00231, 0x00d28c40, 0x00000000 },
-   { 0x00800001, 0xaff00231, 0x00d28c60, 0x00000000 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000e0 },
-   { 0x00000040, 0x27e01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffcce },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00600001, 0x27800231, 0x008d0740, 0x00000000 },
-   { 0x00400005, 0x22083dac, 0x00690680, 0x000f000f },
-   { 0x00400040, 0x26a04625, 0x01e09020, 0x00690058 },
-   { 0x00000001, 0x26d001ad, 0x00000700, 0x00000000 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a0 },
-   { 0x80600040, 0xcc0035b1, 0x00898800, 0x008d0760 },
-   { 0x80600040, 0xcc1035b1, 0x00898820, 0x008d0770 },
-   { 0x00800001, 0x27200231, 0x008d0724, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c06, 0x00000000 },
-   { 0x00000006, 0x26d03dad, 0x00000700, 0x00010001 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a4 },
-   { 0x80600040, 0xcc2035b1, 0x00898808, 0x008d0760 },
-   { 0x80600040, 0xcc3035b1, 0x00898828, 0x008d0770 },
-   { 0x00000001, 0x27230231, 0x00000783, 0x00000000 },
-   { 0x00400001, 0x27240231, 0x008a8c18, 0x00000000 },
-   { 0x00400001, 0x27280231, 0x008a8c38, 0x00000000 },
-   { 0x00400001, 0x272c0231, 0x00008c3e, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00690784, 0x00000000 },
-   { 0x00000006, 0x26d03dad, 0x00000700, 0x00020002 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006a8 },
-   { 0x80600040, 0xcc4035b1, 0x00898840, 0x008d0760 },
-   { 0x80600040, 0xcc5035b1, 0x00898860, 0x008d0770 },
-   { 0x00800001, 0x27200231, 0x008d0724, 0x00000000 },
-   { 0x00600001, 0x27280231, 0x00000727, 0x00000000 },
-   { 0x00400001, 0x27400231, 0x00808c46, 0x00000000 },
-   { 0x00000006, 0x26d03dad, 0x00000700, 0x00030003 },
-   { 0x00000040, 0x27e41c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x000006ac },
-   { 0x80600040, 0xcc6035b1, 0x00898848, 0x008d0760 },
-   { 0x80600040, 0xcc7035b1, 0x00898868, 0x008d0770 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00800001, 0x2760022d, 0x00090724, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00800001, 0x2760022d, 0x00280740, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x02802005, 0x20003da0, 0x000006d0, 0x00020002 },
-   { 0x02802005, 0x20003da0, 0x020006d0, 0x00010001 },
-   { 0x009a0001, 0x27200169, 0x00000000, 0x80808080 },
-   { 0x00780001, 0x27400231, 0x028d0724, 0x00000000 },
-   { 0x00780001, 0x27240231, 0x008d0740, 0x00000000 },
-   { 0x00400040, 0x25e04629, 0x00690724, 0x00690740 },
-   { 0x00200040, 0x25e02529, 0x004505e0, 0x004505e4 },
-   { 0x00800040, 0x2400252c, 0x000005e0, 0x000005e2 },
-   { 0x00800040, 0x24003d8c, 0x008d0400, 0x00040004 },
-   { 0x00800008, 0x27603d8d, 0x008d0400, 0x00030003 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00600001, 0x26c00231, 0x008d0724, 0x00000000 },
-   { 0x00400001, 0x26c80231, 0x0069072b, 0x00000000 },
-   { 0x00600040, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00020002 },
-   { 0x00600048, 0x25e03e29, 0x008d06c0, 0x00010001 },
-   { 0x00800008, 0x27603d2d, 0x002905e0, 0x00020002 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00400009, 0x26e05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26c40231, 0x008d0723, 0x00000000 },
-   { 0x00400001, 0x26c00231, 0x00ab06e3, 0x00000000 },
-   { 0x00600040, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00020002 },
-   { 0x00600048, 0x26c03e2d, 0x008d06c0, 0x00010001 },
-   { 0x00400040, 0x22083eac, 0x00690054, 0x06c006c0 },
-   { 0x00800008, 0x27603dad, 0x01e99000, 0x00020002 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00400009, 0x26e05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26c40231, 0x008d0723, 0x00000000 },
-   { 0x00400001, 0x26c00231, 0x00ab06e3, 0x00000000 },
-   { 0x00600042, 0x25c04629, 0x008d06c4, 0x008d06c5 },
-   { 0x00600040, 0x24003e2c, 0x008d06c3, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00010001 },
-   { 0x00600008, 0x26c03d8d, 0x008d0400, 0x00020002 },
-   { 0x00400001, 0x46c401ad, 0x006906c4, 0x00000000 },
-   { 0x00400001, 0x46c6012d, 0x006905c0, 0x00000000 },
-   { 0x00400040, 0x22083eac, 0x00690054, 0x06c006c0 },
-   { 0x00800001, 0x276001ad, 0x01ea9000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00400009, 0x26e05421, 0x00000740, 0x00690050 },
-   { 0x00600001, 0x26c40231, 0x008d0723, 0x00000000 },
-   { 0x00400001, 0x26c00231, 0x00ab06e3, 0x00000000 },
-   { 0x00600042, 0x25c04629, 0x008d06c0, 0x008d06c1 },
-   { 0x00600040, 0x24003e2c, 0x008d06c2, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d06c1, 0x00020002 },
-   { 0x00600048, 0x26e03e2d, 0x008d06c0, 0x00010001 },
-   { 0x00400008, 0x46c23dad, 0x006906e0, 0x00020002 },
-   { 0x00200008, 0x26d03dad, 0x004506e8, 0x00020002 },
-   { 0x00400001, 0x46c0012d, 0x006905c0, 0x00000000 },
-   { 0x00400009, 0x22083eac, 0x00690054, 0x00010001 },
-   { 0x00400040, 0x22083d8c, 0x00690208, 0x06c006c0 },
-   { 0x00800001, 0x276001ad, 0x01e99000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00600042, 0x45c04629, 0x008d0724, 0x008d0725 },
-   { 0x00600040, 0x24003e2c, 0x008d0726, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d0725, 0x00020002 },
-   { 0x00600048, 0x25e03e29, 0x008d0724, 0x00010001 },
-   { 0x00600008, 0x45c23d29, 0x008d05e0, 0x00020002 },
-   { 0x00800001, 0x2760012d, 0x002a05c0, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00600001, 0x27440231, 0x00000743, 0x00000000 },
-   { 0x00600042, 0x45c04629, 0x008d0740, 0x008d0741 },
-   { 0x00600040, 0x24003e2c, 0x008d0742, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x008d0741, 0x00020002 },
-   { 0x00600048, 0x25e03e29, 0x008d0740, 0x00010001 },
-   { 0x00600008, 0x45c23d29, 0x008d05e0, 0x00020002 },
-   { 0x00800001, 0x2760012d, 0x004905c0, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007e4, 0x00000000 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200801, 0x27c001a1, 0x004507fa, 0x00000000 },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x0ff04000 },
-   { 0x00800001, 0x20400232, 0x00a90400, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x00a90404, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x00a90408, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x00a9040c, 0x00000000 },
-   { 0x00800001, 0x20800232, 0x00a90440, 0x00000000 },
-   { 0x00800001, 0x20900232, 0x00a90444, 0x00000000 },
-   { 0x00800001, 0x20a00232, 0x00a90448, 0x00000000 },
-   { 0x00800001, 0x20b00232, 0x00a9044c, 0x00000000 },
-   { 0x00800001, 0x20c00232, 0x00a90480, 0x00000000 },
-   { 0x00800001, 0x20d00232, 0x00a90484, 0x00000000 },
-   { 0x00800001, 0x20e00232, 0x00a90488, 0x00000000 },
-   { 0x00800001, 0x20f00232, 0x00a9048c, 0x00000000 },
-   { 0x00800001, 0x21000232, 0x00a904c0, 0x00000000 },
-   { 0x00800001, 0x21100232, 0x00a904c4, 0x00000000 },
-   { 0x00800001, 0x21200232, 0x00a904c8, 0x00000000 },
-   { 0x00800001, 0x21300232, 0x00a904cc, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000001, 0x34000020, 0x000007e0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27c00021, 0x008d0000, 0x00000000 },
-   { 0x00200009, 0x27fa3e29, 0x00450064, 0x00040004 },
-   { 0x00000401, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00200809, 0x27c03e21, 0x00450064, 0x00040004 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x1218a000 },
-   { 0x00a02401, 0x20400232, 0x00b10080, 0x00000000 },
-   { 0x00a02801, 0x20500232, 0x00b10090, 0x00000000 },
-   { 0x00a02401, 0x20800232, 0x00b100c0, 0x00000000 },
-   { 0x00a02801, 0x20900232, 0x00b100d0, 0x00000000 },
-   { 0x00a02401, 0x20c00232, 0x00b10100, 0x00000000 },
-   { 0x00a02801, 0x20d00232, 0x00b10110, 0x00000000 },
-   { 0x00a02401, 0x21000232, 0x00b10140, 0x00000000 },
-   { 0x00a02801, 0x21100232, 0x00b10150, 0x00000000 },
-   { 0x01600031, 0x27800021, 0x508d07c0, 0x00000200 },
-   { 0x00000401, 0x20280062, 0x00000000, 0x0007000f },
-   { 0x0000080c, 0x20243c22, 0x000007c4, 0x00010001 },
-   { 0x00000040, 0x22001c00, 0x00000200, 0xf8000001 },
-   { 0x00800001, 0x40400232, 0x00b10180, 0x00000000 },
-   { 0x00800001, 0x40410232, 0x00b101c0, 0x00000000 },
-   { 0x00800001, 0x40600232, 0x00b10190, 0x00000000 },
-   { 0x00800001, 0x40610232, 0x00b101d0, 0x00000000 },
-   { 0x00800001, 0x40800232, 0x00b101a0, 0x00000000 },
-   { 0x00800001, 0x40810232, 0x00b101e0, 0x00000000 },
-   { 0x00800001, 0x40a00232, 0x00b101b0, 0x00000000 },
-   { 0x00800001, 0x40a10232, 0x00b101f0, 0x00000000 },
-   { 0x01600031, 0x27a00001, 0x508d0000, 0x00000200 },
-   { 0x00000001, 0x27800021, 0x00000780, 0x00000000 },
-   { 0x00000001, 0x27a00021, 0x000007a0, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0000, 0x00000000 },
-   { 0x00000005, 0x20203e2d, 0x00000061, 0x001f001f },
-   { 0x00200009, 0x20643e2d, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00000000 },
-   { 0x01000010, 0x20003dac, 0x00000020, 0x00160016 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x01200010, 0x20003e2c, 0x0200006c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000024 },
-   { 0x00800009, 0x25403dad, 0x00050064, 0x00020002 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00180018 },
-   { 0x00200040, 0x45483dad, 0x00660548, 0x00100010 },
-   { 0x00200040, 0x45523dad, 0x00660552, 0x00100010 },
-   { 0x00400040, 0x25583dad, 0x00690558, 0x00100010 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0x00200020 },
-   { 0x00800040, 0x20a035ad, 0x00b100a0, 0x00b10540 },
-   { 0x00600040, 0x45423dad, 0x00ae0542, 0x00200020 },
-   { 0x00800040, 0x20e035ad, 0x00b100e0, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0xffe0ffe0 },
-   { 0x00800040, 0x20c035ad, 0x00b100c0, 0x00b10540 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000014 },
-   { 0x06600010, 0x20003dac, 0x02000020, 0x00030003 },
-   { 0x00000001, 0x206c0171, 0x00000000, 0x00000000 },
-   { 0x00610001, 0x208000a5, 0x02050080, 0x00000000 },
-   { 0x00610001, 0x212000a5, 0x02090100, 0x00000000 },
-   { 0x00410001, 0x211000a5, 0x02690100, 0x00000000 },
-   { 0x00200009, 0x25403dad, 0x00450064, 0x00020002 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00050540 },
-   { 0x00200040, 0x40883dad, 0x00660088, 0x00200020 },
-   { 0x00200040, 0x40923dad, 0x00660092, 0x00200020 },
-   { 0x00400040, 0x20983dad, 0x00690098, 0x00200020 },
-   { 0x00200401, 0x22080060, 0x00000000, 0x03400140 },
-   { 0x00000c01, 0x220c0060, 0x00000000, 0x04400080 },
-   { 0x00000801, 0x22040060, 0x00000000, 0x01000070 },
-   { 0x00000001, 0x20200169, 0x00000000, 0x00000000 },
-   { 0x0000000c, 0x2458262d, 0x0000006d, 0x00000020 },
-   { 0x00000001, 0x210e0169, 0x00000000, 0x00010001 },
-   { 0x00000005, 0x24583dad, 0x00000458, 0x00030003 },
-   { 0x01000010, 0x200035ac, 0x0000010e, 0x00000458 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000002fe },
-   { 0x01000010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00010401, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00010805, 0x245a3e2d, 0x02008800, 0x007f007f },
-   { 0x00110401, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00110805, 0x245a3e2d, 0x02008804, 0x007f007f },
-   { 0x0000000c, 0x211e362d, 0x0000006c, 0x00000020 },
-   { 0x00000040, 0x20780d21, 0x0000045a, 0x0208a002 },
-   { 0x02000005, 0x20003dac, 0x0200011e, 0x00030003 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000001be },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00700000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c000c },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x0007000c },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00110040, 0x20441da5, 0x02000442, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c0007 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00070007 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x01600006, 0x20003dac, 0x0000044a, 0x00000000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00010040, 0x22000c20, 0x00000078, 0x00200010 },
-   { 0x00110040, 0x22000c20, 0x00000078, 0x00300010 },
-   { 0x00010001, 0x20480061, 0x00000000, 0x00030009 },
-   { 0x00110001, 0x20480061, 0x00000000, 0x00040009 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001a },
-   { 0x00600001, 0x26220231, 0x008d05c0, 0x00000000 },
-   { 0x00600401, 0x26120231, 0x008d05b8, 0x00000000 },
-   { 0x00600801, 0x26020231, 0x008d05b0, 0x00000000 },
-   { 0x00600401, 0x25f20231, 0x008d05a8, 0x00000000 },
-   { 0x00600801, 0x25e20231, 0x008d05a0, 0x00000000 },
-   { 0x00600401, 0x25d20231, 0x008d0598, 0x00000000 },
-   { 0x00600801, 0x25c20231, 0x008d0590, 0x00000000 },
-   { 0x00600401, 0x25b20231, 0x008d0588, 0x00000000 },
-   { 0x00600801, 0x25a20231, 0x008d0580, 0x00000000 },
-   { 0x00600401, 0x25920231, 0x008d0578, 0x00000000 },
-   { 0x00600801, 0x25820231, 0x008d0570, 0x00000000 },
-   { 0x00600001, 0x25720231, 0x008d0568, 0x00000000 },
-   { 0x00600001, 0x25620231, 0x008d0560, 0x00000000 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00810001, 0xbc000229, 0x02ad8000, 0x00000000 },
-   { 0x00810001, 0xbc200229, 0x02ad8020, 0x00000000 },
-   { 0x00810001, 0xbc400229, 0x02ad8040, 0x00000000 },
-   { 0x00810001, 0xbc600229, 0x02ad8060, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000012a },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000066 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000064 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04a00480 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00a02040, 0x2400462c, 0x00ad8000, 0x00ad8005 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8001, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8002, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8003, 0x00140014 },
-   { 0x00a02048, 0xb8003e2d, 0x00ad8004, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8040, 0x00ad8045 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8041, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8042, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8043, 0x00140014 },
-   { 0x00a02048, 0xb8403e2d, 0x00ad8044, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8080, 0x00ad8085 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8081, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8082, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8083, 0x00140014 },
-   { 0x00a02048, 0xb8803e2d, 0x00ad8084, 0xfffbfffb },
-   { 0x00600040, 0x2400462c, 0x008d80c0, 0x008d80c5 },
-   { 0x00600048, 0x24003e2c, 0x008d80c1, 0xfffbfffb },
-   { 0x00600048, 0x24003e2c, 0x008d80c2, 0x00140014 },
-   { 0x00600048, 0x24003e2c, 0x008d80c3, 0x00140014 },
-   { 0x00600048, 0xb8c03e2d, 0x008d80c4, 0xfffbfffb },
-   { 0x00000401, 0x22000060, 0x00000000, 0x04a00480 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04a00490 },
-   { 0x00010802, 0x220c2d28, 0x00000454, 0x04800480 },
-   { 0x00a02040, 0x24003dac, 0x00b18000, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8800, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8820, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18020, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8820, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8840, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18040, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x000a000a },
-   { 0x00a02040, 0x24003dac, 0x00b18040, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18060, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8860, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8880, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18080, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8880, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed88a0, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000000b4 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000004c },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000004a },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010002, 0x220c2d28, 0x02000454, 0x04800480 },
-   { 0x00800040, 0x24003e2c, 0x01ed8000, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8001, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8021, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8002, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8022, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8003, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8023, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8004, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8024, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8005, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8025, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00800040, 0x24003e2c, 0x01ed8040, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8060, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8041, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8061, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8042, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8062, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8043, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8063, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8044, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8064, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8045, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8065, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000042 },
-   { 0x00200401, 0x22000128, 0x0066044c, 0x00000000 },
-   { 0x00200c01, 0x22040128, 0x0045044e, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x03400010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220c0168, 0x02000000, 0x04800480 },
-   { 0x00a02040, 0x24003e2c, 0x00ad83e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8be0, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8800, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8800, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8820, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00a02040, 0x24003e2c, 0x00ad8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8040, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8840, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8860, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8060, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8860, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8880, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000001c },
-   { 0x00200401, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x01200010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01200010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00210040, 0x22002d08, 0x00450200, 0x00010001 },
-   { 0x00210040, 0x22002d08, 0x02450200, 0x00100010 },
-   { 0x00800001, 0xb8000229, 0x01ed8000, 0x00000000 },
-   { 0x00800001, 0xb8200229, 0x01ed8020, 0x00000000 },
-   { 0x00800001, 0xb8400229, 0x01ed8040, 0x00000000 },
-   { 0x00800001, 0xb8600229, 0x01ed8060, 0x00000000 },
-   { 0x80800042, 0xd8004631, 0x00d29800, 0x00d20480 },
-   { 0x80800042, 0xd8204631, 0x00d29820, 0x00d204a0 },
-   { 0x80800042, 0xd8404631, 0x00d29840, 0x00d204c0 },
-   { 0x80800042, 0xd8604631, 0x00d29860, 0x00d204e0 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000c01, 0x220201e8, 0x00000000, 0x07100710 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00200040, 0x244c3d09, 0x00450200, 0x00100010 },
-   { 0x00800041, 0x24002628, 0x00ad8000, 0x00000540 },
-   { 0x00800041, 0x24202628, 0x00ad8020, 0x00000540 },
-   { 0x00800048, 0x24002628, 0x00ad8002, 0x00000542 },
-   { 0x00800048, 0x24202628, 0x00ad8022, 0x00000542 },
-   { 0x00200001, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00800048, 0x24002628, 0x01ed8000, 0x00000544 },
-   { 0x00800048, 0x24202628, 0x01ed8020, 0x00000544 },
-   { 0x00800048, 0xbc002629, 0x01ed8002, 0x00000546 },
-   { 0x00801048, 0xbc202629, 0x01ed8022, 0x00000546 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000126 },
-   { 0x00000001, 0x20220169, 0x00000000, 0x00040004 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00500000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x00080008 },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00030008 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0x22000c20, 0x00000078, 0x00100010 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00000001, 0x20480061, 0x00000000, 0x00020005 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00410001, 0xbc000229, 0x02698000, 0x00000000 },
-   { 0x00410001, 0xbc100229, 0x02698010, 0x00000000 },
-   { 0x00410001, 0xbc200229, 0x02698020, 0x00000000 },
-   { 0x00410001, 0xbc300229, 0x02698030, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000000be },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000042 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04d004c0 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00802040, 0x2400462c, 0x00a98000, 0x00a98005 },
-   { 0x00802048, 0x24003e2c, 0x00a98001, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98002, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98003, 0x00140014 },
-   { 0x00802048, 0xb8003e2d, 0x00a98004, 0xfffbfffb },
-   { 0x00802040, 0x2400462c, 0x00a98040, 0x00a98045 },
-   { 0x00802048, 0x24003e2c, 0x00a98041, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98042, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98043, 0x00140014 },
-   { 0x00802048, 0xb8203e2d, 0x00a98044, 0xfffbfffb },
-   { 0x00400040, 0x2400462c, 0x00698080, 0x00698085 },
-   { 0x00400048, 0x24003e2c, 0x00698081, 0xfffbfffb },
-   { 0x00400048, 0x24003e2c, 0x00698082, 0x00140014 },
-   { 0x00400048, 0x24003e2c, 0x00698083, 0x00140014 },
-   { 0x00400048, 0xb8403e2d, 0x00698084, 0xfffbfffb },
-   { 0x00000401, 0x220c0060, 0x00000000, 0x04e004d0 },
-   { 0x00000c01, 0x22000060, 0x00000000, 0x04d004c8 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04e004d8 },
-   { 0x00000801, 0x22080060, 0x00000000, 0x04f004e8 },
-   { 0x00800040, 0x24003dac, 0x00b104c0, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x00b104e0, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed9800, 0x00140014 },
-   { 0x00010001, 0x220c0168, 0x00000000, 0x05400540 },
-   { 0x00110001, 0x220c0168, 0x00000000, 0x04c004c0 },
-   { 0x00800048, 0x24003dac, 0x01e98000, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01e98020, 0x00010001 },
-   { 0x00800048, 0x24003dac, 0x01e98800, 0x00140014 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000060 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000022 },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010001, 0x220e0168, 0x02000000, 0x05400540 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x00800040, 0x24003e2c, 0x01e98000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98001, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98002, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98003, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98004, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98005, 0x00010001 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x03600010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x00400401, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x00400840, 0x22083d2c, 0x0069044c, 0x00100010 },
-   { 0x00610040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x01e983e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e993e0, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e99000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e99020, 0x00010001 },
-   { 0x00000001, 0x220e0168, 0x00000000, 0x05400540 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x00400001, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x01400010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01400010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00010001 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00100010 },
-   { 0x00800001, 0x25400229, 0x01e98000, 0x00000000 },
-   { 0x80800042, 0x45404631, 0x00d20540, 0x00d204c0 },
-   { 0x00000001, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x00400001, 0xd8000231, 0x008a0540, 0x00000000 },
-   { 0x00400001, 0xd8100231, 0x008a0548, 0x00000000 },
-   { 0x00400001, 0xd8200231, 0x008a0550, 0x00000000 },
-   { 0x00400001, 0xd8300231, 0x008a0558, 0x00000000 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00600041, 0x24002628, 0x00898000, 0x00000540 },
-   { 0x00600048, 0x24002628, 0x00898002, 0x00000542 },
-   { 0x00600048, 0x24002628, 0x00898008, 0x00000544 },
-   { 0x00600048, 0x2540262d, 0x0089800a, 0x00000546 },
-   { 0x00400401, 0xbc0001a9, 0x00690540, 0x00000000 },
-   { 0x00400801, 0xbc1001a9, 0x00690548, 0x00000000 },
-   { 0x01000010, 0x20003d2c, 0x00000022, 0x00030003 },
-   { 0x01000040, 0x20223d29, 0x02000022, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00080008 },
-   { 0x00110040, 0x24540c21, 0x00000454, 0x00080008 },
-   { 0x00010040, 0x24540c21, 0x00000454, 0x00180038 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffee6 },
-   { 0x01800010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0xffe0ffe0 },
-   { 0x00010001, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00110001, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00000001, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00800040, 0x24003dac, 0x00b19c00, 0x00200020 },
-   { 0x00800040, 0x24203dac, 0x00b19c20, 0x00200020 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00060006 },
-   { 0x8080000c, 0xdc203d91, 0x00b10420, 0x00060006 },
-   { 0x02000040, 0x210e3d29, 0x0200010e, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00040004 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffcf8 },
-   { 0x01000005, 0x25643e2d, 0x00000060, 0x00c000c0 },
-   { 0x01000010, 0x20003dac, 0x02000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00a02001, 0x46400231, 0x00d20780, 0x00000000 },
-   { 0x00a02001, 0x46800231, 0x00d207c0, 0x00000000 },
-   { 0x00a02001, 0x46c00231, 0x00d20480, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000007e },
-   { 0x80a02042, 0x46404631, 0x00d20640, 0x00d20780 },
-   { 0x80a02042, 0x46804631, 0x00d20680, 0x00d207c0 },
-   { 0x80a02042, 0x46c04631, 0x00d206c0, 0x00d20480 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000010, 0x20003dac, 0x02000564, 0x00800080 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffe4 },
-   { 0x00200401, 0x256801ed, 0x00000000, 0x00200020 },
-   { 0x00200801, 0x256c01ed, 0x00000000, 0x00060006 },
-   { 0x00400001, 0x258001ed, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x45a001ad, 0x00058c00, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000028 },
-   { 0x02600005, 0x20006e28, 0x02008c0c, 0x88848421 },
-   { 0x0220000c, 0x25663dad, 0x00000458, 0x00010001 },
-   { 0x0000000c, 0x25643dad, 0x00000564, 0x00060006 },
-   { 0x00310001, 0x25c401ad, 0x00000458, 0x00000000 },
-   { 0x00210001, 0x25c00061, 0x00000000, 0x00010001 },
-   { 0x00310040, 0x25c03dad, 0x004545c4, 0x00010001 },
-   { 0x00610001, 0x25a00061, 0x02000000, 0x00000080 },
-   { 0x00710001, 0x45a002ad, 0x02ae8c00, 0x00000000 },
-   { 0x00710001, 0x45a202ad, 0x02ae8c01, 0x00000000 },
-   { 0x00800041, 0x25a035ad, 0x00b105a0, 0x000905c0 },
-   { 0x01200010, 0x20003e2c, 0x0245006e, 0x00000000 },
-   { 0x00310009, 0x244c45ad, 0x02000564, 0x0045006e },
-   { 0x00210001, 0x244c01ed, 0x02000000, 0x00000000 },
-   { 0x0031000c, 0x244c3dad, 0x0245044c, 0x00010001 },
-   { 0x00200009, 0x256835ad, 0x0045044c, 0x00000566 },
-   { 0x00210040, 0x256835ad, 0x02450568, 0x00000566 },
-   { 0x00200040, 0x256c362d, 0x0045006e, 0x00000566 },
-   { 0x00400040, 0x240035ac, 0x00ab05a2, 0x00ab05a6 },
-   { 0x00400040, 0x2400358c, 0x00690400, 0x00000566 },
-   { 0x0040000c, 0x2580358d, 0x00690400, 0x00000566 },
-   { 0x00800041, 0x2400362c, 0x00d20640, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d20660, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d20780, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207a0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x464035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x466035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d20680, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d206a0, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d207c0, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207e0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x468035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x46a035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d206c0, 0x000705a8 },
-   { 0x00800041, 0x2420362c, 0x00d206e0, 0x000705a8 },
-   { 0x00800048, 0x2400362c, 0x00d20480, 0x000705ac },
-   { 0x00800048, 0x2420362c, 0x00d204a0, 0x000705ac },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x0000056a },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x0000056a },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056e },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056e },
-   { 0x80800040, 0x46c035b1, 0x00b104c0, 0x00050582 },
-   { 0x80800040, 0x46e035b1, 0x00b104e0, 0x00050582 },
-   { 0x01800005, 0x20003d2c, 0x02000020, 0x00020002 },
-   { 0x80800040, 0xd00045b1, 0x00b19000, 0x00d20640 },
-   { 0x80800040, 0xd02045b1, 0x00b19020, 0x00d20660 },
-   { 0x80800040, 0xd04045b1, 0x00b19040, 0x00d20680 },
-   { 0x80800040, 0xd06045b1, 0x00b19060, 0x00d206a0 },
-   { 0x00000040, 0x22083d8c, 0x00000208, 0x00800080 },
-   { 0x80400040, 0xd40045b1, 0x00699400, 0x00ab06c0 },
-   { 0x80400040, 0xd48045b1, 0x00699480, 0x00ab06c2 },
-   { 0x80400040, 0xd42045b1, 0x00699420, 0x00ab06e0 },
-   { 0x80400040, 0xd4a045b1, 0x006994a0, 0x00ab06e2 },
-   { 0x80400040, 0xd41045b1, 0x00699410, 0x00ab06d0 },
-   { 0x80400040, 0xd49045b1, 0x00699490, 0x00ab06d2 },
-   { 0x80400040, 0xd43045b1, 0x00699430, 0x00ab06f0 },
-   { 0x80400040, 0xd4b045b1, 0x006994b0, 0x00ab06f2 },
-   { 0x00000040, 0x220a3d8c, 0x0000020a, 0x00080008 },
-   { 0x00110040, 0x220a3d8c, 0x0200020a, 0x00300030 },
-   { 0x01000010, 0x20003d2c, 0x02000020, 0x00060006 },
-   { 0x00000040, 0x20203d29, 0x00000020, 0x00020002 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00100001 },
-   { 0x00000040, 0x220c358c, 0x0000020c, 0x0000003a },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffc36 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x220201ec, 0x00000000, 0x01c001c0 },
-   { 0x00800401, 0x20400236, 0x01ee8000, 0x00000000 },
-   { 0x00800801, 0x20500236, 0x01ee8010, 0x00000000 },
-   { 0x00800401, 0x20600236, 0x01ee8020, 0x00000000 },
-   { 0x00800801, 0x20700236, 0x01ee8030, 0x00000000 },
-   { 0x00800401, 0x20800236, 0x01ee8040, 0x00000000 },
-   { 0x00800801, 0x20900236, 0x01ee8050, 0x00000000 },
-   { 0x00800401, 0x20a00236, 0x01ee8060, 0x00000000 },
-   { 0x00800801, 0x20b00236, 0x01ee8070, 0x00000000 },
-   { 0x00800401, 0x20c00236, 0x01ee8100, 0x00000000 },
-   { 0x00800801, 0x20d00236, 0x01ee8110, 0x00000000 },
-   { 0x00800401, 0x20e00236, 0x01ee8120, 0x00000000 },
-   { 0x00800801, 0x20f00236, 0x01ee8130, 0x00000000 },
-   { 0x00800401, 0x21000236, 0x01ee8140, 0x00000000 },
-   { 0x00800801, 0x21100236, 0x01ee8150, 0x00000000 },
-   { 0x00800401, 0x21200236, 0x01ee8160, 0x00000000 },
-   { 0x00800801, 0x21300236, 0x01ee8170, 0x00000000 },
-   { 0x00200401, 0x204001a5, 0x00450064, 0x00000000 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x000f000f },
-   { 0x01600031, 0x21401c21, 0x508d0040, 0x1218a000 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x03400340 },
-   { 0x00800401, 0x41600236, 0x00d28000, 0x00000000 },
-   { 0x00800801, 0x41610236, 0x00d28080, 0x00000000 },
-   { 0x00800401, 0x41800236, 0x00d28020, 0x00000000 },
-   { 0x00800801, 0x41810236, 0x00d280a0, 0x00000000 },
-   { 0x00800401, 0x41a00236, 0x00d28040, 0x00000000 },
-   { 0x00800801, 0x41a10236, 0x00d280c0, 0x00000000 },
-   { 0x00800401, 0x41c00236, 0x00d28060, 0x00000000 },
-   { 0x00800801, 0x41c10236, 0x00d280e0, 0x00000000 },
-   { 0x0000040c, 0x20443ca5, 0x00000044, 0x00010001 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x0007000f },
-   { 0x0a600031, 0x21601c21, 0x508d0040, 0x0a18a001 },
-   { 0x00000001, 0x21400021, 0x00000140, 0x00000000 },
-   { 0x00000001, 0x21600021, 0x00000160, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00600001, 0x20400021, 0x008d0000, 0x00000000 },
-   { 0x00000005, 0x20203e2d, 0x00000061, 0x001f001f },
-   { 0x00200009, 0x20643e2d, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00000000 },
-   { 0x01000010, 0x20003dac, 0x00000020, 0x00160016 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x01200010, 0x20003e2c, 0x0200006c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000024 },
-   { 0x00800009, 0x25403dad, 0x00050064, 0x00020002 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00180018 },
-   { 0x00200040, 0x45483dad, 0x00660548, 0x00100010 },
-   { 0x00200040, 0x45523dad, 0x00660552, 0x00100010 },
-   { 0x00400040, 0x25583dad, 0x00690558, 0x00100010 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0x00200020 },
-   { 0x00800040, 0x20a035ad, 0x00b100a0, 0x00b10540 },
-   { 0x00600040, 0x45423dad, 0x00ae0542, 0x00200020 },
-   { 0x00800040, 0x20e035ad, 0x00b100e0, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0xffe0ffe0 },
-   { 0x00800040, 0x20c035ad, 0x00b100c0, 0x00b10540 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000014 },
-   { 0x06600010, 0x20003dac, 0x02000020, 0x00030003 },
-   { 0x00000001, 0x206c0171, 0x00000000, 0x00000000 },
-   { 0x00610001, 0x208000a5, 0x02050080, 0x00000000 },
-   { 0x00610001, 0x212000a5, 0x02090100, 0x00000000 },
-   { 0x00410001, 0x211000a5, 0x02690100, 0x00000000 },
-   { 0x00200009, 0x25403dad, 0x00450064, 0x00020002 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00050540 },
-   { 0x00200040, 0x40883dad, 0x00660088, 0x00200020 },
-   { 0x00200040, 0x40923dad, 0x00660092, 0x00200020 },
-   { 0x00400040, 0x20983dad, 0x00690098, 0x00200020 },
-   { 0x00200401, 0x22080060, 0x00000000, 0x03400140 },
-   { 0x00000c01, 0x220c0060, 0x00000000, 0x04400080 },
-   { 0x00000801, 0x22040060, 0x00000000, 0x01000070 },
-   { 0x00000005, 0x203e2e29, 0x00000063, 0x00010001 },
-   { 0x00000001, 0x20200169, 0x00000000, 0x00000000 },
-   { 0x0000000c, 0x2458262d, 0x0000006d, 0x00000020 },
-   { 0x00000001, 0x210e0169, 0x00000000, 0x00010001 },
-   { 0x00000005, 0x24583dad, 0x00000458, 0x00030003 },
-   { 0x01000010, 0x200035ac, 0x0000010e, 0x00000458 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000316 },
-   { 0x01000010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00010401, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00010805, 0x245a3e2d, 0x02008800, 0x007f007f },
-   { 0x00110401, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00110805, 0x245a3e2d, 0x02008804, 0x007f007f },
-   { 0x00010005, 0x245c3e2d, 0x02008800, 0x00800080 },
-   { 0x00110005, 0x245c3e2d, 0x02008804, 0x00800080 },
-   { 0x00000009, 0x245c3dad, 0x0000045c, 0x00010001 },
-   { 0x0000000c, 0x211e362d, 0x0000006c, 0x00000020 },
-   { 0x00000040, 0x240035ac, 0x0000003e, 0x0000045c },
-   { 0x01000010, 0x20003d8c, 0x00210400, 0x00010001 },
-   { 0x01000010, 0x20003d8c, 0x02210400, 0x01000100 },
-   { 0x00000001, 0x203c01ed, 0x00000000, 0x00000000 },
-   { 0x00010001, 0x203c01ed, 0x00000000, 0x00020002 },
-   { 0x00010001, 0x203c01ed, 0x02000000, 0xfffefffe },
-   { 0x00000040, 0x20780d21, 0x0000045a, 0x0208e602 },
-   { 0x00000040, 0x20782421, 0x00000078, 0x0000045c },
-   { 0x02000005, 0x20003dac, 0x0200011e, 0x00030003 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000001c0 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00700000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c000c },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x0007000c },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00110040, 0x20441da5, 0x02000442, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c0007 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00070007 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x01600006, 0x20003dac, 0x0000044a, 0x00000000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00010040, 0x22000c20, 0x00000078, 0x00200010 },
-   { 0x00110040, 0x22000c20, 0x00000078, 0x00300010 },
-   { 0x00010001, 0x20480061, 0x00000000, 0x00030009 },
-   { 0x00110001, 0x20480061, 0x00000000, 0x00040009 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001a },
-   { 0x00600001, 0x26220231, 0x008d05c0, 0x00000000 },
-   { 0x00600401, 0x26120231, 0x008d05b8, 0x00000000 },
-   { 0x00600801, 0x26020231, 0x008d05b0, 0x00000000 },
-   { 0x00600401, 0x25f20231, 0x008d05a8, 0x00000000 },
-   { 0x00600801, 0x25e20231, 0x008d05a0, 0x00000000 },
-   { 0x00600401, 0x25d20231, 0x008d0598, 0x00000000 },
-   { 0x00600801, 0x25c20231, 0x008d0590, 0x00000000 },
-   { 0x00600401, 0x25b20231, 0x008d0588, 0x00000000 },
-   { 0x00600801, 0x25a20231, 0x008d0580, 0x00000000 },
-   { 0x00600401, 0x25920231, 0x008d0578, 0x00000000 },
-   { 0x00600801, 0x25820231, 0x008d0570, 0x00000000 },
-   { 0x00600001, 0x25720231, 0x008d0568, 0x00000000 },
-   { 0x00600001, 0x25620231, 0x008d0560, 0x00000000 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00810001, 0xbc000229, 0x02ad8000, 0x00000000 },
-   { 0x00810001, 0xbc200229, 0x02ad8020, 0x00000000 },
-   { 0x00810001, 0xbc400229, 0x02ad8040, 0x00000000 },
-   { 0x00810001, 0xbc600229, 0x02ad8060, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000012a },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000066 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000064 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04a00480 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00a02040, 0x2400462c, 0x00ad8000, 0x00ad8005 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8001, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8002, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8003, 0x00140014 },
-   { 0x00a02048, 0xb8003e2d, 0x00ad8004, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8040, 0x00ad8045 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8041, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8042, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8043, 0x00140014 },
-   { 0x00a02048, 0xb8403e2d, 0x00ad8044, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8080, 0x00ad8085 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8081, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8082, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8083, 0x00140014 },
-   { 0x00a02048, 0xb8803e2d, 0x00ad8084, 0xfffbfffb },
-   { 0x00600040, 0x2400462c, 0x008d80c0, 0x008d80c5 },
-   { 0x00600048, 0x24003e2c, 0x008d80c1, 0xfffbfffb },
-   { 0x00600048, 0x24003e2c, 0x008d80c2, 0x00140014 },
-   { 0x00600048, 0x24003e2c, 0x008d80c3, 0x00140014 },
-   { 0x00600048, 0xb8c03e2d, 0x008d80c4, 0xfffbfffb },
-   { 0x00000401, 0x22000060, 0x00000000, 0x04a00480 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04a00490 },
-   { 0x00010802, 0x220c2d28, 0x00000454, 0x04800480 },
-   { 0x00a02040, 0x24003dac, 0x00b18000, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8800, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8820, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18020, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8820, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8840, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18040, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x000a000a },
-   { 0x00a02040, 0x24003dac, 0x00b18040, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18060, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8860, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8880, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18080, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8880, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed88a0, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000000b4 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000004c },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000004a },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010002, 0x220c2d28, 0x02000454, 0x04800480 },
-   { 0x00800040, 0x24003e2c, 0x01ed8000, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8001, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8021, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8002, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8022, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8003, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8023, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8004, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8024, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8005, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8025, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00800040, 0x24003e2c, 0x01ed8040, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8060, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8041, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8061, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8042, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8062, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8043, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8063, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8044, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8064, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8045, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8065, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000042 },
-   { 0x00200401, 0x22000128, 0x0066044c, 0x00000000 },
-   { 0x00200c01, 0x22040128, 0x0045044e, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x03400010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220c0168, 0x02000000, 0x04800480 },
-   { 0x00a02040, 0x24003e2c, 0x00ad83e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8be0, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8800, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8800, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8820, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00a02040, 0x24003e2c, 0x00ad8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8040, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8840, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8860, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8060, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8860, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8880, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000001c },
-   { 0x00200401, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x01200010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01200010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00210040, 0x22002d08, 0x00450200, 0x00010001 },
-   { 0x00210040, 0x22002d08, 0x02450200, 0x00100010 },
-   { 0x00800001, 0xb8000229, 0x01ed8000, 0x00000000 },
-   { 0x00800001, 0xb8200229, 0x01ed8020, 0x00000000 },
-   { 0x00800001, 0xb8400229, 0x01ed8040, 0x00000000 },
-   { 0x00800001, 0xb8600229, 0x01ed8060, 0x00000000 },
-   { 0x80800042, 0xd8004631, 0x00d29800, 0x00d20480 },
-   { 0x80800042, 0xd8204631, 0x00d29820, 0x00d204a0 },
-   { 0x80800042, 0xd8404631, 0x00d29840, 0x00d204c0 },
-   { 0x80800042, 0xd8604631, 0x00d29860, 0x00d204e0 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000c01, 0x220201e8, 0x00000000, 0x07100710 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00200040, 0x244c3d09, 0x00450200, 0x00100010 },
-   { 0x00800041, 0x24002628, 0x00ad8000, 0x00000540 },
-   { 0x00800041, 0x24202628, 0x00ad8020, 0x00000540 },
-   { 0x00800048, 0x24002628, 0x00ad8002, 0x00000542 },
-   { 0x00800048, 0x24202628, 0x00ad8022, 0x00000542 },
-   { 0x00200001, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00800048, 0x24002628, 0x01ed8000, 0x00000544 },
-   { 0x00800048, 0x24202628, 0x01ed8020, 0x00000544 },
-   { 0x00800048, 0xbc002629, 0x01ed8002, 0x00000546 },
-   { 0x00801048, 0xbc202629, 0x01ed8022, 0x00000546 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000128 },
-   { 0x00000001, 0x20220169, 0x00000000, 0x00040004 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00500000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x00080008 },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00030008 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x00000040, 0x22000c20, 0x00000078, 0x00100010 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00000001, 0x20480061, 0x00000000, 0x00020005 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00410001, 0xbc000229, 0x02698000, 0x00000000 },
-   { 0x00410001, 0xbc100229, 0x02698010, 0x00000000 },
-   { 0x00410001, 0xbc200229, 0x02698020, 0x00000000 },
-   { 0x00410001, 0xbc300229, 0x02698030, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000000be },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000042 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04d004c0 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00802040, 0x2400462c, 0x00a98000, 0x00a98005 },
-   { 0x00802048, 0x24003e2c, 0x00a98001, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98002, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98003, 0x00140014 },
-   { 0x00802048, 0xb8003e2d, 0x00a98004, 0xfffbfffb },
-   { 0x00802040, 0x2400462c, 0x00a98040, 0x00a98045 },
-   { 0x00802048, 0x24003e2c, 0x00a98041, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98042, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98043, 0x00140014 },
-   { 0x00802048, 0xb8203e2d, 0x00a98044, 0xfffbfffb },
-   { 0x00400040, 0x2400462c, 0x00698080, 0x00698085 },
-   { 0x00400048, 0x24003e2c, 0x00698081, 0xfffbfffb },
-   { 0x00400048, 0x24003e2c, 0x00698082, 0x00140014 },
-   { 0x00400048, 0x24003e2c, 0x00698083, 0x00140014 },
-   { 0x00400048, 0xb8403e2d, 0x00698084, 0xfffbfffb },
-   { 0x00000401, 0x220c0060, 0x00000000, 0x04e004d0 },
-   { 0x00000c01, 0x22000060, 0x00000000, 0x04d004c8 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04e004d8 },
-   { 0x00000801, 0x22080060, 0x00000000, 0x04f004e8 },
-   { 0x00800040, 0x24003dac, 0x00b104c0, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x00b104e0, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed9800, 0x00140014 },
-   { 0x00010001, 0x220c0168, 0x00000000, 0x05400540 },
-   { 0x00110001, 0x220c0168, 0x00000000, 0x04c004c0 },
-   { 0x00800048, 0x24003dac, 0x01e98000, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01e98020, 0x00010001 },
-   { 0x00800048, 0x24003dac, 0x01e98800, 0x00140014 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000060 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000022 },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010001, 0x220e0168, 0x02000000, 0x05400540 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x00800040, 0x24003e2c, 0x01e98000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98001, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98002, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98003, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98004, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98005, 0x00010001 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x03600010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x00400401, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x00400840, 0x22083d2c, 0x0069044c, 0x00100010 },
-   { 0x00610040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x01e983e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e993e0, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e99000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e99020, 0x00010001 },
-   { 0x00000001, 0x220e0168, 0x00000000, 0x05400540 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x00400001, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x01400010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01400010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00010001 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00100010 },
-   { 0x00800001, 0x25400229, 0x01e98000, 0x00000000 },
-   { 0x80800042, 0x45404631, 0x00d20540, 0x00d204c0 },
-   { 0x00000001, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x00400001, 0xd8000231, 0x008a0540, 0x00000000 },
-   { 0x00400001, 0xd8100231, 0x008a0548, 0x00000000 },
-   { 0x00400001, 0xd8200231, 0x008a0550, 0x00000000 },
-   { 0x00400001, 0xd8300231, 0x008a0558, 0x00000000 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00600041, 0x24002628, 0x00898000, 0x00000540 },
-   { 0x00600048, 0x24002628, 0x00898002, 0x00000542 },
-   { 0x00600048, 0x24002628, 0x00898008, 0x00000544 },
-   { 0x00600048, 0x2540262d, 0x0089800a, 0x00000546 },
-   { 0x00400401, 0xbc0001a9, 0x00690540, 0x00000000 },
-   { 0x00400801, 0xbc1001a9, 0x00690548, 0x00000000 },
-   { 0x01000010, 0x20003d2c, 0x00000022, 0x00030003 },
-   { 0x01000040, 0x20223d29, 0x02000022, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00080008 },
-   { 0x00110040, 0x24540c21, 0x00000454, 0x00080008 },
-   { 0x00010040, 0x24540c21, 0x00000454, 0x00180038 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffee4 },
-   { 0x01800010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0xffe0ffe0 },
-   { 0x00010001, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00110001, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00000001, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00800040, 0x24003dac, 0x00b19c00, 0x00200020 },
-   { 0x00800040, 0x24203dac, 0x00b19c20, 0x00200020 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00060006 },
-   { 0x8080000c, 0xdc203d91, 0x00b10420, 0x00060006 },
-   { 0x02000040, 0x210e3d29, 0x0200010e, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00040004 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffce0 },
-   { 0x01000005, 0x25643e2d, 0x00000060, 0x00c000c0 },
-   { 0x01000010, 0x20003dac, 0x02000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00a02001, 0x46400231, 0x00d20780, 0x00000000 },
-   { 0x00a02001, 0x46800231, 0x00d207c0, 0x00000000 },
-   { 0x00a02001, 0x46c00231, 0x00d20480, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000007e },
-   { 0x80a02042, 0x46404631, 0x00d20640, 0x00d20780 },
-   { 0x80a02042, 0x46804631, 0x00d20680, 0x00d207c0 },
-   { 0x80a02042, 0x46c04631, 0x00d206c0, 0x00d20480 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000010, 0x20003dac, 0x02000564, 0x00800080 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffe4 },
-   { 0x00200401, 0x256801ed, 0x00000000, 0x00200020 },
-   { 0x00200801, 0x256c01ed, 0x00000000, 0x00060006 },
-   { 0x00400001, 0x258001ed, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x45a001ad, 0x00058c00, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000028 },
-   { 0x02600005, 0x20006e28, 0x02008c0c, 0x88848421 },
-   { 0x0220000c, 0x25663dad, 0x00000458, 0x00010001 },
-   { 0x0000000c, 0x25643dad, 0x00000564, 0x00060006 },
-   { 0x00310001, 0x25c401ad, 0x00000458, 0x00000000 },
-   { 0x00210001, 0x25c00061, 0x00000000, 0x00010001 },
-   { 0x00310040, 0x25c03dad, 0x004545c4, 0x00010001 },
-   { 0x00610001, 0x25a00061, 0x02000000, 0x00000080 },
-   { 0x00710001, 0x45a002ad, 0x02ae8c00, 0x00000000 },
-   { 0x00710001, 0x45a202ad, 0x02ae8c01, 0x00000000 },
-   { 0x00800041, 0x25a035ad, 0x00b105a0, 0x000905c0 },
-   { 0x01200010, 0x20003e2c, 0x0245006e, 0x00000000 },
-   { 0x00310009, 0x244c45ad, 0x02000564, 0x0045006e },
-   { 0x00210001, 0x244c01ed, 0x02000000, 0x00000000 },
-   { 0x0031000c, 0x244c3dad, 0x0245044c, 0x00010001 },
-   { 0x00200009, 0x256835ad, 0x0045044c, 0x00000566 },
-   { 0x00210040, 0x256835ad, 0x02450568, 0x00000566 },
-   { 0x00200040, 0x256c362d, 0x0045006e, 0x00000566 },
-   { 0x00400040, 0x240035ac, 0x00ab05a2, 0x00ab05a6 },
-   { 0x00400040, 0x2400358c, 0x00690400, 0x00000566 },
-   { 0x0040000c, 0x2580358d, 0x00690400, 0x00000566 },
-   { 0x00800041, 0x2400362c, 0x00d20640, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d20660, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d20780, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207a0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x464035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x466035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d20680, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d206a0, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d207c0, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207e0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x468035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x46a035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d206c0, 0x000705a8 },
-   { 0x00800041, 0x2420362c, 0x00d206e0, 0x000705a8 },
-   { 0x00800048, 0x2400362c, 0x00d20480, 0x000705ac },
-   { 0x00800048, 0x2420362c, 0x00d204a0, 0x000705ac },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x0000056a },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x0000056a },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056e },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056e },
-   { 0x80800040, 0x46c035b1, 0x00b104c0, 0x00050582 },
-   { 0x80800040, 0x46e035b1, 0x00b104e0, 0x00050582 },
-   { 0x01800005, 0x20003d2c, 0x02000020, 0x00020002 },
-   { 0x80800040, 0xd00045b1, 0x00b19000, 0x00d20640 },
-   { 0x80800040, 0xd02045b1, 0x00b19020, 0x00d20660 },
-   { 0x80800040, 0xd04045b1, 0x00b19040, 0x00d20680 },
-   { 0x80800040, 0xd06045b1, 0x00b19060, 0x00d206a0 },
-   { 0x00000040, 0x22083d8c, 0x00000208, 0x00800080 },
-   { 0x80400040, 0xd40045b1, 0x00699400, 0x00ab06c0 },
-   { 0x80400040, 0xd48045b1, 0x00699480, 0x00ab06c2 },
-   { 0x80400040, 0xd42045b1, 0x00699420, 0x00ab06e0 },
-   { 0x80400040, 0xd4a045b1, 0x006994a0, 0x00ab06e2 },
-   { 0x80400040, 0xd41045b1, 0x00699410, 0x00ab06d0 },
-   { 0x80400040, 0xd49045b1, 0x00699490, 0x00ab06d2 },
-   { 0x80400040, 0xd43045b1, 0x00699430, 0x00ab06f0 },
-   { 0x80400040, 0xd4b045b1, 0x006994b0, 0x00ab06f2 },
-   { 0x00000040, 0x220a3d8c, 0x0000020a, 0x00080008 },
-   { 0x00110040, 0x220a3d8c, 0x0200020a, 0x00300030 },
-   { 0x01000010, 0x20003d2c, 0x02000020, 0x00060006 },
-   { 0x00000040, 0x20203d29, 0x00000020, 0x00020002 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00100001 },
-   { 0x00000040, 0x220c358c, 0x0000020c, 0x0000003a },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffc1e },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x220201ec, 0x00000000, 0x01c001c0 },
-   { 0x00800401, 0x20400236, 0x01ee8000, 0x00000000 },
-   { 0x00800801, 0x20500236, 0x01ee8010, 0x00000000 },
-   { 0x00800401, 0x20600236, 0x01ee8020, 0x00000000 },
-   { 0x00800801, 0x20700236, 0x01ee8030, 0x00000000 },
-   { 0x00800401, 0x20800236, 0x01ee8040, 0x00000000 },
-   { 0x00800801, 0x20900236, 0x01ee8050, 0x00000000 },
-   { 0x00800401, 0x20a00236, 0x01ee8060, 0x00000000 },
-   { 0x00800801, 0x20b00236, 0x01ee8070, 0x00000000 },
-   { 0x00800401, 0x20c00236, 0x01ee8100, 0x00000000 },
-   { 0x00800801, 0x20d00236, 0x01ee8110, 0x00000000 },
-   { 0x00800401, 0x20e00236, 0x01ee8120, 0x00000000 },
-   { 0x00800801, 0x20f00236, 0x01ee8130, 0x00000000 },
-   { 0x00800401, 0x21000236, 0x01ee8140, 0x00000000 },
-   { 0x00800801, 0x21100236, 0x01ee8150, 0x00000000 },
-   { 0x00800401, 0x21200236, 0x01ee8160, 0x00000000 },
-   { 0x00800801, 0x21300236, 0x01ee8170, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x1218a600 },
-   { 0x00200401, 0x204001a5, 0x00450064, 0x00000000 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x000f000f },
-   { 0x01600031, 0x21400021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x03400340 },
-   { 0x00800401, 0x41600236, 0x00d28000, 0x00000000 },
-   { 0x00800801, 0x41610236, 0x00d28080, 0x00000000 },
-   { 0x00800401, 0x41800236, 0x00d28020, 0x00000000 },
-   { 0x00800801, 0x41810236, 0x00d280a0, 0x00000000 },
-   { 0x00800401, 0x41a00236, 0x00d28040, 0x00000000 },
-   { 0x00800801, 0x41a10236, 0x00d280c0, 0x00000000 },
-   { 0x00800401, 0x41c00236, 0x00d28060, 0x00000000 },
-   { 0x00800801, 0x41c10236, 0x00d280e0, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x0a18a601 },
-   { 0x0000040c, 0x20443ca5, 0x00000044, 0x00010001 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x0007000f },
-   { 0x0a600031, 0x21600021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x21400021, 0x00000140, 0x00000000 },
-   { 0x00000001, 0x21600021, 0x00000160, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0000, 0x00000000 },
-   { 0x00000005, 0x20203e2d, 0x00000061, 0x001f001f },
-   { 0x00200009, 0x20643e2d, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00000000 },
-   { 0x01000010, 0x20003dac, 0x00000020, 0x00160016 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x01200010, 0x20003e2c, 0x0200006c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000024 },
-   { 0x00800009, 0x25403dad, 0x00050064, 0x00020002 },
-   { 0x00000001, 0x203a01ed, 0x00000000, 0x00180018 },
-   { 0x00200040, 0x45483dad, 0x00660548, 0x00100010 },
-   { 0x00200040, 0x45523dad, 0x00660552, 0x00100010 },
-   { 0x00400040, 0x25583dad, 0x00690558, 0x00100010 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0x00200020 },
-   { 0x00800040, 0x20a035ad, 0x00b100a0, 0x00b10540 },
-   { 0x00600040, 0x45423dad, 0x00ae0542, 0x00200020 },
-   { 0x00800040, 0x20e035ad, 0x00b100e0, 0x00b10540 },
-   { 0x00600040, 0x45403dad, 0x00ae0540, 0xffe0ffe0 },
-   { 0x00800040, 0x20c035ad, 0x00b100c0, 0x00b10540 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000014 },
-   { 0x06600010, 0x20003dac, 0x02000020, 0x00030003 },
-   { 0x00000001, 0x206c0171, 0x00000000, 0x00000000 },
-   { 0x00610001, 0x208000a5, 0x02050080, 0x00000000 },
-   { 0x00610001, 0x212000a5, 0x02090100, 0x00000000 },
-   { 0x00410001, 0x211000a5, 0x02690100, 0x00000000 },
-   { 0x00200009, 0x25403dad, 0x00450064, 0x00020002 },
-   { 0x00800040, 0x208035ad, 0x00b10080, 0x00050540 },
-   { 0x00200040, 0x40883dad, 0x00660088, 0x00200020 },
-   { 0x00200040, 0x40923dad, 0x00660092, 0x00200020 },
-   { 0x00400040, 0x20983dad, 0x00690098, 0x00200020 },
-   { 0x00200401, 0x22080060, 0x00000000, 0x03400140 },
-   { 0x00000c01, 0x220c0060, 0x00000000, 0x04400080 },
-   { 0x00000801, 0x22040060, 0x00000000, 0x01000070 },
-   { 0x02000005, 0x20002e28, 0x00000061, 0x00400040 },
-   { 0x00010005, 0x203e2e29, 0x00000063, 0x00010001 },
-   { 0x00110001, 0x203e0169, 0x00000000, 0x00030003 },
-   { 0x00000001, 0x20200169, 0x00000000, 0x00000000 },
-   { 0x0000000c, 0x2458262d, 0x0000006d, 0x00000020 },
-   { 0x00000001, 0x210e0169, 0x00000000, 0x00010001 },
-   { 0x00000005, 0x24583dad, 0x00000458, 0x00030003 },
-   { 0x01000010, 0x200035ac, 0x0000010e, 0x00000458 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000031a },
-   { 0x01000010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00010401, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00010805, 0x245a3e2d, 0x02008800, 0x007f007f },
-   { 0x00110401, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00110805, 0x245a3e2d, 0x02008804, 0x007f007f },
-   { 0x00010005, 0x245c3e2d, 0x02008800, 0x00800080 },
-   { 0x00110005, 0x245c3e2d, 0x02008804, 0x00800080 },
-   { 0x00000009, 0x245c3dad, 0x0000045c, 0x00010001 },
-   { 0x0000000c, 0x211e362d, 0x0000006c, 0x00000020 },
-   { 0x00000040, 0x240035ac, 0x0000003e, 0x0000045c },
-   { 0x01000010, 0x20003d8c, 0x00210400, 0x00010001 },
-   { 0x01000010, 0x20003d8c, 0x02210400, 0x01000100 },
-   { 0x00000001, 0x203c01ed, 0x00000000, 0x00000000 },
-   { 0x00010001, 0x203c01ed, 0x00000000, 0x00020002 },
-   { 0x00010001, 0x203c01ed, 0x02000000, 0xfffefffe },
-   { 0x02000005, 0x20002e28, 0x00000061, 0x00400040 },
-   { 0x00010040, 0x244c0d21, 0x0000045a, 0x0208e602 },
-   { 0x00110040, 0x20780d21, 0x0000045a, 0x0208a002 },
-   { 0x00010040, 0x20782421, 0x0000044c, 0x0000045c },
-   { 0x02000005, 0x20003dac, 0x0200011e, 0x00030003 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000001c0 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00700000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c000c },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x0007000c },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00400000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00110040, 0x20441da5, 0x02000442, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x000c0007 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00070007 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x01600006, 0x20003dac, 0x0000044a, 0x00000000 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00010040, 0x22000c20, 0x00000078, 0x00200010 },
-   { 0x00110040, 0x22000c20, 0x00000078, 0x00300010 },
-   { 0x00010001, 0x20480061, 0x00000000, 0x00030009 },
-   { 0x00110001, 0x20480061, 0x00000000, 0x00040009 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x00009800, 0x00030003 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000001a },
-   { 0x00600001, 0x26220231, 0x008d05c0, 0x00000000 },
-   { 0x00600401, 0x26120231, 0x008d05b8, 0x00000000 },
-   { 0x00600801, 0x26020231, 0x008d05b0, 0x00000000 },
-   { 0x00600401, 0x25f20231, 0x008d05a8, 0x00000000 },
-   { 0x00600801, 0x25e20231, 0x008d05a0, 0x00000000 },
-   { 0x00600401, 0x25d20231, 0x008d0598, 0x00000000 },
-   { 0x00600801, 0x25c20231, 0x008d0590, 0x00000000 },
-   { 0x00600401, 0x25b20231, 0x008d0588, 0x00000000 },
-   { 0x00600801, 0x25a20231, 0x008d0580, 0x00000000 },
-   { 0x00600401, 0x25920231, 0x008d0578, 0x00000000 },
-   { 0x00600801, 0x25820231, 0x008d0570, 0x00000000 },
-   { 0x00600001, 0x25720231, 0x008d0568, 0x00000000 },
-   { 0x00600001, 0x25620231, 0x008d0560, 0x00000000 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00810001, 0xbc000229, 0x02ad8000, 0x00000000 },
-   { 0x00810001, 0xbc200229, 0x02ad8020, 0x00000000 },
-   { 0x00810001, 0xbc400229, 0x02ad8040, 0x00000000 },
-   { 0x00810001, 0xbc600229, 0x02ad8060, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000012a },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000066 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000064 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04a00480 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00a02040, 0x2400462c, 0x00ad8000, 0x00ad8005 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8001, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8002, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8003, 0x00140014 },
-   { 0x00a02048, 0xb8003e2d, 0x00ad8004, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8040, 0x00ad8045 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8041, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8042, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8043, 0x00140014 },
-   { 0x00a02048, 0xb8403e2d, 0x00ad8044, 0xfffbfffb },
-   { 0x00a02040, 0x2400462c, 0x00ad8080, 0x00ad8085 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8081, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8082, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8083, 0x00140014 },
-   { 0x00a02048, 0xb8803e2d, 0x00ad8084, 0xfffbfffb },
-   { 0x00600040, 0x2400462c, 0x008d80c0, 0x008d80c5 },
-   { 0x00600048, 0x24003e2c, 0x008d80c1, 0xfffbfffb },
-   { 0x00600048, 0x24003e2c, 0x008d80c2, 0x00140014 },
-   { 0x00600048, 0x24003e2c, 0x008d80c3, 0x00140014 },
-   { 0x00600048, 0xb8c03e2d, 0x008d80c4, 0xfffbfffb },
-   { 0x00000401, 0x22000060, 0x00000000, 0x04a00480 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04a00490 },
-   { 0x00010802, 0x220c2d28, 0x00000454, 0x04800480 },
-   { 0x00a02040, 0x24003dac, 0x00b18000, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8800, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8820, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18020, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8820, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8840, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18040, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x000a000a },
-   { 0x00a02040, 0x24003dac, 0x00b18040, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x01ed8840, 0xfffbfffb },
-   { 0x00800048, 0x24203dac, 0x01ed8860, 0xfffbfffb },
-   { 0x00a02048, 0x24003dac, 0x00b18060, 0x00140014 },
-   { 0x00800048, 0x24003dac, 0x01ed8860, 0x00140014 },
-   { 0x00800048, 0x24203dac, 0x01ed8880, 0x00140014 },
-   { 0x00a02048, 0x24003dac, 0x00b18080, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed8880, 0x00010001 },
-   { 0x00800048, 0x24203dac, 0x01ed88a0, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x000a000a },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x000000b4 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000004c },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000004a },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010002, 0x220c2d28, 0x02000454, 0x04800480 },
-   { 0x00800040, 0x24003e2c, 0x01ed8000, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8001, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8021, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8002, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8022, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8003, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8023, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8004, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8024, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8005, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8025, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00800040, 0x24003e2c, 0x01ed8040, 0x00100010 },
-   { 0x00800040, 0x24203e2c, 0x01ed8060, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8041, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8061, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8042, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8062, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8043, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8063, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8044, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8064, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8045, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8065, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000042 },
-   { 0x00200401, 0x22000128, 0x0066044c, 0x00000000 },
-   { 0x00200c01, 0x22040128, 0x0045044e, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x03400010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220c0168, 0x02000000, 0x04800480 },
-   { 0x00a02040, 0x24003e2c, 0x00ad83e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8be0, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8800, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8800, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8820, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0x00010001 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8203d91, 0x00b10420, 0x00050005 },
-   { 0x00a02040, 0x24003e2c, 0x00ad8020, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01ed8820, 0xfffbfffb },
-   { 0x00800048, 0x24203e2c, 0x01ed8840, 0xfffbfffb },
-   { 0x00a02048, 0x24003e2c, 0x00ad8040, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01ed8840, 0x00140014 },
-   { 0x00800048, 0x24203e2c, 0x01ed8860, 0x00140014 },
-   { 0x00a02048, 0x24003e2c, 0x00ad8060, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01ed8860, 0x00010001 },
-   { 0x00800048, 0x24203e2c, 0x01ed8880, 0x00010001 },
-   { 0x8080000c, 0xd8403d91, 0x00b10400, 0x00050005 },
-   { 0x8080100c, 0xd8603d91, 0x00b10420, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000001c },
-   { 0x00200401, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00000801, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x01200010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01200010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00210040, 0x22002d08, 0x00450200, 0x00010001 },
-   { 0x00210040, 0x22002d08, 0x02450200, 0x00100010 },
-   { 0x00800001, 0xb8000229, 0x01ed8000, 0x00000000 },
-   { 0x00800001, 0xb8200229, 0x01ed8020, 0x00000000 },
-   { 0x00800001, 0xb8400229, 0x01ed8040, 0x00000000 },
-   { 0x00800001, 0xb8600229, 0x01ed8060, 0x00000000 },
-   { 0x80800042, 0xd8004631, 0x00d29800, 0x00d20480 },
-   { 0x80800042, 0xd8204631, 0x00d29820, 0x00d204a0 },
-   { 0x80800042, 0xd8404631, 0x00d29840, 0x00d204c0 },
-   { 0x80800042, 0xd8604631, 0x00d29860, 0x00d204e0 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000c01, 0x220201e8, 0x00000000, 0x07100710 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00200040, 0x244c3d09, 0x00450200, 0x00100010 },
-   { 0x00800041, 0x24002628, 0x00ad8000, 0x00000540 },
-   { 0x00800041, 0x24202628, 0x00ad8020, 0x00000540 },
-   { 0x00800048, 0x24002628, 0x00ad8002, 0x00000542 },
-   { 0x00800048, 0x24202628, 0x00ad8022, 0x00000542 },
-   { 0x00200001, 0x22000128, 0x0045044c, 0x00000000 },
-   { 0x00800048, 0x24002628, 0x01ed8000, 0x00000544 },
-   { 0x00800048, 0x24202628, 0x01ed8020, 0x00000544 },
-   { 0x00800048, 0xbc002629, 0x01ed8002, 0x00000546 },
-   { 0x00801048, 0xbc202629, 0x01ed8022, 0x00000546 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000128 },
-   { 0x00000001, 0x20220169, 0x00000000, 0x00040004 },
-   { 0x00200005, 0x24443dad, 0x00459800, 0x00030003 },
-   { 0x0020000c, 0x24403dad, 0x00459800, 0x00020002 },
-   { 0x01600006, 0x20003dac, 0x02000446, 0x00000000 },
-   { 0x00010040, 0x22000c20, 0x02000078, 0x00200000 },
-   { 0x00110040, 0x22000c20, 0x02000078, 0x00500000 },
-   { 0x00310040, 0x20401da5, 0x02450440, 0xfffffffe },
-   { 0x00110001, 0x20480061, 0x02000000, 0x00080008 },
-   { 0x00010040, 0x20401da5, 0x02000440, 0xfffffffe },
-   { 0x00010001, 0x204401a5, 0x02000442, 0x00000000 },
-   { 0x00010001, 0x20480061, 0x02000000, 0x00030008 },
-   { 0x01600031, 0x25600021, 0x408d0040, 0x00000200 },
-   { 0x00000040, 0xb80235ad, 0x00009802, 0x0000003c },
-   { 0x00000040, 0x22000c20, 0x00000078, 0x00100010 },
-   { 0x0020040c, 0x24403dad, 0x00459800, 0x00030003 },
-   { 0x00200805, 0x24483dad, 0x00459800, 0x00070007 },
-   { 0x00200001, 0x204001a5, 0x00450440, 0x00000000 },
-   { 0x00000009, 0x20403ca5, 0x00000040, 0x00010001 },
-   { 0x00000001, 0x20480061, 0x00000000, 0x00020005 },
-   { 0x02600031, 0x27000021, 0x408d0040, 0x00000200 },
-   { 0x00110001, 0x220001ec, 0x02000000, 0x05820582 },
-   { 0x00010001, 0x220001ec, 0x02000000, 0x05620562 },
-   { 0x00000001, 0x220e0128, 0x00000454, 0x00000000 },
-   { 0x01800006, 0x200035ac, 0x02000446, 0x00000444 },
-   { 0x00410001, 0xbc000229, 0x02698000, 0x00000000 },
-   { 0x00410001, 0xbc100229, 0x02698010, 0x00000000 },
-   { 0x00410001, 0xbc200229, 0x02698020, 0x00000000 },
-   { 0x00410001, 0xbc300229, 0x02698030, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x000000be },
-   { 0x00600001, 0x2024018d, 0x008d0200, 0x00000000 },
-   { 0x01000041, 0x245e35ad, 0x00000446, 0x00000444 },
-   { 0x02000005, 0x20003db0, 0x0200045e, 0x00010001 },
-   { 0x00000040, 0x22022d08, 0x00000200, 0x00100010 },
-   { 0x00200040, 0x22042d08, 0x00450200, 0x00200020 },
-   { 0x00400001, 0x244c0109, 0x00690200, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000042 },
-   { 0x00000040, 0x22003d08, 0x00000200, 0xffdeffde },
-   { 0x00000440, 0x22023d08, 0x00000202, 0xffeeffee },
-   { 0x00000801, 0x220c0060, 0x00000000, 0x04d004c0 },
-   { 0x01000010, 0x20003db0, 0x0000045e, 0x00040004 },
-   { 0x00802040, 0x2400462c, 0x00a98000, 0x00a98005 },
-   { 0x00802048, 0x24003e2c, 0x00a98001, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98002, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98003, 0x00140014 },
-   { 0x00802048, 0xb8003e2d, 0x00a98004, 0xfffbfffb },
-   { 0x00802040, 0x2400462c, 0x00a98040, 0x00a98045 },
-   { 0x00802048, 0x24003e2c, 0x00a98041, 0xfffbfffb },
-   { 0x00802048, 0x24003e2c, 0x00a98042, 0x00140014 },
-   { 0x00802048, 0x24003e2c, 0x00a98043, 0x00140014 },
-   { 0x00802048, 0xb8203e2d, 0x00a98044, 0xfffbfffb },
-   { 0x00400040, 0x2400462c, 0x00698080, 0x00698085 },
-   { 0x00400048, 0x24003e2c, 0x00698081, 0xfffbfffb },
-   { 0x00400048, 0x24003e2c, 0x00698082, 0x00140014 },
-   { 0x00400048, 0x24003e2c, 0x00698083, 0x00140014 },
-   { 0x00400048, 0xb8403e2d, 0x00698084, 0xfffbfffb },
-   { 0x00000401, 0x220c0060, 0x00000000, 0x04e004d0 },
-   { 0x00000c01, 0x22000060, 0x00000000, 0x04d004c8 },
-   { 0x00000c01, 0x22040060, 0x00000000, 0x04e004d8 },
-   { 0x00000801, 0x22080060, 0x00000000, 0x04f004e8 },
-   { 0x00800040, 0x24003dac, 0x00b104c0, 0x02000200 },
-   { 0x00800048, 0x24003dac, 0x00b104e0, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01ed9800, 0x00140014 },
-   { 0x00010001, 0x220c0168, 0x00000000, 0x05400540 },
-   { 0x00110001, 0x220c0168, 0x00000000, 0x04c004c0 },
-   { 0x00800048, 0x24003dac, 0x01e98000, 0xfffbfffb },
-   { 0x00800048, 0x24003dac, 0x01e98020, 0x00010001 },
-   { 0x00800048, 0x24003dac, 0x01e98800, 0x00140014 },
-   { 0x8080000c, 0xd8003d91, 0x00b10400, 0x000a000a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000060 },
-   { 0x01000010, 0x20003db0, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000022 },
-   { 0x00400040, 0x22003d28, 0x0069044c, 0xfffefffe },
-   { 0x03400010, 0x20003dac, 0x00000446, 0x00020002 },
-   { 0x01000010, 0x20003db0, 0x02000444, 0x00020002 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00100010 },
-   { 0x01000010, 0x20003dac, 0x00000446, 0x00000000 },
-   { 0x00010001, 0x220e0168, 0x02000000, 0x05400540 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x00800040, 0x24003e2c, 0x01e98000, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98001, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98002, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98003, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98004, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e98005, 0x00010001 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x01000010, 0x20003db0, 0x00000446, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000024 },
-   { 0x03600010, 0x20003dac, 0x02000444, 0x00020002 },
-   { 0x00400401, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x00400840, 0x22083d2c, 0x0069044c, 0x00100010 },
-   { 0x00610040, 0x22002d08, 0x02690200, 0x00010001 },
-   { 0x01000010, 0x20003dac, 0x00000444, 0x00000000 },
-   { 0x01000010, 0x20003db0, 0x02000446, 0x00020002 },
-   { 0x00800040, 0x24003e2c, 0x01e983e0, 0x00100010 },
-   { 0x00800048, 0x24003e2c, 0x01e98000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e98020, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e993e0, 0xfffbfffb },
-   { 0x00800048, 0x24003e2c, 0x01e99000, 0x00140014 },
-   { 0x00800048, 0x24003e2c, 0x01e99020, 0x00010001 },
-   { 0x00000001, 0x220e0168, 0x00000000, 0x05400540 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000002 },
-   { 0x00110001, 0x220e0168, 0x02000000, 0x04c004c0 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00050005 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x00400001, 0x22000128, 0x0069044c, 0x00000000 },
-   { 0x01400010, 0x20003dac, 0x00000444, 0x00030003 },
-   { 0x01400010, 0x20003dac, 0x02000446, 0x00030003 },
-   { 0x00410040, 0x22002d08, 0x00690200, 0x00010001 },
-   { 0x00410040, 0x22002d08, 0x02690200, 0x00100010 },
-   { 0x00800001, 0x25400229, 0x01e98000, 0x00000000 },
-   { 0x80800042, 0x45404631, 0x00d20540, 0x00d204c0 },
-   { 0x00000001, 0x220c0128, 0x00000454, 0x00000000 },
-   { 0x00400001, 0xd8000231, 0x008a0540, 0x00000000 },
-   { 0x00400001, 0xd8100231, 0x008a0548, 0x00000000 },
-   { 0x00400001, 0xd8200231, 0x008a0550, 0x00000000 },
-   { 0x00400001, 0xd8300231, 0x008a0558, 0x00000000 },
-   { 0x00600001, 0x220001ac, 0x008d0024, 0x00000000 },
-   { 0x00200040, 0x244c3dad, 0x00450448, 0xfff8fff8 },
-   { 0x00000401, 0x220001ec, 0x00000000, 0x07000700 },
-   { 0x00000801, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00000441, 0x254635ad, 0x00000448, 0x0000044a },
-   { 0x00000c41, 0x254025ad, 0x0000444c, 0x0000444e },
-   { 0x00000c41, 0x254225ad, 0x00000448, 0x0000444e },
-   { 0x00000841, 0x254435ad, 0x0000444c, 0x0000044a },
-   { 0x00600041, 0x24002628, 0x00898000, 0x00000540 },
-   { 0x00600048, 0x24002628, 0x00898002, 0x00000542 },
-   { 0x00600048, 0x24002628, 0x00898008, 0x00000544 },
-   { 0x00600048, 0x2540262d, 0x0089800a, 0x00000546 },
-   { 0x00400401, 0xbc0001a9, 0x00690540, 0x00000000 },
-   { 0x00400801, 0xbc1001a9, 0x00690548, 0x00000000 },
-   { 0x01000010, 0x20003d2c, 0x00000022, 0x00030003 },
-   { 0x01000040, 0x20223d29, 0x02000022, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00080008 },
-   { 0x00110040, 0x24540c21, 0x00000454, 0x00080008 },
-   { 0x00010040, 0x24540c21, 0x00000454, 0x00180038 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffee4 },
-   { 0x01800010, 0x20003dac, 0x0200010e, 0x00010001 },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0xffe0ffe0 },
-   { 0x00010001, 0x24540061, 0x02000000, 0x06c00640 },
-   { 0x00110001, 0x24540061, 0x02000000, 0x04800780 },
-   { 0x00000001, 0x220e0128, 0x00000456, 0x00000000 },
-   { 0x00800040, 0x24003dac, 0x00b19c00, 0x00200020 },
-   { 0x00800040, 0x24203dac, 0x00b19c20, 0x00200020 },
-   { 0x8080000c, 0xdc003d91, 0x00b10400, 0x00060006 },
-   { 0x8080000c, 0xdc203d91, 0x00b10420, 0x00060006 },
-   { 0x02000040, 0x210e3d29, 0x0200010e, 0xffffffff },
-   { 0x00000040, 0x220c3d8c, 0x0000020c, 0x00040004 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffcdc },
-   { 0x01000005, 0x25643e2d, 0x00000060, 0x00c000c0 },
-   { 0x01000010, 0x20003dac, 0x02000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00a02001, 0x46400231, 0x00d20780, 0x00000000 },
-   { 0x00a02001, 0x46800231, 0x00d207c0, 0x00000000 },
-   { 0x00a02001, 0x46c00231, 0x00d20480, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000007e },
-   { 0x80a02042, 0x46404631, 0x00d20640, 0x00d20780 },
-   { 0x80a02042, 0x46804631, 0x00d20680, 0x00d207c0 },
-   { 0x80a02042, 0x46c04631, 0x00d206c0, 0x00d20480 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000010, 0x20003dac, 0x02000564, 0x00800080 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x0000000e },
-   { 0x01000010, 0x20003dac, 0x00000458, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffe4 },
-   { 0x00200401, 0x256801ed, 0x00000000, 0x00200020 },
-   { 0x00200801, 0x256c01ed, 0x00000000, 0x00060006 },
-   { 0x00400001, 0x258001ed, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x45a001ad, 0x00058c00, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000028 },
-   { 0x02600005, 0x20006e28, 0x02008c0c, 0x88848421 },
-   { 0x0220000c, 0x25663dad, 0x00000458, 0x00010001 },
-   { 0x0000000c, 0x25643dad, 0x00000564, 0x00060006 },
-   { 0x00310001, 0x25c401ad, 0x00000458, 0x00000000 },
-   { 0x00210001, 0x25c00061, 0x00000000, 0x00010001 },
-   { 0x00310040, 0x25c03dad, 0x004545c4, 0x00010001 },
-   { 0x00610001, 0x25a00061, 0x02000000, 0x00000080 },
-   { 0x00710001, 0x45a002ad, 0x02ae8c00, 0x00000000 },
-   { 0x00710001, 0x45a202ad, 0x02ae8c01, 0x00000000 },
-   { 0x00800041, 0x25a035ad, 0x00b105a0, 0x000905c0 },
-   { 0x01200010, 0x20003e2c, 0x0245006e, 0x00000000 },
-   { 0x00310009, 0x244c45ad, 0x02000564, 0x0045006e },
-   { 0x00210001, 0x244c01ed, 0x02000000, 0x00000000 },
-   { 0x0031000c, 0x244c3dad, 0x0245044c, 0x00010001 },
-   { 0x00200009, 0x256835ad, 0x0045044c, 0x00000566 },
-   { 0x00210040, 0x256835ad, 0x02450568, 0x00000566 },
-   { 0x00200040, 0x256c362d, 0x0045006e, 0x00000566 },
-   { 0x00400040, 0x240035ac, 0x00ab05a2, 0x00ab05a6 },
-   { 0x00400040, 0x2400358c, 0x00690400, 0x00000566 },
-   { 0x0040000c, 0x2580358d, 0x00690400, 0x00000566 },
-   { 0x00800041, 0x2400362c, 0x00d20640, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d20660, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d20780, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207a0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x464035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x466035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d20680, 0x000005a0 },
-   { 0x00800041, 0x2420362c, 0x00d206a0, 0x000005a0 },
-   { 0x00800048, 0x2400362c, 0x00d207c0, 0x000005a4 },
-   { 0x00800048, 0x2420362c, 0x00d207e0, 0x000005a4 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00000568 },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x00000568 },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056c },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056c },
-   { 0x80800040, 0x468035b1, 0x00b104c0, 0x00000580 },
-   { 0x80800040, 0x46a035b1, 0x00b104e0, 0x00000580 },
-   { 0x00800041, 0x2400362c, 0x00d206c0, 0x000705a8 },
-   { 0x00800041, 0x2420362c, 0x00d206e0, 0x000705a8 },
-   { 0x00800048, 0x2400362c, 0x00d20480, 0x000705ac },
-   { 0x00800048, 0x2420362c, 0x00d204a0, 0x000705ac },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x0000056a },
-   { 0x00800040, 0x2420358c, 0x00b10420, 0x0000056a },
-   { 0x0080000c, 0x24c0358d, 0x00b10400, 0x0000056e },
-   { 0x0080000c, 0x24e0358d, 0x00b10420, 0x0000056e },
-   { 0x80800040, 0x46c035b1, 0x00b104c0, 0x00050582 },
-   { 0x80800040, 0x46e035b1, 0x00b104e0, 0x00050582 },
-   { 0x01800005, 0x20003d2c, 0x02000020, 0x00020002 },
-   { 0x80800040, 0xd00045b1, 0x00b19000, 0x00d20640 },
-   { 0x80800040, 0xd02045b1, 0x00b19020, 0x00d20660 },
-   { 0x80800040, 0xd04045b1, 0x00b19040, 0x00d20680 },
-   { 0x80800040, 0xd06045b1, 0x00b19060, 0x00d206a0 },
-   { 0x00000040, 0x22083d8c, 0x00000208, 0x00800080 },
-   { 0x80400040, 0xd40045b1, 0x00699400, 0x00ab06c0 },
-   { 0x80400040, 0xd48045b1, 0x00699480, 0x00ab06c2 },
-   { 0x80400040, 0xd42045b1, 0x00699420, 0x00ab06e0 },
-   { 0x80400040, 0xd4a045b1, 0x006994a0, 0x00ab06e2 },
-   { 0x80400040, 0xd41045b1, 0x00699410, 0x00ab06d0 },
-   { 0x80400040, 0xd49045b1, 0x00699490, 0x00ab06d2 },
-   { 0x80400040, 0xd43045b1, 0x00699430, 0x00ab06f0 },
-   { 0x80400040, 0xd4b045b1, 0x006994b0, 0x00ab06f2 },
-   { 0x00000040, 0x220a3d8c, 0x0000020a, 0x00080008 },
-   { 0x00110040, 0x220a3d8c, 0x0200020a, 0x00300030 },
-   { 0x01000010, 0x20003d2c, 0x02000020, 0x00060006 },
-   { 0x00000040, 0x20203d29, 0x00000020, 0x00020002 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00100001 },
-   { 0x00000040, 0x220c358c, 0x0000020c, 0x0000003a },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xfffffc1a },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x220201ec, 0x00000000, 0x01c001c0 },
-   { 0x00800401, 0x20400236, 0x01ee8000, 0x00000000 },
-   { 0x00800801, 0x20500236, 0x01ee8010, 0x00000000 },
-   { 0x00800401, 0x20600236, 0x01ee8020, 0x00000000 },
-   { 0x00800801, 0x20700236, 0x01ee8030, 0x00000000 },
-   { 0x00800401, 0x20800236, 0x01ee8040, 0x00000000 },
-   { 0x00800801, 0x20900236, 0x01ee8050, 0x00000000 },
-   { 0x00800401, 0x20a00236, 0x01ee8060, 0x00000000 },
-   { 0x00800801, 0x20b00236, 0x01ee8070, 0x00000000 },
-   { 0x00800401, 0x20c00236, 0x01ee8100, 0x00000000 },
-   { 0x00800801, 0x20d00236, 0x01ee8110, 0x00000000 },
-   { 0x00800401, 0x20e00236, 0x01ee8120, 0x00000000 },
-   { 0x00800801, 0x20f00236, 0x01ee8130, 0x00000000 },
-   { 0x00800401, 0x21000236, 0x01ee8140, 0x00000000 },
-   { 0x00800801, 0x21100236, 0x01ee8150, 0x00000000 },
-   { 0x00800401, 0x21200236, 0x01ee8160, 0x00000000 },
-   { 0x00800801, 0x21300236, 0x01ee8170, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x1218a000 },
-   { 0x00200401, 0x204001a5, 0x00450064, 0x00000000 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x000f000f },
-   { 0x01600031, 0x21400021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x220001ec, 0x00000000, 0x03400340 },
-   { 0x00800401, 0x41600236, 0x00d28000, 0x00000000 },
-   { 0x00800801, 0x41610236, 0x00d28080, 0x00000000 },
-   { 0x00800401, 0x41800236, 0x00d28020, 0x00000000 },
-   { 0x00800801, 0x41810236, 0x00d280a0, 0x00000000 },
-   { 0x00800401, 0x41a00236, 0x00d28040, 0x00000000 },
-   { 0x00800801, 0x41a10236, 0x00d280c0, 0x00000000 },
-   { 0x00800401, 0x41c00236, 0x00d28060, 0x00000000 },
-   { 0x00800801, 0x41c10236, 0x00d280e0, 0x00000000 },
-   { 0x00000040, 0x22000d20, 0x00000062, 0x0a18a001 },
-   { 0x0000040c, 0x20443ca5, 0x00000044, 0x00010001 },
-   { 0x00000801, 0x20480061, 0x00000000, 0x0007000f },
-   { 0x0a600031, 0x21600021, 0x508d0040, 0x00000200 },
-   { 0x00000001, 0x21400021, 0x00000140, 0x00000000 },
-   { 0x00000001, 0x21600021, 0x00000160, 0x00000000 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x01000005, 0x20602d29, 0x02000042, 0x00070007 },
-   { 0x01000005, 0x20422d29, 0x00000042, 0xfff8fff8 },
-   { 0x00000001, 0x202001e9, 0x00000000, 0x100c100c },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00000009, 0x27e82d21, 0x00000040, 0x00060006 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000100 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x02600005, 0x20000c20, 0x02000090, 0x00002000 },
-   { 0x00000006, 0x20880c21, 0x00000088, 0x00200000 },
-   { 0x00200009, 0x20845529, 0x0000009c, 0x00450020 },
-   { 0x00200001, 0x40840231, 0x00450094, 0x00000000 },
-   { 0x00310001, 0x20840229, 0x02450094, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000095, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000094 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x20800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x020000d0, 0x00002000 },
-   { 0x00000006, 0x20c80c21, 0x000000c8, 0x00200000 },
-   { 0x00200009, 0x20c45529, 0x000000dc, 0x00450020 },
-   { 0x00200001, 0x40c40231, 0x004500d4, 0x00000000 },
-   { 0x00310001, 0x20c40229, 0x024500d4, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x000000d5, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x000000d4 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000110, 0x00002000 },
-   { 0x00000006, 0x21080c21, 0x00000108, 0x00200000 },
-   { 0x00200009, 0x21045529, 0x0000011c, 0x00450020 },
-   { 0x00200001, 0x41040231, 0x00450114, 0x00000000 },
-   { 0x00310001, 0x21040229, 0x02450114, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000115, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000114 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000150, 0x00002000 },
-   { 0x00000006, 0x21480c21, 0x00000148, 0x00200000 },
-   { 0x00200009, 0x21445529, 0x0000015c, 0x00450020 },
-   { 0x00200001, 0x41440231, 0x00450154, 0x00000000 },
-   { 0x00310001, 0x21440229, 0x02450154, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000155, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000154 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000190, 0x00002000 },
-   { 0x00000006, 0x21880c21, 0x00000188, 0x00200000 },
-   { 0x00200009, 0x21845529, 0x0000019c, 0x00450020 },
-   { 0x00200001, 0x41840231, 0x00450194, 0x00000000 },
-   { 0x00310001, 0x21840229, 0x02450194, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000195, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000194 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x020001d0, 0x00002000 },
-   { 0x00000006, 0x21c80c21, 0x000001c8, 0x00200000 },
-   { 0x00200009, 0x21c45529, 0x000001dc, 0x00450020 },
-   { 0x00200001, 0x41c40231, 0x004501d4, 0x00000000 },
-   { 0x00310001, 0x21c40229, 0x024501d4, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x000001d5, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x000001d4 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d01c0, 0x00000000 },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000210, 0x00002000 },
-   { 0x00000006, 0x22080c21, 0x00000208, 0x00200000 },
-   { 0x00200009, 0x22045529, 0x0000021c, 0x00450020 },
-   { 0x00200001, 0x42040231, 0x00450214, 0x00000000 },
-   { 0x00310001, 0x22040229, 0x02450214, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000215, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000214 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x22000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x02600005, 0x20000c20, 0x02000250, 0x00002000 },
-   { 0x00000006, 0x22480c21, 0x00000248, 0x00200000 },
-   { 0x00200009, 0x22445529, 0x0000025c, 0x00450020 },
-   { 0x00200001, 0x42440231, 0x00450254, 0x00000000 },
-   { 0x00310001, 0x22440229, 0x02450254, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00000255, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00000254 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0240, 0x00000000 },
-   { 0x00802001, 0x22400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x01000040, 0x20423dad, 0x00000042, 0xfff8fff8 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d00c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000080 },
-   { 0x00802001, 0x20400022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0140, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x21680c22, 0x000007e8, 0x00000100 },
-   { 0x00802001, 0x21800022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d01c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000180 },
-   { 0x00802001, 0x20400022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0240, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000200 },
-   { 0x01000010, 0x20002da0, 0x02000060, 0x00000000 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffff00 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000040 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x00000001, 0x220400e0, 0x00000000, 0x00a00080 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02008810, 0x00002000 },
-   { 0x01000040, 0x20603dad, 0x00000060, 0xffffffff },
-   { 0x00000006, 0xa8080c21, 0x00008808, 0x00200000 },
-   { 0x00200009, 0xa8045529, 0x0000881c, 0x00450020 },
-   { 0x00200001, 0xc8040231, 0x00458814, 0x00000000 },
-   { 0x00310001, 0xa8040229, 0x02458814, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000c },
-   { 0x00800041, 0x24002628, 0x00008815, 0x00000044 },
-   { 0x00800040, 0x24004508, 0x008d0400, 0x00008814 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d8800, 0x00000000 },
-   { 0x00802001, 0xa8000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d8800, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000040 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00400040 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xffffffda },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x01000005, 0x20602d29, 0x02000042, 0x00070007 },
-   { 0x01000005, 0x20422d29, 0x00000042, 0xfff8fff8 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00000009, 0x27e82d21, 0x00000040, 0x00060006 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000260 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x00200001, 0x20640229, 0x00450094, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000090, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000090, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000095, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000095, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000090, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x20881c21, 0x00000088, 0x00200000 },
-   { 0x00200001, 0x20840129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x20800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000090, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000009c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000009c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200009c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000090, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200009c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200009c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x20843d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x20862d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x40840231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x004500d4, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x020000d0, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x000000d0, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x000000d5, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x000000d5, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x000000d0, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x20c81c21, 0x000000c8, 0x00200000 },
-   { 0x00200001, 0x20c40129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x000000d0, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x000000dc, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x000000dc, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x020000dc, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x020000d0, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x020000dc, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x020000dc, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x20c43d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x20c62d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x40c40231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450114, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000110, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000110, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000115, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000115, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000110, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21081c21, 0x00000108, 0x00200000 },
-   { 0x00200001, 0x21040129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000110, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000011c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000011c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200011c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000110, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200011c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200011c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21043d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21062d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41040231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450154, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000150, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000150, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000155, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000155, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000150, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21481c21, 0x00000148, 0x00200000 },
-   { 0x00200001, 0x21440129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000150, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000015c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000015c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200015c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000150, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200015c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200015c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21443d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21462d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41440231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450194, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000190, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000190, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000195, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000195, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000190, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21881c21, 0x00000188, 0x00200000 },
-   { 0x00200001, 0x21840129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000190, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000019c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000019c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200019c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000190, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200019c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200019c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21843d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21862d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41840231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x004501d4, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x020001d0, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x000001d0, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x000001d5, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x000001d5, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x000001d0, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x21c81c21, 0x000001c8, 0x00200000 },
-   { 0x00200001, 0x21c40129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d01c0, 0x00000000 },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x000001d0, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x000001dc, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x000001dc, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x020001dc, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x020001d0, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x020001dc, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x020001dc, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x21c43d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x21c62d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x41c40231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450214, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000210, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000210, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000215, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000215, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000210, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x22081c21, 0x00000208, 0x00200000 },
-   { 0x00200001, 0x22040129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x22000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000210, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000021c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000021c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200021c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000210, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200021c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200021c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x22043d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x22062d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x42040231, 0x00660064, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00450254, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02000250, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00000250, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00000255, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00000255, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00000250, 0x00002000 },
-   { 0x02600005, 0x20001d20, 0x02000066, 0x00000001 },
-   { 0x00000006, 0x22481c21, 0x00000248, 0x00200000 },
-   { 0x00200001, 0x22440129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d0240, 0x00000000 },
-   { 0x00802001, 0x22400061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x02600005, 0x20000c20, 0x00000250, 0x00004000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00000001, 0x20680129, 0x0000025c, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000025c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200025c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02000250, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200025c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200025c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x02000068, 0x000d0070 },
-   { 0x00000009, 0x22443d09, 0x00000602, 0x000c000c },
-   { 0x00000005, 0x22462d09, 0x00000602, 0xf000f000 },
-   { 0x00200001, 0x42440231, 0x00660064, 0x00000000 },
-   { 0x01000040, 0x20423dad, 0x00000042, 0xfff8fff8 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d0080, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d00c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000080 },
-   { 0x00802001, 0x20400022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0140, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x21680c22, 0x000007e8, 0x00000100 },
-   { 0x00802001, 0x21800022, 0x008d0180, 0x00000000 },
-   { 0x00802001, 0x21c00022, 0x008d01c0, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x20280c22, 0x000007e8, 0x00000180 },
-   { 0x00802001, 0x20400022, 0x008d0200, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0240, 0x00000000 },
-   { 0x01800031, 0x20001d0c, 0x508d0000, 0x0a080400 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000200 },
-   { 0x01000010, 0x20002da0, 0x02000060, 0x00000000 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffda0 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000006e },
-   { 0x00600001, 0x20200022, 0x008d07e0, 0x00000000 },
-   { 0x01800031, 0x20801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20400022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20480c22, 0x000007e8, 0x00000080 },
-   { 0x02800031, 0x21001d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20600022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20680c22, 0x000007e8, 0x00000100 },
-   { 0x03800031, 0x21801d09, 0x408d0000, 0x02488400 },
-   { 0x00600001, 0x20800022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20880c22, 0x000007e8, 0x00000180 },
-   { 0x04800031, 0x22001d09, 0x408d0000, 0x02488400 },
-   { 0x00000001, 0x220400e0, 0x00000000, 0x00a00080 },
-   { 0x00600001, 0x20a00022, 0x008d0000, 0x00000000 },
-   { 0x00200001, 0x20640229, 0x00458814, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x02008810, 0x01000000 },
-   { 0x02600005, 0x20000c20, 0x00008810, 0x00004000 },
-   { 0x00600041, 0x24003e2c, 0x00008815, 0x00020002 },
-   { 0x00110001, 0x2066018d, 0x02000400, 0x00000000 },
-   { 0x00010040, 0x20663d8d, 0x02000400, 0x00010001 },
-   { 0x00110001, 0x2066022d, 0x00008815, 0x00000000 },
-   { 0x02600005, 0x20000c20, 0x00008810, 0x00002000 },
-   { 0x01000040, 0x20603dad, 0x02000060, 0xffffffff },
-   { 0x00000006, 0xa8080c21, 0x00008808, 0x00200000 },
-   { 0x00200001, 0xa8040129, 0x00450064, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x00800041, 0x24002528, 0x00000066, 0x00000044 },
-   { 0x00800040, 0x24002508, 0x008d0400, 0x00000064 },
-   { 0x00000009, 0x20a82d02, 0x00000404, 0x00060006 },
-   { 0x00802001, 0x20c00022, 0x008d8800, 0x00000000 },
-   { 0x00802001, 0xa8000061, 0x00000000, 0x00000000 },
-   { 0x05800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000022 },
-   { 0x02600005, 0x20000d20, 0x02000066, 0x00000001 },
-   { 0x02600005, 0x20000c20, 0x00008810, 0x00004000 },
-   { 0x00000001, 0x20680129, 0x0000881c, 0x00000000 },
-   { 0x00210002, 0x20700421, 0x02450038, 0x00450030 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000000e },
-   { 0x02600005, 0x20001d20, 0x0000881c, 0x00000010 },
-   { 0x00210002, 0x20700421, 0x02450028, 0x00450020 },
-   { 0x01600005, 0x20001d20, 0x0200881c, 0x00000001 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x02610005, 0x20001c20, 0x02008810, 0x00008000 },
-   { 0x02610005, 0x20001d20, 0x0200881c, 0x00000010 },
-   { 0x00010006, 0x20681d29, 0x0200881c, 0x00000010 },
-   { 0x02800005, 0x2000452c, 0x00000068, 0x000d0070 },
-   { 0x01000040, 0x20603dad, 0x02000060, 0x00000000 },
-   { 0x00000009, 0xa8043d09, 0x00000600, 0x000c000c },
-   { 0x00000005, 0xa8062d09, 0x00000600, 0xf000f000 },
-   { 0x00200001, 0xc8040231, 0x00660064, 0x00000000 },
-   { 0x00600001, 0x21600022, 0x008d07e0, 0x00000000 },
-   { 0x00802001, 0x21800022, 0x008d8800, 0x00000000 },
-   { 0x0b800031, 0x20001d0c, 0x508d0000, 0x06080300 },
-   { 0x00000040, 0x27e80c21, 0x000007e8, 0x00000040 },
-   { 0x00000040, 0x22040c00, 0x00000204, 0x00400040 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0xffffffac },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x01600031, 0x20001c20, 0x708d0000, 0x82000010 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x01400140 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00200020 },
-   { 0x00000001, 0x203801e2, 0x00000000, 0x00010001 },
-   { 0x00800001, 0x204001ae, 0x00b10020, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x000002a0, 0x00010001 },
-   { 0x00800031, 0x20000128, 0x608d07e0, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00020002 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc6 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffca },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00000041, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff4 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffff6 },
-   { 0x05000010, 0x200035ac, 0x00000240, 0x00000026 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffffc },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x20263d29, 0x00000036, 0x00040004 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000178 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000176 },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0288a001 },
-   { 0x01600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x03600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00000008, 0x25e83e2d, 0x00009080, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459080, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459050, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699060, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000134 },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009040, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699064, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000011e },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009042, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699068, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000110 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x00009044, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069906c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000102 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00800401, 0x23400231, 0x00a90040, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a90044, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a90048, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9004c, 0x00000000 },
-   { 0x00800001, 0x20400232, 0x002b0340, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x002b0350, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x002b0360, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x002b0370, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06082003 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000008, 0x25e83e2d, 0x00009082, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459082, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459054, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699070, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000096 },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009046, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699074, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000080 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009048, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699078, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000072 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x0000904a, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069907c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000064 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21000022, 0x008d0180, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x12082003 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00802001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0618a003 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c01, 0x27e401a1, 0x000005c2, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x02600031, 0x23401c25, 0x408d07e0, 0x02286003 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00800040, 0x2400462d, 0x00b19c00, 0x00b1d830 },
-   { 0x00800040, 0x2340462d, 0x00b19820, 0x00b1d830 },
-   { 0x00800040, 0x2360462d, 0x00b19c10, 0x00b1dc00 },
-   { 0x05810010, 0x200035ac, 0x008d2400, 0x000005d0 },
-   { 0x05810010, 0x200035ac, 0x008d2340, 0x000005d2 },
-   { 0x05810010, 0x200035ac, 0x008d2360, 0x000005d2 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x000000ca },
-   { 0x00800040, 0x2440462d, 0x00b19810, 0x00b1d830 },
-   { 0x00800040, 0x2460462d, 0x00b19c20, 0x00b1dc00 },
-   { 0x00800201, 0x24a00129, 0x00b19820, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000066 },
-   { 0x05800010, 0x200035ac, 0x028d2400, 0x000005e8 },
-   { 0x00800040, 0x2520462d, 0x00b19830, 0x00b19820 },
-   { 0x00800040, 0x2540462d, 0x00b19c00, 0x00b19c10 },
-   { 0x00000201, 0x26000108, 0x00000602, 0x00000000 },
-   { 0x05810010, 0x200035ac, 0x028d2440, 0x000005d2 },
-   { 0x05810010, 0x200035ac, 0x008d2460, 0x000005d2 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x0000001e },
-   { 0x00800040, 0x2560462d, 0x00b19810, 0x00b19800 },
-   { 0x00800040, 0x238045ad, 0x008d0520, 0x00b19c00 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19810 },
-   { 0x00800048, 0x24003dac, 0x008d0560, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x00b19c10, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xb8100231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x00b19820, 0x008d0520 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00800040, 0x2580462d, 0x00b19c20, 0x00b19c30 },
-   { 0x00800040, 0x238045ad, 0x008d0540, 0x008d04b0 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19c20 },
-   { 0x00800048, 0x24003dac, 0x008d0580, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xbc200231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x008d0540 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001005c },
-   { 0x00800201, 0x23e0022d, 0x002805d4, 0x00000000 },
-   { 0x00800201, 0x23c0022d, 0x002805d4, 0x00000000 },
-   { 0x05800010, 0x200035ac, 0x008d2440, 0x000005d2 },
-   { 0x05800010, 0x200035ac, 0x028d2460, 0x000005d2 },
-   { 0x00800040, 0x24003e2c, 0x00b19820, 0x00040004 },
-   { 0x00800048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b1dc10 },
-   { 0x00800008, 0x23403d8d, 0x00b10400, 0x00030003 },
-   { 0x00810040, 0x23e03dad, 0x008d03e0, 0x00010001 },
-   { 0x00200201, 0x25ec018d, 0x00450600, 0x00000000 },
-   { 0x00810040, 0x23e03dad, 0x028d03e0, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05800010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00800042, 0x24c0462d, 0x00b19830, 0x00b19c00 },
-   { 0x00810001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00810001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x00200201, 0x260001ac, 0x004505ec, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19830, 0x008d0340 },
-   { 0x80800040, 0x43403631, 0x00b19c00, 0x008d4340 },
-   { 0x00800001, 0xb8300231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00800040, 0x2400362c, 0x00b19810, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19820, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0360, 0x008d03c0 },
-   { 0x05800010, 0x200035ac, 0x028d0360, 0x008d43c0 },
-   { 0x00810001, 0x236001ad, 0x008d03c0, 0x00000000 },
-   { 0x00810001, 0x236001ad, 0x028d43c0, 0x00000000 },
-   { 0x00000201, 0x260201ac, 0x000005ee, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19820, 0x008d0360 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00800040, 0x2400362c, 0x00b19c20, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19c10, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0360, 0x008d03c0 },
-   { 0x05800010, 0x200035ac, 0x028d0360, 0x008d43c0 },
-   { 0x00810001, 0x236001ad, 0x008d03c0, 0x00000000 },
-   { 0x00810001, 0x236001ad, 0x028d43c0, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19c10, 0x008d0360 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x206801ed, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00030003 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc4 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffc8 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00800001, 0x240001ac, 0x00000068, 0x00000000 },
-   { 0x00000048, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff2 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00600401, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x26140061, 0x00000000, 0x01800000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000801, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00000040, 0x2078252d, 0x00000026, 0x00004280 },
-   { 0x00400001, 0x26000231, 0x00000078, 0x00000000 },
-   { 0x00600031, 0x26201c21, 0x308d0600, 0x02000002 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffffe8 },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000012 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x01400140 },
-   { 0x00000048, 0x20263dad, 0x00000036, 0x00040004 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00800001, 0x2220022d, 0x000d002c, 0x00000000 },
-   { 0x00600040, 0x22303dad, 0x008d0230, 0x00080008 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000126 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000124 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0248a002 },
-   { 0x02600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x02600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00800008, 0x2340352d, 0x00009050, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009052, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c0, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a0, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000fc },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590c8, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b0, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000ee },
-   { 0x00800008, 0x2340352d, 0x00009042, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a4, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000d8 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b4, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000ca },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00600401, 0x2340012d, 0x00890040, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x00890048, 0x00000000 },
-   { 0x00600001, 0x204001aa, 0x00270340, 0x00000000 },
-   { 0x00600001, 0x205001aa, 0x00270350, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x04082004 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00800008, 0x2340352d, 0x00009054, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009056, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c2, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00810081 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590ca, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000078 },
-   { 0x00800008, 0x2340352d, 0x00009048, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990ac, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000062 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990bc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000054 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0a082004 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00600001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0418a004 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00600401, 0x2340012d, 0x008500cc, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x0085010c, 0x00000000 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x02600031, 0x23401c25, 0x408d07e0, 0x02186004 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00600040, 0x2400462d, 0x00ae9c00, 0x00aed810 },
-   { 0x00600040, 0x2340462d, 0x00ae9800, 0x00aed810 },
-   { 0x00600040, 0x2360462d, 0x00ae9c10, 0x00aedc00 },
-   { 0x05810010, 0x200035ac, 0x008d2400, 0x000005d0 },
-   { 0x05810010, 0x200035ac, 0x008d2340, 0x000005d2 },
-   { 0x05810010, 0x200035ac, 0x008d2360, 0x000005d2 },
-   { 0x00618022, 0x34001c00, 0x00001400, 0x00000038 },
-   { 0x00618022, 0x34001c00, 0x02001400, 0x00000016 },
-   { 0x00600040, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9810 },
-   { 0x80600008, 0x43403d91, 0x008d0400, 0x00020002 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9c00 },
-   { 0x80600008, 0x43603d91, 0x008d0400, 0x00020002 },
-   { 0x00600001, 0xd8100231, 0x00ae0340, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0360, 0x00000000 },
-   { 0x00608024, 0x34001c00, 0x00001400, 0x00010020 },
-   { 0x00600201, 0x2400022c, 0x002405d4, 0x00000000 },
-   { 0x00600040, 0x23e03d8d, 0x008d0400, 0x00010001 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00040004 },
-   { 0x00600048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00aedc10 },
-   { 0x00600008, 0x23403d8d, 0x008d0400, 0x00030003 },
-   { 0x03600010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05600010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00610001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00610001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x80600040, 0x43603631, 0x00ae9810, 0x008d0340 },
-   { 0x80600040, 0x43403631, 0x00ae9c00, 0x008d4340 },
-   { 0x00600001, 0xd8100231, 0x00ae0360, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x01400140 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00200020 },
-   { 0x00000001, 0x203801e2, 0x00000000, 0x00010001 },
-   { 0x00800001, 0x204001ae, 0x00b10020, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x000002a0, 0x00010001 },
-   { 0x00800031, 0x20000128, 0x608d07e0, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00020002 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc6 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffca },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00000041, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff4 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffff6 },
-   { 0x05000010, 0x200035ac, 0x00000240, 0x00000026 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffffc },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x20263d29, 0x00000036, 0x00040004 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x0000018c },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000018a },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0288e701 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0288e601 },
-   { 0x01600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x03600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00000008, 0x25e83e2d, 0x00009080, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459080, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459050, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699060, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb8c },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009040, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699064, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb76 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009042, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699068, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb68 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x00009044, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069906c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffb5a },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00800401, 0x23400231, 0x00a90040, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a90044, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a90048, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9004c, 0x00000000 },
-   { 0x00800001, 0x20400232, 0x002b0340, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x002b0350, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x002b0360, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x002b0370, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x06082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x06082603 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000008, 0x25e83e2d, 0x00009082, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x00459082, 0x00000000 },
-   { 0x00200c01, 0x25d80129, 0x00459054, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699070, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffaea },
-   { 0x00000008, 0x25e83e2d, 0x00009084, 0x00020002 },
-   { 0x00200401, 0x25d0022d, 0x00459084, 0x00000000 },
-   { 0x00000801, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000040, 0x25e83dad, 0x000005e8, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000401, 0x25d80129, 0x00009046, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699074, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffad4 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000401, 0x25d80129, 0x00009048, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x00699078, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffac6 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000401, 0x25d80129, 0x0000904a, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x0069907c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0xfffffab8 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21000022, 0x008d0180, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x12082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x12082603 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00802001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0618a703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0618a603 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00800401, 0x23400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c01, 0x27e401a1, 0x000005c2, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x00010008 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00cf0343, 0x00000000 },
-   { 0x00802001, 0x202000a2, 0x008d0380, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x06080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00030003 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x206801ed, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00030003 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc4 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffc8 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00800001, 0x240001ac, 0x00000068, 0x00000000 },
-   { 0x00000048, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff2 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00600401, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x26140061, 0x00000000, 0x01800000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000801, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00000040, 0x2078252d, 0x00000026, 0x00004280 },
-   { 0x00400001, 0x26000231, 0x00000078, 0x00000000 },
-   { 0x00600031, 0x26201c21, 0x308d0600, 0x02000002 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffffe8 },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000012 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00600009, 0x25c03dad, 0x00050034, 0x00040004 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x27e82c21, 0x000005e4, 0x00400040 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x01400140 },
-   { 0x00000048, 0x20263dad, 0x00000036, 0x00040004 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00800001, 0x2220022d, 0x000d002c, 0x00000000 },
-   { 0x00600040, 0x22303dad, 0x008d0230, 0x00080008 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x0000013a },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000138 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0248e702 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0248e602 },
-   { 0x02600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x02600031, 0x20800021, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00800008, 0x2340352d, 0x00009050, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009052, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c0, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a0, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffc0c },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590c8, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b0, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffbfe },
-   { 0x00800008, 0x2340352d, 0x00009042, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a4, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffbe8 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b4, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffbda },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00600401, 0x2340012d, 0x00890040, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x00890048, 0x00000000 },
-   { 0x00600001, 0x204001aa, 0x00270340, 0x00000000 },
-   { 0x00600001, 0x205001aa, 0x00270350, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x04082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x04082604 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00800008, 0x2340352d, 0x00009054, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009056, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000020 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00800080 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200401, 0x25d0022d, 0x004590c2, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb92 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00810081 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00200401, 0x25d0022d, 0x004590ca, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb84 },
-   { 0x00800008, 0x2340352d, 0x00009048, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00200401, 0x25d0022d, 0x004590c4, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990ac, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb6e },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200401, 0x25d0022d, 0x004590cc, 0x00000000 },
-   { 0x00400801, 0x25d40231, 0x006990bc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffb60 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0a082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0a082604 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00600001, 0x20400022, 0x008d0080, 0x00000000 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0418a704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0418a604 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x00600401, 0x2340012d, 0x008500cc, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x0085010c, 0x00000000 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000440, 0x27e03da1, 0x000005c0, 0x000c000c },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x00010008 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x236001ad, 0x002e0340, 0x00000000 },
-   { 0x00600001, 0x202000a2, 0x008d0360, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x00000026, 0x00010001 },
-   { 0x00800031, 0x20001d28, 0x608d07e0, 0x04080020 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00010001 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00010001 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x01400140 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00200020 },
-   { 0x00000001, 0x203801e2, 0x00000000, 0x00010001 },
-   { 0x00800001, 0x204001ae, 0x00b10020, 0x00000000 },
-   { 0x00000008, 0x27e03d29, 0x000002a0, 0x00010001 },
-   { 0x00800031, 0x20000128, 0x608d07e0, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x22a00169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00020002 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc6 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffca },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00000041, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff4 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xfffffff6 },
-   { 0x05000010, 0x200035ac, 0x00000240, 0x00000026 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffffc },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00400441, 0x45c03dad, 0x00000034, 0x00100010 },
-   { 0x00400841, 0x45c23dad, 0x00000036, 0x00200020 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x25e42c21, 0x000005e4, 0x00800080 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00000005, 0x202a3dad, 0x0000002a, 0xfffdfffd },
-   { 0x02000005, 0x20002d2c, 0x0200002a, 0x00020002 },
-   { 0x00000001, 0x27e80021, 0x000005e4, 0x00000000 },
-   { 0x00010040, 0x27e83c21, 0x020007e8, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000005, 0x25ec2e29, 0x00009002, 0x000a000a },
-   { 0x00000005, 0x25ea2e29, 0x00009002, 0x00060006 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000252 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000250 },
-   { 0x01000010, 0x20003d2c, 0x000005ec, 0x00080008 },
-   { 0x00000005, 0x25e03d8d, 0x00000600, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a5, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0288a001 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0288e701 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0288e601 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x00800401, 0x20400231, 0x00cf0340, 0x00000000 },
-   { 0x00800801, 0x20500231, 0x00cf0341, 0x00000000 },
-   { 0x00800401, 0x20600231, 0x00cf0342, 0x00000000 },
-   { 0x00800801, 0x20700231, 0x00cf0343, 0x00000000 },
-   { 0x01600010, 0x20003d2c, 0x000005ea, 0x00040004 },
-   { 0x01600010, 0x20003d2c, 0x020005ea, 0x00020002 },
-   { 0x00800001, 0x21c00229, 0x00009080, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009081, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289060, 0x00000000 },
-   { 0x00610401, 0x41c00229, 0x00009080, 0x00000000 },
-   { 0x00610801, 0x41c20229, 0x00009090, 0x00000000 },
-   { 0x00610401, 0x41e00229, 0x00009081, 0x00000000 },
-   { 0x00610801, 0x41e20229, 0x00009091, 0x00000000 },
-   { 0x00610401, 0x42000229, 0x00249060, 0x00000000 },
-   { 0x00610801, 0x42020229, 0x00249098, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x00610401, 0x21c00229, 0x02009080, 0x00000000 },
-   { 0x00610801, 0x21d00229, 0x02009090, 0x00000000 },
-   { 0x00610401, 0x21e00229, 0x02009081, 0x00000000 },
-   { 0x00610801, 0x21f00229, 0x02009091, 0x00000000 },
-   { 0x00610401, 0x22000229, 0x02249060, 0x00000000 },
-   { 0x00610801, 0x22100229, 0x02249098, 0x00000000 },
-   { 0x00800008, 0x25a03d29, 0x008d01c0, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200001, 0x25d80129, 0x00459050, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x000001b4 },
-   { 0x00800008, 0x25a03e29, 0x00009084, 0x00020002 },
-   { 0x00800001, 0x21c00229, 0x00009084, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009085, 0x00000000 },
-   { 0x00000001, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000001, 0x25d80129, 0x00009040, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289064, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000019c },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x25d80129, 0x00009042, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289068, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000018e },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000001, 0x25d80129, 0x00009044, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x0028906c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000180 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c4, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f0003 },
-   { 0x00800401, 0x23400231, 0x00a90040, 0x00000000 },
-   { 0x00800801, 0x23500231, 0x00a90044, 0x00000000 },
-   { 0x00800401, 0x23600231, 0x00a90048, 0x00000000 },
-   { 0x00800801, 0x23700231, 0x00a9004c, 0x00000000 },
-   { 0x00800001, 0x20400232, 0x002b0340, 0x00000000 },
-   { 0x00800001, 0x20500232, 0x002b0350, 0x00000000 },
-   { 0x00800001, 0x20600232, 0x002b0360, 0x00000000 },
-   { 0x00800001, 0x20700232, 0x002b0370, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06082003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x06082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x06082603 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000010 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02286003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x01000005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000440, 0x27e43ca5, 0x000007e4, 0xfffcfffc },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x00200000 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00010001 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02286703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02286603 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffcfffc },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20400021, 0x408d07e0, 0x00000200 },
-   { 0x00800401, 0x23800231, 0x00a900c0, 0x00000000 },
-   { 0x00800801, 0x23900231, 0x00a90100, 0x00000000 },
-   { 0x00800401, 0x23a00231, 0x00a90140, 0x00000000 },
-   { 0x00800801, 0x23b00231, 0x00a90180, 0x00000000 },
-   { 0x00800401, 0x23c00231, 0x00a900c4, 0x00000000 },
-   { 0x00800801, 0x23d00231, 0x00a90104, 0x00000000 },
-   { 0x00800401, 0x23e00231, 0x00a90144, 0x00000000 },
-   { 0x00800801, 0x23f00231, 0x00a90184, 0x00000000 },
-   { 0x00800401, 0x24000231, 0x00a900c8, 0x00000000 },
-   { 0x00800801, 0x24100231, 0x00a90108, 0x00000000 },
-   { 0x00800401, 0x24200231, 0x00a90148, 0x00000000 },
-   { 0x00800801, 0x24300231, 0x00a90188, 0x00000000 },
-   { 0x00800401, 0x24400231, 0x00a900cc, 0x00000000 },
-   { 0x00800801, 0x24500231, 0x00a9010c, 0x00000000 },
-   { 0x00800401, 0x24600231, 0x00a9014c, 0x00000000 },
-   { 0x00800801, 0x24700231, 0x00a9018c, 0x00000000 },
-   { 0x00800401, 0x20c00231, 0x00cf0380, 0x00000000 },
-   { 0x00800801, 0x20d00231, 0x00cf0381, 0x00000000 },
-   { 0x00800401, 0x20e00231, 0x00cf0382, 0x00000000 },
-   { 0x00800801, 0x20f00231, 0x00cf0383, 0x00000000 },
-   { 0x00800401, 0x21000231, 0x00cf03c0, 0x00000000 },
-   { 0x00800801, 0x21100231, 0x00cf03c1, 0x00000000 },
-   { 0x00800401, 0x21200231, 0x00cf03c2, 0x00000000 },
-   { 0x00800801, 0x21300231, 0x00cf03c3, 0x00000000 },
-   { 0x00800401, 0x21400231, 0x00cf0400, 0x00000000 },
-   { 0x00800801, 0x21500231, 0x00cf0401, 0x00000000 },
-   { 0x00800401, 0x21600231, 0x00cf0402, 0x00000000 },
-   { 0x00800801, 0x21700231, 0x00cf0403, 0x00000000 },
-   { 0x00800401, 0x21800231, 0x00cf0440, 0x00000000 },
-   { 0x00800801, 0x21900231, 0x00cf0441, 0x00000000 },
-   { 0x00800401, 0x21a00231, 0x00cf0442, 0x00000000 },
-   { 0x00800801, 0x21b00231, 0x00cf0443, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000001, 0x260201ac, 0x000005e0, 0x00000000 },
-   { 0x00800008, 0x25a03e29, 0x00009082, 0x00020002 },
-   { 0x00200001, 0x25d80129, 0x00459054, 0x00000000 },
-   { 0x00800001, 0x21c00229, 0x00009082, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009083, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289070, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000050 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x0000000a },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000d4 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000044 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05400540 },
-   { 0x00800001, 0x25000129, 0x00ad0040, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad0080, 0x00000000 },
-   { 0x00800001, 0x25400129, 0x00ad00c0, 0x00000000 },
-   { 0x00800001, 0x25600129, 0x00ad0100, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000c2 },
-   { 0x00600001, 0x20600129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20800129, 0x008d0520, 0x00000000 },
-   { 0x00600001, 0x20a00129, 0x008d0530, 0x00000000 },
-   { 0x00600001, 0x20c00129, 0x008d0540, 0x00000000 },
-   { 0x00600001, 0x20e00129, 0x008d0550, 0x00000000 },
-   { 0x00600001, 0x21000129, 0x008d0560, 0x00000000 },
-   { 0x00800008, 0x25a03e29, 0x00009092, 0x00020002 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05400540 },
-   { 0x00800001, 0x25000129, 0x00ad0050, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad0090, 0x00000000 },
-   { 0x00800001, 0x25400129, 0x00ad00d0, 0x00000000 },
-   { 0x00800001, 0x25600129, 0x00ad0110, 0x00000000 },
-   { 0x00200001, 0x25d80129, 0x0045905c, 0x00000000 },
-   { 0x00800001, 0x21c00229, 0x00009092, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009093, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x0028909c, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000009a },
-   { 0x00600001, 0x20700129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20900129, 0x008d0520, 0x00000000 },
-   { 0x00600001, 0x20b00129, 0x008d0530, 0x00000000 },
-   { 0x00600001, 0x20d00129, 0x008d0540, 0x00000000 },
-   { 0x00600001, 0x20f00129, 0x008d0550, 0x00000000 },
-   { 0x00600001, 0x21100129, 0x008d0560, 0x00000000 },
-   { 0x00800008, 0x25a03e29, 0x00009084, 0x00020002 },
-   { 0x00800001, 0x21c00229, 0x00009084, 0x00000000 },
-   { 0x00800001, 0x21e00229, 0x00009085, 0x00000000 },
-   { 0x00000001, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00800040, 0x25a03d29, 0x00b105a0, 0x00020002 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00c000c0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00000001, 0x25d80129, 0x00009046, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289074, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000076 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00100010 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01000100 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x25d80129, 0x00009048, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x00289078, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000068 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00200020 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x01400140 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01800180 },
-   { 0x00000001, 0x25d80129, 0x0000904a, 0x00000000 },
-   { 0x00800001, 0x22000229, 0x0028907c, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x0000005a },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c0, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00802001, 0x20c00022, 0x008d0140, 0x00000000 },
-   { 0x00802001, 0x21000022, 0x008d0180, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x12082003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x12082703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x12082603 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01800005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x00200401, 0x27e001a1, 0x004505c8, 0x00000000 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00812001, 0x20400022, 0x028d0040, 0x00000000 },
-   { 0x00912001, 0x20400022, 0x028d0080, 0x00000000 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0618a003 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00100010 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00010001 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0618a703 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0618a603 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffcfffc },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x0000002a, 0x00020002 },
-   { 0x00000006, 0x202a3dad, 0x0000002a, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffd94 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00800040, 0x2400462d, 0x00b19c00, 0x00b1d830 },
-   { 0x00800040, 0x2340462d, 0x00b19820, 0x00b1d830 },
-   { 0x00800040, 0x2360462d, 0x00b19c10, 0x00b1dc00 },
-   { 0x05810010, 0x200025ac, 0x008d2400, 0x008d01c0 },
-   { 0x05810010, 0x200025ac, 0x008d2340, 0x008d01e0 },
-   { 0x05810010, 0x200025ac, 0x008d2360, 0x008d01e0 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x000000c8 },
-   { 0x00800040, 0x2440462d, 0x00b19810, 0x00b1d830 },
-   { 0x00800040, 0x2460462d, 0x00b19c20, 0x00b1dc00 },
-   { 0x00800201, 0x24a00129, 0x00b19820, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000066 },
-   { 0x05800010, 0x200025ac, 0x028d2400, 0x008d05a0 },
-   { 0x00800040, 0x2520462d, 0x00b19830, 0x00b19820 },
-   { 0x00800040, 0x2540462d, 0x00b19c00, 0x00b19c10 },
-   { 0x00000201, 0x26000108, 0x00000602, 0x00000000 },
-   { 0x05810010, 0x200025ac, 0x028d2440, 0x008d01e0 },
-   { 0x05810010, 0x200025ac, 0x008d2460, 0x008d01e0 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x0000001e },
-   { 0x00800040, 0x2560462d, 0x00b19810, 0x00b19800 },
-   { 0x00800040, 0x238045ad, 0x008d0520, 0x00b19c00 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19810 },
-   { 0x00800048, 0x24003dac, 0x008d0560, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x00b19c10, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xb8100231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x00b19820, 0x008d0520 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xb8300231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00800040, 0x2580462d, 0x00b19c20, 0x00b19c30 },
-   { 0x00800040, 0x238045ad, 0x008d0540, 0x008d04b0 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00040004 },
-   { 0x00800040, 0x23a0458d, 0x00b10400, 0x00b19c20 },
-   { 0x00800048, 0x24003dac, 0x008d0580, 0x00020002 },
-   { 0x80800008, 0x43c03d91, 0x00b10400, 0x00030003 },
-   { 0x00800040, 0x24003dac, 0x00b103a0, 0xfffefffe },
-   { 0x80800008, 0x43603d91, 0x00b10400, 0x00020002 },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x00b10380 },
-   { 0x00800040, 0x2400358c, 0x00b10400, 0x00b103a0 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00030003 },
-   { 0x00800001, 0xbc200231, 0x00ae03c0, 0x00000000 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001000e },
-   { 0x00800040, 0x2400362c, 0x008d04a0, 0x008d0540 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b19c10 },
-   { 0x00800040, 0x24003d8c, 0x00b10400, 0x00020002 },
-   { 0x80800008, 0x43403d91, 0x00b10400, 0x00020002 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00808024, 0x34001c00, 0x00001400, 0x0001005a },
-   { 0x00800001, 0x23e0012d, 0x008d0200, 0x00000000 },
-   { 0x05800010, 0x200025ac, 0x008d2440, 0x008d01e0 },
-   { 0x05800010, 0x200025ac, 0x028d2460, 0x008d01e0 },
-   { 0x00800040, 0x24003e2c, 0x00b19820, 0x00040004 },
-   { 0x00800048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00800040, 0x2400458c, 0x00b10400, 0x00b1dc10 },
-   { 0x00800008, 0x23403d8d, 0x00b10400, 0x00030003 },
-   { 0x00810040, 0x23e03dad, 0x008d03e0, 0x00010001 },
-   { 0x00200201, 0x25ec018d, 0x00450600, 0x00000000 },
-   { 0x00810040, 0x23e03dad, 0x028d03e0, 0x00010001 },
-   { 0x03800010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05800010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00800042, 0x24c0462d, 0x00b19830, 0x00b19c00 },
-   { 0x00810001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00810001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x00200201, 0x260001ac, 0x004505ec, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19830, 0x008d0340 },
-   { 0x80800040, 0x43403631, 0x00b19c00, 0x008d4340 },
-   { 0x00800001, 0xb8300231, 0x00ae0360, 0x00000000 },
-   { 0x00800001, 0xbc000231, 0x00ae0340, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x00001400, 0x00000016 },
-   { 0x00800040, 0x2400362c, 0x00b19810, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19820, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200025ac, 0x008d0360, 0x008d0200 },
-   { 0x05800010, 0x200025ac, 0x028d0360, 0x008d4200 },
-   { 0x00810001, 0x2360012d, 0x008d0200, 0x00000000 },
-   { 0x00810001, 0x2360012d, 0x028d4200, 0x00000000 },
-   { 0x00000201, 0x260201ac, 0x000005ee, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19820, 0x008d0360 },
-   { 0x00800001, 0xb8200231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00818022, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00800040, 0x2400362c, 0x00b19c20, 0x008d04c0 },
-   { 0x00800048, 0x24003e2c, 0x00b19c10, 0xfffefffe },
-   { 0x00800008, 0x23603d8d, 0x00b10400, 0x00010001 },
-   { 0x03800010, 0x200025ac, 0x008d0360, 0x008d0200 },
-   { 0x05800010, 0x200025ac, 0x028d0360, 0x008d4200 },
-   { 0x00810001, 0x2360012d, 0x008d0200, 0x00000000 },
-   { 0x00810001, 0x2360012d, 0x028d4200, 0x00000000 },
-   { 0x80800040, 0x43603631, 0x00b19c10, 0x008d0360 },
-   { 0x00800001, 0xbc100231, 0x00ae0360, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00a02001, 0x20400169, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x206601ed, 0x00000000, 0x00010001 },
-   { 0x00000009, 0x20663dad, 0x00000066, 0x000a000a },
-   { 0x00000001, 0x206801ed, 0x00000000, 0x01400140 },
-   { 0x00000001, 0x22600169, 0x00000000, 0x00030003 },
-   { 0x00000008, 0x22403dad, 0x00000026, 0x00010001 },
-   { 0x00000041, 0x224235ad, 0x00000020, 0x00000022 },
-   { 0x00600001, 0x20200022, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x203c0022, 0x00000018, 0x00000000 },
-   { 0x00000001, 0x203f01f2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c00e2, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x202c010a, 0x00000e00, 0x00000000 },
-   { 0x00600001, 0x20400021, 0x008d0020, 0x00000000 },
-   { 0x00400001, 0x205401ed, 0x00000000, 0x00000000 },
-   { 0x00200040, 0x20583dad, 0x00450020, 0xffffffff },
-   { 0x00000001, 0x22000060, 0x00000000, 0x06080000 },
-   { 0x00600001, 0x26000021, 0x008d0000, 0x00000000 },
-   { 0x00000001, 0x26140061, 0x00000000, 0x00c00400 },
-   { 0x00000001, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x07600031, 0x26201c21, 0x308d0600, 0x02000000 },
-   { 0x00200401, 0x208000e5, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x208800e5, 0x00000000, 0xffffffc4 },
-   { 0x00000801, 0x208c00e5, 0x00000000, 0xffffffc8 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x20000022, 0x008d07e0, 0x00000000 },
-   { 0x00000040, 0x20283c22, 0x00000008, 0x00100010 },
-   { 0x00000001, 0x206001ed, 0x00000000, 0x00020002 },
-   { 0x00000001, 0x206201ad, 0x0000005a, 0x00000000 },
-   { 0x00000001, 0x20a001ed, 0x00000000, 0x00000000 },
-   { 0x00200001, 0x228001ed, 0x00000000, 0x00000000 },
-   { 0x00802001, 0x20c00061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21000061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21400061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21800061, 0x00000000, 0x00ff00ff },
-   { 0x00802001, 0x21c00061, 0x00000000, 0x00ff00ff },
-   { 0x00000041, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x05000010, 0x200035ac, 0x02000280, 0x00000240 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000004 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x01000010, 0x20002d28, 0x000090c2, 0x00000000 },
-   { 0x03000010, 0x200035ac, 0x02000054, 0x00000058 },
-   { 0x00800001, 0x240001ac, 0x00000068, 0x00000000 },
-   { 0x00000048, 0x22a03dad, 0x00000056, 0x00040004 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffff2 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00200001, 0xb0c00229, 0x00450054, 0x00000000 },
-   { 0x00200040, 0x22803dad, 0x00450280, 0x00010001 },
-   { 0x00000001, 0x20300022, 0x00000010, 0x00000000 },
-   { 0x00000001, 0x20380122, 0x00000260, 0x00000000 },
-   { 0x00800001, 0x204001ae, 0x00b10040, 0x00000000 },
-   { 0x00000008, 0x20003d2a, 0x000002a0, 0x00010001 },
-   { 0x00000040, 0x22602d29, 0x00000260, 0x00020002 },
-   { 0x00800031, 0x20000008, 0x608d0000, 0x00000200 },
-   { 0x00000006, 0x203025a2, 0x00000066, 0x000002a0 },
-   { 0x01600031, 0x20001c00, 0x708d0000, 0x02000001 },
-   { 0x04200010, 0x200035ac, 0x00450054, 0x00450060 },
-   { 0x00010040, 0x20a03dad, 0x02000056, 0x00010001 },
-   { 0x05200010, 0x200035ac, 0x02450280, 0x00450240 },
-   { 0x00000001, 0x240001ec, 0x00000000, 0x00040004 },
-   { 0x00000048, 0x22083dac, 0x00000056, 0x00040004 },
-   { 0x00200040, 0x205455ad, 0x00450054, 0x00450034 },
-   { 0x02000010, 0x20003d8c, 0x00000600, 0x00010001 },
-   { 0x00000041, 0x220e3d8c, 0x00000602, 0x00040004 },
-   { 0x00010041, 0x22083dac, 0x000000a0, 0x00040004 },
-   { 0x00010401, 0x205601ad, 0x000000a0, 0x00000000 },
-   { 0x00010840, 0x20543d2d, 0x000090c0, 0x00010001 },
-   { 0x00000220, 0x34001400, 0x00001400, 0x00009c80 },
-   { 0x01000010, 0x20003dac, 0x02000280, 0x00000000 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000014 },
-   { 0x00000030, 0x32000084, 0x00001200, 0x00000000 },
-   { 0x00000040, 0x22803dad, 0x00000280, 0xffffffff },
-   { 0x00600401, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000c01, 0x26140061, 0x00000000, 0x01800000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000801, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00000040, 0x2078252d, 0x00000026, 0x00004280 },
-   { 0x00400001, 0x26000231, 0x00000078, 0x00000000 },
-   { 0x00600031, 0x26201c21, 0x308d0600, 0x02000002 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0xffffffe8 },
-   { 0x07600031, 0x20001c20, 0x30000000, 0x02000001 },
-   { 0x01600031, 0x20001c24, 0x708d0000, 0x82000012 },
-   { 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
-   { 0x00600001, 0x27e00021, 0x008d0000, 0x00000000 },
-   { 0x00400441, 0x45c03dad, 0x00000034, 0x00100010 },
-   { 0x00400841, 0x45c23dad, 0x00000036, 0x00200020 },
-   { 0x00200001, 0x260001ec, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x25e20129, 0x00000036, 0x00000000 },
-   { 0x00000041, 0x25e435a1, 0x00000020, 0x00000036 },
-   { 0x00000040, 0x25e43421, 0x000005e4, 0x00000034 },
-   { 0x00000041, 0x25e42c21, 0x000005e4, 0x00800080 },
-   { 0x00000040, 0x25c43dad, 0x000005c4, 0xfffcfffc },
-   { 0x00000040, 0x25ca3dad, 0x000005ca, 0xfffcfffc },
-   { 0x00000005, 0x202a3dad, 0x0000002a, 0xfffdfffd },
-   { 0x00800001, 0x2220022d, 0x000d002c, 0x00000000 },
-   { 0x00600040, 0x22303dad, 0x008d0230, 0x00080008 },
-   { 0x02000005, 0x20002d2c, 0x0200002a, 0x00020002 },
-   { 0x00000001, 0x27e80021, 0x000005e4, 0x00000000 },
-   { 0x00010040, 0x27e83c21, 0x020007e8, 0x00400040 },
-   { 0x01600031, 0x22401c21, 0x408d07e0, 0x02885800 },
-   { 0x00000001, 0x220801ec, 0x00000000, 0x02400240 },
-   { 0x01800005, 0x20002d28, 0x02b19040, 0xffffffff },
-   { 0x02000005, 0x20003e2c, 0x00009030, 0x00010001 },
-   { 0x00000005, 0x25ec2e29, 0x00009002, 0x000a000a },
-   { 0x00000005, 0x25ea2e29, 0x00009002, 0x00060006 },
-   { 0x000b0220, 0x34001c00, 0x02001400, 0x00000252 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000250 },
-   { 0x01000010, 0x20003d2c, 0x000005ec, 0x00080008 },
-   { 0x00000005, 0x25e03d8d, 0x00000600, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0248a002 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0248e702 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0248e602 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x20c00021, 0x408d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x23400025, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x00800001, 0x204001a9, 0x002e0340, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00400040 },
-   { 0x01000010, 0x20003d2c, 0x020005ea, 0x00040004 },
-   { 0x00800008, 0x2340352d, 0x00009050, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009052, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x0000006a },
-   { 0x01000010, 0x20003d2c, 0x000005ea, 0x00020002 },
-   { 0x00110220, 0x34001c00, 0x02001400, 0x00000012 },
-   { 0x02600005, 0x20003dac, 0x00650340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02650360, 0x00010001 },
-   { 0x00400401, 0x41c00229, 0x000090c0, 0x00000000 },
-   { 0x00400801, 0x41c20229, 0x000090e0, 0x00000000 },
-   { 0x00400401, 0x41e00229, 0x000090c1, 0x00000000 },
-   { 0x00400801, 0x41e20229, 0x000090e1, 0x00000000 },
-   { 0x00400401, 0x42000229, 0x006990a0, 0x00000000 },
-   { 0x00400801, 0x42020229, 0x006990e8, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000001e },
-   { 0x00110220, 0x34001c00, 0x00001400, 0x00000012 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00400401, 0x21c00229, 0x000090c0, 0x00000000 },
-   { 0x00400801, 0x21c80229, 0x000090e0, 0x00000000 },
-   { 0x00400401, 0x21e00229, 0x000090c1, 0x00000000 },
-   { 0x00400801, 0x21e80229, 0x000090e1, 0x00000000 },
-   { 0x00400401, 0x22000229, 0x006990a0, 0x00000000 },
-   { 0x00400801, 0x22080229, 0x006990e8, 0x00000000 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000000a },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00600001, 0x21c00229, 0x000090c0, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c1, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a0, 0x00000000 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000001c8 },
-   { 0x01400010, 0x20003d2c, 0x000005ea, 0x00040004 },
-   { 0x01400010, 0x20003d2c, 0x020005ea, 0x00020002 },
-   { 0x00600001, 0x21c00229, 0x000090c8, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c9, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b0, 0x00000000 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00410401, 0x41c00229, 0x000090c8, 0x00000000 },
-   { 0x00410801, 0x41c20229, 0x000090f0, 0x00000000 },
-   { 0x00410401, 0x41e00229, 0x000090c9, 0x00000000 },
-   { 0x00410801, 0x41e20229, 0x000090f1, 0x00000000 },
-   { 0x00410401, 0x42000229, 0x006990b0, 0x00000000 },
-   { 0x00410801, 0x42020229, 0x006990f8, 0x00000000 },
-   { 0x00410401, 0x21c00229, 0x020090c8, 0x00000000 },
-   { 0x00410801, 0x21c80229, 0x020090f0, 0x00000000 },
-   { 0x00410401, 0x21e00229, 0x020090c9, 0x00000000 },
-   { 0x00410801, 0x21e80229, 0x020090f1, 0x00000000 },
-   { 0x00410401, 0x22000229, 0x026990b0, 0x00000000 },
-   { 0x00410801, 0x22080229, 0x026990f8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000019c },
-   { 0x00800008, 0x2340352d, 0x00009042, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00600001, 0x21c00229, 0x000090c4, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c5, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a4, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000184 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00600001, 0x21c00229, 0x000090cc, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cd, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b4, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000174 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c4, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c6, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x00070003 },
-   { 0x00600401, 0x2340012d, 0x00890040, 0x00000000 },
-   { 0x00600801, 0x2350012d, 0x00890048, 0x00000000 },
-   { 0x00600001, 0x204001aa, 0x00270340, 0x00000000 },
-   { 0x00600001, 0x205001aa, 0x00270350, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x04082004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x04082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x04082604 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da5, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000010 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x02186004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x01000005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000006 },
-   { 0x00000440, 0x27e43ca5, 0x000007e4, 0xfffefffe },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0003000f },
-   { 0x00000040, 0x22000c00, 0x00000200, 0x00100000 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00020002 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x02186704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x02186604 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffefffe },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x02600031, 0x20400021, 0x408d07e0, 0x00000200 },
-   { 0x00800001, 0x2380012d, 0x008900c0, 0x00000000 },
-   { 0x00800001, 0x23a0012d, 0x00890100, 0x00000000 },
-   { 0x00800001, 0x23c0012d, 0x008900c8, 0x00000000 },
-   { 0x00800001, 0x23e0012d, 0x00890108, 0x00000000 },
-   { 0x00600401, 0x20c001a9, 0x00ab0380, 0x00000000 },
-   { 0x00600801, 0x20d001a9, 0x00ab0382, 0x00000000 },
-   { 0x00600401, 0x20e001a9, 0x00ab0384, 0x00000000 },
-   { 0x00600801, 0x20f001a9, 0x00ab0386, 0x00000000 },
-   { 0x00600401, 0x210001a9, 0x00ab03c0, 0x00000000 },
-   { 0x00600801, 0x211001a9, 0x00ab03c2, 0x00000000 },
-   { 0x00600401, 0x212001a9, 0x00ab03c4, 0x00000000 },
-   { 0x00600801, 0x213001a9, 0x00ab03c6, 0x00000000 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00800080 },
-   { 0x00000001, 0x260201ac, 0x000005e0, 0x00000000 },
-   { 0x00800008, 0x2340352d, 0x00009054, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x00009056, 0x008d0220 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0x00000084 },
-   { 0x00010220, 0x34001c00, 0x02001400, 0x00000026 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00400040 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c000c0 },
-   { 0x00600001, 0x21c00229, 0x000090c2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000f0 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00410041 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x00c100c1 },
-   { 0x00600001, 0x21c00229, 0x000090ca, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cb, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000e0 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000005c },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05200520 },
-   { 0x00800001, 0x25000129, 0x00ad0040, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad00c0, 0x00000000 },
-   { 0x00600001, 0x21c00229, 0x000090c2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490a8, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000c6 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05010501 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05210521 },
-   { 0x00600001, 0x21c00229, 0x000090ca, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cb, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490b8, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x000000b6 },
-   { 0x00800008, 0x2340352d, 0x0000905c, 0x008d0220 },
-   { 0x00800008, 0x2360352d, 0x0000905e, 0x008d0220 },
-   { 0x00600001, 0x20600129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20c00129, 0x008d0520, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x02600005, 0x20003dac, 0x02ae0360, 0x00010001 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05000500 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05200520 },
-   { 0x00800001, 0x25000129, 0x00ad0050, 0x00000000 },
-   { 0x00800001, 0x25200129, 0x00ad00d0, 0x00000000 },
-   { 0x00600001, 0x21c00229, 0x000090e2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090e3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490ec, 0x00000000 },
-   { 0x00200001, 0x25d80109, 0x00450600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000096 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x05010501 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x05210521 },
-   { 0x00600001, 0x21c00229, 0x000090f2, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090f3, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490fc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x00000086 },
-   { 0x00600001, 0x20700129, 0x008d0510, 0x00000000 },
-   { 0x00600001, 0x20d00129, 0x008d0520, 0x00000000 },
-   { 0x00800008, 0x2340352d, 0x00009048, 0x008d0220 },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e000e0 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01000100 },
-   { 0x00600001, 0x21c00229, 0x000090c4, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090c5, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490ac, 0x00000000 },
-   { 0x02600005, 0x20003dac, 0x00ae0340, 0x00010001 },
-   { 0x00000001, 0x260201e8, 0x00000000, 0x00000000 },
-   { 0x00000401, 0x25da01e9, 0x00000000, 0x00000000 },
-   { 0x00000801, 0x25d80109, 0x00000600, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000006a },
-   { 0x00000401, 0x220c01ec, 0x00000000, 0x00e100e1 },
-   { 0x00000801, 0x220e01ec, 0x00000000, 0x01010101 },
-   { 0x00600001, 0x21c00229, 0x000090cc, 0x00000000 },
-   { 0x00600001, 0x21e00229, 0x000090cd, 0x00000000 },
-   { 0x00600001, 0x22000229, 0x002490bc, 0x00000000 },
-   { 0x00200001, 0x26000128, 0x004505d8, 0x00000000 },
-   { 0x00000040, 0x27c01c01, 0x00001400, 0x00000020 },
-   { 0x00000220, 0x34001c00, 0x00001400, 0x0000005a },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c0, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005c2, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20400022, 0x008d00c0, 0x00000000 },
-   { 0x00802001, 0x20800022, 0x008d0100, 0x00000000 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0a082004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000a },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0a082704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0a082604 },
-   { 0x0000000c, 0x27e43ca5, 0x000007e4, 0x00010001 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x20000020, 0x508d07e0, 0x00000200 },
-   { 0x01600005, 0x20003dac, 0x020005e0, 0x00010001 },
-   { 0x01000005, 0x20003e2c, 0x00009002, 0x00020002 },
-   { 0x00000401, 0x27e001a1, 0x000005c8, 0x00000000 },
-   { 0x00000c0c, 0x27e43da1, 0x000005ca, 0x00010001 },
-   { 0x00000801, 0x27e80061, 0x00000000, 0x0001000f },
-   { 0x00610001, 0x20400022, 0x028d0040, 0x00000000 },
-   { 0x00710001, 0x20400022, 0x028d0060, 0x00000000 },
-   { 0x02000005, 0x20003dac, 0x0200002a, 0x00020002 },
-   { 0x00018022, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000001, 0x22000060, 0x00000000, 0x0418a004 },
-   { 0x00010040, 0x27e43ca5, 0x020007e4, 0x00080008 },
-   { 0x00008024, 0x34001c00, 0x00001400, 0x0001000c },
-   { 0x0000000c, 0x27e43da5, 0x000005c2, 0x00020002 },
-   { 0x00010001, 0x22000060, 0x02000000, 0x0418a704 },
-   { 0x00110001, 0x22000060, 0x02000000, 0x0418a604 },
-   { 0x00000040, 0x27e43ca5, 0x000007e4, 0xfffefffe },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x01600031, 0x26400021, 0x508d07e0, 0x00000200 },
-   { 0x01000005, 0x20003dac, 0x0000002a, 0x00020002 },
-   { 0x00000006, 0x202a3dad, 0x0000002a, 0x00020002 },
-   { 0x00010220, 0x34001c00, 0x00001400, 0xfffffd94 },
-   { 0x00600001, 0x26400021, 0x008d0640, 0x00000000 },
-   { 0x00600001, 0x260001e1, 0x00000000, 0x00000000 },
-   { 0x00000009, 0x26143da1, 0x000005e2, 0x00120012 },
-   { 0x00000440, 0x26141c21, 0x00000614, 0x00020000 },
-   { 0x00000c01, 0x26120129, 0x0000000c, 0x00000000 },
-   { 0x00000c01, 0x26100169, 0x00000000, 0x12121212 },
-   { 0x00400801, 0x26000171, 0x00000000, 0xffffffff },
-   { 0x00600031, 0x20001c20, 0x308d0600, 0x82008002 },
-   { 0x00600040, 0x2400462d, 0x00ae9c00, 0x00aed810 },
-   { 0x00600040, 0x2340462d, 0x00ae9800, 0x00aed810 },
-   { 0x00600040, 0x2360462d, 0x00ae9c10, 0x00aedc00 },
-   { 0x05810010, 0x200025ac, 0x008d2400, 0x008d01c0 },
-   { 0x05810010, 0x200025ac, 0x008d2340, 0x008d01e0 },
-   { 0x05810010, 0x200025ac, 0x008d2360, 0x008d01e0 },
-   { 0x00618022, 0x34001c00, 0x00001400, 0x00000036 },
-   { 0x00618022, 0x34001c00, 0x02001400, 0x00000016 },
-   { 0x00600040, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9810 },
-   { 0x80600008, 0x43403d91, 0x008d0400, 0x00020002 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00020002 },
-   { 0x00600048, 0x24003e2c, 0x00ae9c10, 0x00020002 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00ae9c00 },
-   { 0x80600008, 0x43603d91, 0x008d0400, 0x00020002 },
-   { 0x00600001, 0xd8100231, 0x00ae0340, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0360, 0x00000000 },
-   { 0x00608024, 0x34001c00, 0x00001400, 0x0001001e },
-   { 0x00600040, 0x23e03d2d, 0x008d0200, 0x00010001 },
-   { 0x00600040, 0x24003e2c, 0x00ae9800, 0x00040004 },
-   { 0x00600048, 0x24003dac, 0x008d0400, 0x00040004 },
-   { 0x00600040, 0x2400458c, 0x008d0400, 0x00aedc10 },
-   { 0x00600008, 0x23403d8d, 0x008d0400, 0x00030003 },
-   { 0x03600010, 0x200035ac, 0x008d0340, 0x008d03e0 },
-   { 0x05600010, 0x200035ac, 0x028d0340, 0x008d43e0 },
-   { 0x00610001, 0x234001ad, 0x008d03e0, 0x00000000 },
-   { 0x00610001, 0x234001ad, 0x028d43e0, 0x00000000 },
-   { 0x80600040, 0x43603631, 0x00ae9810, 0x008d0340 },
-   { 0x80600040, 0x43403631, 0x00ae9c00, 0x008d4340 },
-   { 0x00600001, 0xd8100231, 0x00ae0360, 0x00000000 },
-   { 0x00600001, 0xdc000231, 0x00ae0340, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00008025, 0x20000000, 0x00000000, 0x00000000 },
-   { 0x00000001, 0x34000020, 0x000007c0, 0x00000000 },
-   { 0x0000007e, 0x00000000, 0x00000000, 0x00000000 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/AVCMCInter.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/AVCMCInter.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/AVCMCInter.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/AVCMCInter.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,254 +0,0 @@
-/*
- * All inter-prediction macroblock kernels 
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: AVCMCInter.asm
-
-#ifdef INTERLABEL
-#undef INTERLABEL
-#endif
-
-#if defined(MBAFF)
-//				< MBaff_Motion >
-#define INTERLABEL(x)	x##_##MBF
-#elif defined(FIELD)
-//				< FieldMB_Motion >
-#define INTERLABEL(x)	x##_##FLD
-#else // FRAME
-//				< FrameMB_Motion >
-#define INTERLABEL(x)	x##_##FRM
-#endif
-//
-// Decoding an inter-prediction macroblock (conditional compile)
-//	-DMBAFF : MBAff picture MB
-//	-DFRAME : Frame picture MB
-//	-DFIELD : Field picture MB
-//	-DMBAFF -DMONO : MBAff mono picture MB
-//	-DFRAME -DMONO : Frame mono picture MB
-//	-DFIELD -DMONO : Field mono picture MB
-
-
-//#if !defined(__AVCMCInter__)		// Make sure this is only included once
-//#define __AVCMCInter__
-
-
-// TODO: header files need to be in sync with intra prediction
-#include "header.inc"
-#include "inter_Header.inc"
-
-// TODO: Kernel names for mono cases
-#if defined(MBAFF)
-.kernel MBAff_Motion
-MBAFF_MB:
-#elif defined(FIELD)
-.kernel FieldMB_Motion
-FIELD_MB:
-#else // Frame
-.kernel FrameMB_Motion
-FRAME_MB:
-#endif
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-#if defined(MBAFF)
-mov (1) acc0:ud 0x0aaa55a5:ud
-#elif defined(FIELD)
-mov (1) acc0:ud 0x0baa55a5:ud
-#else // Frame
-mov (1) acc0:ud 0x0caa55a5:ud
-#endif
-#endif
-
-
-#ifdef SW_SCOREBOARD
-    CALL(scoreboard_start_inter,1)
-#endif
-
-	mov (8)		gMSGSRC<1>:ud		r0.0<8;8,1>:ud		// Initialize message header payload with R0
-	
-	and (1)		gwMBTYPE<1>			gMBTYPE:ub						nMBTYPE_MASK:w		// MB type
-	shl (2)		gX<1>:w				gORIX<2;2,1>:ub					4:w // Convert MB origin to pixel unit
-	
-//	#include "process_inter16x16.asm"					// Handle B_L0_16x16 case with zero MVs and weighted pred off.
-	// In the case of B_L0_16x16 with zero MVs and weighted pred off, the kernel jumps to INTERLABEL(EXIT_LOOP).
-	
-INTERLABEL(INIT_MBPARA):
-	#include "initialize_MBPara.asm"
-	
-	
-    //========================= BEGIN - LOOP_SUBMB ===========================
-	mov (1)		gLOOP_SUBMB:uw		0:uw				// 0, 2, 4, 6
-INTERLABEL(LOOP_SUBMB):
-
-	//========================== BEGIN - LOOP_DIR ============================
-	// Prediction flag (gPREDFLAG - 0:Pred_L0, 1:Pred_L1, 2:BiPred)
-	asr (1)		gPREDFLAG:w			gSUBMB_MODE:ub					gLOOP_SUBMB:uw
-	mov (1)		gLOOP_DIR:uw		1:uw				// 1, 0
-	and (1)		gPREDFLAG:w			gPREDFLAG:w						0x3:w
-INTERLABEL(LOOP_DIR):
-
-	cmp.e.f0.0 (1) null:w			gLOOP_DIR:w						gPREDFLAG:w	
-	(f0.0) jmpi	INTERLABEL(LOOP_DIR_CONTINUE)	
-	
-    // Get binding table index 
-    // & reference picture parity (gREFPARITY - 0:top, 0x100:bottom, x:frame)
-    // & address of interpolation result
-    cmp.e.f0.1 (1) null:w			gLOOP_DIR:w						1:w
-    (f0.1) mov (1)		gpINTP:ud			nOFFSET_INTP0:ud						{NoDDClr} //
-    (f0.1) and (1)		gBIDX:w				r[pBIDX]:ub						0x7f:w	{NoDDChk} //
-    (-f0.1) mov (1)		gpINTP:ud			nOFFSET_INTP1:ud						{NoDDClr} //
-	(-f0.1) and (1)		gBIDX:w				r[pBIDX,4]:ub					0x7f:w	{NoDDChk} //
-#if defined(MBAFF) || defined(FIELD)
-    (f0.1) and (1)		gREFPARITY:w				r[pBIDX]:ub						0x80:w
-    (-f0.1) and (1)		gREFPARITY:w				r[pBIDX,4]:ub					0x80:w
-    shl (1)		gREFPARITY:w		gREFPARITY<0;1,0>:w				1:w
-#endif
-
-	// Sub MB shape
-	asr (1)		gSHAPETEMP:w		gSUBMB_SHAPE:ub					gLOOP_SUBMB:w
-	
-    // Chroma MV adjustment & Set message descriptor for frame/field read
-#if defined(MBAFF)
-	#include "chromaMVAdjust.asm" 
-    and.nz.f0.0 (1) null:uw			gFIELDMBFLAG:ub					nFIELDMB_MASK:uw
-    (f0.0) add (1) gD0:ud			gBIDX:uw						nDWBRMSGDSC_SC_TF:ud
-    (-f0.0) add (1)	gMSGDSC_R:ud	gBIDX:uw						nDWBRMSGDSC_SC:ud
-    (f0.0) add (1) gMSGDSC_R:ud		gD0:ud							gREFPARITY:uw
-#elif defined(FIELD)
-	#include "chromaMVAdjust.asm" 
-    add (1)		gMSGDSC_R:ud		gBIDX:uw						nDWBRMSGDSC_SC_TF:ud
-    add (1)		gMSGDSC_R:ud		gMSGDSC_R:ud					gREFPARITY:uw
-#else // FRAME
-	add (1)		gMSGDSC_R:ud		gBIDX:uw						nDWBRMSGDSC_SC:ud
-#endif
-
-	and.nz.f0.1 (1) null:w			gSHAPETEMP:w					3:w	
-	(f0.1) jmpi INTERLABEL(PROCESS4x4)
-	
-	//======================== BEGIN - PROCESS 8x8 ===========================
-	
-	// Reference block load
-	#include "loadRef_Y_16x13.asm"
-#ifndef MONO
-#if defined(MBAFF) || defined(FIELD)
-	add (1)		r[pMV,2]:w			r[pMV,2]:w						gCHRMVADJ:w
-#endif
-	#include "loadRef_C_10x5.asm"
-#endif
-
-	// Interpolation
-	//CALL_INTER(INTERLABEL(Interpolate_Y_8x8_Func), 1)
-	#include "interpolate_Y_8x8.asm"
-#ifndef MONO
-	//CALL_INTER(INTERLABEL(Interpolate_C_4x4_Func), 1)
-	#include "interpolate_C_4x4.asm"
-#endif
-
-	jmpi INTERLABEL(ROUND_SHIFT_C)
-	//========================= END - PROCESS 8x8 ============================
-	
-	//======================== BEGIN - LOOP_SUBMBPT ==========================
-INTERLABEL(PROCESS4x4):
-
-	mov (1)		gLOOP_SUBMBPT:uw	4:uw				// 4, 3, 2, 1
-INTERLABEL(LOOP_SUBMBPT):
-
-	// Reference block load
-	#include "loadRef_Y_16x9.asm"
-#ifndef MONO
-#if defined(MBAFF) || defined(FIELD)
-	add (1)		r[pMV,2]:w			r[pMV,2]:w						gCHRMVADJ:w
-#endif
-	#include "loadRef_C_6x3.asm"
-#endif
-
-	// Interpolation
-	#include "interpolate_Y_4x4.asm"
-#ifndef MONO
-	#include "interpolate_C_2x2.asm"
-#endif
-	
-	cmp.e.f0.0 (1) null:w			gLOOP_SUBMBPT:uw				3:w
-	add.z.f0.1 (1) gLOOP_SUBMBPT:uw gLOOP_SUBMBPT:uw				-1:w
-	add (1)		pMV:w				pMV:w							8:w	
-	(-f0.0) add (1)	gpINTP:ud		gpINTP:ud						0x00080008:ud	// 8 & 8
-	(f0.0) add (1) gpINTP:ud		gpINTP:ud						0x00180038:ud	// 24 & 56
-	(-f0.1) jmpi INTERLABEL(LOOP_SUBMBPT)
-    
-    cmp.e.f0.1	null:w				gLOOP_DIR:w						1:w
-    add (1)		pMV:w				pMV:w							-32:w
-    (f0.1) mov (1) gpINTP:ud		nOFFSET_INTP0:ud
-    (-f0.1) mov (1) gpINTP:ud		nOFFSET_INTP1:ud
-
-	mov (1)		pRESULT:uw					gpINTPC:uw
-    
-	//========================= END - LOOP_SUBMBPT ===========================
-    
-INTERLABEL(ROUND_SHIFT_C):
-    
-#ifndef MONO
-	#include "roundShift_C_4x4.asm"
-#endif
-
-INTERLABEL(LOOP_DIR_CONTINUE):
-	
-	add.nz.f0.1 (1) gLOOP_DIR:uw	gLOOP_DIR:uw					-1:w
-	add (1)		pMV:w				pMV:w							4:w
-    (-f0.1) jmpi INTERLABEL(LOOP_DIR)
-    //=========================== END - LOOP_DIR =============================
-
-INTERLABEL(Weighted_Prediction):
-	#include "weightedPred.asm"
-	
-	and.z.f0.1 (16)	null<1>:w		gLOOP_SUBMB<0;1,0>:uw			2:w
-
-	#include "recon_Y_8x8.asm"
-#ifndef MONO
-	#include "recon_C_4x4.asm"
-
-	(-f0.1) add (1)	pERRORC:w		pERRORC:w						48:w
-#endif
-
-	cmp.e.f0.1 (1) null:w			gLOOP_SUBMB:uw					6:w
-	add (1)		gLOOP_SUBMB:uw		gLOOP_SUBMB:uw					2:w
-
-	add (1)		pWGT_BIDX:ud		pWGT_BIDX:ud					0x00100001:ud	// 12 & 1
-	add (1)		pMV:w				pMV:w							gMVSTEP:w
-
-    (-f0.1) jmpi INTERLABEL(LOOP_SUBMB)
-    //========================== END - LOOP_SUBMB ============================
-    
-INTERLABEL(EXIT_LOOP):   
-	#include "writeRecon_YC.asm"    
-
-#ifdef SW_SCOREBOARD    
-	wait	n0:ud		//	Now wait for scoreboard to response
-    #include "Soreboard_update.asm"	// scorboard update function
-#else
-// Check for write commit first if SW scoreboard is disabled
-	mov	(1)	gREG_WRITE_COMMIT_Y<1>:ud	gREG_WRITE_COMMIT_Y<0;1,0>:ud		// Make sure Y write is committed
-	mov	(1)	gREG_WRITE_COMMIT_UV<1>:ud	gREG_WRITE_COMMIT_UV<0;1,0>:ud		// Make sure U/V write is committed
-#endif
-
-// Terminate the thread
-//
-    END_THREAD
-
-
-//#include "Interpolate_Y_8x8_Func.asm"
-//#include "Interpolate_C_4x4_Func.asm"
-//#include "WeightedPred_Y_Func.asm"	
-//#include "WeightedPred_C_Func.asm"	
-
-
-.end_code
-
-.end_kernel
-
-        
-//#endif	// !defined(__AVCMCInter__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/BSDReset.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/BSDReset.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/BSDReset.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/BSDReset.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * Initial kernel for filling initial BSD command buffer
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: BSDReset.asm
-//
-// Initial kernel for filling initial BSD command buffer
-//
-
-// ----------------------------------------------------
-//  Main: BSDReset
-// ----------------------------------------------------
-
-.kernel BSDReset
-BSDRESET:
-
-#include "header.inc"
-
-.code
-#ifdef SW_SCOREBOARD
-    CALL(scoreboard_start_inter,1)
-	wait	n0:ud		//	Now wait for scoreboard to response
-
-#define BSDRESET_ENABLE
-	#include "scoreboard_update.asm"	// scorboard update function
-#undef BSDRESET_ENABLE
-
-#endif	// defined(SW_SCOREBOARD)
-
-// Terminate the thread
-//
-    END_THREAD
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif	// !defined(COMBINED_KERNEL)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/chromaMVAdjust.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/chromaMVAdjust.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/chromaMVAdjust.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/chromaMVAdjust.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/*
- * Adjust chrom MV
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: ChromaMVAdjust.asm
-//
-//
-
-
-//#if !defined(__ChromaMVAdjust__)		// Make sure this is only included once
-//#define __ChromaMVAdjust__
-
-
-	// Chroma MV adjustment
-	add (1)		acc0:w				gPARITY:w						gREFPARITY:w
-	cmp.e.f0.0 (1) null:w			acc0:w							0x1:w
-	cmp.e.f0.1 (1) null:w			acc0:w							0x100:w
-	mov (1)		gCHRMVADJ:w			0:w
-	(f0.0) mov (1)	gCHRMVADJ:w		2:w	
-	(f0.1) mov (1)	gCHRMVADJ:w		-2:w
-        
-//#endif	// !defined(__ChromaMVAdjust__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/DCResetDummy.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/DCResetDummy.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/DCResetDummy.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/DCResetDummy.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * Dummy kernel
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: DCResetDummy.asm
-//
-// Dummy kernel used by driver for debug-counter reset SW WA
-//
-
-// ----------------------------------------------------
-//  Main: DCResetDummy
-// ----------------------------------------------------
-
-.kernel DCResetDummy
-DCRESETDUMMY:
-
-#include "header.inc"
-
-.code
-
-// Terminate the thread
-//
-    END_THREAD
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif	// !defined(COMBINED_KERNEL)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Decode_Chroma_Intra.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/Decode_Chroma_Intra.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Decode_Chroma_Intra.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Decode_Chroma_Intra.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
- * Decode both intra chroma blocks
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__DECODE_CHROMA_INTRA__)		// Make sure this is only included once
-#define __DECODE_CHROMA_INTRA__
-
-// Module name: Decode_Chroma_Intra.asm
-//
-// Decode both intra chroma blocks
-//
-
-decode_Chroma_Intra:
-#ifndef MONO
-    #include "load_Intra_Ref_UV.asm"	// Load intra U/V reference data
-    #include "intra_Pred_Chroma.asm"	// Intra predict chroma blocks
-    #include "add_Error_UV.asm"			// Add error data to predicted U/V data blocks
-#endif	// !defined(MONO)
-    #include "save_8x8_UV.asm"			// Save to destination U/V frame surface
-
-	RETURN
-// End of Decode_Chroma_Intra
-
-#endif	// !defined(__DECODE_CHROMA_INTRA__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/EndIntraThread.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/EndIntraThread.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/EndIntraThread.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/EndIntraThread.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-/*
- * Common module to end current intra thread
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: EndIntraThread.asm
-//
-// Common module to end current intra thread
-//
-#ifndef SW_SCOREBOARD
-// Check for write commit first if SW scoreboard is disabled
-	mov	(1)	REG_WRITE_COMMIT_Y<1>:ud	REG_WRITE_COMMIT_Y<0;1,0>:ud		// Make sure Y write is committed
-	mov	(1)	REG_WRITE_COMMIT_UV<1>:ud	REG_WRITE_COMMIT_UV<0;1,0>:ud		// Make sure U/V write is committed
-#endif
-
-	END_THREAD
-
-    #include "Intra_funcLib.asm"
-
-#ifndef COMBINED_KERNEL		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif	// COMBINED_KERNEL
-
-// End of EndIntraThread
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/export.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/export.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/export.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/export.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,345 +0,0 @@
-#define INTRA_16x16_IP 0
-#define INTRA_16x16_VERTICAL_IP 14
-#define INTRA_16x16_HORIZONTAL_IP 32
-#define INTRA_16x16_DC_IP 52
-#define INTRA_16x16_PLANE_IP 98
-#define End_intra_Pred_16x16_Y_IP 166
-#define End_add_Error_16x16_Y_IP 204
-#define load_Intra_Ref_Y_IP 220
-#define decode_Chroma_Intra_IP 238
-#define INTRA_CHROMA_DC_IP 260
-#define INTRA_CHROMA_HORIZONTAL_IP 320
-#define INTRA_CHROMA_VERTICAL_IP 332
-#define INTRA_Chroma_PLANE_IP 342
-#define End_of_intra_Pred_Chroma_IP 392
-#define save_16x16_Y_IP 436
-#define INTRA_8x8_IP 464
-#define INTRA_8x8_BLK2_IP 568
-#define intra_Pred_8x8_Y_IP 640
-#define INTRA_8X8_VERTICAL_IP 672
-#define INTRA_8X8_HORIZONTAL_IP 682
-#define INTRA_8X8_DC_IP 692
-#define INTRA_8X8_DIAG_DOWN_LEFT_IP 724
-#define INTRA_8X8_DIAG_DOWN_RIGHT_IP 744
-#define INTRA_8X8_VERT_RIGHT_IP 772
-#define INTRA_8X8_HOR_DOWN_IP 808
-#define INTRA_8X8_VERT_LEFT_IP 842
-#define INTRA_8X8_HOR_UP_IP 862
-#define save_8x8_Y_IP 886
-#define INTRA_4x4_IP 928
-#define intra_Pred_4x4_Y_4_IP 1062
-#define ADD_ERROR_SB0_IP 1074
-#define ADD_ERROR_SB1_IP 1088
-#define ADD_ERROR_SB2_IP 1108
-#define ADD_ERROR_SB3_IP 1124
-#define intra_Pred_4x4_Y_IP 1130
-#define INTRA_4X4_VERTICAL_IP 1130
-#define INTRA_4X4_HORIZONTAL_IP 1134
-#define INTRA_4X4_DC_IP 1138
-#define INTRA_4X4_DIAG_DOWN_LEFT_IP 1160
-#define INTRA_4X4_DIAG_DOWN_RIGHT_IP 1174
-#define INTRA_4X4_VERT_RIGHT_IP 1192
-#define INTRA_4X4_HOR_DOWN_IP 1218
-#define INTRA_4X4_VERT_LEFT_IP 1246
-#define INTRA_4X4_HOR_UP_IP 1260
-#define save_4x4_Y_IP 1276
-#define INTRA_PCM_IP 1320
-#define FRAME_MB_IP 1384
-#define INIT_MBPARA_FRM_IP 1390
-#define NOT_8x8_MODE_FRM_IP 1426
-#define CONVERT_MVS_FRM_IP 1436
-#define INIT_ADDRESS_REGS_FRM_IP 1446
-#define LOOP_SUBMB_FRM_IP 1454
-#define LOOP_DIR_FRM_IP 1460
-#define LOADREF_MVXZERO_FRM_IP 1510
-#define EXIT_LOADREF_Y_16x13_FRM_IP 1524
-#define Interpolate_Y_8x8_Func_FRM_IP 1544
-#define Interpolate_Y_8x8_Func2_FRM_IP 1574
-#define Interpolate_Y_H_8x8_FRM_IP 1708
-#define Interpolate_Y_V_8x8_FRM_IP 1790
-#define VFILTER_8x8_FRM_IP 1812
-#define Interpolate_Y_I_8x8_FRM_IP 1860
-#define Average_8x8_FRM_IP 1880
-#define Return_Interpolate_Y_8x8_FRM_IP 1888
-#define Exit_Interpolate_Y_8x8_FRM_IP 1890
-#define Interpolate_C_4x4_Func_FRM_IP 1890
-#define PROCESS4x4_FRM_IP 1928
-#define LOOP_SUBMBPT_FRM_IP 1930
-#define Interpolate_Y_H_4x4_FRM_IP 2066
-#define Interpolate_Y_V_4x4_FRM_IP 2108
-#define VFILTER_4x4_FRM_IP 2142
-#define Interpolate_Y_I_4x4_FRM_IP 2148
-#define Average_4x4_FRM_IP 2160
-#define Return_Interpolate_Y_4x4_FRM_IP 2162
-#define Exit_Interpolate_Y_4x4_FRM_IP 2174
-#define ROUND_SHIFT_C_FRM_IP 2222
-#define LOOP_DIR_CONTINUE_FRM_IP 2230
-#define Weighted_Prediction_FRM_IP 2236
-#define DefaultWeightedPred_UniPred_FRM_IP 2244
-#define DefaultWeightedPred_BiPred_FRM_IP 2256
-#define WeightedPred_FRM_IP 2264
-#define WeightedPred_Explicit_FRM_IP 2282
-#define WeightedPred_LOOP_FRM_IP 2322
-#define Return_WeightedPred_FRM_IP 2382
-#define EXIT_LOOP_FRM_IP 2424
-#define FIELD_MB_IP 2496
-#define INIT_MBPARA_FLD_IP 2502
-#define NOT_8x8_MODE_FLD_IP 2538
-#define CONVERT_MVS_FLD_IP 2548
-#define INIT_ADDRESS_REGS_FLD_IP 2558
-#define LOOP_SUBMB_FLD_IP 2568
-#define LOOP_DIR_FLD_IP 2574
-#define LOADREF_MVXZERO_FLD_IP 2644
-#define EXIT_LOADREF_Y_16x13_FLD_IP 2658
-#define Interpolate_Y_8x8_Func_FLD_IP 2680
-#define Interpolate_Y_8x8_Func2_FLD_IP 2710
-#define Interpolate_Y_H_8x8_FLD_IP 2844
-#define Interpolate_Y_V_8x8_FLD_IP 2926
-#define VFILTER_8x8_FLD_IP 2948
-#define Interpolate_Y_I_8x8_FLD_IP 2996
-#define Average_8x8_FLD_IP 3016
-#define Return_Interpolate_Y_8x8_FLD_IP 3024
-#define Exit_Interpolate_Y_8x8_FLD_IP 3026
-#define Interpolate_C_4x4_Func_FLD_IP 3026
-#define PROCESS4x4_FLD_IP 3064
-#define LOOP_SUBMBPT_FLD_IP 3066
-#define Interpolate_Y_H_4x4_FLD_IP 3204
-#define Interpolate_Y_V_4x4_FLD_IP 3246
-#define VFILTER_4x4_FLD_IP 3280
-#define Interpolate_Y_I_4x4_FLD_IP 3286
-#define Average_4x4_FLD_IP 3298
-#define Return_Interpolate_Y_4x4_FLD_IP 3300
-#define Exit_Interpolate_Y_4x4_FLD_IP 3312
-#define ROUND_SHIFT_C_FLD_IP 3360
-#define LOOP_DIR_CONTINUE_FLD_IP 3368
-#define Weighted_Prediction_FLD_IP 3374
-#define DefaultWeightedPred_UniPred_FLD_IP 3382
-#define DefaultWeightedPred_BiPred_FLD_IP 3394
-#define WeightedPred_FLD_IP 3402
-#define WeightedPred_Explicit_FLD_IP 3420
-#define WeightedPred_LOOP_FLD_IP 3460
-#define Return_WeightedPred_FLD_IP 3520
-#define EXIT_LOOP_FLD_IP 3562
-#define MBAFF_MB_IP 3640
-#define INIT_MBPARA_MBF_IP 3646
-#define NOT_8x8_MODE_MBF_IP 3682
-#define CONVERT_MVS_MBF_IP 3692
-#define INIT_ADDRESS_REGS_MBF_IP 3702
-#define LOOP_SUBMB_MBF_IP 3716
-#define LOOP_DIR_MBF_IP 3722
-#define LOADREF_MVXZERO_MBF_IP 3796
-#define EXIT_LOADREF_Y_16x13_MBF_IP 3810
-#define Interpolate_Y_8x8_Func_MBF_IP 3832
-#define Interpolate_Y_8x8_Func2_MBF_IP 3862
-#define Interpolate_Y_H_8x8_MBF_IP 3996
-#define Interpolate_Y_V_8x8_MBF_IP 4078
-#define VFILTER_8x8_MBF_IP 4100
-#define Interpolate_Y_I_8x8_MBF_IP 4148
-#define Average_8x8_MBF_IP 4168
-#define Return_Interpolate_Y_8x8_MBF_IP 4176
-#define Exit_Interpolate_Y_8x8_MBF_IP 4178
-#define Interpolate_C_4x4_Func_MBF_IP 4178
-#define PROCESS4x4_MBF_IP 4216
-#define LOOP_SUBMBPT_MBF_IP 4218
-#define Interpolate_Y_H_4x4_MBF_IP 4356
-#define Interpolate_Y_V_4x4_MBF_IP 4398
-#define VFILTER_4x4_MBF_IP 4432
-#define Interpolate_Y_I_4x4_MBF_IP 4438
-#define Average_4x4_MBF_IP 4450
-#define Return_Interpolate_Y_4x4_MBF_IP 4452
-#define Exit_Interpolate_Y_4x4_MBF_IP 4464
-#define ROUND_SHIFT_C_MBF_IP 4512
-#define LOOP_DIR_CONTINUE_MBF_IP 4520
-#define Weighted_Prediction_MBF_IP 4526
-#define DefaultWeightedPred_UniPred_MBF_IP 4534
-#define DefaultWeightedPred_BiPred_MBF_IP 4546
-#define WeightedPred_MBF_IP 4554
-#define WeightedPred_Explicit_MBF_IP 4572
-#define WeightedPred_LOOP_MBF_IP 4612
-#define Return_WeightedPred_MBF_IP 4672
-#define EXIT_LOOP_MBF_IP 4714
-#define SETHWSCOREBOARD_IP 4792
-#define SetHWScoreboard_Loop_IP 4806
-#define Parse_8_Loop_0_IP 4852
-#define Parse_8_Loop_2_IP 4876
-#define Parse_8_Loop_4_IP 4900
-#define Parse_8_Loop_6_IP 4924
-#define Parse_8_Loop_8_IP 4948
-#define Parse_8_Loop_10_IP 4972
-#define Parse_8_Loop_12_IP 4996
-#define Parse_8_Loop_14_IP 5020
-#define SetHWScoreboard_Remainder_IP 5062
-#define SetHWScoreboard_Remainder_Loop_IP 5090
-#define Output_Remainder_Intra_IP 5116
-#define SetHWScoreboard_Done_IP 5128
-#define SETHWSCOREBOARD_MBAFF_IP 5136
-#define SetHWScoreboard_MBAFF_Loop_IP 5148
-#define SET_SB_MBAFF_INTRA_0_IP 5208
-#define SET_SB_MBAFF_0_IP 5230
-#define NEXT_MB_MBAFF_0_IP 5238
-#define SET_SB_MBAFF_INTRA_2_IP 5276
-#define SET_SB_MBAFF_2_IP 5298
-#define NEXT_MB_MBAFF_2_IP 5306
-#define SET_SB_MBAFF_INTRA_4_IP 5344
-#define SET_SB_MBAFF_4_IP 5366
-#define NEXT_MB_MBAFF_4_IP 5374
-#define SET_SB_MBAFF_INTRA_6_IP 5412
-#define SET_SB_MBAFF_6_IP 5434
-#define NEXT_MB_MBAFF_6_IP 5442
-#define SET_SB_MBAFF_INTRA_8_IP 5480
-#define SET_SB_MBAFF_8_IP 5502
-#define NEXT_MB_MBAFF_8_IP 5510
-#define SET_SB_MBAFF_INTRA_10_IP 5548
-#define SET_SB_MBAFF_10_IP 5570
-#define NEXT_MB_MBAFF_10_IP 5578
-#define SET_SB_MBAFF_INTRA_12_IP 5616
-#define SET_SB_MBAFF_12_IP 5638
-#define NEXT_MB_MBAFF_12_IP 5646
-#define SET_SB_MBAFF_INTRA_14_IP 5684
-#define SET_SB_MBAFF_14_IP 5706
-#define NEXT_MB_MBAFF_14_IP 5714
-#define SetHWScoreboard_MBAFF_Remainder_IP 5756
-#define SetHWScoreboard_MBAFF_Remainder_Loop_IP 5784
-#define SET_SB_MBAFF_REM_INTRA_IP 5822
-#define SET_SB_MBAFF_REM_IP 5846
-#define Output_MBAFF_Remainder_Intra_IP 5856
-#define SetHWScoreboard_MBAFF_Done_IP 5868
-#define BSDRESET_IP 5870
-#define DCRESETDUMMY_IP 5872
-#define AVC_ILDB_ROOT_Y_ILDB_FRAME_IP 5880
-#define SLEEP_ENTRY_Y_ILDB_FRAME_IP 5976
-#define POST_SLEEP_Y_ILDB_FRAME_IP 5980
-#define NEXT_MB_Y_ILDB_FRAME_IP 6010
-#define ALL_SPAWNED_Y_ILDB_FRAME_IP 6034
-#define ALL_DONE_Y_ILDB_FRAME_IP 6044
-#define WAIT_FOR_UV_ILDB_FRAME_IP 6044
-#define AVC_ILDB_CHILD_Y_ILDB_FRAME_IP 6056
-#define WRITE_URB_Y_ILDB_FRAME_IP 6436
-#define POST_ILDB_Y_ILDB_FRAME_IP 6444
-#define READ_FOR_URB_Y_ILDB_FRAME_IP 6458
-#define FILTER_Y_IP 6494
-#define Y_ELSE3_IP 6560
-#define Y_ENDIF3_IP 6574
-#define Y_ELSE4_IP 6604
-#define Y_ENDIF4_IP 6618
-#define Y_ELSE2_IP 6618
-#define Y_ENDIF6_IP 6684
-#define Y_ENDIF7_IP 6706
-#define Y_ENDIF2_IP 6710
-#define Y_ENDIF1_IP 6710
-#define AVC_ILDB_ROOT_UV_ILDB_FRAME_IP 6720
-#define SLEEP_ENTRY_UV_ILDB_FRAME_IP 6798
-#define POST_SLEEP_UV_ILDB_FRAME_IP 6802
-#define NEXT_MB_UV_ILDB_FRAME_IP 6834
-#define ALL_SPAWNED_UV_ILDB_FRAME_IP 6858
-#define ALL_DONE_UV_ILDB_FRAME_IP 6882
-#define AVC_ILDB_CHILD_UV_ILDB_FRAME_IP 6888
-#define BYPASS_EXT_LEFT_EDGE_UV_ILDB_FRAME_IP 7008
-#define BYPASS_EXT_TOP_EDGE_UV_ILDB_FRAME_IP 7126
-#define WRITE_URB_UV_ILDB_FRAME_IP 7194
-#define POST_ILDB_UV_ILDB_FRAME_IP 7202
-#define READ_FOR_URB_UV_ILDB_FRAME_IP 7216
-#define FILTER_UV_IP 7246
-#define UV_ELSE2_IP 7282
-#define UV_ENDIF2_IP 7314
-#define UV_ENDIF1_IP 7314
-#define AVC_ILDB_ROOT_Y_ILDB_FIELD_IP 7320
-#define SLEEP_ENTRY_Y_ILDB_FIELD_IP 7416
-#define POST_SLEEP_Y_ILDB_FIELD_IP 7420
-#define NEXT_MB_Y_ILDB_FIELD_IP 7450
-#define ALL_SPAWNED_Y_ILDB_FIELD_IP 7474
-#define ALL_DONE_Y_ILDB_FIELD_IP 7484
-#define WAIT_FOR_UV_ILDB_FIELD_IP 7484
-#define AVC_ILDB_CHILD_Y_ILDB_FIELD_IP 7496
-#define WRITE_URB_Y_ILDB_FIELD_IP 7896
-#define POST_ILDB_Y_ILDB_FIELD_IP 7904
-#define READ_FOR_URB_Y_ILDB_FIELD_IP 7918
-#define ELSE_Y_4x16T_ILDB_FIELD_IP 7934
-#define ENDIF_Y_4x16T_ILDB_FIELD_IP 7942
-#define AVC_ILDB_ROOT_UV_ILDB_FIELD_IP 7976
-#define SLEEP_ENTRY_UV_ILDB_FIELD_IP 8054
-#define POST_SLEEP_UV_ILDB_FIELD_IP 8058
-#define NEXT_MB_UV_ILDB_FIELD_IP 8090
-#define ALL_SPAWNED_UV_ILDB_FIELD_IP 8114
-#define ALL_DONE_UV_ILDB_FIELD_IP 8138
-#define AVC_ILDB_CHILD_UV_ILDB_FIELD_IP 8144
-#define BYPASS_EXT_LEFT_EDGE_UV_ILDB_FIELD_IP 8272
-#define BYPASS_EXT_TOP_EDGE_UV_ILDB_FIELD_IP 8394
-#define WRITE_URB_UV_ILDB_FIELD_IP 8470
-#define POST_ILDB_UV_ILDB_FIELD_IP 8478
-#define READ_FOR_URB_UV_ILDB_FIELD_IP 8492
-#define ELSE_Y_2x8T_ILDB_FIELD_IP 8508
-#define ENDIF_Y_2x8T_ILDB_FIELD_IP 8516
-#define AVC_ILDB_ROOT_Y_ILDB_MBAFF_IP 8544
-#define SLEEP_ENTRY_Y_ILDB_MBAFF_IP 8642
-#define POST_SLEEP_Y_ILDB_MBAFF_IP 8646
-#define NEXT_MB_Y_ILDB_MBAFF_IP 8676
-#define ALL_SPAWNED_Y_ILDB_MBAFF_IP 8700
-#define ALL_DONE_Y_ILDB_MBAFF_IP 8710
-#define WAIT_FOR_UV_ILDB_MBAFF_IP 8710
-#define AVC_ILDB_CHILD_Y_ILDB_MBAFF_IP 8720
-#define RE_ENTRY_IP 8742
-#define ELSE_Y_16x16T_ILDB_MBAFF_IP 8782
-#define ENDIF_Y_16x16T_ILDB_MBAFF_IP 8792
-#define ELSE_Y_4x16T_IP 8808
-#define ENDIF_Y_4x16T_IP 8818
-#define BYPASS_V1_Y_IP 8966
-#define BYPASS_V2_Y_IP 8980
-#define BYPASS_V3_Y_IP 8994
-#define ELSE_Y_16x4T_IP 9024
-#define ENDIF_Y_16x4T_IP 9034
-#define NOT_DUAL_FIELD_IP 9060
-#define ELSE_Y_16x4_IP 9060
-#define ENDIF_Y_16x4_IP 9072
-#define DUAL_FIELD_Y_IP 9168
-#define H0_Y_DONE_IP 9236
-#define ELSE_Y_16x16_IP 9310
-#define ENDIF_Y_16x16_IP 9320
-#define ELSE_Y_16x4_SAVE_IP 9342
-#define ENDIF_Y_16x4_SAVE_IP 9354
-#define SKIP_ILDB_IP 9356
-#define POST_ILDB_IP 9364
-#define FILTER_Y_MBAFF_IP 9378
-#define MBAFF_Y_ELSE3_IP 9444
-#define MBAFF_Y_ENDIF3_IP 9458
-#define MBAFF_Y_ELSE4_IP 9488
-#define MBAFF_Y_ENDIF4_IP 9502
-#define MBAFF_Y_ELSE2_IP 9502
-#define MBAFF_Y_ENDIF6_IP 9566
-#define MBAFF_Y_ENDIF7_IP 9588
-#define MBAFF_Y_ENDIF2_IP 9592
-#define MBAFF_Y_ENDIF1_IP 9592
-#define AVC_ILDB_ROOT_UV_ILDB_MBAFF_IP 9600
-#define SLEEP_ENTRY_UV_ILDB_MBAFF_IP 9678
-#define POST_SLEEP_UV_ILDB_MBAFF_IP 9682
-#define NEXT_MB_UV_ILDB_MBAFF_IP 9714
-#define ALL_SPAWNED_UV_ILDB_MBAFF_IP 9738
-#define ALL_DONE_UV_ILDB_MBAFF_IP 9762
-#define AVC_ILDB_CHILD_UV_ILDB_MBAFF_IP 9768
-#define RE_ENTRY_UV_ILDB_MBAFF_IP 9794
-#define ELSE_UV_8X8T_ILDB_MBAFF_IP 9836
-#define ENDIF_UV_8X8T_ILDB_MBAFF_IP 9846
-#define ELSE_Y_2x8T_ILDB_MBAFF_IP 9864
-#define ENDIF_Y_2x8T_ILDB_MBAFF_IP 9874
-#define V0_U_NEXT1_IP 9934
-#define V0_U_NEXT2_IP 9954
-#define V0_U_NEXT3_IP 9964
-#define BYPASS_V0_UV_IP 10018
-#define ELSE_UV_8X2T_IP 10082
-#define ENDIF_UV_8X2T_IP 10092
-#define NOT_DUAL_FIELD_UV_IP 10120
-#define ELSE_UV_8X2_IP 10120
-#define ENDIF_UV_8X2_IP 10132
-#define DUAL_FIELD_UV_IP 10208
-#define H0_UV_DONE_IP 10300
-#define ELSE_UV_8X8_IP 10360
-#define ENDIF_UV_8X8_IP 10370
-#define ELSE_UV_8X2_SAVE_IP 10394
-#define ENDIF_UV_8X2_SAVE_IP 10406
-#define SKIP_ILDB_UV_ILDB_MBAFF_IP 10408
-#define POST_ILDB_UV_ILDB_MBAFF_IP 10416
-#define FILTER_UV_MBAFF_IP 10430
-#define MBAFF_UV_ELSE2_IP 10466
-#define MBAFF_UV_ENDIF2_IP 10496
-#define MBAFF_UV_ENDIF1_IP 10496
-#define AllAVC_END_IP 10500
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/export.inc.gen5 libva-1.0.1/i965_drv_video/shaders/h264/mc/export.inc.gen5
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/export.inc.gen5	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/export.inc.gen5	1970-01-01 00:00:00.000000000 +0000
@@ -1,345 +0,0 @@
-#define INTRA_16x16_IP_GEN5 0
-#define INTRA_16x16_VERTICAL_IP_GEN5 14
-#define INTRA_16x16_HORIZONTAL_IP_GEN5 32
-#define INTRA_16x16_DC_IP_GEN5 52
-#define INTRA_16x16_PLANE_IP_GEN5 98
-#define End_intra_Pred_16x16_Y_IP_GEN5 166
-#define End_add_Error_16x16_Y_IP_GEN5 204
-#define load_Intra_Ref_Y_IP_GEN5 220
-#define decode_Chroma_Intra_IP_GEN5 238
-#define INTRA_CHROMA_DC_IP_GEN5 260
-#define INTRA_CHROMA_HORIZONTAL_IP_GEN5 320
-#define INTRA_CHROMA_VERTICAL_IP_GEN5 332
-#define INTRA_Chroma_PLANE_IP_GEN5 342
-#define End_of_intra_Pred_Chroma_IP_GEN5 392
-#define save_16x16_Y_IP_GEN5 436
-#define INTRA_8x8_IP_GEN5 464
-#define INTRA_8x8_BLK2_IP_GEN5 568
-#define intra_Pred_8x8_Y_IP_GEN5 640
-#define INTRA_8X8_VERTICAL_IP_GEN5 672
-#define INTRA_8X8_HORIZONTAL_IP_GEN5 682
-#define INTRA_8X8_DC_IP_GEN5 692
-#define INTRA_8X8_DIAG_DOWN_LEFT_IP_GEN5 724
-#define INTRA_8X8_DIAG_DOWN_RIGHT_IP_GEN5 744
-#define INTRA_8X8_VERT_RIGHT_IP_GEN5 772
-#define INTRA_8X8_HOR_DOWN_IP_GEN5 808
-#define INTRA_8X8_VERT_LEFT_IP_GEN5 842
-#define INTRA_8X8_HOR_UP_IP_GEN5 862
-#define save_8x8_Y_IP_GEN5 886
-#define INTRA_4x4_IP_GEN5 928
-#define intra_Pred_4x4_Y_4_IP_GEN5 1062
-#define ADD_ERROR_SB0_IP_GEN5 1074
-#define ADD_ERROR_SB1_IP_GEN5 1088
-#define ADD_ERROR_SB2_IP_GEN5 1108
-#define ADD_ERROR_SB3_IP_GEN5 1124
-#define intra_Pred_4x4_Y_IP_GEN5 1130
-#define INTRA_4X4_VERTICAL_IP_GEN5 1130
-#define INTRA_4X4_HORIZONTAL_IP_GEN5 1134
-#define INTRA_4X4_DC_IP_GEN5 1138
-#define INTRA_4X4_DIAG_DOWN_LEFT_IP_GEN5 1160
-#define INTRA_4X4_DIAG_DOWN_RIGHT_IP_GEN5 1174
-#define INTRA_4X4_VERT_RIGHT_IP_GEN5 1192
-#define INTRA_4X4_HOR_DOWN_IP_GEN5 1218
-#define INTRA_4X4_VERT_LEFT_IP_GEN5 1246
-#define INTRA_4X4_HOR_UP_IP_GEN5 1260
-#define save_4x4_Y_IP_GEN5 1276
-#define INTRA_PCM_IP_GEN5 1320
-#define FRAME_MB_IP_GEN5 1384
-#define INIT_MBPARA_FRM_IP_GEN5 1390
-#define NOT_8x8_MODE_FRM_IP_GEN5 1426
-#define CONVERT_MVS_FRM_IP_GEN5 1436
-#define INIT_ADDRESS_REGS_FRM_IP_GEN5 1446
-#define LOOP_SUBMB_FRM_IP_GEN5 1454
-#define LOOP_DIR_FRM_IP_GEN5 1460
-#define LOADREF_MVXZERO_FRM_IP_GEN5 1510
-#define EXIT_LOADREF_Y_16x13_FRM_IP_GEN5 1524
-#define Interpolate_Y_8x8_Func_FRM_IP_GEN5 1544
-#define Interpolate_Y_8x8_Func2_FRM_IP_GEN5 1574
-#define Interpolate_Y_H_8x8_FRM_IP_GEN5 1708
-#define Interpolate_Y_V_8x8_FRM_IP_GEN5 1790
-#define VFILTER_8x8_FRM_IP_GEN5 1812
-#define Interpolate_Y_I_8x8_FRM_IP_GEN5 1860
-#define Average_8x8_FRM_IP_GEN5 1880
-#define Return_Interpolate_Y_8x8_FRM_IP_GEN5 1888
-#define Exit_Interpolate_Y_8x8_FRM_IP_GEN5 1890
-#define Interpolate_C_4x4_Func_FRM_IP_GEN5 1890
-#define PROCESS4x4_FRM_IP_GEN5 1928
-#define LOOP_SUBMBPT_FRM_IP_GEN5 1930
-#define Interpolate_Y_H_4x4_FRM_IP_GEN5 2066
-#define Interpolate_Y_V_4x4_FRM_IP_GEN5 2108
-#define VFILTER_4x4_FRM_IP_GEN5 2142
-#define Interpolate_Y_I_4x4_FRM_IP_GEN5 2148
-#define Average_4x4_FRM_IP_GEN5 2160
-#define Return_Interpolate_Y_4x4_FRM_IP_GEN5 2162
-#define Exit_Interpolate_Y_4x4_FRM_IP_GEN5 2174
-#define ROUND_SHIFT_C_FRM_IP_GEN5 2222
-#define LOOP_DIR_CONTINUE_FRM_IP_GEN5 2230
-#define Weighted_Prediction_FRM_IP_GEN5 2236
-#define DefaultWeightedPred_UniPred_FRM_IP_GEN5 2244
-#define DefaultWeightedPred_BiPred_FRM_IP_GEN5 2256
-#define WeightedPred_FRM_IP_GEN5 2264
-#define WeightedPred_Explicit_FRM_IP_GEN5 2282
-#define WeightedPred_LOOP_FRM_IP_GEN5 2322
-#define Return_WeightedPred_FRM_IP_GEN5 2382
-#define EXIT_LOOP_FRM_IP_GEN5 2424
-#define FIELD_MB_IP_GEN5 2496
-#define INIT_MBPARA_FLD_IP_GEN5 2502
-#define NOT_8x8_MODE_FLD_IP_GEN5 2538
-#define CONVERT_MVS_FLD_IP_GEN5 2548
-#define INIT_ADDRESS_REGS_FLD_IP_GEN5 2558
-#define LOOP_SUBMB_FLD_IP_GEN5 2568
-#define LOOP_DIR_FLD_IP_GEN5 2574
-#define LOADREF_MVXZERO_FLD_IP_GEN5 2644
-#define EXIT_LOADREF_Y_16x13_FLD_IP_GEN5 2658
-#define Interpolate_Y_8x8_Func_FLD_IP_GEN5 2680
-#define Interpolate_Y_8x8_Func2_FLD_IP_GEN5 2710
-#define Interpolate_Y_H_8x8_FLD_IP_GEN5 2844
-#define Interpolate_Y_V_8x8_FLD_IP_GEN5 2926
-#define VFILTER_8x8_FLD_IP_GEN5 2948
-#define Interpolate_Y_I_8x8_FLD_IP_GEN5 2996
-#define Average_8x8_FLD_IP_GEN5 3016
-#define Return_Interpolate_Y_8x8_FLD_IP_GEN5 3024
-#define Exit_Interpolate_Y_8x8_FLD_IP_GEN5 3026
-#define Interpolate_C_4x4_Func_FLD_IP_GEN5 3026
-#define PROCESS4x4_FLD_IP_GEN5 3064
-#define LOOP_SUBMBPT_FLD_IP_GEN5 3066
-#define Interpolate_Y_H_4x4_FLD_IP_GEN5 3204
-#define Interpolate_Y_V_4x4_FLD_IP_GEN5 3246
-#define VFILTER_4x4_FLD_IP_GEN5 3280
-#define Interpolate_Y_I_4x4_FLD_IP_GEN5 3286
-#define Average_4x4_FLD_IP_GEN5 3298
-#define Return_Interpolate_Y_4x4_FLD_IP_GEN5 3300
-#define Exit_Interpolate_Y_4x4_FLD_IP_GEN5 3312
-#define ROUND_SHIFT_C_FLD_IP_GEN5 3360
-#define LOOP_DIR_CONTINUE_FLD_IP_GEN5 3368
-#define Weighted_Prediction_FLD_IP_GEN5 3374
-#define DefaultWeightedPred_UniPred_FLD_IP_GEN5 3382
-#define DefaultWeightedPred_BiPred_FLD_IP_GEN5 3394
-#define WeightedPred_FLD_IP_GEN5 3402
-#define WeightedPred_Explicit_FLD_IP_GEN5 3420
-#define WeightedPred_LOOP_FLD_IP_GEN5 3460
-#define Return_WeightedPred_FLD_IP_GEN5 3520
-#define EXIT_LOOP_FLD_IP_GEN5 3562
-#define MBAFF_MB_IP_GEN5 3640
-#define INIT_MBPARA_MBF_IP_GEN5 3646
-#define NOT_8x8_MODE_MBF_IP_GEN5 3682
-#define CONVERT_MVS_MBF_IP_GEN5 3692
-#define INIT_ADDRESS_REGS_MBF_IP_GEN5 3702
-#define LOOP_SUBMB_MBF_IP_GEN5 3716
-#define LOOP_DIR_MBF_IP_GEN5 3722
-#define LOADREF_MVXZERO_MBF_IP_GEN5 3796
-#define EXIT_LOADREF_Y_16x13_MBF_IP_GEN5 3810
-#define Interpolate_Y_8x8_Func_MBF_IP_GEN5 3832
-#define Interpolate_Y_8x8_Func2_MBF_IP_GEN5 3862
-#define Interpolate_Y_H_8x8_MBF_IP_GEN5 3996
-#define Interpolate_Y_V_8x8_MBF_IP_GEN5 4078
-#define VFILTER_8x8_MBF_IP_GEN5 4100
-#define Interpolate_Y_I_8x8_MBF_IP_GEN5 4148
-#define Average_8x8_MBF_IP_GEN5 4168
-#define Return_Interpolate_Y_8x8_MBF_IP_GEN5 4176
-#define Exit_Interpolate_Y_8x8_MBF_IP_GEN5 4178
-#define Interpolate_C_4x4_Func_MBF_IP_GEN5 4178
-#define PROCESS4x4_MBF_IP_GEN5 4216
-#define LOOP_SUBMBPT_MBF_IP_GEN5 4218
-#define Interpolate_Y_H_4x4_MBF_IP_GEN5 4356
-#define Interpolate_Y_V_4x4_MBF_IP_GEN5 4398
-#define VFILTER_4x4_MBF_IP_GEN5 4432
-#define Interpolate_Y_I_4x4_MBF_IP_GEN5 4438
-#define Average_4x4_MBF_IP_GEN5 4450
-#define Return_Interpolate_Y_4x4_MBF_IP_GEN5 4452
-#define Exit_Interpolate_Y_4x4_MBF_IP_GEN5 4464
-#define ROUND_SHIFT_C_MBF_IP_GEN5 4512
-#define LOOP_DIR_CONTINUE_MBF_IP_GEN5 4520
-#define Weighted_Prediction_MBF_IP_GEN5 4526
-#define DefaultWeightedPred_UniPred_MBF_IP_GEN5 4534
-#define DefaultWeightedPred_BiPred_MBF_IP_GEN5 4546
-#define WeightedPred_MBF_IP_GEN5 4554
-#define WeightedPred_Explicit_MBF_IP_GEN5 4572
-#define WeightedPred_LOOP_MBF_IP_GEN5 4612
-#define Return_WeightedPred_MBF_IP_GEN5 4672
-#define EXIT_LOOP_MBF_IP_GEN5 4714
-#define SETHWSCOREBOARD_IP_GEN5 4792
-#define SetHWScoreboard_Loop_IP_GEN5 4806
-#define Parse_8_Loop_0_IP_GEN5 4852
-#define Parse_8_Loop_2_IP_GEN5 4876
-#define Parse_8_Loop_4_IP_GEN5 4900
-#define Parse_8_Loop_6_IP_GEN5 4924
-#define Parse_8_Loop_8_IP_GEN5 4948
-#define Parse_8_Loop_10_IP_GEN5 4972
-#define Parse_8_Loop_12_IP_GEN5 4996
-#define Parse_8_Loop_14_IP_GEN5 5020
-#define SetHWScoreboard_Remainder_IP_GEN5 5062
-#define SetHWScoreboard_Remainder_Loop_IP_GEN5 5090
-#define Output_Remainder_Intra_IP_GEN5 5116
-#define SetHWScoreboard_Done_IP_GEN5 5128
-#define SETHWSCOREBOARD_MBAFF_IP_GEN5 5136
-#define SetHWScoreboard_MBAFF_Loop_IP_GEN5 5148
-#define SET_SB_MBAFF_INTRA_0_IP_GEN5 5208
-#define SET_SB_MBAFF_0_IP_GEN5 5230
-#define NEXT_MB_MBAFF_0_IP_GEN5 5238
-#define SET_SB_MBAFF_INTRA_2_IP_GEN5 5276
-#define SET_SB_MBAFF_2_IP_GEN5 5298
-#define NEXT_MB_MBAFF_2_IP_GEN5 5306
-#define SET_SB_MBAFF_INTRA_4_IP_GEN5 5344
-#define SET_SB_MBAFF_4_IP_GEN5 5366
-#define NEXT_MB_MBAFF_4_IP_GEN5 5374
-#define SET_SB_MBAFF_INTRA_6_IP_GEN5 5412
-#define SET_SB_MBAFF_6_IP_GEN5 5434
-#define NEXT_MB_MBAFF_6_IP_GEN5 5442
-#define SET_SB_MBAFF_INTRA_8_IP_GEN5 5480
-#define SET_SB_MBAFF_8_IP_GEN5 5502
-#define NEXT_MB_MBAFF_8_IP_GEN5 5510
-#define SET_SB_MBAFF_INTRA_10_IP_GEN5 5548
-#define SET_SB_MBAFF_10_IP_GEN5 5570
-#define NEXT_MB_MBAFF_10_IP_GEN5 5578
-#define SET_SB_MBAFF_INTRA_12_IP_GEN5 5616
-#define SET_SB_MBAFF_12_IP_GEN5 5638
-#define NEXT_MB_MBAFF_12_IP_GEN5 5646
-#define SET_SB_MBAFF_INTRA_14_IP_GEN5 5684
-#define SET_SB_MBAFF_14_IP_GEN5 5706
-#define NEXT_MB_MBAFF_14_IP_GEN5 5714
-#define SetHWScoreboard_MBAFF_Remainder_IP_GEN5 5756
-#define SetHWScoreboard_MBAFF_Remainder_Loop_IP_GEN5 5784
-#define SET_SB_MBAFF_REM_INTRA_IP_GEN5 5822
-#define SET_SB_MBAFF_REM_IP_GEN5 5846
-#define Output_MBAFF_Remainder_Intra_IP_GEN5 5856
-#define SetHWScoreboard_MBAFF_Done_IP_GEN5 5868
-#define BSDRESET_IP_GEN5 5870
-#define DCRESETDUMMY_IP_GEN5 5872
-#define AVC_ILDB_ROOT_Y_ILDB_FRAME_IP_GEN5 5880
-#define SLEEP_ENTRY_Y_ILDB_FRAME_IP_GEN5 5976
-#define POST_SLEEP_Y_ILDB_FRAME_IP_GEN5 5980
-#define NEXT_MB_Y_ILDB_FRAME_IP_GEN5 6010
-#define ALL_SPAWNED_Y_ILDB_FRAME_IP_GEN5 6034
-#define ALL_DONE_Y_ILDB_FRAME_IP_GEN5 6044
-#define WAIT_FOR_UV_ILDB_FRAME_IP_GEN5 6044
-#define AVC_ILDB_CHILD_Y_ILDB_FRAME_IP_GEN5 6056
-#define WRITE_URB_Y_ILDB_FRAME_IP_GEN5 6436
-#define POST_ILDB_Y_ILDB_FRAME_IP_GEN5 6444
-#define READ_FOR_URB_Y_ILDB_FRAME_IP_GEN5 6458
-#define FILTER_Y_IP_GEN5 6494
-#define Y_ELSE3_IP_GEN5 6560
-#define Y_ENDIF3_IP_GEN5 6574
-#define Y_ELSE4_IP_GEN5 6604
-#define Y_ENDIF4_IP_GEN5 6618
-#define Y_ELSE2_IP_GEN5 6618
-#define Y_ENDIF6_IP_GEN5 6684
-#define Y_ENDIF7_IP_GEN5 6706
-#define Y_ENDIF2_IP_GEN5 6710
-#define Y_ENDIF1_IP_GEN5 6710
-#define AVC_ILDB_ROOT_UV_ILDB_FRAME_IP_GEN5 6720
-#define SLEEP_ENTRY_UV_ILDB_FRAME_IP_GEN5 6798
-#define POST_SLEEP_UV_ILDB_FRAME_IP_GEN5 6802
-#define NEXT_MB_UV_ILDB_FRAME_IP_GEN5 6834
-#define ALL_SPAWNED_UV_ILDB_FRAME_IP_GEN5 6858
-#define ALL_DONE_UV_ILDB_FRAME_IP_GEN5 6882
-#define AVC_ILDB_CHILD_UV_ILDB_FRAME_IP_GEN5 6888
-#define BYPASS_EXT_LEFT_EDGE_UV_ILDB_FRAME_IP_GEN5 7008
-#define BYPASS_EXT_TOP_EDGE_UV_ILDB_FRAME_IP_GEN5 7126
-#define WRITE_URB_UV_ILDB_FRAME_IP_GEN5 7194
-#define POST_ILDB_UV_ILDB_FRAME_IP_GEN5 7202
-#define READ_FOR_URB_UV_ILDB_FRAME_IP_GEN5 7216
-#define FILTER_UV_IP_GEN5 7246
-#define UV_ELSE2_IP_GEN5 7282
-#define UV_ENDIF2_IP_GEN5 7314
-#define UV_ENDIF1_IP_GEN5 7314
-#define AVC_ILDB_ROOT_Y_ILDB_FIELD_IP_GEN5 7320
-#define SLEEP_ENTRY_Y_ILDB_FIELD_IP_GEN5 7416
-#define POST_SLEEP_Y_ILDB_FIELD_IP_GEN5 7420
-#define NEXT_MB_Y_ILDB_FIELD_IP_GEN5 7450
-#define ALL_SPAWNED_Y_ILDB_FIELD_IP_GEN5 7474
-#define ALL_DONE_Y_ILDB_FIELD_IP_GEN5 7484
-#define WAIT_FOR_UV_ILDB_FIELD_IP_GEN5 7484
-#define AVC_ILDB_CHILD_Y_ILDB_FIELD_IP_GEN5 7496
-#define WRITE_URB_Y_ILDB_FIELD_IP_GEN5 7896
-#define POST_ILDB_Y_ILDB_FIELD_IP_GEN5 7904
-#define READ_FOR_URB_Y_ILDB_FIELD_IP_GEN5 7918
-#define ELSE_Y_4x16T_ILDB_FIELD_IP_GEN5 7934
-#define ENDIF_Y_4x16T_ILDB_FIELD_IP_GEN5 7942
-#define AVC_ILDB_ROOT_UV_ILDB_FIELD_IP_GEN5 7976
-#define SLEEP_ENTRY_UV_ILDB_FIELD_IP_GEN5 8054
-#define POST_SLEEP_UV_ILDB_FIELD_IP_GEN5 8058
-#define NEXT_MB_UV_ILDB_FIELD_IP_GEN5 8090
-#define ALL_SPAWNED_UV_ILDB_FIELD_IP_GEN5 8114
-#define ALL_DONE_UV_ILDB_FIELD_IP_GEN5 8138
-#define AVC_ILDB_CHILD_UV_ILDB_FIELD_IP_GEN5 8144
-#define BYPASS_EXT_LEFT_EDGE_UV_ILDB_FIELD_IP_GEN5 8272
-#define BYPASS_EXT_TOP_EDGE_UV_ILDB_FIELD_IP_GEN5 8394
-#define WRITE_URB_UV_ILDB_FIELD_IP_GEN5 8470
-#define POST_ILDB_UV_ILDB_FIELD_IP_GEN5 8478
-#define READ_FOR_URB_UV_ILDB_FIELD_IP_GEN5 8492
-#define ELSE_Y_2x8T_ILDB_FIELD_IP_GEN5 8508
-#define ENDIF_Y_2x8T_ILDB_FIELD_IP_GEN5 8516
-#define AVC_ILDB_ROOT_Y_ILDB_MBAFF_IP_GEN5 8544
-#define SLEEP_ENTRY_Y_ILDB_MBAFF_IP_GEN5 8642
-#define POST_SLEEP_Y_ILDB_MBAFF_IP_GEN5 8646
-#define NEXT_MB_Y_ILDB_MBAFF_IP_GEN5 8676
-#define ALL_SPAWNED_Y_ILDB_MBAFF_IP_GEN5 8700
-#define ALL_DONE_Y_ILDB_MBAFF_IP_GEN5 8710
-#define WAIT_FOR_UV_ILDB_MBAFF_IP_GEN5 8710
-#define AVC_ILDB_CHILD_Y_ILDB_MBAFF_IP_GEN5 8720
-#define RE_ENTRY_IP_GEN5 8742
-#define ELSE_Y_16x16T_ILDB_MBAFF_IP_GEN5 8782
-#define ENDIF_Y_16x16T_ILDB_MBAFF_IP_GEN5 8792
-#define ELSE_Y_4x16T_IP_GEN5 8808
-#define ENDIF_Y_4x16T_IP_GEN5 8818
-#define BYPASS_V1_Y_IP_GEN5 8966
-#define BYPASS_V2_Y_IP_GEN5 8980
-#define BYPASS_V3_Y_IP_GEN5 8994
-#define ELSE_Y_16x4T_IP_GEN5 9024
-#define ENDIF_Y_16x4T_IP_GEN5 9034
-#define NOT_DUAL_FIELD_IP_GEN5 9060
-#define ELSE_Y_16x4_IP_GEN5 9060
-#define ENDIF_Y_16x4_IP_GEN5 9072
-#define DUAL_FIELD_Y_IP_GEN5 9168
-#define H0_Y_DONE_IP_GEN5 9236
-#define ELSE_Y_16x16_IP_GEN5 9310
-#define ENDIF_Y_16x16_IP_GEN5 9320
-#define ELSE_Y_16x4_SAVE_IP_GEN5 9342
-#define ENDIF_Y_16x4_SAVE_IP_GEN5 9354
-#define SKIP_ILDB_IP_GEN5 9356
-#define POST_ILDB_IP_GEN5 9364
-#define FILTER_Y_MBAFF_IP_GEN5 9378
-#define MBAFF_Y_ELSE3_IP_GEN5 9444
-#define MBAFF_Y_ENDIF3_IP_GEN5 9458
-#define MBAFF_Y_ELSE4_IP_GEN5 9488
-#define MBAFF_Y_ENDIF4_IP_GEN5 9502
-#define MBAFF_Y_ELSE2_IP_GEN5 9502
-#define MBAFF_Y_ENDIF6_IP_GEN5 9566
-#define MBAFF_Y_ENDIF7_IP_GEN5 9588
-#define MBAFF_Y_ENDIF2_IP_GEN5 9592
-#define MBAFF_Y_ENDIF1_IP_GEN5 9592
-#define AVC_ILDB_ROOT_UV_ILDB_MBAFF_IP_GEN5 9600
-#define SLEEP_ENTRY_UV_ILDB_MBAFF_IP_GEN5 9678
-#define POST_SLEEP_UV_ILDB_MBAFF_IP_GEN5 9682
-#define NEXT_MB_UV_ILDB_MBAFF_IP_GEN5 9714
-#define ALL_SPAWNED_UV_ILDB_MBAFF_IP_GEN5 9738
-#define ALL_DONE_UV_ILDB_MBAFF_IP_GEN5 9762
-#define AVC_ILDB_CHILD_UV_ILDB_MBAFF_IP_GEN5 9768
-#define RE_ENTRY_UV_ILDB_MBAFF_IP_GEN5 9794
-#define ELSE_UV_8X8T_ILDB_MBAFF_IP_GEN5 9836
-#define ENDIF_UV_8X8T_ILDB_MBAFF_IP_GEN5 9846
-#define ELSE_Y_2x8T_ILDB_MBAFF_IP_GEN5 9864
-#define ENDIF_Y_2x8T_ILDB_MBAFF_IP_GEN5 9874
-#define V0_U_NEXT1_IP_GEN5 9934
-#define V0_U_NEXT2_IP_GEN5 9954
-#define V0_U_NEXT3_IP_GEN5 9964
-#define BYPASS_V0_UV_IP_GEN5 10018
-#define ELSE_UV_8X2T_IP_GEN5 10082
-#define ENDIF_UV_8X2T_IP_GEN5 10092
-#define NOT_DUAL_FIELD_UV_IP_GEN5 10120
-#define ELSE_UV_8X2_IP_GEN5 10120
-#define ENDIF_UV_8X2_IP_GEN5 10132
-#define DUAL_FIELD_UV_IP_GEN5 10208
-#define H0_UV_DONE_IP_GEN5 10300
-#define ELSE_UV_8X8_IP_GEN5 10360
-#define ENDIF_UV_8X8_IP_GEN5 10370
-#define ELSE_UV_8X2_SAVE_IP_GEN5 10394
-#define ENDIF_UV_8X2_SAVE_IP_GEN5 10406
-#define SKIP_ILDB_UV_ILDB_MBAFF_IP_GEN5 10408
-#define POST_ILDB_UV_ILDB_MBAFF_IP_GEN5 10416
-#define FILTER_UV_MBAFF_IP_GEN5 10430
-#define MBAFF_UV_ELSE2_IP_GEN5 10466
-#define MBAFF_UV_ENDIF2_IP_GEN5 10496
-#define MBAFF_UV_ENDIF1_IP_GEN5 10496
-#define AllAVC_END_IP_GEN5 10500
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/header.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/header.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/header.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/header.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,303 +0,0 @@
-/*
- * Common header file for all AVC MC kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__HEADER__)	// Make sure this file is only included once
-#define __HEADER__
-
-// Module name: header.inc
-//
-// Common header file for all AVC MC kernels
-//
-
-#ifndef	COMBINED_KERNEL
-#ifdef DEV_CTG
-  #define SW_SCOREBOARD		// SW Scoreboard should be enabled for CTG and earlier
-  #undef HW_SCOREBOARD		// HW Scoreboard should be disabled for CTG and earlier
-#else
-  #define HW_SCOREBOARD		// HW Scoreboard should be enabled for ILK and beyond
-  #undef SW_SCOREBOARD		// SW Scoreboard should be disabled for ILK and beyond
-#endif	// DEV_CTG
-#endif	// COMBINED_KERNEL
-
-//#define MONO				// Build Monochrome kernels
-
-//  Surface state definition
-//
-#define	DESTY		0
-#define	DESTUV		1
-#define	REFYFM0		2
-#define	REFYFM1		3
-#define	REFYFM2		4
-#define	REFYFM3		5
-#define	REFYFM4		6
-#define	REFYFM5		7
-#define	REFYFM6		8
-#define	REFYFM7		9
-#define	REFYFM8		10
-#define	REFYFM9		11
-#define	REFYFM10	12
-#define	REFYFM11	13
-#define	REFYFM12	14
-#define	REFYFM13	15
-#define	REFYFM14	16
-#define	REFYFM15	17
-#define	REFUVFM0	18
-#define	REFUVFM1	19
-#define	REFUVFM2	20
-#define	REFUVFM3	21
-#define	REFUVFM4	22
-#define	REFUVFM5	23
-#define	REFUVFM6	24
-#define	REFUVFM7	25
-#define	REFUVFM8	26
-#define	REFUVFM9	27
-#define	REFUVFM10	28
-#define	REFUVFM11	29
-#define	REFUVFM12	30
-#define	REFUVFM13	31
-#define	REFUVFM14	32
-#define	REFUVFM15	33
-
-.default_execution_size	(16)
-.default_register_type	:ub
-
-//  ----------- Common constant definitions ------------
-//
-//  Bit position constants
-//
-#define BIT0	0x01
-#define BIT1	0x02
-#define BIT2	0x04
-#define BIT3	0x08
-#define BIT4	0x10
-#define BIT5	0x20
-#define BIT6	0x40
-#define BIT7	0x80
-#define BIT8	0x0100
-#define BIT9	0x0200
-#define BIT10	0x0400
-#define BIT11	0x0800
-#define BIT12	0x1000
-#define BIT13	0x2000
-#define BIT14	0x4000
-#define BIT15	0x8000
-#define BIT16	0x00010000
-#define BIT17	0x00020000
-#define BIT18	0x00040000
-#define BIT19	0x00080000
-#define BIT20	0x00100000
-#define BIT21	0x00200000
-#define BIT22	0x00400000
-#define BIT23	0x00800000
-#define BIT24	0x01000000
-#define BIT25	0x02000000
-#define BIT26	0x04000000
-#define BIT27	0x08000000
-#define BIT28	0x10000000
-#define BIT29	0x20000000
-#define BIT30	0x40000000
-#define BIT31	0x80000000
-
-#define	GRFWIB	32		// GRF register width in byte
-#define	GRFWIW	16		// GRF register width in word
-#define	GRFWID	8		// GRF register width in dword
-
-#define INST_SIZE   16		// Instruction size = 128b = 16 Bytes
-
-#define REGION(Width,HStride) <Width*HStride;Width,HStride>
-
-#define NULLREG		null<1>:ud
-#define NULLREGW	null<1>:w
-
-#define TOP_FIELD		0
-#define BOTTOM_FIELD	1
-
-//  M2 - M9 for date writing message payload
-.declare    MSGPAYLOAD	Base=m2 ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-.declare    MSGPAYLOADB	Base=m2 ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-.declare    MSGPAYLOADW	Base=m2 ElementSize=2 SrcRegion=REGION(16,1) Type=uw
-.declare    MSGPAYLOADD	Base=m2 ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-
-//  ----------- Common Message Descriptor ------------
-//
-#ifdef DEV_ILK
-#define MSG_GW		0x03		// Message Gateway Extended Message Descriptor,
-#define DAPREAD		0x04		// Data Port Read Extended Message Descriptor,
-#define DAPWRITE	0x05		// Data Port Write Extended Message Descriptor,
-#define TS			0x07		// Thread Spawner Extended Message Descriptor
-#define TS_EOT		0x27		// End of Thread Extended Message Descriptor
-
-#define EOTMSGDSC	0x02000010	// End of Thread Message Descriptor, don't deference URB handle
-
-// Data Port Message Descriptor
-#define DWBRMSGDSC_RC	 0x02086000	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_TF 0x02086600	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_BF 0x02086700	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_SC	 0x0208A000	// DWORD Block Read Message Descriptor, reading from sampler cache = A.
-#define DWBRMSGDSC_SC_TF 0x0208E600	// DWORD Block Read Message Descriptor, reading top field from field mode sampler cache.
-#define DWBRMSGDSC_SC_BF 0x0208E700	// DWORD Block Read Message Descriptor, reading bottom field from field mode sampler cache.
-
-#define DWBWMSGDSC		 0x02082000	// DWORD Block Write Message Descriptor
-#define DWBWMSGDSC_WC 	 0x0218A000	// DWORD Block Write Message Descriptor + write commit
-
-// Enable Write Commit writeback mesage
-#define	ENWRCOM		0x00108000	// Enable "write commit" and set response length = 1
-
-// Thread Spawner Message Descriptor
-#define	TSMSGDSC	0x02000011
-
-// Message Gateway Message Descriptors
-#define OGWMSGDSC	0x02000000	// OpenGateway Message Descriptor
-#define CGWMSGDSC	0x02000001	// CloseGateway Message Descriptor
-#define FWDMSGDSC	0x02000002	// ForwardMsg Message Descriptor
-
-#define	NOTIFYMSG	0x00008000	// Send notification with ForwardMsg message
-
-#define	RESP_LEN(len)	0x100000*len
-#define MSG_LEN(len)	0x2000000*len
-
-#else	// Pre DEV_ILK
-
-#define MSG_GW
-#define DAPREAD
-#define DAPWRITE
-#define TS
-#define TS_EOT
-
-#define EOTMSGDSC	0x87100010	// End of Thread Message Descriptor, don't deference URB handle
-
-// Data Port Message Descriptor
-#define DWBRMSGDSC_RC	 0x04106000	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_TF 0x04106600	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_RC_BF 0x04106700	// DWORD Block Read Message Descriptor, reading from render cache = 6.
-#define DWBRMSGDSC_SC	 0x0410A000	// DWORD Block Read Message Descriptor, reading from sampler cache = A.
-#define DWBRMSGDSC_SC_TF 0x0410A600	// DWORD Block Read Message Descriptor, reading top field from field mode sampler cache.
-#define DWBRMSGDSC_SC_BF 0x0410A700	// DWORD Block Read Message Descriptor, reading bottom field from field mode sampler cache.
-
-#define DWBWMSGDSC		 0x05102000	// DWORD Block Write Message Descriptor
-#define DWBWMSGDSC_WC 	 0x0511A000	// DWORD Block Write Message Descriptor + write commit
-
-// Enable Write Commit writeback mesage
-#define	ENWRCOM		0x00018000	// Enable "write commit" and set response length = 1
-
-// Thread Spawner Message Descriptor
-#define	TSMSGDSC	0x07100011
-
-// Message Gateway Message Descriptors
-#define OGWMSGDSC	0x03100000	// OpenGateway Message Descriptor
-#define CGWMSGDSC	0x03100001	// CloseGateway Message Descriptor
-#define FWDMSGDSC	0x03100002	// ForwardMsg Message Descriptor
-
-#define	NOTIFYMSG	0x00008000	// Send notification with ForwardMsg message
-#define	ACKREQMSG	0x00014000	// Acknowledgement required so response length should be 1
-
-#define	RESP_LEN(len)	0x10000*len
-#define MSG_LEN(len)	0x100000*len
-
-#endif	// DEV_ILK
-
-// Enable frame/field selection in message descriptor
-#define ENMSGDSCFM	0x400		// Enable MSGDSC to select frame surface
-#define ENMSGDSCTF	0x600		// Enable MSGDSC to select top field surface
-#define ENMSGDSCBF	0x700		// Enable MSGDSC to select bottom field surface
-
-//  ----------- Message related register ------------
-//
-#define MSGHDR		m1		// Message Payload Header
-#define MSGHDRY		m1		// Message Payload Header register for Y data
-#define MSGHDRY0	m1		// Message Payload Header register for Y data
-#define MSGHDRY1	m2		// Message Payload Header register for Y data
-#define MSGHDRY2	m3		// Message Payload Header register for Y data
-#define MSGHDRY3	m4		// Message Payload Header register for Y data
-#define MSGHDRUV	m5		// Message Payload Header register for U/V data
-#define MSGSRC		r62		// Message source register, should never be used for other purposes
-#define MSGDSC		a0.0:ud	// Message Descriptor register (type DWORD)
-
-#define MH_ORI		MSGSRC.0	// DWORD block R/W message header block offset
-#define MH_ORIX		MSGSRC.0	// DWORD block R/W message header X offset
-#define MH_ORIY		MSGSRC.1	// DWORD block R/W message header Y offset
-#define MH_SIZE		MSGSRC.2	// DWORD block R/W message header block width & height
-
-// Data necessary for kernel operations
-//
-//  Address registers used as pointers
-//
-//  Note: Please keep the register order as is since they are used in compressed instructions
-//
-#define	    PPREDBUF_Y		a0.4	// Pointer to predicted Y picture
-#define	    PPREDBUF_Y1		a0.5	// Pointer to predicted Y picture for extended instruction
-
-#define	    PPREDBUF_UV		a0.4	// Pointer to predicted U/V picture
-#define	    PPREDBUF_UV1	a0.5	// Pointer to predicted U/V picture for extended instruction
-
-#define	    PDECBUF		a0.4	// Pointer to decoded picture data
-#define	    PDECBUF_UD	a0.2	// Pointer to decoded picture data in DWORD unit
-
-//  ----------- R63 is reserved for global variables ------------
-//
-//  Note: Don't program it with values other than what are defined here. 
-
-#define G_REG		r63
-
-#define RETURN_REG	G_REG.0		// Return pointer for all sub-routine calls (type DWORD)
-#define RETURN_REG1	G_REG.1		// Return pointer for second-level calls
-
-#define I_ORIX		G_REG.13	// :uw, H. origin of the macroblock in pixel unit, don't overwrite in-line data
-#define I_ORIY		G_REG.14	// :uw, V. origin of the macroblock in pixel unit, don't overwrite in-line data
-
-//  Macros
-//
-//  Note: For macros that require multiple line expansion, insert "\n" at the end of each line.
-//
-#define	GRF(reg)	r##reg
-#ifdef DEV_ILK
-#define END_THREAD			send (8) NULLREG MSGHDR r0:ud TS_EOT	EOTMSGDSC
-#else
-#define END_THREAD			send (8) NULLREG MSGHDR r0:ud EOTMSGDSC
-#endif	// DEV_ILK
-
-#define CALL(subFunc, skipInst)	add (1) RETURN_REG<1>:ud   ip:ud	(1+skipInst)*INST_SIZE \n\
-				jmpi (1) subFunc
-
-#define CALL_1(subFunc, skipInst)	add (1) RETURN_REG1<1>:ud   ip:ud	(1+skipInst)*INST_SIZE \n\
-				jmpi (1) subFunc
-
-#define	RETURN		mov (1)	ip:ud	RETURN_REG<0;1,0>:ud		// Return to calling module
-#define	RETURN_1	mov (1)	ip:ud	RETURN_REG1<0;1,0>:ud		// Return to second-level calling module
-																// To support iterative calling
-#ifdef SW_SCOREBOARD    
-
-#ifdef DEV_CTG_A
-  #define LEADING_THREAD	1		// For CTG A, no SRT is needed. Only PRT is necessary
-#else
-  #define LEADING_THREAD	0		// For CTG B0 and beyond, PRT doesn't take into debug count
-  #define DOUBLE_SB					// Scoreboard size needs to be doubled
-#endif
-
-#ifdef	DOUBLE_SB					// Scoreboard size needs to be doubled
-  #define SB_MASK		0x1ff		// Scoreboard wrap-around mask (for 512 entries)
-#else
-  #define SB_MASK		0xff		// Scoreboard wrap-around mask (for 256 entries)
-#endif	// defined(DOUBLE_SB)
-
-// Scoreboard related definitions
-
-#define	TEMPX		r50
-#define	TEMPY		r51
-#define	DELTA		r52
-
-#define M05_STORE	r0.13		// :uw, reuse r0.6:ud upper-word to store M0.5 header information for scoreboard
-
-
-#endif	// SW_SCOREBOARD
-
-// End of header.inc
-
-#endif	// !defined(__HEADER__)
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/HwmcOnlyHeader.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/HwmcOnlyHeader.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/HwmcOnlyHeader.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/HwmcOnlyHeader.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
- * Header file used only in HWMC_ONLY mode
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: HwmcOnlyHeader.inc
-//
-// Header file used only in HWMC_ONLY mode
-//
-
-#include "header.inc"
-
-#if !defined(__HWMCONLYHEADER__)	// Make sure the following are only included once
-#define __HWMCONLYHEADER__
-
-.reg_count_total    64
-.reg_count_payload  2
-
-//
-//  Now, begin source code....
-//
-
-.code
-#endif	// !defined(__HWMCONLYHEADER__)
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/initialize_MBPara.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/initialize_MBPara.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/initialize_MBPara.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/initialize_MBPara.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
- * Initialize parameters
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Initialize_MBPara.asm
-//
-
-
-//#if !defined(__INITIALIZE_MBPARA__)		// Make sure this is only included once
-//#define __INITIALIZE_MBPARA__
-
-
-// WA for weighted prediction - 2007/09/06		// shlee
-//	mov (1)		guwW128(0)<1>			guwR1(0)<0;1,0>		// Copy the unique number indicating weight/offset=(128,0)
-
-
-
-//	MB Type		Category
-//	1			B_L0_16x16
-//	2			B_L1_16x16
-//	3			B_Bi_16x16
-//	4			B_L0_L0_16x8
-//	5			B_L0_L0_8x16
-//	6			B_L1_L1_16x8
-//	7			B_L1_L1_8x16
-//	8			B_L0_L1_16x8
-//	9			B_L0_L1_8x16
-//	10			B_L1_L0_16x8
-//	11			B_L1_L0_8x16
-//	12			B_L0_Bi_16x8
-//	13			B_L0_Bi_8x16
-//	14			B_L1_Bi_16x8
-//	15			B_L1_Bi_8x16
-//	16			B_Bi_L0_16x8
-//	17			B_Bi_L0_8x16
-//	18			B_Bi_L1_16x8
-//	19			B_Bi_L1_8x16
-//	20			B_Bi_Bi_16x8
-//	21			B_Bi_Bi_8x16
-//	22			B_8x8
-
-	// TODO:
-	// Initialize interpolation area to eliminate uninitialized registers making the results of mac instructions XX.
-	// This issue was reported by Sharath on 5/25/2006, and why multiplication by zero still yields XX has not been understood yet.
-#if 0
-	mov (16)	gudINTPY0(0)<1>		0:ud	{Compr}
-	mov (16)	gudINTPY0(2)<1>		0:ud	{Compr}
-	mov (16)	gudINTPY1(0)<1>		0:ud	{Compr}
-	mov (16)	gudINTPY1(2)<1>		0:ud	{Compr}
-	mov (16)	gudINTPC0(0)<1>		0:ud	{Compr}
-	mov (16)	gudINTPC1(0)<1>		0:ud	{Compr}
-#endif
-
-	mov (1)		gMVSTEP:w			0:w								// Address increament for MV read
-
-	cmp.e.f0.0 (1) null:w			gwMBTYPE<0;1,0>					22:w
-	(-f0.0)		jmpi				INTERLABEL(NOT_8x8_MODE)
-
-	//--- 8x8 mode
-		
-	// Starting address of error data blocks
-	cmp.e.f0.1 (2) null<1>:w		gSUBMB_SHAPE<0;1,0>:ub			0:w
-	(f0.1) jmpi INTERLABEL(CONVERT_MVS)
-
-	// Note: MVs and Weights/Offsets are already expanded by HW or driver
-	
-	// MV conversion - Convert each MV to absolute coord. (= MV + MB org. + block offset) 
-	shl (16)	gwTEMP(0)<1>		gX<0;2,1>:w						2:w // Convert MB origin to 1/4-pel unit
-	mov (1)		gMVSTEP:w			24:w							// Address increament for MV read
-	add (2)		gwTEMP(0,4)<2>		gwTEMP(0,4)<4;2,2>				16:w
-	add (2)		gwTEMP(0,9)<2>		gwTEMP(0,9)<4;2,2>				16:w
-	add (4)		gwTEMP(0,12)<1>		gwTEMP(0,12)<4;4,1>				16:w
-	
-	add (16)	gMV<1>:w			gMV<16;16,1>:w					gwTEMP(0)<16;16,1>
-	add (8)		gwTEMP(0)<2>		gwTEMP(0)<16;8,2>				32:w
-	add (16)	gwMV(1,0)<1>		gwMV(1,0)<16;16,1>				gwTEMP(0)<16;16,1>	
-	add (8)		gwTEMP(0,1)<2>		gwTEMP(0,1)<16;8,2>				32:w
-	add (16)	gwMV(3,0)<1>		gwMV(3,0)<16;16,1>				gwTEMP(0)<16;16,1>	
-	add (8)		gwTEMP(0)<2>		gwTEMP(0)<16;8,2>				-32:w
-	add (16)	gwMV(2,0)<1>		gwMV(2,0)<16;16,1>				gwTEMP(0)<16;16,1>	
-
-	jmpi INTERLABEL(INIT_ADDRESS_REGS)
-
-INTERLABEL(NOT_8x8_MODE):
-
-	//--- !8x8 mode (16x16, 16x8, 8x16)
-
-	// MVs and Weights/Offsets are expanded
-	cmp.le.f0.1 (8) null<1>:w		gwMBTYPE<0;1,0>					3:w // Check 16x16
-	mov (1)		gSUBMB_SHAPE:ub		0:uw							// subMB shape
-	(f0.1) mov (8)	gMV<1>:d		gMV<0;2,1>:d					
-	(f0.1) mov (8)	gdWGT(1,0)<1>	gWGT<0;4,1>:d					
-	(f0.1) mov (4)	gdWGT(0,4)<1>	gWGT<4;4,1>:d					
-	
-INTERLABEL(CONVERT_MVS):
-	// MV conversion - Convert each MV to absolute coord. (= MV + MB org. + block offset)
-	shl (2)		gwTEMP(0)<1>		gX<2;2,1>:w						2:w // Convert MB origin to 1/4-pel unit
-	add (16)	gMV<1>:w			gMV<16;16,1>:w					gwTEMP(0)<0;2,1>
-	add (2)		gwMV(0,4)<2>		gwMV(0,4)<4;2,2>				32:w	//{NoDDClr}
-	add (2)		gwMV(0,9)<2>		gwMV(0,9)<4;2,2>				32:w	//{NoDDChk,NoDDClr}
-	add (4)		gwMV(0,12)<1>		gwMV(0,12)<4;4,1>				32:w	//{NoDDChk}
-		
-INTERLABEL(INIT_ADDRESS_REGS):
-	// Initialize the address registers
-	mov (2)		pERRORYC:ud			nOFFSET_ERROR:ud				{NoDDClr} // Address of Y and C error blocks
-	mov (1)		pRECON_MV:ud		nOFFSET_RECON_MV:ud				{NoDDChk,NoDDClr} // Address of recon area and motion vectors
-	mov (1)		pWGT_BIDX:ud		nOFFSET_WGT_BIDX:ud				{NoDDChk} // Address of weights/offsets and binding tbl idx
-	
-	// Read the parity of the current field (gPARITY - 0:top, 1:bottom, 3:frame)
-	// and set message descriptor for frame/field write
-#if defined(MBAFF)
-	and.nz.f0.0 (1) null:uw			gFIELDMBFLAG:ub					nFIELDMB_MASK:uw
-	(f0.0) and (1)	gPARITY:uw		gMBPARITY:ub					nMBPARITY_MASK:uw
-	(-f0.0) mov (1) gPARITY:uw		3:uw
-#elif defined(FIELD)
-	and (1)		gPARITY:uw			gMBPARITY:ub					nMBPARITY_MASK:uw
-#endif
-	
-        
-//#endif	// !defined(__INITIALIZE_MBPARA__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/inter_Header.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/inter_Header.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/inter_Header.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/inter_Header.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,371 +0,0 @@
-/*
- * Header file for all AVC INTER prediction kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__INTER_HEADER__)	// Make sure this file is only included once
-#define __INTER_HEADER__
-
-// Module name: inter_header.inc
-//
-// Header file for all AVC INTER prediction kernels
-//
-
-#define INTER_KERNEL
-
-//-------------------------------------------------------------------------------------------
-// TODO: The followings will be merged with the above definitions later
-//-------------------------------------------------------------------------------------------
-
-
-//------------ Input parameters & bit masks
-
-// SW WA for weighted prediction - 2007/09/06	
-//.declare	guwR1			Base=r1 ElementSize=2 Type=uw	
-//.declare	guwW128			Base=r63.13 ElementSize=2 Type=uw
-
-#ifdef DEV_ILK
-// #define SW_W_128		// Enable SW WA for special Weight=128 case. Can be commented to disable it
-#else	// Pre DEV_ILK
-#define SW_W_128		// Enable SW WA for special Weight=128 case.
-#endif	// DEV_ILK
-
-#ifdef	SW_W_128
-.declare	gudW128			Base=r1.0 ElementSize=4 Type=ud
-#else
-#endif	// SW_W_128
-
-#define		gORIX			r3.4				// :ub, X origin
-#define		gORIY			r3.5				// :ub, Y origin
-
-#define		gCBP			r3.9				// :ub, CBP (0, 0, Y0, Y1, Y2, Y3, Cb, Cr)
-#define		nCBPY_MASK		0x3c
-#define		nCBPU_MASK		0x2
-#define		nCBPV_MASK		0x1
-
-#define		gFIELDFLAGS		r3.1				// :uw - To compute message descriptor for write
-
-#define		gMBTYPE			r3.1				// :ub, MB type
-#define		nMBTYPE_MASK	0x1f
-#define		gFIELDMBFLAG	r3.1				// :ub, Field MB flag
-#define		nFIELDMB_MASK	0x40
-#define		gMBPARITY		r3.3				// :ub, Bottom field flag
-#define		nMBPARITY_MASK	0x01
-
-#define		gWPREDFLAG		r3.0				// :ub, Weighted pred flag
-#define		nWBIDIR_MASK	0xc0
-
-#define		gSUBMB_SHAPE	r3.12				// :ub, Sub-MB shape
-#define		gSUBMB_MODE		r3.13				// :ub, Sub-MB prediction mode
-.declare	guwSUBMB_SHAPE_MODE	Base=r3.6 ElementSize=2 Type=uw
-
-#define		gYWDENOM		r3.14				// :ub, Luma log2 weight denom
-#define		gCWDENOM		r3.15				// :ub, Chroma log2 weight denom
-
-#define		gADDR			r3.24				// :ub, Register addresses of error data / MV
-
-.declare	gubBIDX			Base=r3.16 ElementSize=1 Type=ub
-
-#define		gWGT			r8					// Weights/offsets
-.declare    gdWGT			Base=r8  ElementSize=4 Type=d
-.declare    gwWGT			Base=r8  ElementSize=2 Type=w
-#define		gMV				r4					// MVs
-.declare    gwMV			Base=r4  ElementSize=2 Type=w
-.declare    gdMV			Base=r4  ElementSize=4 Type=d
-
-.declare	gwERRORY		Base=r10 ElementSize=2 Type=w		// 16 GRFs
-.declare	gubERRORY		Base=r10 ElementSize=1 Type=ub
-.declare	gwERRORC		Base=r26 ElementSize=2 Type=w		// 8 GRFs
-.declare	gubERRORC		Base=r26 ElementSize=2 Type=ub
-
-//------------ Address registers
-#define		pMSGDSC			a0.0				// ud: Must be the leading dword of the address register
-#define		pREF			a0.0
-
-#define		pBIDX			a0.2				
-#define		pWGT			a0.3
-#define		pERRORYC		a0.2				// :ud	
-#define		pERRORY			a0.4
-#define		pERRORC			a0.5
-#define		pMV				a0.6	
-
-#define		pWGT_BIDX		a0.1				// :ud, WGT & BIDX
-#define		pRECON_MV		a0.3				// :ud, RECON & MV
-
-#define		pREF0			a0.0				// :uw
-#define		pREF0D			a0.0				// :ud
-#define		pREF1			a0.1
-#define		pREF2			a0.2
-#define		pREF2D			a0.1				// :ud
-#define		pREF3			a0.3
-#define		pREF4			a0.4
-#define		pREF4D			a0.2				// :ud
-#define		pREF5			a0.5
-#define		pREF6			a0.6
-#define		pREF6D			a0.3				// :ud
-#define		pREF7			a0.7
-
-#define		pRES			a0.6
-#define		pRESD			a0.3				// :ud
-#define		pRESULT			a0.7
-
-#define		p0				a0.0
-#define		p1				a0.1
-
-//------------ Constants for static/inline/indirect
-#define		nOFFSET_BIDX	112					// = 32*3+4*4
-
-#define		nOFFSET_WGT		256					// = 32*8
-#define		nOFFSET_WGT_BIDX 0x01000070			// = (256<<16)+112
-#define		nOFFSET_ERROR	0x03400140			// = (320+128*4)<<16+320=0x03400140
-#define		nOFFSET_ERRORY	0x0140
-#define		nOFFSET_ERRORC	0x0340
-#define		nOFFSET_MV		128					// = 32*4
-#define		nOFFSET_RECON_MV 0x04400080			// = (1088<<16)+128		// TODO: OFFSET_RECON is obsolete
-
-//------------ Constants for kernel internal variables
-#define		nOFFSET_INTPY0	0x0640				// = 32*50
-#define		nOFFSET_INTPY1	0x0780				// = 32*60
-#define		nOFFSET_INTPC0	0x06c0				// = 32*54
-#define		nOFFSET_INTPC1	0x0480				// = 32*36
-#define		nOFFSET_INTP0	0x06c00640
-#define		nOFFSET_INTP1	0x04800780
-
-#define		nOFFSET_INTERIM		0x0480				// = 32*36
-#define		nOFFSET_INTERIM2	0x04A00480			// = ((32*37)<<16)|(32*36)
-#define		nOFFSET_INTERIM3	0x04A00480			// = ((32*36+32)<<16)|(32*36)
-#define		nOFFSET_INTERIM4	0x04A00490			// = ((32*37)<<16)|(32*36+16)
-
-#define		nOFFSET_INTERIM4x4		0x04C0			// = 32*38
-#define		nOFFSET_INTERIM4x4_4	0x04E004D0		// = ((32*38+32)<<16)|(32*38+16)
-#define		nOFFSET_INTERIM4x4_5	0x04D004C0		// = ((32*38+16)<<16)|(32*38)
-#define		nOFFSET_INTERIM4x4_6	0x04E004C0		// = ((32*38+32)<<16)|(32*38)
-#define		nOFFSET_INTERIM4x4_7	0x04D004C8		// = ((32*38+16)<<16)|(32*38+8)
-#define		nOFFSET_INTERIM4x4_8	0x04E004D8		// = ((32*38+32)<<16)|(32*38+24)
-#define		nOFFSET_INTERIM4x4_9	0x04F004E8		// = ((32*38+48)<<16)|(32*38+40)
-
-#define		nOFFSET_RES		0x540				// = 32*42
-#define		nOFFSET_REF		0x560				// = 32*43
-#define		nOFFSET_REFC	0x700				// = 32*56
-
-			// Binding table index
-#define		nBDIX_DESTY		0
-#define		nBDIX_DESTC		1
-#define		nBI_LC_DIFF		0x10				// Binding table index diff between luma and chroma
-
-#define		nGRFWIB			32
-#define		nGRFHWIB		16
-
-//------------ Regions
-
-.declare    gudREF			Base=r43 ElementSize=4 SrcRegion=<16;16,1> Type=ud
-.declare    gubREF			Base=r43 ElementSize=1 Type=ub
-.declare    gudREFC			Base=r56 ElementSize=4 SrcRegion=<16;16,1> Type=ud
-
-// 16x16 handling
-.declare    gudREF21x21		Base=r58 ElementSize=4 SrcRegion=<16;16,1> Type=ud
-.declare    gudREF18x10		Base=r66 ElementSize=4 SrcRegion=<16;16,1> Type=ud
-.declare    gubREF18x10		Base=r66 ElementSize=1 SrcRegion=<16;16,1> Type=ub
-
-
-
-.declare    gudREF16x16		Base=r38 ElementSize=4 Type=ud			// 8 GRFs
-.declare    gubREF16x16		Base=r38 ElementSize=1 Type=ub
-.declare    gudREFC16x8		Base=r46 ElementSize=4 Type=ud			// 4 GRFs
-.declare    gubREFC16x8		Base=r46 ElementSize=1 Type=ub
-
-// TODO
-.declare    gubAVG			Base=r56 ElementSize=1 Type=ub
-.declare	gubREFY_BWD		Base=r64 ElementSize=1 Type=ub
-.declare	gubREFC_BWD		Base=r72 ElementSize=1 Type=ub
-
-
-.declare    guwINTPY0		Base=r50 ElementSize=2 SrcRegion=<16;16,1> Type=uw
-.declare	gudINTPY0		Base=r50 ElementSize=4 Type=ud
-.declare    gubINTPY0		Base=r50 ElementSize=1 SrcRegion=<32;16,2> Type=ub
-.declare    guwINTPY1		Base=r60 ElementSize=2 SrcRegion=<16;16,1> Type=uw
-.declare	gudINTPY1		Base=r60 ElementSize=4 Type=ud
-.declare    gubINTPY1		Base=r60 ElementSize=1 SrcRegion=<32;16,2> Type=ub
-.declare    guwYPRED		Base=r50 ElementSize=2 SrcRegion=<8;8,1> Type=uw
-.declare    gubYPRED		Base=r50 ElementSize=1 SrcRegion=<32;16,2> Type=ub
-
-.declare    guwINTPC0		Base=r54 ElementSize=2 SrcRegion=<16;16,1> Type=uw
-.declare    gwINTPC0		Base=r54 ElementSize=2 SrcRegion=<16;16,1> Type=w
-.declare	gudINTPC0		Base=r54 ElementSize=4 Type=ud
-.declare    gubINTPC0		Base=r54 ElementSize=1 SrcRegion=<32;16,2> Type=ub
-.declare    guwINTPC1		Base=r36 ElementSize=2 SrcRegion=<16;16,1> Type=uw
-.declare	gudINTPC1		Base=r36 ElementSize=4 Type=ud
-.declare    gubINTPC1		Base=r36 ElementSize=1 SrcRegion=<32;16,2> Type=ub
-.declare    guwCPRED		Base=r54 ElementSize=2 SrcRegion=<16;8,2> Type=uw
-.declare    gubCPRED		Base=r54 ElementSize=1 SrcRegion=<32;8,4> Type=ub
-
-#define		gINTERIM		r36
-.declare	gubINTERIM_BUF	Base=r36 ElementSize=1 SrcRegion=<32;16,2> Type=ub
-#define		gINTERIM4x4		r38
-.declare	gubINTERIM4x4_BUF Base=r38 ElementSize=1 SrcRegion=<32;16,2> Type=ub
-.declare	gwINTERIM4x4_BUF Base=r38 ElementSize=2  Type=w
-
-.declare	gubINTERIM_BUF2	Base=r42 ElementSize=1 SrcRegion=<8;4,2> Type=ub
-.declare	gwINTERIM_BUF2	Base=r42 ElementSize=2 SrcRegion=<16;16,1> Type=w	
-.declare	guwINTERIM_BUF2	Base=r42 ElementSize=2 Type=uw	
-
-.declare	gwINTERIM_BUF3	Base=r38 ElementSize=2 SrcRegion=<16;16,1> Type=w		// 2 GRFs
-.declare	gubINTERIM_BUF3	Base=r38 ElementSize=1 Type=ub							
-
-.declare	gwTEMP			Base=r42 ElementSize=2 SrcRegion=<16;16,1> Type=w
-
-//------------ General registers
-
-#define		gX				r3.2				// w
-#define		gY				r3.3				// w
-
-#define		gMSGDSC_R		r3.6				// ud
-#define		gMSGDSC_W		r3.7				// ud
-
-#ifdef	SW_W_128
-.declare	gwMBTYPE		Base=r8.6 ElementSize=2 Type=w			// Shared with gLOOP_SUBMB
-
-// TODO
-#define		gLOOP_SUBMB		r8.6
-#define		gLOOP_SUBMBPT	r8.7
-#define		gLOOP_DIR		r9.6
-#define		gLOOPCNT		r9.7				// Loop counter for submodules
-#else
-.declare	gwMBTYPE		Base=r1.0 ElementSize=2 Type=w			// Shared with gLOOP_SUBMB
-
-// TODO
-#define		gLOOP_SUBMB		r1.0
-#define		gLOOP_SUBMBPT	r1.1
-#define		gLOOP_DIR		r8.7
-#define		gLOOPCNT		r9.7				// Loop counter for submodules
-#endif	// SW_W_128
-
-#define		gW0				r34.6				// Temporary WORD 
-#define		gW1				r34.7				// Temporary WORD 
-#define		gW2				r34.8				// Temporary WORD 
-#define		gW3				r34.9				// Temporary WORD 
-#define		gD0				r34.3				// Temporary DWORD
-
-#define		gW4				r34.15
-
-//
-
-#define		gMVX_INT		r34.0				// :w
-#define		gMVY_INT		r34.1				// :w
-#define		gMVX_FRAC		r34.2				// :w
-#define		gMVY_FRAC		r34.3				// :w
-#define		gMVX_FRACC		r34.4				// :w
-#define		gMVY_FRACC		r34.5				// :w
-
-#define		gpINTPY			r34.10
-#define		gpINTPC			r34.11
-#define		gpINTP			r34.5				// DW
-
-#define		gPREDFLAG		r34.12
-#define		gBIDX			r34.13
-#define		gREFPARITY		r34.14
-#define		gCHRMVADJ		r1.14
-#define		gPARITY			r1.15
-#define		gCBP_MASK		r1.1
-
-#define		gMVSTEP			r1.13
-
-#define		gpADDR			r1.2				// :uw (8 words)
-
-#define		gSHAPETEMP		r8.15				// :uw
-
-#define		gCOEFA			r42.0				
-#define		gCOEFB			r42.1				
-#define		gCOEFC			r42.2				
-#define		gCOEFD			r42.3
-
-// Weighted prediction
-#define		gPREDFLAG0		r46.0
-#define		gPREDFLAG1		r46.2
-
-#define		gWEIGHTFLAG		r43.2
-#define		gBIPRED			r43.3
-#define		gYADD			r43.4
-#define		gCADD			r43.5
-#define		gYSHIFT			r43.6
-#define		gCSHIFT			r43.7
-
-#define		gOFFSET			r44.0
-#define		gUOFFSET		r44.1
-#define		gVOFFSET		r44.2
-
-#define		gWT0			r45.0
-#define		gO0				r45.1
-#define		gWT1			r45.2
-#define		gO1				r45.3
-#define		gUW0			r45.4
-#define		gUO0			r45.5
-#define		gUW1			r45.6
-#define		gUO1			r45.7	
-#define		gVW0			r45.8	
-#define		gVO0			r45.9	
-#define		gVW1			r45.10	
-#define		gVO1			r45.11
-
-#define		gWT0_D			r45.0	
-#define		gUW0_D			r45.2	
-
-//------------ Message-related Registers & constants
-#define		gMSGSRC			r2					// Message Source
-
-#define		mMSGHDR			m1		
-#define		mMSGHDRY		m1		
-#define		mMSGHDRC		m2		
-#define		mMSGHDR1		m1		
-#define		mMSGHDR2		m2		
-#define		mMSGHDR3		m3		
-#define		mMSGHDR4		m4		
-#define		mMSGHDRYW		m1		
-#define		mMSGHDRCW		m10		
-
-#ifdef DEV_ILK
-	// 0000 0100(read)  0001(msg len) xxxx(resp len) 1010 (sampler cache) xxxx (field/frame) xxxx xxxx (bidx)
-#define		nDWBRMSGDSC_SC		0x0208A002	// DWORD Block Read Message Descriptor through Data Port, Sampler Cache
-#define		nDWBRMSGDSC_SC_TF	0x0208E602	// DWORD Block Read Message Descriptor through Data Port, Sampler Cache
-#define		nDWBRMSGDSC_SC_BF	0x0208E702	// DWORD Block Read Message Descriptor through Data Port, Sampler Cache
-	// 0000 0101(write) 0001(msg len) xxxx(resp len) 0010 (render cache)  xxxx (field/frame) xxxx xxxx (bidx)										
-#define		nDWBWMSGDSC		0x02082000  // DWORD Block Write Message Descriptor through Data Port, Render Cache
-#define		nDWBWMSGDSC_TF	0x02082600  // DWORD Block Write Message Descriptor through Data Port, Render Cache
-#define		nDWBWMSGDSC_BF	0x02082700  // DWORD Block Write Message Descriptor through Data Port, Render Cache										
-
-#else	// Pre DEV_ILK
-	// 0000 0100(read)  0001(msg len) xxxx(resp len) 1010 (sampler cache) xxxx (field/frame) xxxx xxxx (bidx)
-#define		nDWBRMSGDSC_SC		0x0410A002	// DWORD Block Read Message Descriptor through Data Port, Sampler Cache
-#define		nDWBRMSGDSC_SC_TF	0x0410A602	// DWORD Block Read Message Descriptor through Data Port, Sampler Cache
-#define		nDWBRMSGDSC_SC_BF	0x0410A702	// DWORD Block Read Message Descriptor through Data Port, Sampler Cache
-	// 0000 0101(write) 0001(msg len) xxxx(resp len) 0010 (render cache)  xxxx (field/frame) xxxx xxxx (bidx)										
-#define		nDWBWMSGDSC		0x05102000  // DWORD Block Write Message Descriptor through Data Port, Render Cache
-#define		nDWBWMSGDSC_TF	0x05102600  // DWORD Block Write Message Descriptor through Data Port, Render Cache
-#define		nDWBWMSGDSC_BF	0x05102700  // DWORD Block Write Message Descriptor through Data Port, Render Cache										
-#endif	// DEV_ILK
-
-#define		nDWB_FIELD_MASK	0x0600
-										
-// message data payload
-.declare    mbMSGPAYLOADY	Base=m2  ElementSize=1 SrcRegion=REGION(16,1) Type=b
-.declare    mbMSGPAYLOADC	Base=m11 ElementSize=1 SrcRegion=REGION(16,1) Type=b
-
-// Destination registers for write commit
-#define		gREG_WRITE_COMMIT_Y		r10.0
-#define		gREG_WRITE_COMMIT_UV	r11.0
-
-#define RETURN_REG_INTER	r1.5		// Return pointer for all sub-routine calls (type DWORD)
-
-#define CALL_INTER(subFunc, skipInst)	add (1) RETURN_REG_INTER<1>:ud   ip:ud	1+skipInst*INST_SIZE \n\
-				jmpi (1) subFunc
-#define	RETURN_INTER		mov (1)	ip:ud	RETURN_REG_INTER<0;1,0>:ud		// Return to calling module
-
-
-// End of inter_header.inc
-
-#endif	// !defined(__INTER_HEADER__)
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_C_2x2.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_C_2x2.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_C_2x2.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_C_2x2.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * Interpolation kernel for chrominance 2x2 motion compensation
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	Kernel name: Interpolate_C_2x2.asm
-//
-//	Interpolation kernel for chrominance 2x2 motion compensation
-//
-//  $Revision: 8 $
-//  $Date: 10/09/06 4:00p $
-//
-
-
-//#if !defined(__Interpolate_C_2x2__)		// Make sure this is only included once
-//#define __Interpolate_C_2x2__
-
-	
-	// (8-xFrac) and (8-yFrac)
-    add (2)		gW0<1>:w			gMVX_FRACC<2;2,1>:w				-0x08:w
-    
-	// Compute the GRF address of the starting position of the reference area
-    mov (1)		pREF0:w				nOFFSET_REFC:w		{NoDDClr}
-	mov (1)		pRESULT:uw			gpINTPC:uw			{NoDDChk}
-
-	// gCOEFA = (8-xFrac)*(8-yFrac)
-    // gCOEFB = xFrac*(8-yFrac)  
-    // gCOEFC = (8-xFrac)*yFrac
-    // gCOEFD = xFrac*yFrac 
-    mul (1)		gCOEFD:w	        gMVX_FRACC:w					gMVY_FRACC:w	{NoDDClr}
-    mul (1)		gCOEFA:w			-gW0:w							-gW1:uw		{NoDDClr,NoDDChk}
-    mul (1)		gCOEFB:w			gMVX_FRACC:w					-gW1:uw		{NoDDClr,NoDDChk}
-    mul (1)		gCOEFC:w		    -gW0:w							gMVY_FRACC:w {NoDDChk}
-    
-    // (8-xFrac)*(8-yFrac)*A
-    // ---------------------
-    mul (8)		acc0<1>:uw			r[pREF0,0]<8;4,1>:ub			gCOEFA:uw
-        
-    // xFrac*(8-yFrac)*B
-    // -------------------
-    mac (8)		acc0<1>:uw			r[pREF0,2]<8;4,1>:ub			gCOEFB:uw
-          
-    // (8-xFrac)*yFrac*C
-    // -------------------
-    mac (8)		acc0<1>:uw			r[pREF0,8]<8;4,1>:ub			gCOEFC:uw
-            
-    // xFrac*yFrac*D
-    // -----------------
-    mac (8)		gwINTERIM_BUF2(0)<1>	r[pREF0,10]<8;4,1>:ub		gCOEFD:uw
-    mov (4)		r[pRESULT]<1>:uw		gwINTERIM_BUF2(0)<4;4,1>		{NoDDClr}
-	mov (4)		r[pRESULT,16]<1>:uw		gwINTERIM_BUF2(0,4)<4;4,1>		{NoDDChk}
-    
-//#endif	// !defined(__Interpolate_C_2x2__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_C_4x4.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_C_4x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_C_4x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_C_4x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-/*
- * Interpolation kernel for chrominance 4x4 motion compensation
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	Kernel name: Interpolate_C_4x4_Func.asm
-//
-//	Interpolation kernel for chrominance 4x4 motion compensation
-//
-//  $Revision: 8 $
-//  $Date: 10/09/06 4:00p $
-//
-
-
-//#if !defined(__Interpolate_C_4x4_Func__)		// Make sure this is only included once
-//#define __Interpolate_C_4x4_Func__
-
-
-INTERLABEL(Interpolate_C_4x4_Func):
-
-
-	// (8-xFrac) and (8-yFrac)
-    add (2)		gW0<1>:w			gMVX_FRACC<2;2,1>:w				-0x08:w
-
-	// Compute the GRF address of the starting position of the reference area
-    mov (1)		pREF0:w				nOFFSET_REFC:w		{NoDDClr}
-	mov (1)		pREF1:uw			nOFFSET_REFC+16:w	{NoDDChk,NoDDClr}
-	mov (1)		pRESULT:uw			gpINTPC:uw			{NoDDChk}
-
-	// gCOEFA = (8-xFrac)*(8-yFrac)
-    // gCOEFB = xFrac*(8-yFrac)  
-    // gCOEFC = (8-xFrac)*yFrac
-    // gCOEFD = xFrac*yFrac 
-    mul (1)		gCOEFD:w	        gMVX_FRACC:w					gMVY_FRACC:w	{NoDDClr}
-    mul (1)		gCOEFA:w			-gW0:w							-gW1:uw		{NoDDClr,NoDDChk}
-    mul (1)		gCOEFB:w			gMVX_FRACC:w					-gW1:uw		{NoDDClr,NoDDChk}
-    mul (1)		gCOEFC:w		    -gW0:w							gMVY_FRACC:w {NoDDChk}
-
-	add (2)		gW0<1>:uw			pREF0<2;2,1>:uw					16:w
-
-    // (8-xFrac)*(8-yFrac)*A
-    // ---------------------
-    mul (16)	acc0<1>:uw			r[pREF0,0]<16;8,1>:ub			gCOEFA:uw
-    mul (16)	acc1<1>:uw			r[pREF0,nGRFWIB]<16;8,1>:ub		gCOEFA:uw
-        
-    // xFrac*(8-yFrac)*B
-    // -------------------
-    mac (16)	acc0<1>:uw          r[pREF0,2]<16;8,1>:ub			gCOEFB:uw
-    mac (16)	acc1<1>:uw          r[pREF0,nGRFWIB+2]<16;8,1>:ub	gCOEFB:uw
-
-    // (8-xFrac)*yFrac*C
-    // -------------------
-    mov (2)		pREF0<1>:uw			gW0<2;2,1>:uw
-    mac (16)	acc0<1>:uw          r[pREF0,0]<8,1>:ub				gCOEFC:uw
-    mac (16)	acc1<1>:uw          r[pREF0,nGRFWIB]<8,1>:ub		gCOEFC:uw
-            
-    // xFrac*yFrac*D
-    // -----------------
-    mac (16)	r[pRESULT]<1>:uw	r[pREF0,2]<8,1>:ub				gCOEFD:uw
-    mac (16)	r[pRESULT,GRFWIB]<1>:uw r[pREF0,nGRFWIB+2]<8,1>:ub gCOEFD:uw {SecHalf}
-
-   
-//#endif	// !defined(__Interpolate_C_4x4_Func__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_Y_4x4.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_Y_4x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_Y_4x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_Y_4x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,217 +0,0 @@
-/*
- * Interpolation kernel for luminance motion compensation
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Interpolate_Y_4x4.asm
-//
-// Interpolation kernel for luminance motion compensation
-//
-//  $Revision: 10 $
-//  $Date: 10/09/06 4:00p $
-//
-
-
-	// Compute the GRF address of the starting position of the reference area
-#if 1
-    (-f0.1) mov (1)	pREF:w			nOFFSET_REF+2+nGRFWIB:w
-    (f0.1) mov (1)	pREF:w			nOFFSET_REF+2:w		
-	mov (1)		pRESULT:uw			gpINTPY:uw											
-#else
-    mov (1)		pREF:w				nOFFSET_REF+2+nGRFWIB:w	{NoDDClr}
-	mov (1)		pRESULT:uw			gpINTPY:uw				{NoDDChk}
-#endif
-	
-	/*
-	 *			 |		 |
-	 *		 - - 0 1 2 3 + - 
-	 *			 4 5 6 7
-	 *			 8 9 A B
-	 *			 C D E F
-	 *		 - - + - - - + -
-     *			 |		 |
-	 */
-	
-	// Case 0
-	or.z.f0.1 (16) null:w			gMVY_FRAC<0;1,0>:w				gMVX_FRAC<0;1,0>:w	
-	(f0.1) mov (4)	r[pRESULT]<1>:uw	r[pREF0]<4;4,1>:ub
-	(f0.1) mov (4)	r[pRESULT,16]<1>:uw	r[pREF0,16]<4;4,1>:ub
-	(f0.1) mov (4)	r[pRESULT,32]<1>:uw r[pREF0,32]<4;4,1>:ub
-	(f0.1) mov (4)	r[pRESULT,48]<1>:uw r[pREF0,48]<4;4,1>:ub
-	(f0.1) jmpi INTERLABEL(Exit_Interpolate_Y_4x4)
-	
-	// Store all address registers
-	mov (8)		gpADDR<1>:w			a0<8;8,1>:w
-	
-	mul.z.f0.0 (1) gW4:w			gMVY_FRAC:w						gMVX_FRAC:w
-	and.nz.f0.1 (1) null			gW4:w							1:w
-
-	add (1)		pREF1:uw			pREF0:uw						nGRFWIB/2:uw
-	add (2)		pREF2<1>:uw			pREF0<2;2,1>:uw					nGRFWIB:uw
-	mov (4)		gW0<1>:uw			pREF0<4;4,1>:uw
-
-	(f0.0) jmpi INTERLABEL(Interpolate_Y_H_4x4)
-	(f0.1) jmpi INTERLABEL(Interpolate_Y_H_4x4)	
-	
-	//-----------------------------------------------------------------------
-	// CASE: A69BE (H/V interpolation)
-	//-----------------------------------------------------------------------
-
-	// Compute interim horizontal intepolation 
-	add (1)		pREF0<1>:uw			pREF0<0;1,0>:uw					-34:w 
-	add (1)		pREF1<1>:uw			pREF1<0;1,0>:uw					-18:w {NoDDClr}
-	mov (1)		pRESD:ud			nOFFSET_INTERIM4x4_5:ud				{NoDDChk} // Case 69be
-	
-	// Check whether this position is 'A'
-	cmp.e.f0.0 (1) null				gW4:w							4:w
-
-    $for(0;<2;1) {
-	add (16)	acc0<1>:w			r[pREF0,nGRFWIB*2*%1]<16;4,1>:ub			r[pREF0,nGRFWIB*2*%1+5]<16;4,1>:ub		{Compr}
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*2*%1+1]<16;4,1>:ub			-5:w	{Compr}
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*2*%1+2]<16;4,1>:ub			20:w	{Compr}
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*2*%1+3]<16;4,1>:ub			20:w	{Compr}
-	mac (16)	r[pRES,nGRFWIB*%1]<1>:w		r[pREF0,nGRFWIB*2*%1+4]<16;4,1>:ub	-5:w	{Compr}
-	}
-	// last line
-	add (4)		acc0<1>:w			r[pREF0,nGRFWIB*2*2]<4;4,1>:ub				r[pREF0,nGRFWIB*2*2+5]<4;4,1>:ub
-	mac (4)		acc0<1>:w			r[pREF0,nGRFWIB*2*2+1]<4;4,1>:ub			-5:w
-	mac (4)		acc0<1>:w			r[pREF0,nGRFWIB*2*2+2]<4;4,1>:ub			20:w
-	mac (4)		acc0<1>:w			r[pREF0,nGRFWIB*2*2+3]<4;4,1>:ub			20:w
-	mac (4)		r[pRES,nGRFWIB*2]<1>:w		r[pREF0,nGRFWIB*2*2+4]<4;4,1>:ub	-5:w
-	
-    // Compute interim/output vertical interpolation 
-	mov (1)		pREF6D:ud			nOFFSET_INTERIM4x4_4:ud		{NoDDClr}
-	mov (1)		pREF0D:ud			nOFFSET_INTERIM4x4_7:ud		{NoDDChk,NoDDClr}
-	mov (1)		pREF2D:ud			nOFFSET_INTERIM4x4_8:ud		{NoDDChk,NoDDClr}
-	mov (1)		pREF4D:ud			nOFFSET_INTERIM4x4_9:ud		{NoDDChk}
-
- 	add (16)	acc0<1>:w			gwINTERIM4x4_BUF(0)<16;16,1>		512:w
-	mac (16)	acc0<1>:w			gwINTERIM4x4_BUF(1)<16;16,1>		-5:w
-	mac (16)	acc0<1>:w			r[pREF6,0]<8,1>:w				20:w
-	
-	(f0.0) mov (1) pRES:uw			nOFFSET_RES:uw					// Case a
-	(-f0.0) mov (1) pRES:uw			nOFFSET_INTERIM4x4:uw				// Case 69be
-	
-	mac (16)	acc0<1>:w			r[pREF0,0]<4,1>:w				-5:w
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB]<4,1>:w			1:w
-	mac (16)	acc0<1>:w			r[pREF2,0]<4,1>:w				20:w	
-	asr.sat (16) r[pRES]<2>:ub		acc0<16;16,1>:w					10:w  
-	
-	(f0.0) jmpi INTERLABEL(Return_Interpolate_Y_4x4)
-
-INTERLABEL(Interpolate_Y_H_4x4):
-	
-	cmp.e.f0.0 (1) null				gMVX_FRAC:w						0:w
-	cmp.e.f0.1 (1) null				gMVY_FRAC:w						2:w
-	(f0.0) jmpi INTERLABEL(Interpolate_Y_V_4x4)
-	(f0.1) jmpi INTERLABEL(Interpolate_Y_V_4x4)
-
-	//-----------------------------------------------------------------------
-	// CASE: 123567DEF (H interpolation)
-	//-----------------------------------------------------------------------
-	
-	add (4)		pREF0<1>:uw			gW0<4;4,1>:uw					-2:w		
-	cmp.g.f0.0 (4) null:w			gMVY_FRAC<0;1,0>:w				2:w
-	cmp.e.f0.1 (1) null				gMVX_FRAC:w						2:w
-	(f0.0) add (4) pREF0<1>:uw		pREF0<4;4,1>:uw					nGRFWIB/2:uw
-	
-	cmp.e.f0.0 (1) null:w			gMVY_FRAC<0;1,0>:w				0:w
-
-	(f0.1) mov (1) pRESULT:uw		nOFFSET_RES:uw					// Case 26E
-	(-f0.1) mov (1) pRESULT:uw		nOFFSET_INTERIM4x4:uw			// Case 1357DF
-	
-	// Compute interim/output horizontal interpolation
-	add (16)	acc0<1>:w			r[pREF0]<4,1>:ub				16:w
-	mac (16)	acc0<1>:w			r[pREF0,1]<4,1>:ub				-5:w
-	mac (16)	acc0<1>:w			r[pREF0,2]<4,1>:ub				20:w
-	mac (16)	acc0<1>:w			r[pREF0,3]<4,1>:ub				20:w
-	mac (16)	acc0<1>:w			r[pREF0,4]<4,1>:ub				-5:w
-	mac (16)	acc0<1>:w			r[pREF0,5]<4,1>:ub				1:w
-	asr.sat (16) r[pRESULT]<2>:ub	acc0<16;16,1>:w					5:w
-	
-	(-f0.1) jmpi INTERLABEL(Interpolate_Y_V_4x4)
-	(-f0.0) jmpi INTERLABEL(Average_4x4)
-	
-	jmpi INTERLABEL(Return_Interpolate_Y_4x4)
-
-INTERLABEL(Interpolate_Y_V_4x4):
-
-	cmp.e.f0.0 (1) null				gMVY_FRAC:w						0:w
-	(f0.0) jmpi INTERLABEL(Interpolate_Y_I_4x4)
-	
-	//-----------------------------------------------------------------------
-	// CASE: 48C59D7BF (V interpolation)
-	//-----------------------------------------------------------------------
-	
-	cmp.g.f0.1 (8) null:w			gMVX_FRAC<0;1,0>:w				2:w
-
-	mov (4)		pREF0<1>:uw			gW0<4;4,1>:uw							{NoDDClr}
-	add (4)		pREF4<1>:w			gW0<4;4,1>:uw					16:w	{NoDDChk}
-	
-	(f0.1) add (8) pREF0<1>:uw		pREF0<4;4,1>:uw					1:uw
-
-	cmp.e.f0.0 (1) null:w			gMVX_FRAC<0;1,0>:w				0:w
-	cmp.e.f0.1 (1) null				gMVY_FRAC:w						2:w
-
-	// Compute interim/output vertical interpolation
-	add (16)	acc0<1>:w			r[pREF0,-nGRFWIB]<4,1>:ub		16:w
-	mac (16)	acc0<1>:w			r[pREF0]<4,1>:ub				20:w
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB]<4,1>:ub		-5:w
-	mac (16)	acc0<1>:w			r[pREF4,-nGRFWIB]<4,1>:ub		-5:w
-	mac (16)	acc0<1>:w			r[pREF4]<4,1>:ub				20:w	
-	mac (16)	acc0<1>:w			r[pREF4,nGRFWIB]<4,1>:ub		1:w
-	
-	mov (1)		pRESULT:uw			nOFFSET_RES:uw
-	(-f0.0) jmpi INTERLABEL(VFILTER_4x4)
-	(-f0.1) mov (1) pRESULT:uw		nOFFSET_INTERIM4x4:uw
- 
- INTERLABEL(VFILTER_4x4):
- 
-	asr.sat (16) r[pRESULT]<2>:ub	acc0<16;16,1>:w					5:w
-	
-	(-f0.0) jmpi INTERLABEL(Average_4x4)
-	(f0.1) jmpi INTERLABEL(Return_Interpolate_Y_4x4	)
-
-INTERLABEL(Interpolate_Y_I_4x4):
-
-	//-----------------------------------------------------------------------
-	// CASE: 134C (Integer position)
-	//-----------------------------------------------------------------------
-	
-	mov (4)		pREF0<1>:uw			gW0<4;4,1>:uw
-		
-	cmp.e.f0.0 (4) null:w			gMVX_FRAC<0;1,0>:w				3:w
-	cmp.e.f0.1 (4) null:w			gMVY_FRAC<0;1,0>:w				3:w
-	(f0.0) add (4) pREF0<1>:uw		pREF0<4;4,1>:uw					1:uw 
-	(f0.1) add (4) pREF0<1>:uw		pREF0<4;4,1>:uw					nGRFWIB/2:uw
-	
-	mov (16)	guwINTERIM_BUF2(0)<1>	r[pREF0]<4,1>:ub
-	
-INTERLABEL(Average_4x4):
-
-	//-----------------------------------------------------------------------
-	// CASE: 13456789BCDEF (Average)
-	//-----------------------------------------------------------------------
-	
-	// Average two interim results
-	avg.sat (16) gubINTERIM_BUF2(0)<2>	gubINTERIM_BUF2(0)<32;16,2>		gINTERIM4x4<32;16,2>:ub
-
-INTERLABEL(Return_Interpolate_Y_4x4):
-	// Move result
-	mov (1)		pRES:uw				gpINTPY:uw
-	mov (4)		r[pRES,0]<2>:ub		gubINTERIM_BUF2(0,0)
-	mov (4)		r[pRES,16]<2>:ub	gubINTERIM_BUF2(0,8)
-	mov (4)		r[pRES,32]<2>:ub	gubINTERIM_BUF2(0,16)
-	mov (4)		r[pRES,48]<2>:ub	gubINTERIM_BUF2(0,24)
-
-	// Restore all address registers
-	mov (8)		a0<1>:w					gpADDR<8;8,1>:w
-	
-INTERLABEL(Exit_Interpolate_Y_4x4):
-	
-        
-// end of file
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_Y_8x8.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_Y_8x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/interpolate_Y_8x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/interpolate_Y_8x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,262 +0,0 @@
-/*
- * Interpolation kernel for luminance motion compensation
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Interpolate_Y_8x8.asm
-//
-// Interpolation kernel for luminance motion compensation
-//
-//  $Revision: 13 $
-//  $Date: 10/09/06 4:00p $
-//
-
-
-//---------------------------------------------------------------
-// In: pMV => Source address of MV
-// In: gMVX_FRAC<2;2,1>:w => MV fractional components
-// In: f0.1 (1) => If 1, vertical MV is integer
-// In: gpINTPY:uw => Destination address for interpolated result
-// In: Reference area staring from R43
-//		If horizontal/vertical MVs are all integer, 8x8 pixels are on R43~R44 (2 GRFs)
-//		If only horz MV is integer, 8x13 pixels are on R43~R46 (4 GRFs)
-//		If only vert MV is integer, 13x8 pixels are on R43~R46 (4 GRFs)
-//		If no MVs are integer, 13x13 pixels are on R43~R49 (7 GRFs)
-//---------------------------------------------------------------
-
-
-INTERLABEL(Interpolate_Y_8x8_Func):
-
-
-
-	// Check whether MVX is integer MV
-	and.z.f0.0 (1) null:w			r[pMV,0]<0;1,0>:w				0x3:w
-	(-f0.0)	jmpi (1) INTERLABEL(Interpolate_Y_8x8_Func2)
-		
-	// TODO: remove this back-to-back read - huge latency..
-	mov (8)	gubREF(6,2)<1>	gubREF(3,0)<8;8,1>
-    mov (8)	gubREF(5,18)<1>	gubREF(2,24)<8;8,1>		{NoDDClr}
-	mov (8)	gubREF(5,2)<1>	gubREF(2,16)<8;8,1>		{NoDDChk}
-	mov (8)	gubREF(4,18)<1>	gubREF(2,8)<8;8,1>		{NoDDClr}
-	mov (8)	gubREF(4,2)<1>	gubREF(2,0)<8;8,1>		{NoDDChk}
-	mov (8)	gubREF(3,18)<1>	gubREF(1,24)<8;8,1>		{NoDDClr}
-	mov (8)	gubREF(3,2)<1>	gubREF(1,16)<8;8,1>		{NoDDChk}
-	mov (8)	gubREF(2,18)<1>	gubREF(1,8)<8;8,1>		{NoDDClr}
-	mov (8)	gubREF(2,2)<1>	gubREF(1,0)<8;8,1>		{NoDDChk}
-	mov (8)	gubREF(1,18)<1>	gubREF(0,24)<8;8,1>		{NoDDClr}
-	mov (8)	gubREF(1,2)<1>	gubREF(0,16)<8;8,1>		{NoDDChk}
-	mov (8)	gubREF(0,18)<1>	gubREF(0,8)<8;8,1>	
-    mov (8)	gubREF(0,2)<1>	gubREF(0,0)<8;8,1>
-
-INTERLABEL(Interpolate_Y_8x8_Func2):
-
-	// Compute the GRF address of the starting position of the reference area
-    (-f0.1) mov (1)	pREF:w			nOFFSET_REF+2+nGRFWIB:w	
-    (f0.1) mov (1)	pREF:w			nOFFSET_REF+2:w			
-	mov (1)		pRESULT:uw			gpINTPY:uw	
-	
-	/*
-	 *			 |		 |
-	 *		 - - 0 1 2 3 + - 
-	 *			 4 5 6 7
-	 *			 8 9 A B
-	 *			 C D E F
-	 *		 - - + - - - + -
-     *			 |		 |
-	 */
-	
-	// Case 0
-	or.z.f0.1 (16) null:w			gMVY_FRAC<0;1,0>:w				gMVX_FRAC<0;1,0>:w	
-	(f0.1) mov (16)	r[pRESULT]<1>:uw				r[pREF]<16;8,1>:ub
-	(f0.1) mov (16)	r[pRESULT,nGRFWIB]<1>:uw		r[pREF,nGRFWIB]<16;8,1>:ub
-	(f0.1) mov (16)	r[pRESULT,nGRFWIB*2]<1>:uw		r[pREF,nGRFWIB*2]<16;8,1>:ub
-	(f0.1) mov (16)	r[pRESULT,nGRFWIB*3]<1>:uw		r[pREF,nGRFWIB*3]<16;8,1>:ub
-	(f0.1) jmpi INTERLABEL(Exit_Interpolate_Y_8x8)
-	
-	// Store all address registers
-	mov (8)		gpADDR<1>:w			a0<8;8,1>:w
-	
-	mul.z.f0.0 (1) gW4:w			gMVY_FRAC:w						gMVX_FRAC:w
-	add (1)		pREF1:uw			pREF0:uw						nGRFWIB/2:uw
-	and.nz.f0.1 (1) null			gW4:w							1:w
-	add (2)		pREF2<1>:uw			pREF0<2;2,1>:uw					nGRFWIB:uw
-	mov (4)		gW0<1>:uw			pREF0<4;4,1>:uw
-
-	(f0.0) jmpi INTERLABEL(Interpolate_Y_H_8x8)
-	(f0.1) jmpi INTERLABEL(Interpolate_Y_H_8x8)
-	
-	//-----------------------------------------------------------------------
-	// CASE: A69BE (H/V interpolation)
-	//-----------------------------------------------------------------------
-	
-	// Compute interim horizontal intepolation of 12 lines (not 9 lines)
-//	add (1)		pREF0<1>:ud			pREF0<0;1,0>:ud					0xffeeffde:ud	// (-18<<16)|(-34)
-	add (1)		pREF0<1>:uw			pREF0<0;1,0>:uw					-34:w	
-	add (1)		pREF1<1>:uw			pREF1<0;1,0>:uw					-18:w {NoDDClr}	
-	mov (1)		pRESD:ud			nOFFSET_INTERIM3:ud					{NoDDChk}			
-	
-	// Check whether this position is 'A'    
-	cmp.e.f0.0 (1) null				gW4:w							4:w
-	
-	$for(0;<6;2) {
-	add (32)	acc0<1>:w			r[pREF,nGRFWIB*%1]<16;8,1>:ub			r[pREF0,nGRFWIB*%1+5]<16;8,1>:ub		{Compr}
-	mac (32)	acc0<1>:w			r[pREF,nGRFWIB*%1+1]<16;8,1>:ub			-5:w	{Compr}
-	mac (32)	acc0<1>:w			r[pREF,nGRFWIB*%1+2]<16;8,1>:ub			20:w	{Compr}
-	mac (32)	acc0<1>:w			r[pREF,nGRFWIB*%1+3]<16;8,1>:ub			20:w	{Compr}
-	mac (32)	r[pRES,nGRFWIB*%1]<1>:w		r[pREF,nGRFWIB*%1+4]<16;8,1>:ub	-5:w	{Compr}
-	}
-	// last line
-	add (8)		acc0<1>:w			r[pREF,nGRFWIB*6]<8;8,1>:ub				r[pREF,nGRFWIB*6+5]<8;8,1>:ub
-	mac (8)		acc0<1>:w			r[pREF,nGRFWIB*6+1]<8;8,1>:ub			-5:w
-	mac (8)		acc0<1>:w			r[pREF,nGRFWIB*6+2]<8;8,1>:ub			20:w
-	mac (8)		acc0<1>:w			r[pREF,nGRFWIB*6+3]<8;8,1>:ub			20:w
-	mac (8)		r[pRES,nGRFWIB*6]<1>:w		r[pREF,nGRFWIB*6+4]<8;8,1>:ub	-5:w
-
-    // Compute interim/output vertical interpolation 
-    mov (1)		pREF0:ud			nOFFSET_INTERIM2:ud	{NoDDClr}			// set pREF0 and pREF1 at the same time
-	mov (1)		pREF2D:ud			nOFFSET_INTERIM4:ud	{NoDDChk,NoDDClr}	// set pREF2 and pREF3 at the same time
-	(f0.0) sel (1) pRES:uw			gpINTPY:uw	nOFFSET_INTERIM:uw {NoDDChk} // Case A vs. 69BE
-    
-	$for(0;<4;2) {
-	add (32)	acc0<1>:w			r[pREF0,nGRFWIB*%1]<16;16,1>:w				512:w	{Compr}
-	mac (16)	acc0<1>:w			r[pREF2,nGRFWIB*%1]<8,1>:w					-5:w
-	mac (16)	acc1<1>:w			r[pREF2,nGRFWIB*%1+nGRFWIB]<8,1>:w			-5:w
-	mac (32)	acc0<1>:w			r[pREF0,nGRFWIB*%1+nGRFWIB]<16;16,1>:w		20:w	{Compr}
-	mac (16)	acc0<1>:w			r[pREF2,nGRFWIB*%1+nGRFWIB]<8,1>:w			20:w	
-	mac (16)	acc1<1>:w			r[pREF2,nGRFWIB*%1+nGRFWIB+nGRFWIB]<8,1>:w	20:w	
-	mac (32)	acc0<1>:w			r[pREF0,(2+%1)*nGRFWIB]<16;16,1>:w			-5:w	{Compr}
-	mac (16)	acc0<1>:w			r[pREF2,(2+%1)*nGRFWIB]<8,1>:w				1:w
-	mac (16)	acc1<1>:w			r[pREF2,(2+%1)*nGRFWIB+nGRFWIB]<8,1>:w		1:w
-	asr.sat (16) r[pRES,nGRFWIB*%1]<2>:ub			acc0<16;16,1>:w				10:w
-	asr.sat (16) r[pRES,nGRFWIB*%1+nGRFWIB]<2>:ub	acc1<16;16,1>:w				10:w {SecHalf}
-	}
-	
-	(f0.0) jmpi INTERLABEL(Return_Interpolate_Y_8x8)
-	
-INTERLABEL(Interpolate_Y_H_8x8):
-	
-	cmp.e.f0.0 (1) null				gMVX_FRAC:w						0:w
-	cmp.e.f0.1 (1) null				gMVY_FRAC:w						2:w
-	(f0.0) jmpi INTERLABEL(Interpolate_Y_V_8x8)
-	(f0.1) jmpi INTERLABEL(Interpolate_Y_V_8x8)
-	
-	//-----------------------------------------------------------------------
-	// CASE: 123567DEF (H interpolation)
-	//-----------------------------------------------------------------------
-
-	add (4)		pREF0<1>:uw			gW0<4;4,1>:uw					-2:w		
-	cmp.g.f0.0 (4) null:w			gMVY_FRAC<0;1,0>:w				2:w
-	cmp.e.f0.1 (1) null				gMVX_FRAC:w						2:w
-	(f0.0) add (4) pREF0<1>:uw		pREF0<4;4,1>:uw					nGRFWIB/2:uw
-
-	cmp.e.f0.0 (1) null:w			gMVY_FRAC<0;1,0>:w				0:w
-
-	(f0.1) sel (1) pRES:uw			gpINTPY:uw						nOFFSET_INTERIM:uw // Case 26E vs. 1357DF
-	
-	// Compute interim/output horizontal interpolation
-	$for(0;<4;2) {
-	add (16)	acc0<1>:w			r[pREF0,nGRFWIB*%1]<8,1>:ub				16:w
-	add (16)	acc1<1>:w			r[pREF0,nGRFWIB*%1+nGRFWIB]<8,1>:ub		16:w
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*%1+1]<8,1>:ub			-5:w
-	mac (16)	acc1<1>:w			r[pREF0,nGRFWIB*%1+1+nGRFWIB]<8,1>:ub	-5:w
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*%1+2]<8,1>:ub			20:w
-	mac (16)	acc1<1>:w			r[pREF0,nGRFWIB*%1+2+nGRFWIB]<8,1>:ub	20:w
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*%1+3]<8,1>:ub			20:w
-	mac (16)	acc1<1>:w			r[pREF0,nGRFWIB*%1+3+nGRFWIB]<8,1>:ub	20:w
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*%1+4]<8,1>:ub			-5:w
-	mac (16)	acc1<1>:w			r[pREF0,nGRFWIB*%1+4+nGRFWIB]<8,1>:ub	-5:w
-	mac (16)	acc0<1>:w			r[pREF0,nGRFWIB*%1+5]<8,1>:ub			1:w
-	mac (16)	acc1<1>:w			r[pREF0,nGRFWIB*%1+5+nGRFWIB]<8,1>:ub	1:w
-	asr.sat (16) r[pRES,nGRFWIB*%1]<2>:ub			acc0<16;16,1>:w		5:w
-	asr.sat (16) r[pRES,nGRFWIB*%1+nGRFWIB]<2>:ub	acc1<16;16,1>:w		5:w {SecHalf}
-    }
-    
-    (-f0.1) jmpi INTERLABEL(Interpolate_Y_V_8x8)
-	(-f0.0) jmpi INTERLABEL(Average_8x8)
-	
-	jmpi INTERLABEL(Return_Interpolate_Y_8x8)
-
-INTERLABEL(Interpolate_Y_V_8x8):
-
-	cmp.e.f0.0 (1) null				gMVY_FRAC:w						0:w
-	(f0.0) jmpi INTERLABEL(Interpolate_Y_I_8x8)
-	
-	//-----------------------------------------------------------------------
-	// CASE: 48C59D7BF (V interpolation)
-	//-----------------------------------------------------------------------
-
-	mov (2)		pREF0<1>:uw			gW0<4;2,2>:uw	{NoDDClr}
-	mov (2)		pREF2<1>:uw			gW1<2;2,1>:uw	{NoDDChk,NoDDClr}
-	mov (1)		pRES:uw				gpINTPY:uw		{NoDDChk}
-
-	cmp.g.f0.1 (4) null:w			gMVX_FRAC<0;1,0>:w				2:w
-	cmp.e.f0.0 (1) null:w			gMVX_FRAC<0;1,0>:w				0:w
-	(f0.1) add (4) pREF0<1>:uw		pREF0<4;4,1>:uw					1:uw
-
-	cmp.e.f0.1 (1) null				gMVY_FRAC:w						2:w
-	(-f0.0) jmpi INTERLABEL(VFILTER_8x8)
-	(-f0.1) mov (1) pRES:uw		nOFFSET_INTERIM:uw
-	
-  INTERLABEL(VFILTER_8x8): 
-
-	// Compute interim/output vertical interpolation
-	$for(0;<4;2) {
-	add (32)	acc0<1>:w			r[pREF0,nGRFWIB*%1-nGRFWIB]<16;8,1>:ub			16:w {Compr}
-	mac (16)	acc0<1>:w			r[pREF2,nGRFWIB*%1-nGRFWIB]<8,1>:ub				-5:w
-	mac (16)	acc1<1>:w			r[pREF2,nGRFWIB*%1]<8,1>:ub						-5:w
-	mac (32)	acc0<1>:w			r[pREF0,nGRFWIB*%1]<16;8,1>:ub					20:w {Compr}
-	mac (16)	acc0<1>:w			r[pREF2,nGRFWIB*%1]<8,1>:ub						20:w	
-	mac (16)	acc1<1>:w			r[pREF2,nGRFWIB*%1+nGRFWIB]<8,1>:ub				20:w	
-	mac (32)	acc0<1>:w			r[pREF0,nGRFWIB*%1+nGRFWIB]<16;8,1>:ub			-5:w {Compr}
-	mac (16)	acc0<1>:w			r[pREF2,nGRFWIB*%1+nGRFWIB]<8,1>:ub				1:w
-	mac (16)	acc1<1>:w			r[pREF2,nGRFWIB*%1+nGRFWIB+nGRFWIB]<8,1>:ub		1:w
-	asr.sat (16) r[pRES,nGRFWIB*%1]<2>:ub			acc0<16;16,1>:w					5:w
-	asr.sat (16) r[pRES,nGRFWIB*%1+nGRFWIB]<2>:ub	acc1<16;16,1>:w					5:w	{SecHalf}
-	}
-
-	(-f0.0) jmpi INTERLABEL(Average_8x8)
-	(f0.1) jmpi INTERLABEL(Return_Interpolate_Y_8x8)
-
-INTERLABEL(Interpolate_Y_I_8x8):
-
-	//-----------------------------------------------------------------------
-	// CASE: 134C (Integer position)
-	//-----------------------------------------------------------------------
-	
-	mov (2)		pREF0<1>:uw			gW0<2;2,1>:uw		{NoDDClr}
-			
-	mov (1)		pRES:uw				gpINTPY:uw			{NoDDChk}
-
-	cmp.e.f0.0 (2) null:w			gMVX_FRAC<0;1,0>:w				3:w
-	cmp.e.f0.1 (2) null:w			gMVY_FRAC<0;1,0>:w				3:w
-	(f0.0) add (2) pREF0<1>:uw		pREF0<2;2,1>:uw					1:uw 
-	(f0.1) add (2) pREF0<1>:uw		pREF0<2;2,1>:uw					nGRFWIB/2:uw
-	
-	mov (16)	r[pRES]<1>:uw			r[pREF0]<8,1>:ub
-	mov (16)	r[pRES,nGRFWIB]<1>:uw	r[pREF0,nGRFWIB]<8,1>:ub
-	mov (16)	r[pRES,nGRFWIB*2]<1>:uw	r[pREF0,nGRFWIB*2]<8,1>:ub
-	mov (16)	r[pRES,nGRFWIB*3]<1>:uw	r[pREF0,nGRFWIB*3]<8,1>:ub
-	
-INTERLABEL(Average_8x8):
-
-	//-----------------------------------------------------------------------
-	// CASE: 13456789BCDEF (Average)
-	//-----------------------------------------------------------------------
-
-	// Average two interim results
-	avg.sat (16) r[pRES,0]<2>:ub			r[pRES,0]<32;16,2>:ub			gubINTERIM_BUF(0)	
-	avg.sat (16) r[pRES,nGRFWIB]<2>:ub		r[pRES,nGRFWIB]<32;16,2>:ub		gubINTERIM_BUF(1)	
-	avg.sat (16) r[pRES,nGRFWIB*2]<2>:ub	r[pRES,nGRFWIB*2]<32;16,2>:ub	gubINTERIM_BUF(2)	
-	avg.sat (16) r[pRES,nGRFWIB*3]<2>:ub	r[pRES,nGRFWIB*3]<32;16,2>:ub	gubINTERIM_BUF(3)	
-
-INTERLABEL(Return_Interpolate_Y_8x8):
-	// Restore all address registers
-	mov (8)		a0<1>:w					gpADDR<8;8,1>:w
-	
-INTERLABEL(Exit_Interpolate_Y_8x8):
-	        
-// end of file
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_16x16.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_16x16.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_16x16.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_16x16.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,71 +0,0 @@
-/*
- * Decode Intra_16x16 macroblock
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Intra_16x16.asm
-//
-// Decoding of Intra_16x16 macroblock
-//
-//  $Revision: 8 $
-//  $Date: 10/18/06 4:10p $
-//
-
-// ----------------------------------------------------
-//  Main: Intra_16x16
-// ----------------------------------------------------
-
-#define	INTRA_16X16
-
-.kernel Intra_16x16
-INTRA_16x16:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0x00aa55a5:ud
-#endif
-
-#include "SetupForHWMC.asm"
-
-#ifdef SW_SCOREBOARD    
-    CALL(scoreboard_start_intra,1)
-#endif
-
-#ifdef SW_SCOREBOARD 
-	wait	n0:ud		//	Now wait for scoreboard to response
-#endif
-
-//
-//  Decode Y blocks
-//
-//	Load reference data from neighboring macroblocks
-    CALL(load_Intra_Ref_Y,1)
-
-//	Intra predict Intra_16x16 luma block
-	#include "intra_pred_16x16_Y.asm"
-
-//	Add error data to predicted intra data
-	#include "add_Error_16x16_Y.asm"
-
-//	Save decoded Y picture
-	CALL(save_16x16_Y,1)
-//
-//  Decode U/V blocks
-//
-//	Note: The decoding for chroma blocks will be the same for all intra prediction mode
-//
-	CALL(decode_Chroma_Intra,1)
-
-#ifdef SW_SCOREBOARD
-    #include "scoreboard_update.asm"
-#endif
-
-// Terminate the thread
-//
-    #include "EndIntraThread.asm"
-
-// End of Intra_16x16
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_4x4.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_4x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_4x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_4x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-/*
- * Decode Intra_4x4 macroblock
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Intra_4x4.asm
-//
-// Decoding of Intra_4x4 macroblock
-//
-//  $Revision: 12 $
-//  $Date: 10/18/06 4:10p $
-//
-
-// ----------------------------------------------------
-//  Main: Intra_4x4
-// ----------------------------------------------------
-
-#define	INTRA_4X4
-
-.kernel Intra_4x4
-INTRA_4x4:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0x02aa55a5:ud
-#endif
-
-#include "SetupForHWMC.asm"
-
-#undef		PPREDBUF_Y
-#define	    PPREDBUF_Y		a0.3	// Pointer to predicted Y picture
-
-#define		REG_INTRA_PRED_AVAIL	REG_INTRA_TEMP_4
-#define		REG_INTRA_4X4_PRED		REG_INTRA_TEMP_7		// Store predicted Intra_4x4 data
-
-// Offset where 4x4 predicted data blocks are stored
-#define	PREDSUBBLK0		0*GRFWIB
-#define	PREDSUBBLK1		1*GRFWIB
-#define	PREDSUBBLK2		2*GRFWIB
-#define	PREDSUBBLK3		3*GRFWIB
-#define	PREDSUBBLK4		4*GRFWIB
-#define	PREDSUBBLK5		5*GRFWIB
-#define	PREDSUBBLK6		6*GRFWIB
-#define	PREDSUBBLK7		7*GRFWIB
-#define	PREDSUBBLK8		8*GRFWIB
-#define	PREDSUBBLK9		9*GRFWIB
-#define	PREDSUBBLK10	10*GRFWIB
-#define	PREDSUBBLK11	11*GRFWIB
-#define	PREDSUBBLK12	12*GRFWIB
-#define	PREDSUBBLK13	13*GRFWIB
-#define	PREDSUBBLK14	14*GRFWIB
-#define	PREDSUBBLK15	15*GRFWIB
-
-// 4x4 error block byte offset within the 8x8 error block
-#define ERRBLK0		0
-#define ERRBLK1		8
-#define ERRBLK2		64
-#define ERRBLK3		72
-
-#ifdef SW_SCOREBOARD    
-    CALL(scoreboard_start_intra,1)
-#endif
-
-#ifdef SW_SCOREBOARD    
-	wait	n0:ud		//	Now wait for scoreboard to response
-#endif
-
-//
-//  Decode Y blocks
-//
-//	Load reference data from neighboring macroblocks
-    CALL(load_Intra_Ref_Y,1)
-
-	mov	(1)	PERROR<1>:w	ERRBUF*GRFWIB:w			// Pointer to macroblock error data
-	mov	(1)	PPREDBUF_Y<1>:w	PREDBUF*GRFWIB:w	// Pointer to predicted data
-	shr (2)	REG_INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL_FLAG_BYTE<0;1,0>:ub	0x40:v
-    and.nz.f0.0 (8)	NULLREG	REG_INTRA_PRED_AVAIL_FLAG_BYTE<0;1,0>:ub	4:w	// Top-right macroblock available for intra prediction?
-	(-f0.0.any8h) mov (8)	INTRA_REF_TOP(0,16)<1>	INTRA_REF_TOP(0,15)REGION(1,0)	// Extend right boundary of MB B to C
-
-//	Intra predict Intra_4x4 luma blocks
-//
-//	Sub-macroblock 0 *****************
-	mov	(16)	REF_TOP0(0)<1>	INTRA_REF_TOP0(0)	// Top reference data
-	mov	(8)		REF_LEFT(0)<1>	INTRA_REF_LEFT(0)REGION(8,4)	// Left reference data
-	shr	(4)		PRED_MODE<1>:w	INTRA_PRED_MODE(0)<1;2,0>	0x4040:v	// Expand IntraPredMode to 1 byte/block
-	CALL(intra_Pred_4x4_Y_4,1)
-    add (1)		PERROR<1>:w	PERROR<0;1,0>:w	0x0080:w	// Pointers to next error block
-
-	or  (1)	REG_INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w	0x1:w	// Left neighbor is available now
-
-//	Sub-macroblock 1 *****************
-
-	mov	(16)	REF_TOP0(0)<1>	INTRA_REF_TOP0(0,8)	// Top reference data
-	mov	(4)		REF_LEFT(0)<1>	r[PPREDBUF_Y,PREDSUBBLK1+6]<8;1,0>:ub	// Left reference data (top half)
-	mov	(4)		REF_LEFT(0,4)<1>	r[PPREDBUF_Y,PREDSUBBLK3+6]<8;1,0>:ub	// Left reference data (bottom half)
-	shr	(4)		PRED_MODE<1>:w	INTRA_PRED_MODE(0,2)<1;2,0>	0x4040:v	// Expand IntraPredMode to 1 byte/block
-	add	(1)		PPREDBUF_Y<1>:w	PPREDBUF_Y<0;1,0>:w	4*GRFWIB:w	// Pointer to predicted sub-macroblock 1
-	CALL(intra_Pred_4x4_Y_4,1)
-    add (1)		PERROR<1>:w	PERROR<0;1,0>:w	0x0080:w	// Pointers to next error block
-
-	or  (1)	REG_INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL.1<0;1,0>:w	0x2:w	// Top neighbor is available now
-
-//	Pack constructed data from word-aligned to byte-aligned format
-//	to speed up save_4x4_Y module later
-//	PPREDBUF_Y now points to sub-block #4
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK4]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK4]<32;16,2>:ub		// Sub-block 0
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK4+16]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK3]<32;16,2>:ub	// Sub-block 1
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK2]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK2]<32;16,2>:ub		// Sub-block 2
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK2+16]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK1]<32;16,2>:ub	// Sub-block 3
-
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK3]<1>:ub	r[PPREDBUF_Y]<32;16,2>:ub				// Sub-block 4
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK3+16]<1>:ub	r[PPREDBUF_Y,PREDSUBBLK1]<32;16,2>:ub	// Sub-block 5
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK1]<1>:ub	r[PPREDBUF_Y,PREDSUBBLK2]<32;16,2>:ub		// Sub-block 6
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK1+16]<1>:ub	r[PPREDBUF_Y,PREDSUBBLK3]<32;16,2>:ub	// Sub-block 7
-
-//	Sub-macroblock 2 *****************
-
-	mov	(4)		REF_TOP0(0)<1>		INTRA_REF_LEFT0(0,28)REGION(4,1)		// Top-left reference data
-	mov	(8)		REF_TOP0(0,4)<1>	r[PPREDBUF_Y,0-2*GRFWIB+12]<16;4,1>:ub	// Top reference data from SB 2,3
-	mov	(8)		REF_TOP0(0,12)<1>	r[PPREDBUF_Y,0-GRFWIB+12]<16;4,1>:ub	// Top reference data from SB 6,7
-	mov	(8)		REF_TOP0(0,20)<1>	r[PPREDBUF_Y,0-GRFWIB+31]<0;1,0>:ub		// Top-right reference data
-	mov	(16)	REG_INTRA_REF_TOP<1>:w	REF_TOP_W(0)		// Store top reference data for SubMB #2 and #3.
-	mov	(8)		REF_LEFT(0)<1>		INTRA_REF_LEFT(1)REGION(8,4)	// Left reference data
-	shr	(4)		PRED_MODE<1>:w		INTRA_PRED_MODE(0,4)<1;2,0>	0x4040:v	// Expand IntraPredMode to 1 byte/block
-	CALL(intra_Pred_4x4_Y_4,1)
-    add (1)		PERROR<1>:w	PERROR<0;1,0>:w	0x0080:w	// Pointers to next error block
-
-	or  (1)	REG_INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w	0x1:w	// Left neighbor is available now
-
-//	Sub-macroblock 3 *****************
-
-	mov	(16)	REF_TOP0(0)<1>	INTRA_REF_TOP0(0,8)		// Top reference data
-	mov	(8)		REF_TOP0(0,16)<1>	INTRA_REF_TOP0(0,24)REGION(8,1)	// Top reference data
-	mov	(4)		REF_LEFT(0)<1>	r[PPREDBUF_Y,PREDSUBBLK1+6]<8;1,0>:ub	// Left reference data (top half)
-	mov	(4)		REF_LEFT(0,4)<1>	r[PPREDBUF_Y,PREDSUBBLK3+6]<8;1,0>:ub	// Left reference data (bottom half)
-	shr	(4)		PRED_MODE<1>:w	INTRA_PRED_MODE(0,6)<1;2,0>	0x4040:v	// Expand IntraPredMode to 1 byte/block
-	add	(1)		PPREDBUF_Y<1>:w	PPREDBUF_Y<0;1,0>:w	4*GRFWIB:w	// Pointer to predicted sub-macroblock 3
-	CALL(intra_Pred_4x4_Y_4,1)
-
-//	Pack constructed data from word-aligned to byte-aligned format
-//	to speed up save_4x4_Y module later
-//	PPREDBUF_Y now points to sub-block #12
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK4]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK4]<32;16,2>:ub		// Sub-block 8
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK4+16]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK3]<32;16,2>:ub	// Sub-block 9
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK2]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK2]<32;16,2>:ub		// Sub-block 10
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK2+16]<1>:ub	r[PPREDBUF_Y,-PREDSUBBLK1]<32;16,2>:ub	// Sub-block 11
-
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK3]<1>:ub	r[PPREDBUF_Y]<32;16,2>:ub				// Sub-block 12
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK3+16]<1>:ub	r[PPREDBUF_Y,PREDSUBBLK1]<32;16,2>:ub	// Sub-block 13
-	mov (16)	r[PPREDBUF_Y,-PREDSUBBLK1]<1>:ub	r[PPREDBUF_Y,PREDSUBBLK2]<32;16,2>:ub		// Sub-block 14
-	mov (16)	r[PPREDBUF_Y,0-PREDSUBBLK1+16]<1>:ub	r[PPREDBUF_Y,PREDSUBBLK3]<32;16,2>:ub	// Sub-block 15
-
-//	All 4 sub-macroblock (containing 4 intra_4x4 blocks) have be constructed
-//	Save constructed Y picture
-	CALL(save_4x4_Y,1)		// Save Intra_4x4 predicted luma data.
-//
-//  Decode U/V blocks
-//
-//	Note: The decoding for chroma blocks will be the same for all intra prediction mode
-//
-	CALL(decode_Chroma_Intra,1)
-
-#ifdef SW_SCOREBOARD
-    #include "scoreboard_update.asm"
-#endif
-
-// Terminate the thread
-//
-    #include "EndIntraThread.asm"
-
-// End of Intra_4x4
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_8x8.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_8x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_8x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_8x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,192 +0,0 @@
-/*
- * Decode Intra_8x8 macroblock
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Intra_8x8.asm
-//
-// Decoding of Intra_8x8 macroblock
-//
-//  $Revision: 12 $
-//  $Date: 10/18/06 4:10p $
-//
-
-// ----------------------------------------------------
-//  Main: Intra_8x8
-// ----------------------------------------------------
-
-#define	INTRA_8X8
-
-.kernel Intra_8x8
-INTRA_8x8:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0x01aa55a5:ud
-#endif
-
-#include "SetupForHWMC.asm"
-
-#define		REG_INTRA_PRED_AVAIL	REG_INTRA_TEMP_4
-#define		INTRA_PRED_AVAIL		REG_INTRA_TEMP_4.4
-
-// Offset where 8x8 predicted data blocks are stored
-#define	PREDBLK0	0*GRFWIB
-#define	PREDBLK1	4*GRFWIB
-#define	PREDBLK2	8*GRFWIB
-#define	PREDBLK3	12*GRFWIB
-
-#ifdef SW_SCOREBOARD
-
-// Update "E" flag with "F" flag information
-	mov (1)	REG_INTRA_TEMP_0<1>:w	REG_INTRA_PRED_AVAIL_FLAG_WORD<0;1,0>:w		// Store original Intra_Pred_Avail_Flag
-	and.nz.f0.0 (1)	NULLREG	REG_MBAFF_PIC	MBAFF_PIC	// Is current MBAFF picture
-	and.z.f0.1 (1) NULLREG	REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_TH_AVAIL_FLAG	// Is "A" not available?
-	(f0.0) and.z.f0.0 (1) NULLREG	REG_FIELD_MACROBLOCK_FLAG	FIELD_MACROBLOCK_FLAG	// Is current frame MB?
-	(f0.1) and.nz.f0.1 (1) NULLREG	REG_INTRA_PRED_8X8_BLK2_AVAIL_FLAG	INTRA_PRED_8X8_BLK2_AVAIL_FLAG	// Is "F" flag set?
-	(f0.0.allv) or (1)	REG_INTRA_PRED_AVAIL_FLAG_WORD<1>:w	REG_INTRA_PRED_AVAIL_FLAG_WORD<0;1,0>:w	INTRA_PRED_LEFT_BH_AVAIL_FLAG	// Set "E" to 1 if all conditions meet
-
-    CALL(scoreboard_start_intra,1)
-	mov (1)	REG_INTRA_PRED_AVAIL_FLAG_WORD<1>:w	REG_INTRA_TEMP_0<0;1,0>:w		// Restore original Intra_Pred_Avail_Flag
-#endif
-
-#ifdef SW_SCOREBOARD    
-	wait	n0:ud		//	Now wait for scoreboard to response
-#endif
-
-//
-//  Decode Y blocks
-//
-//	Load reference data from neighboring macroblocks
-    CALL(load_Intra_Ref_Y,1)
-
-	mov	(1)	PERROR<1>:w	ERRBUF*GRFWIB:w			// Pointer to macroblock error data
-	mov	(1)	PDECBUF_UD<1>:ud	0x00010001*PREDBUF*GRFWIB+0x00100000:ud	// Pointers to predicted data
-	shr (2)	REG_INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL_FLAG_BYTE<0;1,0>:ub	0x40:v
-	
-#if 1
-	mov (4) REF_LEFT_D(0,0)<1>	0:ud		// This is to make validation easier. Without it, DRAM mismatch occurs.
-#endif
-
-//	Intra predict Intra_8x8 luma blocks
-//
-//	Sub-macroblock 0 *****************
-	mov	(16)	REF_TOP_W(0)<1>	REG_INTRA_REF_TOP<16;16,1>:w		// Copy entire top reference data
-	and.nz.f0.0 (8)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_UP_LEFT_AVAIL_FLAG	// Is "D" available?
-	(-f0.0) mov (1)	REF_TOP(0,-1)<1>	INTRA_REF_TOP(0)REGION(1,0)		// p[-1,-1] = p[0,-1]
-
-	mov	(8)		REF_LEFT(0,2)<1>	INTRA_REF_LEFT(0)	// Left reference data, (leave 2 for reference filtering)
-	(-f0.0) mov (1)		REF_LEFT(0,1)<1>	INTRA_REF_LEFT(0)REGION(1,0)			// p[-1,-1]=p[-1,0]
-	(f0.0.any2h)  mov (2)		REF_LEFT(0,0)<1>	INTRA_REF_TOP(0,-1)REGION(1,0)	// p'[-1,y] (y=0,1) = p[-1,-1]
-	and.nz.f0.1 (1)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_UP_AVAIL_FLAG	// Is "B" available?
-	(f0.1) mov	(1)		REF_LEFT(0,0)<1>	INTRA_REF_TOP(0,0)REGION(1,0)	// p[0,-1] for left filtering
-	and.nz.f0.1 (1)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_TH_AVAIL_FLAG	// Is "A" available?
-	(-f0.1) mov	(1)		REF_LEFT(0,2)<1>	INTRA_REF_TOP(0,-1)REGION(1,0)	// p'[-1,2] = p[-1,-1]
-
-	and	(1)		PRED_MODE<1>:w	INTRA_PRED_MODE(0)REGION(1,0)	0x0F:w		// Intra pred mode for current block
-	mov (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w		// Top/Left neighbor available flags
-	CALL(intra_Pred_8x8_Y,1)
-    add (1)		PERROR<1>:w	PERROR<0;1,0>:w	0x0080:w	// Pointers to next error block
-
-//	Sub-macroblock 1 *****************
-	mov	(16)	REF_TOP0(0)<1>	INTRA_REF_TOP(0,4)	// Top reference data
-	and.nz.f0.1 (8)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_UP_RIGHT_AVAIL_FLAG	// Is "C" available?
-	(f0.1.any8h)  mov (8)	REF_TOP(0,8)<1>	INTRA_REF_TOP(0,16)<8;8,1>		// Take data from "C"
-	(-f0.1.any8h) mov (8)	REF_TOP(0,8)<1>	INTRA_REF_TOP(0,15)REGION(1,0)	// Repeat last pixel from "B"
-
-	mov	(4)		REF_LEFT(0,2)<1>	DEC_Y(0,14)<16;1,0>		// Left reference data (top half) (leave 2 for reference filtering)
-	mov	(4)		REF_LEFT(0,6)<1>	DEC_Y(2,14)<16;1,0>		// Left reference data (bottom half)
-	mov	(2)		REF_LEFT(0,0)<1>	INTRA_REF_TOP(0,7)REGION(1,0)		// p'[-1,y] (y=0,1) = p[-1,-1]
-	and.nz.f0.1 (1)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_UP_AVAIL_FLAG	// Is "B" available?
-	(f0.1)  mov	(1)		REF_LEFT(0,0)<1>	INTRA_REF_TOP(0,8)REGION(1,0)	// p[-1,-1] for left filtering
-	(-f0.1) mov	(1)		REF_LEFT(0,1)<1>	DEC_Y(0,14)REGION(1,0)	// p[-1,-1] = p[-1,0]
-
-	shr	(1)		PRED_MODE<1>:w	INTRA_PRED_MODE(0)REGION(1,0)	4:w		// Intra pred mode for current block
-	add	(2)		PPREDBUF_Y<1>:w	PPREDBUF_Y<2;2,1>:w	4*GRFWIB:w			// Pointer to predicted sub-macroblock 1
-	or (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w	1:w		// Left neighbor is available
-	CALL(intra_Pred_8x8_Y,1)
-    add (1)		PERROR<1>:w	PERROR<0;1,0>:w	0x0080:w	// Pointers to next error block
-
-//	Pack constructed data from word-aligned to byte-aligned format and interlace Y0 and Y1(every two Y rows)
-//	to speed up save_8x8_Y module later
-//	PPREDBUF_Y now points to sub-macroblock Y1
-	mov (32)	r[PPREDBUF_Y,-PREDBLK1]<1>:ub		DEC_Y(0)<32;16,2> {Compr}	// First 4 Y0 rows
-	mov (32)	r[PPREDBUF_Y,0-PREDBLK1+32]<1>:ub	DEC_Y(4)<32;16,2> {Compr}	// First 4 Y1 rows
-	mov (32)	r[PPREDBUF_Y,0-PREDBLK1+64]<1>:ub	DEC_Y(2)<32;16,2> {Compr}	// Second 4 Y0 rows
-	mov (32)	r[PPREDBUF_Y,0-PREDBLK1+96]<1>:ub	DEC_Y(6)<32;16,2> {Compr}	// Second 4 Y1 rows
-
-//	Sub-macroblock 2 *****************
-//	Intra_8x8 special available flag handling
-	and.nz.f0.0 (1)	NULLREG	REG_MBAFF_PIC	MBAFF_PIC	// Is current MBAFF picture
-	and.z.f0.1 (1) NULLREG	REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_TH_AVAIL_FLAG	// Is "A" not available?
-	(f0.0) and.z.f0.0 (1) NULLREG	REG_FIELD_MACROBLOCK_FLAG	FIELD_MACROBLOCK_FLAG	// Is current frame MB?
-	(f0.1) and.nz.f0.1 (1) NULLREG	REG_INTRA_PRED_8X8_BLK2_AVAIL_FLAG	INTRA_PRED_8X8_BLK2_AVAIL_FLAG	// Is special intra_8x8 available flag set?
-	(f0.0.allv) mov (1)	REF_TOP(0,-1)<1>	INTRA_REF_LEFT0(0,31)REGION(1,0)	// Top-left reference data
-	(f0.0.allv) jmpi (1)	INTRA_8x8_BLK2
-//	Done intra_8x8 special available flag handling
-
-	and.nz.f0.0 (8)	NULLREG	REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_TH_AVAIL_FLAG	// Is top-half "A" available?
-	(f0.0.any4h) mov (4)	REF_TOP0(0)<1>		INTRA_REF_LEFT0(0,28)REGION(4,1)	// Top-left reference data
-	(-f0.0) mov (1)	REF_TOP(0,-1)<1>	DEC_Y(2,24)REGION(1,0)	// p[-1,-1] = p[0,-1]
-INTRA_8x8_BLK2:
-	mov	(8)		REF_TOP(0)<1>		DEC_Y(2,24)REGION(8,1)		// Top reference data
-	mov	(8)		REF_TOP(0,8)<1>		DEC_Y(3,24)REGION(8,1)		// Top reference data
-
-	mov	(8)		REF_LEFT(0,2)<1>	INTRA_REF_LEFT(1)			// Left reference data,  (leave 2 for reference filtering)
-	mov (1)		REF_LEFT(0,0)<1>	DEC_Y(2,24)REGION(1,0)		// p'[-1,0] = p[0,-1] since "B" is always available
-	(f0.0) mov	(1)	REF_LEFT(0,1)<1>	INTRA_REF_LEFT(0,28)REGION(1,0)	// p[-1,1] = p[-1,-1] if top-half "A" available
-	(-f0.0) mov (1)	REF_LEFT(0,1)<1>	INTRA_REF_LEFT(1)REGION(1,0)	// p[-1,1] = p[-1,0]
-	and.nz.f0.1 (1)	NULLREG	REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_BH_AVAIL_FLAG	// Is bottom-half "A" available?
-	(-f0.1) mov	(1)	REF_LEFT(0,2)<1>	INTRA_REF_LEFT(0,28)REGION(1,0)	// p'[-1,2] = p[-1,-1]
-
-	and	(1)		PRED_MODE<1>:w			INTRA_PRED_MODE(0,1)REGION(1,0)	0x0F:w	// Intra pred mode for current block
-	or (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL.1<0;1,0>:w	2:w		// Top neighbor is available
-	CALL(intra_Pred_8x8_Y,1)
-    add (1)		PERROR<1>:w	PERROR<0;1,0>:w	0x0080:w	// Pointers to next error block
-
-//	Sub-macroblock 3 *****************
-	mov	(4)		REF_TOP0(0)<1>		DEC_Y(2,28)REGION(4,1)		// Top-left reference data
-	mov	(8)		REF_TOP(0)<1>		DEC_Y(3,24)REGION(8,1)		// Top reference data
-	mov	(16)	REF_TOP(0,8)<1>		DEC_Y(3,31)REGION(1,0)		// Top-right reference data
-
-	mov (4)		REF_LEFT(0,2)<1>	DEC_Y(4,14)<16;1,0>		// Left reference data (top half) (leave 2 for reference filtering)
-	mov (4)		REF_LEFT(0,6)<1>	DEC_Y(6,14)<16;1,0>		// Left reference data (bottom half)
-	mov (1)		REF_LEFT(0,0)<1>	DEC_Y(3,24)REGION(1,0)	// p[-1,0] = p[0,-1]
-	mov (1)		REF_LEFT(0,1)<1>	DEC_Y(2,31)REGION(1,0)	// p[-1,1] = p[-1,-1]
-
-	shr	(1)		PRED_MODE<1>:w	INTRA_PRED_MODE(0,1)REGION(1,0)	4:w		// Intra pred mode for current block
-	add	(2)		PPREDBUF_Y<1>:w	PPREDBUF_Y<2;2,1>:w	4*GRFWIB:w	// Pointer to predicted sub-macroblock 3
-	or (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w	3:w		// Top and Left neighbor are available
-	CALL(intra_Pred_8x8_Y,1)
-
-//	Pack constructed data from word-aligned to byte-aligned format
-//	to speed up save_8x8_Y module later
-//	PPREDBUF_Y now points to sub-macroblock Y1
-	mov (32)	r[PPREDBUF_Y,-PREDBLK1]<1>:ub		DEC_Y(4)<32;16,2> {Compr}	// First 4 Y2 rows
-	mov (32)	r[PPREDBUF_Y,0-PREDBLK1+32]<1>:ub	DEC_Y(8)<32;16,2> {Compr}	// First 4 Y3 rows
-	mov (32)	r[PPREDBUF_Y,0-PREDBLK1+64]<1>:ub	DEC_Y(6)<32;16,2> {Compr}	// Second 4 Y2 rows
-	mov (32)	r[PPREDBUF_Y,0-PREDBLK1+96]<1>:ub	DEC_Y(10)<32;16,2> {Compr}	// Second 4 Y3 rows
-
-//	All 4 sub-macroblock (containing 4 intra_8x8 blocks) have be constructed
-//	Save constructed Y picture
-	CALL(save_8x8_Y,1)		// Save Intra_8x8 predicted luma data.
-//
-//  Decode U/V blocks
-//
-//	Note: The decoding for chroma blocks will be the same for all intra prediction mode
-//
-	CALL(decode_Chroma_Intra,1)
-
-#ifdef SW_SCOREBOARD
-    #include "scoreboard_update.asm"
-#endif
-
-// Terminate the thread
-//
-    #include "EndIntraThread.asm"
-
-// End of Intra_8x8
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_funcLib.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_funcLib.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_funcLib.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_funcLib.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * Library of common modules shared among different intra prediction kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: Intra_funcLib.asm
-//
-// Library of common modules shared among different intra prediction kernels
-//
-//  Note: Any sub-modules, if they are #included in more than one kernel,
-//	  should be moved to this module.
-//
-#if defined(INTRA_16X16)
-#undef INTRA_16X16
-    #include "load_Intra_Ref_Y.asm"		// Load intra Y reference data
-    #include "Decode_Chroma_Intra.asm"	// Decode chroma blocks
-    #include "save_16x16_Y.asm"			// Save to destination Y frame surface
-#elif defined(INTRA_8X8)
-#undef INTRA_8X8
-    #include "load_Intra_Ref_Y.asm"		// Load intra Y reference data
-    #include "Decode_Chroma_Intra.asm"	// Decode chroma blocks
-    #include "intra_Pred_8x8_Y.asm"		// Intra predict Intra_4x4 blocks
-    #include "save_8x8_Y.asm"			// Save to destination Y frame surface
-#elif defined(INTRA_4X4)
-#undef INTRA_4X4
-    #include "load_Intra_Ref_Y.asm"		// Load intra Y reference data
-    #include "Decode_Chroma_Intra.asm"	// Decode chroma blocks
-    #include "intra_Pred_4x4_Y_4.asm"	// Intra predict Intra_4x4 blocks
-    #include "save_4x4_Y.asm"			// Save to destination Y frame surface
-#else								// For all merged kernels
-#endif
-
-#ifdef SW_SCOREBOARD    
-    #include "scoreboard_start_intra.asm"	// scorboard intra start function	
-    #include "scoreboard_start_inter.asm"	// scorboard inter start function	
-#endif	// SW_SCOREBOARD
-
-// End of Intra_funcLib
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Header.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Header.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Header.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Header.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,276 +0,0 @@
-/*
- * Header file for all AVC intra prediction kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__INTRA_HEADER__)	// Make sure this file is only included once
-#define __INTRA_HEADER__
-
-// Module name: intra_header.inc
-//
-// Header file for all AVC intra prediction kernels
-//
-//	This header file defines everything that's specific to intra macroblock kernels
-
-
-//  ----------- Various data buffers and pointers ------------
-//
-//	I_PCM data buffer
-//
-#define		I_PCM_BUF_Y			4
-#define		I_PCM_BUF_UV		12
-
-#define		REG_I_PCM_BUF_Y		r4
-#define		REG_I_PCM_BUF_UV	r12
-
-.declare    I_PCM_Y  Base=REG_I_PCM_BUF_Y  ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 8-bit I_PCM Y data
-.declare    I_PCM_UV Base=REG_I_PCM_BUF_UV ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// 8-bit I_PCM U/V data
-
-//	Intra macroblock error data blocks
-//
-#define	    ERRBUF		4		// Starting GRF index for error data
-#define		REG_ERRBUF	r4
-.declare    MBBLOCKW Base=REG_ERRBUF ElementSize=2 SrcRegion=REGION(16,1) Type=w	// For 16-bit inter MB
-.declare    MBBLOCKD Base=REG_ERRBUF ElementSize=2 SrcRegion=REGION(16,1) Type=uw	// For use in "send" command
-
-#define	    PERROR		a0.2	// Pointer to macroblock error data
-#define	    PERROR1		a0.3	// Pointer to macroblock error data used by instruction compression
-#define	    PERROR_UD	a0.1	// Pointer to macroblock error data in DWORD unit
-
-//	Intra macroblock reference data
-//
-#define		REG_INTRA_REF_TOP	r49		// Must be an odd numbered GRF register
-.declare    INTRA_REF_TOP0		Base=REG_INTRA_REF_TOP	 ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-.declare    INTRA_REF_TOP		Base=REG_INTRA_REF_TOP.4 ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-										// Actual top row reference data start at offset 4 in BYTE
-.declare    INTRA_REF_TOP_W		Base=REG_INTRA_REF_TOP.2 ElementSize=2 SrcRegion=REGION(16,1) Type=uw
-										// Actual top row reference data start at offset 2 in WORD
-.declare    INTRA_REF_TOP_D		Base=REG_INTRA_REF_TOP ElementSize=4 DstRegion=<1> Type=ud	// Only used in "send" instruction
-
-#define		INTRA_REF_LEFT_ID	50
-#define		REG_INTRA_REF_LEFT	r50
-.declare    INTRA_REF_LEFT0		Base=REG_INTRA_REF_LEFT ElementSize=1 SrcRegion=REGION(8,4) Type=ub
-.declare    INTRA_REF_LEFT		Base=REG_INTRA_REF_LEFT.3 ElementSize=1 SrcRegion=REGION(8,4) Type=ub
-										// Actual left column reference data are located at offset 3 in BYTE
-.declare    INTRA_REF_LEFT_UV	Base=REG_INTRA_REF_LEFT.2 ElementSize=1 SrcRegion=REGION(8,4) Type=ub
-										// Actual left column U/V reference data are located at offset 2 in BYTE
-.declare    INTRA_REF_LEFT_W	Base=REG_INTRA_REF_LEFT.1 ElementSize=2 SrcRegion=REGION(8,2) Type=uw
-										// Actual left column reference data are located at offset 1 in WORD
-.declare    INTRA_REF_LEFT_D	Base=REG_INTRA_REF_LEFT ElementSize=4 DstRegion=<1> Type=ud	// Only used in "send" instruction
-
-#define		PREF_LEFT		a0.4	// Pointer to left reference data
-#define		PREF_LEFT_UD	a0.2	// Pointer in DWORD to left reference data
-
-#define		INTRA_TEMP_0	52
-#define		INTRA_TEMP_1	53
-#define		INTRA_TEMP_2	54
-#define		INTRA_TEMP_3	55
-#define		INTRA_TEMP_4	56
-#define		INTRA_TEMP_5	57
-#define		INTRA_TEMP_6	58
-
-#define		REG_INTRA_TEMP_0	r52
-#define		REG_INTRA_TEMP_1	r53
-#define		REG_INTRA_TEMP_2	r54
-#define		REG_INTRA_TEMP_3	r55
-#define		REG_INTRA_TEMP_4	r56
-#define		REG_INTRA_TEMP_5	r57
-#define		REG_INTRA_TEMP_6	r58
-#define		REG_INTRA_TEMP_7	r59
-#define		REG_INTRA_TEMP_8	r60
-
-// Destination registers for write commit
-#define		REG_WRITE_COMMIT_Y	r60.0
-#define		REG_WRITE_COMMIT_UV	r61.0
-
-//  ----------- Various data buffers and pointers ------------
-//  R32 - R47 for predicted picture buffer (for both Y and U/V blocks)
-//
-#define	    PREDBUF		32		// Starting GRF index for predicted buffer
-#define		REG_PREDBUF	r32
-
-.declare    PRED_Y		Base=REG_PREDBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Predicted Y picture
-.declare    PRED_YW		Base=REG_PREDBUF ElementSize=2 SrcRegion=REGION(16,1) Type=uw	// Predicted Y picture stored in WORD
-.declare    PRED_Y_FM	Base=REG_PREDBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Predicted Y picture frame
-.declare    PRED_Y_TF	Base=REG_PREDBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Predicted Y picture Top field
-
-.declare    PRED_UV		Base=REG_PREDBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Predicted U/V picture
-.declare    PRED_UVW	Base=REG_PREDBUF ElementSize=2 SrcRegion=REGION(16,1) Type=uw	// Predicted U/V picture stored in WORD
-.declare    PRED_UV_FM	Base=REG_PREDBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Predicted U/V picture frame
-.declare    PRED_UV_TF	Base=REG_PREDBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Predicted U/V picture top field
-.declare    PRED_UV_BF	Base=REG_PREDBUF.16 ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Predicted U/V picture bottom field
-
-//  The same region will also be used as finally decoded Y blocks shared with U/V blocks
-//
-#define	    DECBUF		32
-#define		REG_DECBUF	r32
-.declare    DEC_Y		Base=REG_DECBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Decoded Y picture
-.declare    DEC_UV		Base=REG_DECBUF ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Decoded U/V P-/B-picture
-.declare    DEC_UD		Base=REG_DECBUF ElementSize=4 SrcRegion=REGION(8,1) Type=ud		// Decoded buffer in UD type
-
-//	Reference buffer for intra_NxN prediction
-//
-#define		PRED_MODE	REG_INTRA_TEMP_0
-.declare    REF_TOP0	Base=REG_INTRA_TEMP_5	ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-.declare    REF_TOP		Base=REG_INTRA_TEMP_5.4 ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-									// Actual top reference data start from offset 3,i.e. p[-1,-1]
-.declare    REF_TOP_W	Base=REG_INTRA_TEMP_5 ElementSize=2 SrcRegion=REGION(16,1) Type=uw
-.declare    REF_TOP_D	Base=REG_INTRA_TEMP_5 ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-.declare    REF_LEFT	Base=REG_INTRA_TEMP_6 ElementSize=1 SrcRegion=REGION(16,1) Type=ub
-.declare    REF_LEFT_D	Base=REG_INTRA_TEMP_6 ElementSize=4 SrcRegion=REGION(8,1) Type=ud
-
-// For intra prediction plane mode
-//
-.declare    H1	Base=REG_INTRA_TEMP_0 ElementSize=2 SrcRegion=REGION(8,1) Type=w	// Make sure it's an even GRF
-.declare    H2	Base=REG_INTRA_TEMP_0.8 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-.declare    V1	Base=REG_INTRA_TEMP_1 ElementSize=2 SrcRegion=REGION(8,1) Type=w	// Make sure it's the following odd GRF
-.declare    V2	Base=REG_INTRA_TEMP_1.8 ElementSize=2 SrcRegion=REGION(8,1) Type=w
-
-.declare	CP	Base=REG_INTRA_TEMP_2 ElementSize=2 SrcRegion=REGION(16,1) Type=w
-
-#define		PINTRAPRED_Y	a0.7	// Used as luma intra prediction mode pointer
-#define		PINTRAPRED_UV	a0.7	// Used as chroma intra prediction mode pointer
-#define		PINTRA4X4_Y		a0.4	// Used as luma intra_4x4 prediction mode pointer
-
-#define		PBWDCOPY_4		a0.4	// a0.4 - a0.7 used in intra_4x4 prediction for moving data backward
-#define		PBWDCOPY_8		a0.6	// a0.6 - a0.7 used in intra_8x8 prediction for moving data backward
-
-// For Intra_4x4 prediction mode
-//
-.declare    INTRA_4X4_MODE	Base=REG_INTRA_TEMP_1 ElementSize=4 SrcRegion=REGION(1,0) DstRegion=<1> Type=d	// Actually only need 1 DWORD
-
-//  ----------- Intra CURBE constants ------------
-//
-#define		REG_CURBE1	r1
-#define		REG_CURBE2	r2
-#define		INTRA_4X4_OFFSET	1*GRFWIB		// 9 Bytes
-#define		INTRA_8X8_OFFSET	1*GRFWIB+12		// 9 Bytes starting sub-register r1.3:ud
-#define		INTRA_16X16_OFFSET	1*GRFWIB+24		// 4 Bytes starting sub-register r1.6:ud
-#define		INTRA_CHROMA_OFFSET	1*GRFWIB+28		// 4 Bytes starting sub-register r1.7:ud
-
-#define		TOP_REF_OFFSET		REG_CURBE1.10	// r1.5:w
-
-//	Constants used in plane intra prediction mode
-#define		XY_3	REG_CURBE2.4	// Stored BYTE constants x-3 for x=0...7, i.e. -3,-2,...3,4 for U/V, need duplicate to every other byte
-#define		XY_3_1	REG_CURBE2.5	// Stored BYTE constants x-3 for x=0...7, i.e. -3,-2,...3,4 for 2nd instruction in {Comp}
-#define		XY_7	REG_CURBE2.0	// Stored BYTE constants x-7 for x=0...15, i.e. -7,-6,...7,8 for Y
-#define		XY_7_1	REG_CURBE2.1	// Stored BYTE constants x-7 for x=0...15, i.e. -7,-6,...7,8 for 2nd instruction in {Comp}
-
-#define		INV_SHIFT	REG_CURBE2.16
-
-#define		INV_TRANS4	REG_CURBE2.20	// For reverse data transfer for intra_4x4 (0x00020406)
-#define		INV_TRANS48	REG_CURBE2.22	// For reverse data transfer for intra_4x4 (0x0002)
-#define		INV_TRANS8	REG_CURBE1.22	// For reverse data transfer for intra_8x8 (0x0001)
-
-#define		INTRA_MODE	REG_CURBE2.24	// Offset to intra_Pred_4x4_Y from each sub-block
-
-//  ----------- In-line parameters ------------
-//
-#define REG_INLINE	r3
-
-#define INLINE_DW0	REG_INLINE.0<0;1,0>:ud
-#define INLINE_DW1	REG_INLINE.1<0;1,0>:ud
-#define INLINE_DW2	REG_INLINE.2<0;1,0>:ud
-#define INLINE_DW3	REG_INLINE.3<0;1,0>:ud
-#define INLINE_DW4	REG_INLINE.4<0;1,0>:ud
-#define INLINE_DW5	REG_INLINE.5<0;1,0>:ud
-#define INLINE_DW6	REG_INLINE.6<0;1,0>:ud
-#define INLINE_DW7	REG_INLINE.7<0;1,0>:ud
-
-//	Intra macroblock in-line data
-//
-//	In-line DWORD 0
-#define REG_MBAFF_FIELD				REG_INLINE.1	// :uw, can be added directly to lower-word of MSGDSC
-#define MBAFF_FIELD					BIT26+BIT25		// Bits 26:25 - MBAFF field macroblock flag
-													//  00 = Current macroblock is not an MBAFF field macroblock
-													//  11 = Current macroblock is an MBAFF field macroblock
-
-#define REG_FIELD_PARITY			INLINE_DW0
-#define FIELD_PARITY				BIT24			// Bit 24 - Macroblock field parity flag
-													//  0 = Current field is a top field
-													//  1 = Current field is a bottom field
-
-#define REG_FIELD_MACROBLOCK_FLAG	INLINE_DW0
-#define FIELD_MACROBLOCK_FLAG		BIT14			// Bit 14 - Field macroblock flag
-													//  0 = Current macroblock is not a field macroblock
-													//  1 = Current macroblock is a field macroblock
-#define REG_MACROBLOCK_TYPE			INLINE_DW0
-#define MACROBLOCK_TYPE				BIT12+BIT11+BIT10+BIT9+BIT8		// Bit 12:8 - Intra macroblock flag
-
-#define REG_CHROMA_FORMAT_IDC		INLINE_DW0
-#define CHROMA_FORMAT_IDC			BIT3+BIT2		// Bit 3:2 - Chroma format
-													// 00 = Luma only (Monochrome)
-													// 01 = YUV420
-													// 10 = YUV422
-													// 11 = YUV444
-#define	REG_MBAFF_PIC				INLINE_DW0
-#define MBAFF_PIC					BIT1			// Bit 1 - MBAFF Frame picture
-													// 0 = Not an MBAFF frame picture
-													// 1 = An MBAFF frame picture
-#define REG_INTRA_PRED_8X8_BLK2_AVAIL_FLAG	INLINE_DW0
-#define INTRA_PRED_8X8_BLK2_AVAIL_FLAG	BIT4		// Bit 4: Pixel available for block 2 in an intra_8x8 MB.
-
-//	In-line DWORD 1
-#define ORIX			REG_INLINE.4	// :ub, H. origin of the macroblock in macroblock unit
-#define ORIY			REG_INLINE.5	// :ub, V. origin of the macroblock in macroblock unit
-
-//	In-line DWORD 2
-#define	REG_CBPCYB					REG_INLINE.9	// :ub, Coded block pattern
-#define	REG_CBPCY					INLINE_DW2		// Bits 13:8 - Coded block pattern
-													// reflect Y0, Y1, Y2, Y3, Cb4, Cr5
-													// Bit 13 - Y0
-													// Bit 12 - Y1
-													// Bit 11 - Y2
-													// Bit 10 - Y3
-													// Bit 9 - U4
-													// Bit 8 - V5
-#define CBP_MASK					0x3F00:ud		// Bit mask for all CBP bits
-#define CBP_Y_MASK					0x3C00:ud		// Bit mask for CBP Y bits
-#define CBP_UV_MASK					0x0300:ud		// Bit mask for CBP U/V bits
-
-#define CBP_Y0_MASK					BIT13:ud		// Bit mask for CBP Y0 bit
-#define CBP_Y1_MASK					BIT12:ud		// Bit mask for CBP Y1 bit
-#define CBP_Y2_MASK					BIT11:ud		// Bit mask for CBP Y2 bit
-#define CBP_Y3_MASK					BIT10:ud		// Bit mask for CBP Y3 bit
-#define CBP_U_MASK					BIT9:ud			// Bit mask for CBP U bit
-#define CBP_V_MASK					BIT8:ud			// Bit mask for CBP V bit
-
-//	In-line DWORD 3
-#define REG_INTRA_CHROMA_PRED_MODE	REG_INLINE.12	// :ub - Intra chroma prediction mode
-#define INTRA_CHROMA_PRED_MODE		BIT7+BIT6		// Bit 7:6 - Intra chroma prediction mode
-													// 00 = Intra DC prediction
-													// 01 = Intra horizontal prediction
-													// 10 = Intra vertical prediction
-													// 11 = Intra plane prediction
-#define INTRA_CHROMA_PRED_MODE_SHIFT	6			// Intra chroma prediction mode shift
-
-#define REG_INTRA_PRED_AVAIL_FLAG	INLINE_DW3
-#define INTRA_PRED_AVAIL_FLAG		BIT4+BIT3+BIT2+BIT1+BIT0	// Bits 4:0 - Intra prediction available flag
-													// Bit 0: Macroblock A (the left neighbor) entire or top half
-													// Bit 1: Macroblock B (the upper neighbor)
-													// Bit 2: Macroblock C (the above-right neighbor)
-													// Bit 3: Macroblock D (the above-left neighbor)
-													// Bit 4: Macroblock A (the left neighbor) bottom half
-													// Each bit is defined below
-													// 0 = The macroblock is not available for intra prediction
-													// 1 = The macroblock is available for intra prediction
-#define INTRA_PRED_LEFT_TH_AVAIL_FLAG	BIT0		// Bit 0: Macroblock A (the left neighbor) entire or top half
-#define INTRA_PRED_UP_AVAIL_FLAG		BIT1		// Bit 1: Macroblock B (the upper neighbor)
-#define INTRA_PRED_UP_RIGHT_AVAIL_FLAG	BIT2		// Bit 2: Macroblock C (the above-right neighbor)
-#define INTRA_PRED_UP_LEFT_AVAIL_FLAG	BIT3		// Bit 3: Macroblock D (the above-left neighbor)
-#define INTRA_PRED_LEFT_BH_AVAIL_FLAG	BIT4		// Bit 4: Macroblock A (the left neighbor) bottom half
-//#define INTRA_PRED_8X8_BLK2_AVAIL_FLAG	BIT5		// Bit 5: Pixel available for block 2 in an intra_8x8 MB.
-#define REG_INTRA_PRED_AVAIL_FLAG_BYTE	REG_INLINE.12	// Byte location of Intra_Pred_Avail_Flag
-#define REG_INTRA_PRED_AVAIL_FLAG_WORD	REG_INLINE.6	// Word location of Intra_Pred_Avail_Flag
-
-
-.declare    INTRA_PRED_MODE  Base=REG_INLINE.16 ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Intra prediction mode
-
-// End of intra_header.inc
-
-#endif	// !defined(__INTRA_HEADER__)
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_PCM.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_PCM.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Intra_PCM.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Intra_PCM.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Decode Intra_PCM macroblock
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Intra_PCM.asm
-//
-// Decoding of I_PCM macroblock
-//
-//  $Revision: 8 $
-//  $Date: 10/18/06 4:10p $
-//
-
-// ----------------------------------------------------
-//  Main: Intra_PCM
-// ----------------------------------------------------
-
-.kernel Intra_PCM
-INTRA_PCM:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0x03aa55a5:ud
-#endif
-
-#include "SetupForHWMC.asm"
-
-// Not actually needed here but just want to slow down the Intra-PCM to avoid race condition
-//
-#ifdef SW_SCOREBOARD
-	and (1)	  REG_INTRA_PRED_AVAIL_FLAG_WORD<1>:w	REG_INTRA_PRED_AVAIL_FLAG_WORD<0;1,0>:w	0xffe0:w	// Ensure all neighbor avail flags are "0"
-    CALL(scoreboard_start_intra,1)
-	wait	n0:ud		//	Now wait for scoreboard to response
-#endif
-
-//
-//  Decoding Y blocks
-//
-//	In I_PCM mode, the samples are already arranged in raster scan order within the macroblock.
-//	We just need to save them to picture buffers
-//
-    #include "save_I_PCM.asm"		    // Save to destination picture buffers
-
-#ifdef SW_SCOREBOARD    
-    #include "scoreboard_update.asm"
-#endif
-
-// Terminate the thread
-//
-    #include "EndIntraThread.asm"
-
-// End of Intra_PCM
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_pred_16x16_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_pred_16x16_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_pred_16x16_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_pred_16x16_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-/*
- * Intra predict 16x16 luma block
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: intra_Pred_16x16_Y.asm
-//
-// Intra predict 16x16 luma block
-//
-	and	(1)	PINTRAPRED_Y<1>:w	INTRA_PRED_MODE(0)REGION(1,0)	0x0F:w
-	// WA for "jmpi" restriction
-	mov (1)	REG_INTRA_TEMP_1<1>:ud	r[PINTRAPRED_Y, INTRA_16X16_OFFSET]:ub
-	jmpi (1) REG_INTRA_TEMP_1<0;1,0>:d
-
-// Mode 0
-INTRA_16x16_VERTICAL:
-    $for(0; <16; 2) {
-	mov (32)	PRED_YW(%1)<1>	INTRA_REF_TOP(0) {Compr}
-	}
-	jmpi (1) End_intra_Pred_16x16_Y
-
-// Mode 1
-INTRA_16x16_HORIZONTAL:
-	mov (1)		PREF_LEFT_UD<1>:ud	INTRA_REF_LEFT_ID*GRFWIB*0x00010001+0x00040000:ud	// Set address registers for instruction compression
-    $for(0,0; <16; 2,8) {
-	mov (32)	PRED_YW(%1)<1>	r[PREF_LEFT,%2+3]<0;1,0>:ub {Compr}	// Actual left column reference data start at offset 3
-	}
-	jmpi (1) End_intra_Pred_16x16_Y
-
-// Mode 2
-INTRA_16x16_DC:
-    and.nz.f0.0 (8)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_UP_AVAIL_FLAG:ud	// Top macroblock available for intra prediction?
-    and (8)			acc0<1>:ud	REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_TH_AVAIL_FLAG+INTRA_PRED_LEFT_BH_AVAIL_FLAG:ud	// Left macroblock available for intra prediction?
-    xor.z.f0.1 (8)	NULLREG		acc0:ud	INTRA_PRED_LEFT_TH_AVAIL_FLAG+INTRA_PRED_LEFT_BH_AVAIL_FLAG:ud	// Left macroblock available for intra prediction?
-// Rearrange reference samples for unified DC prediction code
-//
-	(-f0.0.any8h)	mov (8)	INTRA_REF_TOP_W(0)<1>	0x8080:uw
-	(-f0.1.any8h)	mov (8)	INTRA_REF_LEFT(0)<4>	INTRA_REF_TOP(0)REGION(8,1)
-	(-f0.1.any8h)	mov (8)	INTRA_REF_LEFT(1)<4>	INTRA_REF_TOP(0,8)REGION(8,1)
-	(-f0.0.any8h)	mov (8)	INTRA_REF_TOP(0)<1>		INTRA_REF_LEFT(0)REGION(8,4)
-	(-f0.0.any8h)	mov (8)	INTRA_REF_TOP(0,8)<1>	INTRA_REF_LEFT(1)REGION(8,4)	// Split due to HW limitation
-// Perform DC prediction
-//
-	add (16)	PRED_YW(15)<1>	INTRA_REF_LEFT(0)REGION(8,4)	INTRA_REF_TOP(0)REGION(16,1)
-	add (8)		PRED_YW(15)<1>	PRED_YW(15)REGION(8,1)	PRED_YW(15,8)REGION(8,1)
-	add (4)		PRED_YW(15)<1>	PRED_YW(15)REGION(4,1)	PRED_YW(15,4)REGION(4,1)
-	add (2)		PRED_YW(15)<1>	PRED_YW(15)REGION(2,1)	PRED_YW(15,2)REGION(2,1)
-	add (32)	acc0<1>:w		PRED_YW(15)REGION(1,0)	PRED_YW(15,1)REGION(1,0) {Compr}	// Set up both acc0 and acc1
-	add	(32)	acc0<1>:w		acc0:w	16:w {Compr}
-
-    $for(0; <16; 2) {
-	shr (32)	PRED_YW(%1)<1>	acc0:w	5:w {Compr}
-	}
-	jmpi (1) End_intra_Pred_16x16_Y
-
-// Mode 3
-INTRA_16x16_PLANE:
-// Refer to H.264/AVC spec Section 8.3.3.4
-
-#define A		REG_INTRA_TEMP_2.0		// All are WORD type
-#define B		REG_INTRA_TEMP_3.0
-#define C		REG_INTRA_TEMP_3.1
-#define YP		REG_INTRA_TEMP_0		// Store intermediate results of c*(y-7). Make sure it's an even GRF
-#define YP1		REG_INTRA_TEMP_1		// Store intermediate results of c*(y-7). Make sure it's an odd GRF, used in {Comp}
-#define XP		REG_INTRA_TEMP_5		// Store intermediate results of a+b*(x-7)+16. Make sure it's an odd GRF
-
-// First Calculate constants H and V
-//	H1 = sum((-x'-1)*p[8+x',-1]), x'=0,1,...7
-//	H2 =  sum((-x'-1)*p[6-x',-1]), x'=7,6,...0
-//	H = -H1 + H2
-//	The same calculation holds for V
-//
-	mul (8)	H1(0)<1>	INTRA_REF_TOP(0,8)REGION(8,1)		0x89ABCDEF:v
-	mul (8)	H2(0)<1>	INTRA_REF_TOP(0,-1)REGION(8,1)		0xFEDCBA98:v
-
-	mul (8)	V1(0)<1>	INTRA_REF_LEFT(0,8*4)REGION(8,4)	0x89ABCDEF:v
-	mul (8)	V2(0)<1>	INTRA_REF_LEFT(0)REGION(8,4)		0x0FEDCBA9:v
-	mul (1)	V2(0,7)<1>	INTRA_REF_TOP(0,-1)<0;1,0>	-8:w		// Replace 0*p[-1,7] with -8*p[-1,-1]
-	// Now, REG_INTRA_TEMP_0 holds [H2, -H1] and REG_INTRA_TEMP_1 holds [V2, -V1]
-
-	// Sum up [H2, -H1] and [V2, -V1] using instruction compression
-	// ExecSize = 16 is restricted by B-spec for instruction compression
-	// Actual intermediate results are in lower sub-registers after each summing step
-	add	(16)	H1(0)<1>	-H1(0)	H2(0)	{Compr}	// Results in lower 8 WORDs
-	add	(16)	H1(0)<1>	H1(0)	H1(0,4) {Compr}	// Results in lower 4 WORDs
-	add	(16)	H1(0)<1>	H1(0)	H1(0,2) {Compr}	// Results in lower 2 WORDs
-	add	(16)	H1(0)<1>	H1(0)	H1(0,1) {Compr}	// Results in lower 1 WORD
-
-//	Calculate a, b, c and further derivations
-	mov	(16)	acc0<1>:w	32:w
-	mac	(2)		acc0<1>:w	H1(0)<16;1,0>	5:w
-	shr	(2)		B<1>:w		acc0:w	6:w		// Done b,c
-	mov	(16)	acc0<1>:w	16:w
-	mac	(16)	acc0<1>:w	INTRA_REF_TOP(0,15)<0;1,0>	16:w
-	mac	(16)	A<1>:w		INTRA_REF_LEFT(0,15*4)<0;1,0>	16:w	// A = a+16
-	mac (16)	XP<1>:w		B<0;1,0>:w		XY_7<16;16,1>:b			// XP = A+b*(x-7)
-	mul	(8)		YP<1>:w		C<0;1,0>:w		XY_7<16;8,2>:b			// YP = c*(y-7), even portion
-	mul	(8)		YP1<1>:w	C<0;1,0>:w		XY_7_1<16;8,2>:b		// YP = c*(y-7), odd portion
-
-//	Finally the intra_16x16 plane prediction
-    $for(0,0; <16; 2,1) {
-	add (32)	acc0<1>:w		XP<16;16,1>:w	YP.%2<16;16,0>:w {Compr}	// Set Width!= 1 to trick EU to use YP_1.%2 for 2nd instruction
-	shr.sat (32)	PRED_Y(%1)<2>	acc0<16;16,1>:w	5:w {Compr}
-	}
-
-End_intra_Pred_16x16_Y:
-// End of intra_Pred_16x16_Y
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Pred_4x4_Y_4.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Pred_4x4_Y_4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Pred_4x4_Y_4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Pred_4x4_Y_4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,240 +0,0 @@
-/*
- * Intra predict 4 Intra_4x4 luma blocks
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__INTRA_PRED_4X4_Y_4__)		// Make sure this is only included once
-#define __INTRA_PRED_4X4_Y_4__
-
-// Module name: intra_Pred_4x4_Y_4.asm
-//
-// Intra predict 4 Intra_4x4 luma blocks
-//
-//--------------------------------------------------------------------------
-//  Input data:
-//
-//  REF_TOP:	Top reference data stored in BYTE with p[-1,-1] at REF_TOP(0,-1)
-//  REF_LEFT:	Left reference data stored in BYTE with p[-1,0] at REF_LEFT(0,0)
-//	PRED_MODE:	Intra prediction mode stored in 4 words (4 LSB)
-//	REG_INTRA_PRED_AVAIL:	Top/Left available flag, (Bit0: Left, Bit1: Top)
-//
-//--------------------------------------------------------------------------
-
-#undef	INTRA_PRED_AVAIL
-#undef	INTRA_REF
-#undef	REF_LEFT_BACK
-#undef	REF_TMP
-#undef	REF_TMP1
-
-#define	INTRA_PRED_AVAIL	REG_INTRA_TEMP_2.8
-#define INTRA_REF			REG_INTRA_TEMP_2
-#define	REF_LEFT_BACK		REG_INTRA_TEMP_8
-#define	REF_TMP				REG_INTRA_TEMP_3
-#define REF_TMP1			REG_INTRA_TEMP_4
-
-intra_Pred_4x4_Y_4:
-
-	mov	(8)		REF_LEFT_BACK<1>:ub	REF_LEFT(0)REGION(8,1)	// Store left referece data
-//	Set up pointers to each intra_4x4 prediction mode
-//
-	and	(4)		PINTRA4X4_Y<1>:w	PRED_MODE<4;4,1>:w	0x0F:w
-	add (4)		INTRA_4X4_MODE(0)	r[PINTRA4X4_Y, INTRA_4X4_OFFSET]<1,0>:ub	INTRA_MODE<4;4,1>:ub
-
-//	Sub-block 0 *****************
-	mov (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w		// Top/Left neighbor available flags
-	CALL_1(INTRA_4X4_MODE(0),1)
-
-//	Add error data to predicted intra data
-ADD_ERROR_SB0:
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK0]<2>:ub	r[PERROR,ERRBLK0]<8;4,1>:w		REG_INTRA_4X4_PRED<8;8,1>:w		// Too bad indexed src can't
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK0+16]<2>:ub	r[PERROR,ERRBLK0+32]<8;4,1>:w	REG_INTRA_4X4_PRED.8<8;8,1>:w	// cross 2 GRFs
-
-//	Sub-block 1 *****************
-	mov	(16)	REF_TOP0(0)<1>	REF_TOP0(0,4)REGION(8,1)		// Top reference data
-	mov	(4)		REF_LEFT(0)<1>	r[PPREDBUF_Y,PREDSUBBLK0+6]<8;1,0>:ub	// New left referece data from sub-block 0
-	or (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w	1:w		// Left neighbor is available
-	CALL_1(INTRA_4X4_MODE(0,1),1)
-
-//	Add error data to predicted intra data
-ADD_ERROR_SB1:
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK1]<2>:ub	r[PERROR,ERRBLK1]<8;4,1>:w		REG_INTRA_4X4_PRED<8;8,1>:w		// Too bad indexed src can't
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK1+16]<2>:ub	r[PERROR,ERRBLK1+32]<8;4,1>:w	REG_INTRA_4X4_PRED.8<8;8,1>:w	// cross 2 GRFs
-
-//	Sub-block 2 *****************
-	mov	(1)		REF_TOP0(0,3)<1>	REF_LEFT_BACK.3<0;1,0>:ub		// Top-left reference data from stored left referece data
-	mov	(4)		REF_TOP0(0,4)<1>	r[PPREDBUF_Y,PREDSUBBLK0+24]REGION(4,2):ub	// Top reference data
-	mov	(4)		REF_TOP0(0,8)<1>	r[PPREDBUF_Y,PREDSUBBLK0+24+32]REGION(4,2):ub	// Too bad indexed src can't cross 2 GRFs
-	mov	(4)		REF_TOP0(0,12)<1>	r[PPREDBUF_Y,PREDSUBBLK0+30+32]REGION(1,0):ub	// Extended top-right reference data
-	mov	(4)		REF_LEFT(0)<1>		REF_LEFT_BACK.4<4;4,1>:ub	// From stored left referece data
-	or (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w	2:w		// Top neighbor is available
-	CALL_1(INTRA_4X4_MODE(0,2),1)
-
-//	Add error data to predicted intra data
-ADD_ERROR_SB2:
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK2]<2>:ub	r[PERROR,ERRBLK2]<8;4,1>:w		REG_INTRA_4X4_PRED<8;8,1>:w		// Too bad indexed src can't
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK2+16]<2>:ub	r[PERROR,ERRBLK2+32]<8;4,1>:w	REG_INTRA_4X4_PRED.8<8;8,1>:w	// cross 2 GRFs
-
-//	Sub-block 3 *****************
-	mov	(16)	REF_TOP0(0)<1>		REF_TOP0(0,4)REGION(8,1)	// Top reference data
-	mov	(8)		REF_TOP0(0,8)<1>	REF_TOP0(0,7)<0;1,0>	// Extended top-right reference data
-	mov	(4)		REF_LEFT(0)<1>	r[PPREDBUF_Y,PREDSUBBLK2+6]<8;1,0>:ub	// Left referece data from sub-block 0
-	or (1)		INTRA_PRED_AVAIL<1>:w	REG_INTRA_PRED_AVAIL<0;1,0>:w	3:w		// Top/Left neighbor are available
-	CALL_1(INTRA_4X4_MODE(0,3),1)
-
-//	Add error data to predicted intra data
-ADD_ERROR_SB3:
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK3]<2>:ub	r[PERROR,ERRBLK3]<8;4,1>:w		REG_INTRA_4X4_PRED<8;8,1>:w		// Too bad indexed src can't
-	add.sat (8)	r[PPREDBUF_Y,PREDSUBBLK3+16]<2>:ub	r[PERROR,ERRBLK3+32]<8;4,1>:w	REG_INTRA_4X4_PRED.8<8;8,1>:w	// cross 2 GRFs
-
-	RETURN
-
-//--------------------------------------------------------------------------
-//  Actual module that performs Intra_4x4 prediction and construction
-//
-//  REF_TOP:		Top reference data stored in BYTE with p[-1,-1] at REF_TOP(0,-1)
-//  REF_LEFT:		Left reference data stored in BYTE with p[-1,0] at REF_LEFT(0,0)
-//	PINTRA4X4_Y:	Intra prediction mode
-//	INTRA_PRED_AVAIL:	Top/Left available flag, (Bit0: Left, Bit1: Top)
-//
-//	Output data:
-//
-//	REG_INTRA_4X4_PRED: Predicted 4x4 block data stored in 1 GRF register
-//--------------------------------------------------------------------------
-intra_Pred_4x4_Y:
-// Mode 0
-INTRA_4X4_VERTICAL:
-	mov (16)	REG_INTRA_4X4_PRED<1>:w	REF_TOP(0)<0;4,1>
-	RETURN_1
-
-// Mode 1
-INTRA_4X4_HORIZONTAL:
-	mov (16)	REG_INTRA_4X4_PRED<1>:w	REF_LEFT(0)<1;4,0>
-	RETURN_1
-
-// Mode 2
-INTRA_4X4_DC:
-// Rearrange reference samples for unified DC prediction code
-//
-    and.nz.f0.0 (16)	NULLREG		INTRA_PRED_AVAIL<0;1,0>:w	2:w  {Compr}
-    and.nz.f0.1 (16)	NULLREG		INTRA_PRED_AVAIL<0;1,0>:w	1:w  {Compr}
-	(-f0.0.any16h) mov (16)	REF_TOP_W(0)<1>	0x8080:uw				// Top macroblock not available for intra prediction
-	(-f0.1.any8h) mov (8)	REF_LEFT(0)<1>	REF_TOP(0)REGION(8,1)	// Left macroblock not available for intra prediction
-	(-f0.0.any8h) mov (8)	REF_TOP(0)<1>	REF_LEFT(0)REGION(8,1)	// Top macroblock not available for intra prediction
-// Perform DC prediction
-//
-	add (4)		PRED_YW(15)<1>	REF_TOP(0)REGION(4,1)	REF_LEFT(0)REGION(4,1)
-	add (2)		PRED_YW(15)<1>	PRED_YW(15)REGION(2,1)	PRED_YW(15,2)REGION(2,1)
-	add (16)	acc0<1>:w		PRED_YW(15)REGION(1,0)	PRED_YW(15,1)REGION(1,0)
-	add	(16)	acc0<1>:w		acc0:w	4:w
-	shr (16)	REG_INTRA_4X4_PRED<1>:w	acc0:w	3:w
-	RETURN_1
-
-// Mode 3
-INTRA_4X4_DIAG_DOWN_LEFT:
-	mov	(8)		INTRA_REF<1>:ub	REF_TOP(0)REGION(8,1)		// Keep REF_TOP untouched for future use
-	mov	(4)		INTRA_REF.8<1>:ub	REF_TOP(0,7)REGION(4,1)	// p[8,-1] = p[7,-1]
-	add (8)		acc0<1>:w		INTRA_REF.2<8;8,1>	2:w		// p[x+2]+2
-	mac (8)		acc0<1>:w		INTRA_REF.1<8;8,1>	2:w		// 2*p[x+1]+p[x+2]+2
-	mac (8)		PRED_YW(15)<1>	INTRA_REF.0<8;8,1>	1:w		// p[x]+2*p[x+1]+p[x+2]+2
-
-	shr (16)	REG_INTRA_4X4_PRED<1>:w	PRED_YW(15)<1;4,1>	2:w		// (p[x]+2*p[x+1]+p[x+2]+2)>>2
-	RETURN_1
-
-// Mode 4
-INTRA_4X4_DIAG_DOWN_RIGHT:
-
-//	Set inverse shift count
-	shl	(4)		REF_TMP<1>:ud	REF_LEFT_D(0)REGION(1,0)	INV_SHIFT<4;4,1>:b
-	mov	(8)		INTRA_REF.4<1>:ub	REF_TOP(0,-1)REGION(8,1)	// INTRA_REF holds all reference data
-	mov	(4)		INTRA_REF<1>:ub	REF_TMP.3<16;4,4>:ub
-
-	add (8)		acc0<1>:w		INTRA_REF.2<8;8,1>:ub	2:w		// p[x+2]+2
-	mac (8)		acc0<1>:w		INTRA_REF.1<8;8,1>:ub	2:w		// 2*p[x+1]+p[x+2]+2
-	mac (8)		INTRA_REF<1>:w	INTRA_REF<8;8,1>:ub		1:w		// p[x]+2*p[x+1]+p[x+2]+2
-
-//	Store data in reversed order
-	add (4)		PBWDCOPY_4<1>:w	INV_TRANS4<4;4,1>:b	INTRA_TEMP_2*GRFWIB:w	// Must match with INTRA_REF
-	shr (16)	REG_INTRA_4X4_PRED<1>:w	r[PBWDCOPY_4]<4,1>:w	2:w
-	RETURN_1
-
-// Mode 5
-INTRA_4X4_VERT_RIGHT:
-
-//	Set inverse shift count
-	shl	(4)		REF_TMP<1>:ud	REF_LEFT_D(0)REGION(1,0)	INV_SHIFT<4;4,1>:b
-	mov	(8)		INTRA_REF.4<1>:ub	REF_TOP(0,-1)REGION(8,1)	// INTRA_REF holds all reference data
-	mov	(4)		INTRA_REF<1>:ub	REF_TMP.3<16;4,4>:ub
-
-	// Even rows
-	avg (8)		PRED_YW(14)<1>	INTRA_REF.4<8;8,1>	INTRA_REF.5<8;8,1>	// avg(p[x-1],p[x])
-	// Odd rows
-	add (8)		acc0<1>:w		INTRA_REF.3<8;8,1>:ub		2:w		// p[x]+2
-	mac (8)		acc0<1>:w		INTRA_REF.2<8;8,1>:ub		2:w		// 2*p[x-1]+p[x]+2
-	mac (8)		acc0<1>:w		INTRA_REF.1<8;8,1>:ub		1:w		// p[x-2]+2*p[x-1]+p[x]+2
-	shr (8)		INTRA_REF<1>:w	acc0:w	2:w		// (p[x-2]+2*p[x-1]+p[x]+2)>>2
-
-	mov	(4)		INTRA_REF.2<2>:w	INTRA_REF.2<4;4,1>:w	// Keep zVR = -2,-3 unchanged
-	mov	(4)		INTRA_REF.3<2>:w	PRED_YW(14)REGION(4,1)	// Combining even rows
-
-	add (4)		PBWDCOPY_4<1>:w	INV_TRANS4<4;4,1>:b	INTRA_TEMP_2*GRFWIB:w	// Must match with INTRA_REF
-	mov (16)	REG_INTRA_4X4_PRED<1>:w	r[PBWDCOPY_4]<4,2>:w
-	RETURN_1
-
-// Mode 6
-INTRA_4X4_HOR_DOWN:
-//	Set inverse shift count
-	shl	(4)		REF_TMP<1>:ud	REF_LEFT_D(0)REGION(1,0)	INV_SHIFT<4;4,1>:b
-	mov	(8)		INTRA_REF.4<1>:ub	REF_TOP(0,-1)REGION(8,1)	// INTRA_REF holds all reference data
-	mov	(4)		INTRA_REF<1>:ub	REF_TMP.3<16;4,4>:ub
-
-	// Even pixels
-	avg (8)		PRED_YW(14)<1>	INTRA_REF<8;8,1>	INTRA_REF.1<8;8,1>	// avg(p[y-1],p[y])
-	// Odd pixels
-	add (8)		acc0<1>:w		INTRA_REF.2<8;8,1>:ub	2:w		// p[y]+2
-	mac (8)		acc0<1>:w		INTRA_REF.1<8;8,1>:ub	2:w		// 2*p[y-1]+p[y]+2
-	mac (8)		REF_TMP<1>:w	INTRA_REF.0<8;8,1>:ub	1:w		// p[y-2]+2*p[y-1]+p[y]+2
-	shr (4)		INTRA_REF.1<2>:w	REF_TMP<4;4,1>:w	2:w		// (p[y-2]+2*p[y-1]+p[y]+2)>>2
-
-	shr	(2)		INTRA_REF.8<1>:w	REF_TMP.4<2;2,1>:w	2:w		// Keep zVR = -2,-3 unchanged
-	mov	(4)		INTRA_REF.0<2>:w	PRED_YW(14)REGION(4,1)	// Combining even pixels
-
-	shl (4)		PBWDCOPY_4<1>:w	INV_TRANS4<4;4,1>:b	1:w		// Convert to WORD offset
-	add (4)		PBWDCOPY_4<1>:w	PBWDCOPY_4<4;4,1>:w	INTRA_TEMP_2*GRFWIB:w	// Must match with INTRA_REF
-	mov (16)	REG_INTRA_4X4_PRED<1>:w	r[PBWDCOPY_4]<4,1>:w
-	RETURN_1
-
-// Mode 7
-INTRA_4X4_VERT_LEFT:
-	// Even rows
-	avg (8)		PRED_YW(14)<2>	REF_TOP(0)REGION(8,1)	REF_TOP(0,1)REGION(8,1)	// avg(p[x],p[x+1])
-	// Odd rows
-	add (8)		acc0<1>:w		REF_TOP(0,2)REGION(8,1)	2:w		// p[x+2]+2
-	mac (8)		acc0<1>:w		REF_TOP(0,1)REGION(8,1)	2:w		// 2*p[x+1]+p[x+2]+2
-	mac (8)		PRED_YW(15)<1>	REF_TOP(0)REGION(8,1)		1:w		// p[x]+2*p[x+1]+p[x+2]+2
-	shr (8)		PRED_YW(14,1)<2>	PRED_YW(15)REGION(8,1)	2:w
-
-	mov (16)	REG_INTRA_4X4_PRED<1>:w	PRED_YW(14)<1;4,2>
-	RETURN_1
-
-// Mode 8
-INTRA_4X4_HOR_UP:
-//	Set extra left reference pixels for unified prediction
-	mov	(8)		REF_LEFT(0,4)<1>	REF_LEFT(0,3)REGION(1,0)	// Copy p[-1,3] to p[-1,y],y=4...7
-	// Even pixels
-	avg (8)		PRED_YW(14)<2>	REF_LEFT(0)REGION(8,1)	REF_LEFT(0,1)REGION(8,1)	// avg(p[y],p[y+1])
-	// Odd pixels
-	add (8)		acc0<1>:w		REF_LEFT(0,2)REGION(8,1)	2:w		// p[y+2]+2
-	mac (8)		acc0<1>:w		REF_LEFT(0,1)REGION(8,1)	2:w		// 2*p[y+1]+p[y+2]+2
-	mac (8)		PRED_YW(15)<1>	REF_LEFT(0)REGION(8,1)		1:w		// p[y]+2*p[y+1]+p[y+2]+2
-	shr (8)		PRED_YW(14,1)<2>	PRED_YW(15)REGION(8,1)	2:w		// (p[y]+2*p[y+1]+p[y+2]+2)>>2
-
-	mov (16)	REG_INTRA_4X4_PRED<1>:w	PRED_YW(14)<2;4,1>
-	RETURN_1
-
-// End of intra_Pred_4x4_Y_4
-
-#endif	// !defined(__INTRA_PRED_4X4_Y_4__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Pred_8x8_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,246 +0,0 @@
-/*
- * Intra predict 8X8 luma block
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__INTRA_PRED_8X8_Y__)		// Make sure this is only included once
-#define __INTRA_PRED_8X8_Y__
-
-// Module name: intra_Pred_8X8_Y.asm
-//
-// Intra predict 8X8 luma block
-//
-//--------------------------------------------------------------------------
-//  Input data:
-//
-//  REF_TOP:	Top reference data stored in BYTE with p[-1,-1] at REF_TOP(0,-1), p[-1,-1] and [15,-1] adjusted
-//  REF_LEFT:	Left reference data stored in BYTE with p[-1,0] at REF_LEFT(0,2), REF_LEFT(0,1) (p[-1,-1]) adjusted
-//	PRED_MODE:	Intra prediction mode stored in 4 LSBs
-//	INTRA_PRED_AVAIL:	Top/Left available flag, (Bit0: Left, Bit1: Top)
-//
-//	Output data:
-//
-//	REG_INTRA_8X8_PRED: Predicted 8X8 block data
-//--------------------------------------------------------------------------
-
-#define INTRA_REF	REG_INTRA_TEMP_1
-#define REF_TMP		REG_INTRA_TEMP_2
-
-intra_Pred_8x8_Y:
-
-//	Reference sample filtering
-//
-	// Set up boundary pixels for unified filtering
-	mov (1)		REF_TOP(0,16)<1>	REF_TOP(0,15)REGION(1,0)	// p[16,-1] = p[15,-1]
-	mov	(8)		REF_LEFT(0,2+8)<1>	REF_LEFT(0,2+7)REGION(1,0)	// p[-1,8] = p[-1,7]
-
-	// Top reference sample filtering (!!Consider instruction compression later)
-	add (16)	acc0<1>:w	REF_TOP(0,-1)REGION(16,1)	2:w		// p[x-1,-1]+2
-	mac (16)	acc0<1>:w	REF_TOP(0)REGION(16,1)		2:w		// p[x-1,-1]+2*p[x,-1]+2
-	mac (16)	acc0<1>:w	REF_TOP(0,1)REGION(16,1)	1:w		// p[x-1,-1]+2*p[x,-1]+p[x+1,-1]+2
-	shr	(16)	REF_TMP<1>:w	acc0:w	2:w		// (p[x-1,-1]+2*p[x,-1]+p[x+1,-1]+2)>>2
-
-	// Left reference sample filtering
-	add (16)	acc0<1>:w	REF_LEFT(0)REGION(16,1)		2:w		// p[-1,y-1]+2
-	mac (16)	acc0<1>:w	REF_LEFT(0,1)REGION(16,1)	2:w		// p[-1,y-1]+2*p[-1,y]+2
-	mac (16)	acc0<1>:w	REF_LEFT(0,2)REGION(16,1)	1:w		// p[-1,y-1]+2*p[-1,y]+p[-1,y+1]+2
-	shr	(16)	INTRA_REF<1>:w	acc0:w	2:w		// (p[-1,y-1]+2*p[-1,y]+p[-1,y+1]+2)>>2
-
-	// Re-assign filtered reference samples
-	mov	(16)	REF_TOP(0)<1>	REF_TMP<32;16,2>:ub			// p'[x,-1], x=0...15
-	mov	(8)		REF_LEFT(0)<1>	INTRA_REF.2<16;8,2>:ub		// p'[-1,y], y=0...7
-	mov	(1)		REF_TOP(0,-1)<1>	INTRA_REF<0;1,0>:ub		// p'[-1,-1]
-
-//	Select intra_8x8 prediction mode
-//
-	and	(1)	PINTRAPRED_Y<1>:w	PRED_MODE<0;1,0>:w	0x0F:w
-	// WA for "jmpi" restriction
-	mov (1)	REG_INTRA_TEMP_1<1>:ud	r[PINTRAPRED_Y, INTRA_8X8_OFFSET]:ub
-	jmpi (1) REG_INTRA_TEMP_1<0;1,0>:d
-
-// Mode 0
-#define	PTMP	a0.6
-#define PTMP_D	a0.3
-INTRA_8X8_VERTICAL:
-    $for(0,0; <4; 1,32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	r[PERROR,%2]<16;16,1>:w	REF_TOP(0)<0;8,1>
-	}
-	RETURN
-
-// Mode 1
-INTRA_8X8_HORIZONTAL:
-    $for(0,0; <8; 2,32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	r[PERROR,%2]<16;16,1>:w	REF_LEFT(0,%1)<1;8,0>
-	}
-	RETURN
-
-// Mode 2
-INTRA_8X8_DC:
-// Rearrange reference samples for unified DC prediction code
-//
-    and.nz.f0.0 (16)	NULLREG		INTRA_PRED_AVAIL<0;1,0>:w	2:w	// Top macroblock available for intra prediction?
-    and.nz.f0.1 (8)		NULLREG		INTRA_PRED_AVAIL<0;1,0>:w	1:w	// Left macroblock available for intra prediction?
-	(-f0.0.any16h) mov (16)	REF_TOP_W(0)<1>	0x8080:uw
-	(-f0.1.any8h) mov (8)	REF_LEFT(0)<1>	REF_TOP(0)REGION(8,1)
-	(-f0.0.any8h) mov (8)	REF_TOP(0)<1>	REF_LEFT(0)REGION(8,1)
-
-// Perform DC prediction
-//
-	add (8)		PRED_YW(15)<1>	REF_TOP(0)REGION(8,1)	REF_LEFT(0)REGION(8,1)
-	add (4)		PRED_YW(15)<1>	PRED_YW(15)REGION(4,1)	PRED_YW(15,4)REGION(4,1)
-	add (2)		PRED_YW(15)<1>	PRED_YW(15)REGION(2,1)	PRED_YW(15,2)REGION(2,1)
-	add (16)	acc0<1>:w		PRED_YW(15)REGION(1,0)	PRED_YW(15,1)REGION(1,0)
-	add	(16)	acc0<1>:w		acc0:w	8:w
-	shr (16)	REG_INTRA_TEMP_0<1>:w	acc0:w	4:w
-
-	// Add error block
-    $for(0,0; <4; 1,32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	r[PERROR,%2]<16;16,1>:w	REG_INTRA_TEMP_0<16;16,1>:w
-	}
-	RETURN
-
-// Mode 3
-INTRA_8X8_DIAG_DOWN_LEFT:
-	mov	(8)		REF_TOP(0,16)<1>	REF_TOP(0,15)REGION(8,1)	// p[16,-1] = p[15,-1]
-	add (16)	acc0<1>:w		REF_TOP(0,2)REGION(16,1)	2:w		// p[x+2]+2
-	mac (16)	acc0<1>:w		REF_TOP(0,1)REGION(16,1)	2:w		// 2*p[x+1]+p[x+2]+2
-	mac (16)	acc0<1>:w		REF_TOP(0)REGION(16,1)		1:w		// p[x]+2*p[x+1]+p[x+2]+2
-	shr (16)	REG_INTRA_TEMP_0<1>:w	acc0<16;16,1>:w		2:w		// (p[x]+2*p[x+1]+p[x+2]+2)>>2
-
-	// Add error block
-    $for(0,0; <8; 2,32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	r[PERROR,%2]<16;16,1>:w	REG_INTRA_TEMP_0.%1<1;8,1>:w
-	}
-	RETURN
-
-// Mode 4
-INTRA_8X8_DIAG_DOWN_RIGHT:
-#define INTRA_REF	REG_INTRA_TEMP_1
-#define REF_TMP		REG_INTRA_TEMP_2
-
-//	Set inverse shift count
-	shl	(4)		REF_TMP<1>:ud	REF_LEFT_D(0,1)REGION(1,0)	INV_SHIFT<4;4,1>:b	// Reverse order bottom 4 pixels of left ref.
-	shl	(4)		REF_TMP.4<1>:ud	REF_LEFT_D(0)REGION(1,0)	INV_SHIFT<4;4,1>:b	// Reverse order top 4 pixels of left ref.
-	mov	(8)		INTRA_REF<1>:ub	REF_TMP.3<32;8,4>:ub
-	mov	(16)	INTRA_REF.8<1>:ub	REF_TOP(0,-1)REGION(16,1)	// INTRA_REF holds all reference data
-
-	add (16)	acc0<1>:w		INTRA_REF.2<16;16,1>:ub		2:w		// p[x+2]+2
-	mac (16)	acc0<1>:w		INTRA_REF.1<16;16,1>:ub		2:w		// 2*p[x+1]+p[x+2]+2
-	mac (16)	acc0<1>:w		INTRA_REF<16;16,1>:ub		1:w		// p[x]+2*p[x+1]+p[x+2]+2
-	shr (16)	INTRA_REF<1>:w	acc0<16;16,1>:w				2:w		// (p[x]+2*p[x+1]+p[x+2]+2)>>2
-
-//	Store data in reversed order
-	add (2)		PBWDCOPY_8<1>:w	INV_TRANS48<2;2,1>:b	INTRA_TEMP_1*GRFWIB:w	// Must match with INTRA_REF
-
-	// Add error block
-    $for(0,96; <8; 2,-32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	r[PBWDCOPY_8,%1*2]<8,1>:w	r[PERROR,%2]<16;16,1>:w
-	}
-	RETURN
-
-// Mode 5
-INTRA_8X8_VERT_RIGHT:
-#define INTRA_REF	REG_INTRA_TEMP_1
-#define REF_TMP		REG_INTRA_TEMP_2
-#define REF_TMP1	REG_INTRA_TEMP_3
-
-//	Set inverse shift count
-	shl	(4)		REF_TMP<1>:ud	REF_LEFT_D(0,1)REGION(1,0)	INV_SHIFT<4;4,1>:b	// Reverse order bottom 4 pixels of left ref.
-	shl	(4)		REF_TMP.4<1>:ud	REF_LEFT_D(0)REGION(1,0)	INV_SHIFT<4;4,1>:b	// Reverse order top 4 pixels of left ref.
-	mov	(8)		INTRA_REF<1>:ub	REF_TMP.3<32;8,4>:ub
-	mov	(16)	INTRA_REF.8<1>:ub	REF_TOP(0,-1)REGION(16,1)	// INTRA_REF holds all reference data
-
-	// Even rows
-	avg (16)	PRED_YW(14)<1>	INTRA_REF.8<16;16,1>	INTRA_REF.9<16;16,1>	// avg(p[x-1],p[x])
-	// Odd rows
-	add (16)	acc0<1>:w		INTRA_REF.3<16;16,1>:ub		2:w		// p[x]+2
-	mac (16)	acc0<1>:w		INTRA_REF.2<16;16,1>:ub		2:w		// 2*p[x-1]+p[x]+2
-	mac (16)	acc0<1>:w		INTRA_REF.1<16;16,1>:ub		1:w		// p[x-2]+2*p[x-1]+p[x]+2
-	shr (16)	REF_TMP<1>:w	acc0:w	2:w		// (p[x-2]+2*p[x-1]+p[x]+2)>>2
-
-	mov	(8)		INTRA_REF<1>:ub		REF_TMP<16;8,2>:ub		// Keep zVR = -1,-2,-3,-4,-5,-6,-7 sequencially
-	mov	(8)		INTRA_REF.6<2>:ub	REF_TMP.12<16;8,2>:ub	// Keep zVR = -1,1,3,5,7,9,11,13 at even byte
-	mov	(8)		INTRA_REF.7<2>:ub	PRED_Y(14)REGION(8,2)	// Combining zVR = 0,2,4,6,8,10,12,14 at odd byte
-
-	add (2)		PBWDCOPY_8<1>:w	INV_TRANS8<2;2,1>:b	INTRA_TEMP_1*GRFWIB:w	// Must match with INTRA_REF
-
-	// Add error block
-    $for(0,96; <8; 2,-32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	r[PBWDCOPY_8,%1]<8,2>:ub	r[PERROR,%2]<16;16,1>:w
-	}
-	RETURN
-
-// Mode 6
-INTRA_8X8_HOR_DOWN:
-//	Set inverse shift count
-	shl	(4)		REF_TMP<1>:ud	REF_LEFT_D(0,1)REGION(1,0)	INV_SHIFT<4;4,1>:b	// Reverse order bottom 4 pixels of left ref.
-	shl	(4)		REF_TMP.4<1>:ud	REF_LEFT_D(0)REGION(1,0)	INV_SHIFT<4;4,1>:b	// Reverse order top 4 pixels of left ref.
-	mov	(8)		INTRA_REF<1>:ub	REF_TMP.3<16;4,4>:ub
-	mov	(16)	INTRA_REF.8<1>:ub	REF_TOP(0,-1)REGION(16,1)	// INTRA_REF holds all reference data
-
-	// Odd pixels
-	add (16)	acc0<1>:w	INTRA_REF.2<16;16,1>:ub		2:w		// p[y]+2
-	mac (16)	acc0<1>:w	INTRA_REF.1<16;16,1>:ub		2:w		// 2*p[y-1]+p[y]+2
-	mac (16)	acc0<1>:w	INTRA_REF.0<16;16,1>:ub		1:w		// p[y-2]+2*p[y-1]+p[y]+2
-	shr (16)	PRED_YW(14)<1>	acc0:w	2:w		// (p[y-2]+2*p[y-1]+p[y]+2)>>2
-	// Even pixels
-	avg (16)	INTRA_REF<1>:w	INTRA_REF<16;16,1>:ub	INTRA_REF.1<16;16,1>:ub	// avg(p[y-1],p[y])
-
-	mov	(8)		INTRA_REF.1<2>:ub	PRED_Y(14)REGION(8,2)		// Combining odd pixels to form byte type
-	mov	(8)		INTRA_REF.16<1>:ub	PRED_Y(14,16)REGION(8,2)	// Keep zVR = -2,-3,-4,-5,-6,-7 unchanged
-	// Now INTRA_REF.0 - INTRA_REF.21 contain predicted data
-
-	add (2)		PBWDCOPY_8<1>:w	INV_TRANS48<2;2,1>:b	INTRA_TEMP_1*GRFWIB:w	// Must match with INTRA_REF
-
-	// Add error block
-    $for(0,96; <13; 4,-32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	r[PBWDCOPY_8,%1]<8,1>:ub	r[PERROR,%2]<16;16,1>:w
-	}
-	RETURN
-
-// Mode 7
-INTRA_8X8_VERT_LEFT:
-	// Even rows
-	avg (16)		PRED_YW(14)<1>	REF_TOP(0)REGION(16,1)	REF_TOP(0,1)REGION(16,1)	// avg(p[x],p[x+1])
-	// Odd rows
-	add (16)		acc0<1>:w		REF_TOP(0,2)REGION(16,1)	2:w		// p[x+2]+2
-	mac (16)		acc0<1>:w		REF_TOP(0,1)REGION(16,1)	2:w		// 2*p[x+1]+p[x+2]+2
-	mac (16)		acc0<1>:w		REF_TOP(0)REGION(16,1)		1:w		// p[x]+2*p[x+1]+p[x+2]+2
-	shr (16)		PRED_YW(15)<1>	acc0<1;8,1>:w	2:w		// (p[x]+2*p[x+1]+p[x+2]+2)>>2
-
-	// Add error block
-    $for(0,0; <4; 1,32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	PRED_YW(14,%1)<16;8,1>	r[PERROR,%2]<16;16,1>:w
-	}
-	RETURN
-
-// Mode 8
-INTRA_8X8_HOR_UP:
-//	Set extra left reference pixels for unified prediction
-	mov	(8)		REF_LEFT(0,8)<1>	REF_LEFT(0,7)REGION(1,0)	// Copy p[-1,7] to p[-1,y],y=8...15
-
-	// Even pixels
-	avg (16)	PRED_YW(14)<1>	REF_LEFT(0)REGION(16,1)	REF_LEFT(0,1)REGION(16,1)	// avg(p[y],p[y+1])
-	// Odd pixels
-	add (16)	acc0<1>:w		REF_LEFT(0,2)REGION(16,1)	2:w		// p[y+2]+2
-	mac (16)	acc0<1>:w		REF_LEFT(0,1)REGION(16,1)	2:w		// 2*p[y+1]+p[y+2]+2
-	mac (16)	acc0<1>:w		REF_LEFT(0)REGION(16,1)		1:w		// p[y]+2*p[y+1]+p[y+2]+2
-	shr (16)	PRED_YW(15)<1>	acc0<1;8,1>:w	2:w		// (p[y]+2*p[y+1]+p[y+2]+2)>>2
-
-	// Merge even/odd pixels
-	// The predicted data need to be stored in byte type (22 bytes are required)
-	mov (16)	PRED_Y(14,1)<2>	PRED_Y(15)REGION(16,2)
-
-	// Add error block
-    $for(0,0; <4; 1,32) {
-	add.sat (16)	r[PPREDBUF_Y,%2]<2>:ub	PRED_Y(14,%1*4)<2;8,1>	r[PERROR,%2]<16;16,1>:w
-	}
-	RETURN
-
-// End of intra_Pred_8X8_Y
-
-#endif	// !defined(__INTRA_PRED_8X8_Y__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Pred_Chroma.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Pred_Chroma.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/intra_Pred_Chroma.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/intra_Pred_Chroma.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-/*
- * Intra predict 8x8 chroma block
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__INTRA_PRED_CHROMA__)		// Make sure this is only included once
-#define __INTRA_PRED_CHROMA__
-
-// Module name: intra_Pred_Chroma.asm
-//
-// Intra predict 8x8 chroma block
-//
-
-	shr	(1)	PINTRAPRED_UV<1>:w	REG_INTRA_CHROMA_PRED_MODE<0;1,0>:ub	INTRA_CHROMA_PRED_MODE_SHIFT:w	// Bits 1:0 = intra chroma pred mode
-	// WA for "jmpi" restriction
-	mov (1)	REG_INTRA_TEMP_1<1>:d	r[PINTRAPRED_UV, INTRA_CHROMA_OFFSET]:b
-	jmpi (1) REG_INTRA_TEMP_1<0;1,0>:d
-
-// Mode 0
-INTRA_CHROMA_DC:
-    and.nz.f0.0 (8)		NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_UP_AVAIL_FLAG:ud	// Top macroblock available for intra prediction?
-
-// Calculate DC values for sub-block 0 and 3
-//
-// Rearrange reference samples for unified DC prediction code
-//	Need to check INTRA_PRED_LEFT_TH_AVAIL_FLAG for blk0 and INTRA_PRED_LEFT_BH_AVAIL_FLAG for blk3
-// 
-	(-f0.0.any8h)	mov (8)		INTRA_REF_TOP_W(0)<1>	0x8080:uw	// Up not available
-
-    and.nz.f0.1 (4)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_TH_AVAIL_FLAG:ud
-	(-f0.1.any4h)	mov (4)		INTRA_REF_LEFT_W(0)<2>	INTRA_REF_TOP_W(0)REGION(4,1)	// Left top half macroblock not available for intra prediction
-    and.nz.f0.1 (4)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_BH_AVAIL_FLAG:ud
-	(-f0.1.any4h)	mov (4)		INTRA_REF_LEFT_W(0,8)<2>	INTRA_REF_TOP_W(0,4)REGION(4,1)	// Left bottom half macroblock not available for intra prediction
-
-	(-f0.0.any8h)	mov (8)		INTRA_REF_TOP_W(0)<1>	INTRA_REF_LEFT_W(0)REGION(8,2)	// Up not available
-// Calculate DC prediction
-//
-	add (16)	PRED_UVW(0)<1>	INTRA_REF_TOP(0)REGION(16,1)	INTRA_REF_LEFT_UV(0)<4;2,1>	// Sum of top and left reference
-	add (8)		PRED_UVW(0)<1>	PRED_UVW(0)<4;2,1>	PRED_UVW(0,2)<4;2,1>	// Sum of first half (blk #0) and second half (blk #3)
-
-	add (8)		PRED_UVW(9)<1>	PRED_UVW(0)<0;2,1>	PRED_UVW(0,2)<0;2,1>	// Sum of blk #0
-	add (8)		PRED_UVW(11,8)<1>	PRED_UVW(0,4)<0;2,1>	PRED_UVW(0,6)<0;2,1>	// Sum of blk #3
-
-// Calculate DC values for sub-block 1 and 2
-//
-// Rearrange reference samples for unified DC prediction code
-//
-	// Blk #2
-	(-f0.0.any4h)	mov (4)		INTRA_REF_TOP_W(0)<1>	0x8080:uw
-	(f0.1.any4h)	mov (4)		INTRA_REF_TOP_W(0)<1>	INTRA_REF_LEFT_W(0,8)REGION(4,2)	// Always use available left reference
-	(-f0.1.any4h)	mov (4)		INTRA_REF_LEFT_W(0,8)<2>	INTRA_REF_TOP_W(0)REGION(4,1)
-
-	// Blk #1
-    and.nz.f0.1 (4)	NULLREG		REG_INTRA_PRED_AVAIL_FLAG	INTRA_PRED_LEFT_TH_AVAIL_FLAG:ud
-	(-f0.1.any4h)	mov (4)		INTRA_REF_LEFT_W(0)<2>	0x8080:uw
-	(f0.0.any4h)	mov (4)		INTRA_REF_LEFT_W(0)<2>	INTRA_REF_TOP_W(0,4)REGION(4,1)	// Always use available top reference
-	(-f0.0.any4h)	mov (4)		INTRA_REF_TOP_W(0,4)<1>	INTRA_REF_LEFT_W(0)REGION(4,2)
-
-// Calculate DC prediction
-//
-	add (8)	PRED_UVW(0)<1>		INTRA_REF_TOP(0)REGION(8,1)	INTRA_REF_LEFT_UV(0,16)<4;2,1>	// Sum of top and left reference for blk #2
-	add (8)	PRED_UVW(0,8)<1>	INTRA_REF_LEFT_UV(0)<4;2,1>	INTRA_REF_TOP(0,8)REGION(8,1)	// Sum of top and left reference for blk #1
-	add (8)	PRED_UVW(0)<1>		PRED_UVW(0)<4;2,1>		PRED_UVW(0,2)<4;2,1>	// Sum of first half (blk #2) and second half (blk #1)
-
-	add (8)	PRED_UVW(9,8)<1>	PRED_UVW(0,4)<0;2,1>	PRED_UVW(0,6)<0;2,1>	// Sum of blk #1
-	add (8)	PRED_UVW(11)<1>		PRED_UVW(0)<0;2,1>		PRED_UVW(0,2)<0;2,1>	// Sum of blk #2
-
-// Now, PRED_UVW(9) holds sums for blks #0 and #1 and PRED_UVW(11) holds sums for blks #2 and #3
-//
-	add (32)	acc0<1>:w	PRED_UVW(9)REGION(16,1)		4:w {Compr}		// Add rounder
-    $for(0; <4; 2) {
-	shr (32)	PRED_UVW(%1)<1>	acc0:w		3:w {Compr}
-	}
-
-	add (32)	acc0<1>:w	PRED_UVW(11)REGION(16,1)	4:w {Compr}		// Add rounder
-    $for(4; <8; 2) {
-	shr (32)	PRED_UVW(%1)<1>	acc0:w		3:w {Compr}
-	}
-	jmpi (1)	End_of_intra_Pred_Chroma
-
-// Mode 1
-INTRA_CHROMA_HORIZONTAL:
-	mov (1)		PREF_LEFT_UD<1>:ud	INTRA_REF_LEFT_ID*GRFWIB*0x00010001+0x00040000:ud	// Set address registers for instruction compression
-    $for(0,0; <8; 2,8) {
-	mov (32)	PRED_UVW(%1)<1>	r[PREF_LEFT,%2+2]<0;2,1>:ub {Compr}	// Actual left column reference data start at offset 2
-	}
-	jmpi (1)	End_of_intra_Pred_Chroma
-
-// Mode 2
-INTRA_CHROMA_VERTICAL:
-    $for(0; <8; 2) {
-	mov (32)	PRED_UVW(%1)<1>	INTRA_REF_TOP(0) {Compr}
-	}
-	jmpi (1)	End_of_intra_Pred_Chroma
-
-// Mode 3
-INTRA_Chroma_PLANE:
-// Refer to H.264/AVC spec Section 8.3.4.4
-
-#undef	C
-
-#define A		REG_INTRA_TEMP_2.0		// All are WORD type
-#define B		REG_INTRA_TEMP_3.0		// B[U] & B[V]
-#define C		REG_INTRA_TEMP_3.2		// C[U] & C[V]
-#define YP		REG_INTRA_TEMP_0		// Store intermediate results of c*(y-3). Make sure it's an even GRF
-#define YP1		REG_INTRA_TEMP_1		// Store intermediate results of c*(y-3). Make sure it's an odd GRF
-#define XP		REG_INTRA_TEMP_5		// Store intermediate results of a+b*(x-3)+16. Make sure it's an odd GRF
-
-// First Calculate constants H and V
-//	H1 = sum((x'+1)*p[4+x',-1]), x'=0,1,2,3
-//	H2 =  sum((-x'-1)*p[2-x',-1]), x'=3,2,1,0
-//	H = H1 + H2
-//	The same calculation holds for V
-//
-	mul (8)	H1(0)<1>	INTRA_REF_TOP(0,8)REGION(8,1)	0x44332211:v
-	mul (8)	H2(0)<1>	INTRA_REF_TOP(0,-2)REGION(8,1)	0xFFEEDDCC:v
-
-	mul (8)	V1(0)<1>	INTRA_REF_LEFT_UV(0,4*4)<4;2,1>	0x44332211:v
-	mul (8)	V2(0)<1>	INTRA_REF_LEFT_UV(0)<4;2,1>		0x00FFEEDD:v
-	mul (2)	V2(0,6)<1>	INTRA_REF_TOP(0,-2)REGION(2,1)	-4:w		// Replace 0*p[-1,3] with -4*p[-1,-1]
-	// Now, REG_INTRA_TEMP_0 holds [H2, H1] and REG_INTRA_TEMP_1 holds [V2, V1]
-
-	// Sum up [H2, H1] and [V2, V1] using instruction compression
-	// ExecSize = 16 is restricted by B-spec for instruction compression
-	// Actual intermediate results are in lower sub-registers after each summing step
-	add	(16)	H1(0)<1>	H1(0)	H2(0) {Compr}	// Results in lower 8 WORDs
-	add	(16)	H1(0)<1>	H1(0)	H1(0,4) {Compr}	// Results in lower 4 WORDs
-	add	(16)	H1(0)<1>	H1(0)	H1(0,2) {Compr}	// Results in lower 2 WORDs
-
-//	Calculate a, b, c and further derivations
-	mov	(16)	acc0<1>:w	32:w
-	mac	(4)		acc0<1>:w	H1(0)<16;2,1>	34:w
-	shr	(4)		B<1>:w		acc0:w	6:w		// Done b,c
-	mov	(16)	acc0<1>:w	16:w
-	mac	(16)	acc0<1>:w	INTRA_REF_TOP(0,7*2)<0;2,1>		16:w
-	mac	(16)	A<1>:w		INTRA_REF_LEFT_UV(0,7*4)<0;2,1>	16:w	// A = a+16
-	mac (16)	XP<1>:w		B<0;2,1>:w		XY_3<1;2,0>:b		// XP = A+b*(x-3)
-	mul	(8)		YP<1>:w		C<0;2,1>:w		XY_3<2;2,0>:b		// YP = c*(y-3), Even portion
-	mul	(8)		YP1<1>:w	C<0;2,1>:w		XY_3_1<2;2,0>:b	// YP = c*(y-3), Odd portion
-
-//	Finally the intra_Chroma plane prediction
-    $for(0; <8; 2) {
-	add (32)	acc0<1>:w		XP<16;16,1>:w	YP.%1<0;2,1>:w {Compr}
-	shr.sat (32)	PRED_UV(%1)<2>	acc0<16;16,1>:w	5:w {Compr}
-	}
-
-End_of_intra_Pred_Chroma:
-
-// End of intra_Pred_Chroma
-
-#endif	// !defined(__INTRA_PRED_CHROMA__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/load_Intra_Ref_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/load_Intra_Ref_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/load_Intra_Ref_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/load_Intra_Ref_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * Load all reference U/V samples from neighboring macroblocks
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__LOAD_INTRA_REF_UV__)		// Make sure this is only included once
-#define __LOAD_INTRA_REF_UV__
-
-// Module name: load_Intra_Ref_UV.asm
-//
-// Load all reference U/V samples from neighboring macroblocks
-//
-// Note: Since loading of U/V data always follows writing of Y, the message descriptor is manipulated
-// to avoid recalculating due to frame/field variztions.
-
-// First load top 20x1 row U/V reference samples
-// 4 from macroblock D (actually use 2), 16 from macroblock B
-//
-    shr	(1)	I_ORIY<1>:w		I_ORIY<0;1,0>:w	1:w		// Adjust I_ORIY for NV12 format
-    add	(2)	MSGSRC.0<1>:d	I_ORIX<2;2,1>:w	TOP_REF_OFFSET<2;2,1>:b	{NoDDClr}	// Reference samples positioned at (-4, -1)
-    mov (1)	MSGSRC.2:ud		0x00000013:ud {NoDDChk}			// Block width and height (20x1)
-
-//  Update message descriptor based on previous Y block write
-//
-#ifdef DEV_ILK
-    add (1)	MSGDSC	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC+DESTUV-DWBWMSGDSC_WC-0x10000000-DESTY:ud  // Set message descriptor
-#else
-    add (1)	MSGDSC	MSGDSC	RESP_LEN(1)+DWBRMSGDSC_RC+DESTUV-DWBWMSGDSC_WC-0x00800000-DESTY:ud  // Set message descriptor
-#endif	// DEV_ILK
-
-    send (8)	INTRA_REF_TOP_D(0)	MSGHDR	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-// Then load left 4x8 reference samples (actually use 1x8 column)
-//
-    add	(1)	MSGSRC.1<1>:d	MSGSRC.1<0;1,0>:d	1:w {NoDDClr}	// Reference samples positioned next row
-    mov (1)	MSGSRC.2:ud		0x00070003:ud {NoDDChk}			// Block width and height (4x8)
-    send (8)	INTRA_REF_LEFT_D(0)	MSGHDRUV	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-// End of load_Intra_Ref_UV
-#endif	// !defined(__LOAD_INTRA_REF_UV__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/load_Intra_Ref_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/load_Intra_Ref_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/load_Intra_Ref_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/load_Intra_Ref_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*
- * Load all reference Y samples from neighboring macroblocks
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__LOAD_INTRA_REF_Y__)		// Make sure this is only included once
-#define __LOAD_INTRA_REF_Y__
-
-// Module name: load_Intra_Ref_Y.asm
-//
-// Load all reference Y samples from neighboring macroblocks
-//
-load_Intra_Ref_Y:
-//	shl (2) I_ORIX<1>:uw	ORIX<2;2,1>:ub	4:w		// Convert MB origin to pixel unit
-
-// First load top 28x1 row reference samples
-// 4 from macroblock D (actually use 1), 16 from macroblock B, and 8 from macroblock C
-//
-    add	(2)	MSGSRC.0<1>:d	I_ORIX<2;2,1>:w	TOP_REF_OFFSET<2;2,1>:b	{NoDDClr}	// Reference samples positioned at (-4, -1)
-    mov (1)	MSGSRC.2:ud		0x0000001B:ud {NoDDChk}								// Block width and height (28x1)
-    add (1)	MSGDSC	REG_MBAFF_FIELD<0;1,0>:uw	RESP_LEN(1)+DWBRMSGDSC_RC+DESTY:ud  // Set message descriptor
-    send (8)	INTRA_REF_TOP_D(0)	MSGHDRY0	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-// Then load left 4x16 reference samples (actually use 1x16 column)
-//
-    add	(1)	MSGSRC.1<1>:d	MSGSRC.1<0;1,0>:d	1:w {NoDDClr}	// Reference samples positioned next row
-    mov (1)	MSGSRC.2:ud		0x00F0003:ud	{NoDDChk}			// Block width and height (4x16)
-    add (1)	MSGDSC			MSGDSC	RESP_LEN(1):ud	// Need to read 1 more GRF register
-    send (8)	INTRA_REF_LEFT_D(0)	MSGHDRY1	MSGSRC<8;8,1>:ud	DAPREAD	MSGDSC
-
-	RETURN
-// End of load_Intra_Ref_Y
-#endif	// !defined(__LOAD_INTRA_REF_Y__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_C_10x5.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_C_10x5.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_C_10x5.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_C_10x5.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
- * Load reference 10x5 area for chroma NV12 4x4 MC
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: LoadRef_C_10x5.asm
-//
-// Load reference 10x5 area for chroma NV12 4x4 MC
-
-
-//#if !defined(__LOADREF_C_10x5__)		// Make sure this is only included once
-//#define __LOADREF_C_10x5__
-
-
-#if 1
-
-	// Compute integer and fractional components of MV
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x03:w {NoDDClr}
-    and (2)		gMVX_FRACC<1>:w		r[pMV,0]<2;2,1>:w				0x07:w {NoDDChk}
-    
-    // Check whether MVY is integer
-	or.z.f0.0 (8) null:w			gMVY_FRACC<0;1,0>:w				0:w
-	
-	// Compute top-left corner position to be loaded
-    mov (2)		gMSGSRC.0<1>:d		gMVX_INT<2;2,1>:w
-	shl (1)		gMSGSRC.0:d			gMSGSRC.0:d						1:w
-
-	(f0.0) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					RESP_LEN(2)+nBI_LC_DIFF:ud
-	(-f0.0) add (1) pMSGDSC:ud		gMSGDSC_R:ud					RESP_LEN(3)+nBI_LC_DIFF:ud
-	
-    // Read 16x5 pixels - TODO: Reading 12x5 instead of 16x5 took more time on CL. Why?
-    (f0.0) mov (1)	gMSGSRC.2:ud	0x00030009:ud					//{NoDDChk}
-    (-f0.0) mov (1)	gMSGSRC.2:ud	0x00040009:ud					//{NoDDChk}
-    send (8)	gudREFC(0)<1>	    mMSGHDRC						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-
-#else
-
-	add (1)		pMSGDSC:ud			gMSGDSC_R:ud					RESP_LEN(3)+nBI_LC_DIFF:ud
-
-	// Compute integer and fractional components of MV
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x03:w {NoDDClr}
-    and (2)		gMVX_FRACC<1>:w		r[pMV,0]<2;2,1>:w				0x07:w {NoDDChk}
-	
-	// Compute top-left corner position to be loaded
-    mov (2)		gMSGSRC.0<1>:d		gMVX_INT<2;2,1>:w
-	shl (1)		gMSGSRC.0:d			gMSGSRC.0:d						1:w
-
-    // Read 16x5 pixels
-    mov (1)		gMSGSRC.2:ud		0x00040009:ud					{NoDDChk}
-    send (8)	gudREFC(0)<1>	    mMSGHDRC						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-#endif
-        
-//#endif	// !defined(__LOADREF_C_10x5__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_C_6x3.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_C_6x3.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_C_6x3.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_C_6x3.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
- * Load reference 6x3 area for chroma NV12 4x4 MC
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: LoadRef_C_6x3.asm
-//
-// Load reference 6x3 area for chroma NV12 4x4 MC
-
-
-//#if !defined(__LOADREF_C_6x3__)		// Make sure this is only included once
-//#define __LOADREF_C_6x3__
-
-
-#ifdef DEV_ILK
-	add (1)		pMSGDSC:ud			gMSGDSC_R:ud					0x00100010:ud
-#else
-	add (1)		pMSGDSC:ud			gMSGDSC_R:ud					0x00010010:ud
-#endif	// DEV_ILK
-
-	// Compute integer and fractional components of MV
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x03:w {NoDDClr}
-    and (2)		gMVX_FRACC<1>:w		r[pMV,0]<2;2,1>:w				0x07:w {NoDDChk}
-	
-	// Compute top-left corner position to be loaded
-    mov (2)		gMSGSRC.0<1>:d		gMVX_INT<2;2,1>:w
-	shl (1)		gMSGSRC.0:d			gMSGSRC.0:d						1:w
-
-    // Read 8x3 pixels
-    mov (1)		gMSGSRC.2:ud		0x00020005:ud
-    send (8)	gudREFC(0)<1>	    mMSGHDRC						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-
-        
-//#endif	// !defined(__LOADREF_C_6x3__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_Y_16x13.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_Y_16x13.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_Y_16x13.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_Y_16x13.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,127 +0,0 @@
-/*
- * Load reference 16x13 area for luma 8x8 MC
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: LoadRef_Y_16x13.asm
-//
-// Load reference 16x13 area for luma 8x8 MC
-
-
-//#if !defined(__LOADREF_Y_16x13__)		// Make sure this is only included once
-//#define __LOADREF_Y_16x13__
-
-#if 1
-
-#if 1
-
-	// Check whether MVX is integer MV
-	and.z.f0.0 (1) null:w			r[pMV,0]<0;1,0>:w				0x3:w
-
-	// Compute integer and fractional components of MV
-    and (2)		gMVX_FRAC<1>:w		r[pMV,0]<2;2,1>:w				0x03:w	//{NoDDClr}
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x02:w	//{NoDDChk}
-    
-    // Check whether MVY is integer
-	or.z.f0.1 (8) null:w			gMVY_FRAC<0;1,0>:w				0:w
-	
-	// If MVX is a multiple of 4 (..., -4, 0, 4, ...) integer MV, do special handling
-	(f0.0)	jmpi (1)	INTERLABEL(LOADREF_MVXZERO)	
-	
-    // Set message descriptor
-    (f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					RESP_LEN(4):ud	
-	(-f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					RESP_LEN(7):ud
-	
-	// Compute top-left corner position to be loaded
-	// TODO: sel
-    (-f0.1) add (2)	gMSGSRC.0<1>:d	gMVX_INT<2;2,1>:w				-0x02:d //{NoDDClr}
-    (-f0.1) mov (1)	gMSGSRC.2:ud	0x000c000c:ud							//{NoDDChk}
-    (f0.1) add (1)	gMSGSRC.0<1>:d	gMVX_INT<0;1,0>:w				-0x02:d //{NoDDClr}
-	(f0.1) mov (1)	gMSGSRC.1<1>:d	gMVY_INT<0;1,0>:w						//{NoDDChk,NoDDClr}
-    (f0.1) mov (1)	gMSGSRC.2:ud	0x0007000c:ud							//{NoDDChk}
-
-    // Read 16x13 pixels
-    send (8)	gudREF(0)<1>		mMSGHDRY						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-    
-    jmpi INTERLABEL(EXIT_LOADREF_Y_16x13)
-    
-INTERLABEL(LOADREF_MVXZERO):
-    
-    // Set message descriptor
-#ifdef DEV_ILK
-    (f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00200000:ud	
-	(-f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00400000:ud
-#else
-    (f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00020000:ud	
-	(-f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00040000:ud
-#endif
-	
-	// Compute top-left corner position to be loaded
-	// TODO: sel
-	mov (2)	gMSGSRC.0<1>:d	gMVX_INT<2;2,1>:w
-    (-f0.1) add (1)	gMSGSRC.1<1>:d	gMVY_INT<0;1,0>:w				-0x02:d
-    (-f0.1) mov (1)	gMSGSRC.2:ud	0x000c0007:ud							//{NoDDChk}
-    (f0.1) mov (1)	gMSGSRC.2:ud	0x00070007:ud							//{NoDDChk}
-
-    // Read 16x13 pixels
-    send (8)	gudREF(0)<1>		mMSGHDRY						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-    
-
-#else
-	// Compute integer and fractional components of MV
-    and (2)		gMVX_FRAC<1>:w		r[pMV,0]<2;2,1>:w				0x03:w	//{NoDDClr}
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x02:w	//{NoDDChk}
-    
-    // Check whether MVY is integer
-	or.z.f0.1 (8) null:w			gMVY_FRAC<0;1,0>:w				0:w
-	
-    // Set message descriptor
-#ifdef DEV_ILK
-    (f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00400000:ud	
-	(-f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00700000:ud
-#else
-    (f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00040000:ud	
-	(-f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					0x00070000:ud
-#endif
-	
-	// Compute top-left corner position to be loaded
-	// TODO: sel
-    (-f0.1) add (2)	gMSGSRC.0<1>:d	gMVX_INT<2;2,1>:w				-0x02:d //{NoDDClr}
-    (-f0.1) mov (1)	gMSGSRC.2:ud	0x000c000c:ud							//{NoDDChk}
-    (f0.1) add (1)	gMSGSRC.0<1>:d	gMVX_INT<0;1,0>:w				-0x02:d //{NoDDClr}
-	(f0.1) mov (1)	gMSGSRC.1<1>:d	gMVY_INT<0;1,0>:w						//{NoDDChk,NoDDClr}
-    (f0.1) mov (1)	gMSGSRC.2:ud	0x0007000c:ud							//{NoDDChk}
-
-    // Read 16x13 pixels
-    send (8)	gudREF(0)<1>		mMSGHDRY						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-#endif
-    
-#else   
-
-	// Compute integer and fractional components of MV
-    and (2)		gMVX_FRAC<1>:w		r[pMV,0]<2;2,1>:w				0x03:w	{NoDDClr} //
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x02:w	{NoDDChk} //
-    
-    // Set message descriptor
-#ifdef DEV_ILK
-    add (1)		pMSGDSC:ud			gMSGDSC_R:ud					0x00700000:ud
-#else
-    add (1)		pMSGDSC:ud			gMSGDSC_R:ud					0x00070000:ud
-#endif	// DEV_ILK
-    
-	// Compute top-left corner position to be loaded
-    add (2)		gMSGSRC.0<1>:d		gMVX_INT<2;2,1>:w				-0x02:d {NoDDClr} //
-    mov (1)		gMSGSRC.2:ud		0x000c000c:ud							{NoDDChk} //
-
-    // Read 16x13 pixels
-    send (8)	gudREF(0)<1>	    mMSGHDRY						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-    
-#endif
-
-INTERLABEL(EXIT_LOADREF_Y_16x13):
-
-//#endif	// !defined(__LOADREF_Y_16x13__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_Y_16x9.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_Y_16x9.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/loadRef_Y_16x9.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/loadRef_Y_16x9.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-/*
- * Load reference 16x9 area for luma 4x4 MC
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: LoadRef_Y_16x9.asm
-//
-// Load reference 16x9 area for luma 4x4 MC
-
-
-//#if !defined(__LOADREF_Y_16x9__)		// Make sure this is only included once
-//#define __LOADREF_Y_16x9__
-
-#if 1
-
-	// Compute integer and fractional components of MV
-    and (2)		gMVX_FRAC<1>:w		r[pMV,0]<2;2,1>:w				0x03:w	//{NoDDClr}
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x02:w	//{NoDDChk}
- 
-    // Check whether MVY is integer
-	or.z.f0.1 (8) null:w			gMVY_FRAC<0;1,0>:w				0:w
-	   
-	// Set message descriptor
-	(f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					RESP_LEN(2):ud
-	(-f0.1) add (1)	pMSGDSC:ud		gMSGDSC_R:ud					RESP_LEN(5):ud
-
-	// Compute top-left corner position to be loaded
-	// TODO: sel
-    (-f0.1) add (2)	gMSGSRC.0<1>:d	gMVX_INT<2;2,1>:w				-0x02:d	//{NoDDClr}
-    (-f0.1) mov (1)	gMSGSRC.2:ud	0x00080008:ud							//{NoDDChk}
-    (f0.1) add (1)	gMSGSRC.0<1>:d	gMVX_INT<0;1,0>:w				-0x02:d //{NoDDClr}
-	(f0.1) mov (1)	gMSGSRC.1<1>:d	gMVY_INT<0;1,0>:w						//{NoDDChk,NoDDClr}
-    (f0.1) mov (1)	gMSGSRC.2:ud	0x00030008:ud							//{NoDDChk}
-
-    // Read 16x9 pixels
-    send (8)	gudREF(0)<1>	    mMSGHDRY						gMSGSRC<8;8,1>:ud	DAPREAD pMSGDSC:ud
-
-#else
-
-	// Compute integer and fractional components of MV
-    and (2)		gMVX_FRAC<1>:w		r[pMV,0]<2;2,1>:w				0x03:w {NoDDClr} //
-    asr (2)		gMVX_INT<1>:w		r[pMV,0]<2;2,1>:w				0x02:w {NoDDChk} //
-
-	// Set message descriptor
-	add (1)		pMSGDSC:ud			gMSGDSC_R:ud					RESP_LEN(5):ud
-    
-	// Compute top-left corner position to be loaded 
-    add (2)		gMSGSRC.0<1>:d		gMVX_INT<2;2,1>:w				-0x02:d	{NoDDClr} //
-    mov (1)		gMSGSRC.2:ud		0x00080008:ud							{NoDDChk} //
-
-    // Read 16x9 pixels
-    send (8)	gudREF(0)<1>	    mMSGHDRY						gMSGSRC<8;8,1>:ud	DAPREAD	pMSGDSC:ud
-
-#endif
-
-        
-//#endif	// !defined(__LOADREF_Y_16x9__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Makefile.am libva-1.0.1/i965_drv_video/shaders/h264/mc/Makefile.am
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-
-INTEL_G4I = 
-
-INTEL_G4A = null.g4a
-
-INTEL_G4B = null.g4b
-
-INTEL_G4B_GEN5 = null.g4b.gen5
-
-EXTRA_DIST = $(INTEL_G4I)	\
-	     $(INTEL_G4A)       \
-	     $(INTEL_G4B)    	\
-	     $(INTEL_G4B_GEN5)
-
-if HAVE_GEN4ASM
-
-SUFFIXES = .g4a .g4b
-.g4a.g4b:
-	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
-
-$(INTEL_G4B): $(INTEL_G4I)
-
-BUILT_SOURCES= $(INTEL_G4B)
-
-clean-local:
-	-rm -f $(INTEL_G4B)
-	-rm -f $(INTEL_G4B_GEN5)
-endif    
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Makefile.in libva-1.0.1/i965_drv_video/shaders/h264/mc/Makefile.in
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,402 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = i965_drv_video/shaders/h264/mc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
-GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
-LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
-LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
-LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
-LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
-LIBVA_VERSION = @LIBVA_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XFIXES_CFLAGS = @XFIXES_CFLAGS@
-XFIXES_LIBS = @XFIXES_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libvabackendlib = @libvabackendlib@
-libvacorelib = @libvacorelib@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INTEL_G4I = 
-INTEL_G4A = null.g4a
-INTEL_G4B = null.g4b
-INTEL_G4B_GEN5 = null.g4b.gen5
-EXTRA_DIST = $(INTEL_G4I)	\
-	     $(INTEL_G4A)       \
-	     $(INTEL_G4B)    	\
-	     $(INTEL_G4B_GEN5)
-
-@HAVE_GEN4ASM_TRUE@SUFFIXES = .g4a .g4b
-@HAVE_GEN4ASM_TRUE@BUILT_SOURCES = $(INTEL_G4B)
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .g4a .g4b
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu i965_drv_video/shaders/h264/mc/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu i965_drv_video/shaders/h264/mc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile
-installdirs:
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@HAVE_GEN4ASM_FALSE@clean-local:
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: all check install install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	clean-local distclean distclean-generic distclean-libtool \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am
-
-@HAVE_GEN4ASM_TRUE@.g4a.g4b:
-@HAVE_GEN4ASM_TRUE@	m4 $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && intel-gen4asm -g 5 -o $@.gen5 $*.g4m && rm $*.g4m
-
-@HAVE_GEN4ASM_TRUE@$(INTEL_G4B): $(INTEL_G4I)
-
-@HAVE_GEN4ASM_TRUE@clean-local:
-@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B)
-@HAVE_GEN4ASM_TRUE@	-rm -f $(INTEL_G4B_GEN5)
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/null.g4a libva-1.0.1/i965_drv_video/shaders/h264/mc/null.g4a
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/null.g4a	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/null.g4a	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * Author:
- *    Zou Nan hai <nanhai.zou@intel.com>
- *    Xiang Haihao <haihao.xiang@intel.com>
- *
- */
-define(`YUV_color',`0xFFFFFFFFUD')
-shl(2) g62.0<1>UD g3.4<2,2,1>UB 4UW {align1};
-mov(1) g62.8<1>UD 0x000f000fUD {align1};
-mov(16) m1<1>UD YUV_color {align1 compr};
-mov(16) m3<1>UD YUV_color {align1 compr};
-mov(16) m5<1>UD YUV_color {align1 compr};
-mov(16) m7<1>UD YUV_color {align1 compr};
-send(16) 0 acc0<1>UW g62<8,8,1>UW write(0, 0, 2, 0) mlen 9 rlen 0 {align1};
-
-shr(1) g62.4<1>UD g62.4<1,1,1>UD 1UW {align1};
-mov(1) g62.8<1>UD 0x0007000fUD {align1};
-mov(16) m1<1>UD YUV_color {align1 compr};
-mov(16) m3<1>UD YUV_color {align1 compr};
-send(16) 0 acc0<1>UW g62<8,8,1>UW write(1, 0, 2, 0) mlen 5 rlen 0 {align1};
-
-send(16) 0 acc0<1>UW g0<8,8,1>UW thread_spawner(0, 0, 0) mlen 1 rlen 0 {align1 EOT};
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/null.g4b libva-1.0.1/i965_drv_video/shaders/h264/mc/null.g4b
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/null.g4b	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/null.g4b	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-   { 0x00200009, 0x27c02e21, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20200062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20600062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20a00062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20e00062, 0x00000000, 0xffffffff },
-   { 0x00800031, 0x24001d28, 0x008d07c0, 0x05902000 },
-   { 0x00000008, 0x27c42c21, 0x002107c4, 0x00010001 },
-   { 0x00000001, 0x27c80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20200062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20600062, 0x00000000, 0xffffffff },
-   { 0x00800031, 0x24001d28, 0x008d07c0, 0x05502001 },
-   { 0x00800031, 0x24001d28, 0x008d0000, 0x87100000 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/null.g4b.gen5 libva-1.0.1/i965_drv_video/shaders/h264/mc/null.g4b.gen5
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/null.g4b.gen5	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/null.g4b.gen5	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-   { 0x00200009, 0x27c02e21, 0x00450064, 0x00040004 },
-   { 0x00000001, 0x27c80061, 0x00000000, 0x000f000f },
-   { 0x00802001, 0x20200062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20600062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20a00062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20e00062, 0x00000000, 0xffffffff },
-   { 0x00800031, 0x24001d28, 0x508d07c0, 0x12082000 },
-   { 0x00000008, 0x27c42c21, 0x002107c4, 0x00010001 },
-   { 0x00000001, 0x27c80061, 0x00000000, 0x0007000f },
-   { 0x00802001, 0x20200062, 0x00000000, 0xffffffff },
-   { 0x00802001, 0x20600062, 0x00000000, 0xffffffff },
-   { 0x00800031, 0x24001d28, 0x508d07c0, 0x0a082001 },
-   { 0x00800031, 0x24001d28, 0x748d0000, 0x82000000 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/recon_C_4x4.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/recon_C_4x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/recon_C_4x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/recon_C_4x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Recon_C_4x4.asm
-//
-//  $Revision: 11 $
-//  $Date: 10/03/06 5:28p $
-//
-
-
-//#if !defined(__RECON_C_4x4__)		// Make sure this is only included once
-//#define __RECON_C_4x4__
-
-
-	// TODO: Use instruction compression
-	add.sat (4) r[pERRORC,0]<2>:ub			r[pERRORC,0]<4;4,1>:w			gubCPRED(0)<16;4,4>
-	add.sat (4) r[pERRORC,128]<2>:ub		r[pERRORC,128]<4;4,1>:w			gubCPRED(0,2)<16;4,4>
-	add.sat (4) r[pERRORC,32]<2>:ub			r[pERRORC,32]<4;4,1>:w			gubCPRED(1)<16;4,4>
-	add.sat (4) r[pERRORC,128+32]<2>:ub		r[pERRORC,128+32]<4;4,1>:w		gubCPRED(1,2)<16;4,4>
-	
-	add.sat (4) r[pERRORC,16]<2>:ub			r[pERRORC,16]<4;4,1>:w			gubCPRED(0,16)<16;4,4>
-	add.sat (4) r[pERRORC,128+16]<2>:ub		r[pERRORC,128+16]<4;4,1>:w		gubCPRED(0,18)<16;4,4>
-	add.sat (4) r[pERRORC,48]<2>:ub			r[pERRORC,48]<4;4,1>:w			gubCPRED(1,16)<16;4,4>
-	add.sat (4) r[pERRORC,128+48]<2>:ub		r[pERRORC,128+48]<4;4,1>:w		gubCPRED(1,18)<16;4,4>
-
-	// Increase chroma error block offset	
-#ifndef MONO
-	add (1)		pERRORC:w			pERRORC:w						8:w
-#endif
-
-        
-//#endif	// !defined(__RECON_C_4x4__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/recon_Y_8x8.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/recon_Y_8x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/recon_Y_8x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/recon_Y_8x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: Recon_Y_8x8.asm
-//
-//  $Revision: 10 $
-//  $Date: 9/22/06 2:50p $
-//
-
-
-//#if !defined(__RECON_Y_8x8__)		// Make sure this is only included once
-//#define __RECON_Y_8x8__
-
-
-	add.sat (16)		r[pERRORY,0]<2>:ub			r[pERRORY,0]<16;16,1>:w				gubYPRED(0)
-	add.sat (16)		r[pERRORY,nGRFWIB]<2>:ub	r[pERRORY,nGRFWIB]<16;16,1>:w		gubYPRED(1)
-	add.sat (16)		r[pERRORY,nGRFWIB*2]<2>:ub	r[pERRORY,nGRFWIB*2]<16;16,1>:w		gubYPRED(2)
-	add.sat (16)		r[pERRORY,nGRFWIB*3]<2>:ub	r[pERRORY,nGRFWIB*3]<16;16,1>:w		gubYPRED(3)
-	
-	add (1)				pERRORY:w					pERRORY:w							128:w
-
-//#endif	// !defined(__RECON_Y_8x8__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/roundShift_C_4x4.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/roundShift_C_4x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/roundShift_C_4x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/roundShift_C_4x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//	Kernel name: RoundShift_C_4x4.asm
-//
-//	Do (...+32)>>6 to 4x4 (NV12 8x4) interpolated chrominance data
-//
-
-
-//#if !defined(__RoundShift_C_4x4__)		// Make sure this is only included once
-//#define __RoundShift_C_4x4__
-
-
-	// TODO: Optimize using instruction compression
-	add (16)	acc0<1>:w					r[pRESULT,0]<16;16,1>:w			32:w
-	add (16)	acc1<1>:w					r[pRESULT,nGRFWIB]<16;16,1>:w	32:w
-	asr.sat (16) r[pRESULT,0]<2>:ub			acc0<16;16,1>:w					6:w
-	asr.sat (16) r[pRESULT,nGRFWIB]<2>:ub	acc1<16;16,1>:w					6:w
-	
-
-//#endif	// !defined(__RoundShift_C_4x4__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/save_16x16_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/save_16x16_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/save_16x16_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/save_16x16_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
- * Save decoded Y picture data to frame buffer
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SAVE_16X16_Y__)		// Make sure this is only included once
-#define __SAVE_16X16_Y__
-
-// Module name: save_16x16_Y.asm
-//
-// Save decoded Y picture data to frame buffer
-//
-
-save_16x16_Y:
-
-    mov (1) MSGSRC.2:ud		0x000F000F:ud {NoDDClr}		// Block width and height (16x16)
-    mov (2) MSGSRC.0:ud		I_ORIX<2;2,1>:w {NoDDChk}	// X, Y offset
-#ifdef DEV_ILK
-    add (1)		MSGDSC	MSGDSC MSG_LEN(8)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00200000:ud  // Set message descriptor
-#else
-    add (1)		MSGDSC	MSGDSC MSG_LEN(8)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00020000:ud  // Set message descriptor
-#endif	// DEV_ILK
-
-    mov (1) PDECBUF_UD<1>:ud	0x10001*DECBUF*GRFWIB+0x00400000:ud	// Pointers to row 0 and 2 of decoded data
-
-    $for(0,0; <8; 2,4) {
-	mov (32)	MSGPAYLOAD(%1)<1>	r[PDECBUF, %2*GRFWIB]REGION(16,2) {Compr}		// Block Y0/Y2
-	mov (32)	MSGPAYLOAD(%1,16)<1>	r[PDECBUF, (1+%2)*GRFWIB]REGION(16,2) {Compr}	// Block Y1/Y3
-    }
-
-//  Update message descriptor based on previous read setup
-//
-    send (8)	REG_WRITE_COMMIT_Y<1>:ud	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-    RETURN
-// End of save_16x16_Y
-
-#endif	// !defined(__SAVE_16X16_Y__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/save_4x4_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/save_4x4_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/save_4x4_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/save_4x4_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * Save Intra_4x4 decoded Y picture data to frame buffer
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SAVE_4X4_Y__)		// Make sure this is only included once
-#define __SAVE_4X4_Y__
-
-// Module name: save_4x4_Y.asm
-//
-// Save Intra_4x4 decoded Y picture data to frame buffer
-// Note: Each 4x4 block is stored in 1 GRF register in the order of block raster scan order,
-// i.e. 0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15
-
-save_4x4_Y:
-
-    mov (1) MSGSRC.2:ud		0x000F000F:ud {NoDDClr}		// Block width and height (16x16)
-    mov (2) MSGSRC.0:ud		I_ORIX<2;2,1>:w {NoDDChk}	// X, Y offset
-#ifdef DEV_ILK
-    add (1)		MSGDSC	MSGDSC MSG_LEN(8)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00200000:ud  // Set message descriptor
-#else
-    add (1)		MSGDSC	MSGDSC MSG_LEN(8)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00020000:ud  // Set message descriptor
-#endif	// DEV_ILK
-
-    $for(0; <8; 2) {
-	mov (16)	MSGPAYLOAD(%1)<1>		DEC_Y(%1)<16;4,1>
-	mov (16)	MSGPAYLOAD(%1,16)<1>	DEC_Y(%1,4)<16;4,1>
-	mov (16)	MSGPAYLOAD(%1+1)<1>		DEC_Y(%1,8)<16;4,1>
-	mov (16)	MSGPAYLOAD(%1+1,16)<1>	DEC_Y(%1,12)<16;4,1>
-    }
-
-//  Update message descriptor based on previous read setup
-//
-    send (8)	REG_WRITE_COMMIT_Y<1>:ud	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-    RETURN
-// End of save_4x4_Y
-
-#endif	// !defined(__SAVE_4X4_Y__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/save_8x8_UV.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/save_8x8_UV.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/save_8x8_UV.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/save_8x8_UV.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
- * Save decoded U/V picture data to frame buffer
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SAVE_8x8_UV__)		// Make sure this is only included once
-#define __SAVE_8x8_UV__
-
-// Module name: save_8x8_UV.asm
-//
-// Save decoded U/V picture data to frame buffer
-//
-
-    mov (1) MSGSRC.2:ud	    0x0007000F:ud {NoDDClr}		// Block width and height (16x8)
-    mov (2) MSGSRC.0<1>:ud  I_ORIX<2;2,1>:w	{NoDDChk}	// I_ORIX has already been adjusted for NV12
-
-//  Update message descriptor based on previous read setup
-//
-#ifdef DEV_ILK
-    add (1)		MSGDSC	MSGDSC MSG_LEN(4)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00100000:ud  // Set message descriptor
-#else
-    add (1)		MSGDSC	MSGDSC MSG_LEN(4)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00010000:ud  // Set message descriptor
-#endif	// DEV_ILK
-
-// Write U/V picture data
-//
-#ifndef MONO
-    mov	    MSGPAYLOAD(0,0)<1>	DEC_UV(0)REGION(16,2)	// U/V row 0
-    mov	    MSGPAYLOAD(0,16)<1>	DEC_UV(1)REGION(16,2)	// U/V row 1
-    mov	    MSGPAYLOAD(1,0)<1>	DEC_UV(2)REGION(16,2)	// U/V row 2
-    mov	    MSGPAYLOAD(1,16)<1>	DEC_UV(3)REGION(16,2)	// U/V row 3
-    mov	    MSGPAYLOAD(2,0)<1>	DEC_UV(4)REGION(16,2)	// U/V row 4
-    mov	    MSGPAYLOAD(2,16)<1>	DEC_UV(5)REGION(16,2)	// U/V row 5
-    mov	    MSGPAYLOAD(3,0)<1>	DEC_UV(6)REGION(16,2)	// U/V row 6
-    mov	    MSGPAYLOAD(3,16)<1>	DEC_UV(7)REGION(16,2)	// U/V row 7
-#else	// defined(MONO)
-    $for(0; <4; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>		0x80808080:ud {Compr}
-	}
-
-#endif	// !defined(MONO)
-
-	send (8)	REG_WRITE_COMMIT_UV<1>:ud	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-// End of save_8x8_UV
-
-#endif	// !defined(__SAVE_8x8_UV__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/save_8x8_Y.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/save_8x8_Y.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/save_8x8_Y.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/save_8x8_Y.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Save Intra_8x8 decoded Y picture data to frame buffer
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SAVE_8X8_Y__)		// Make sure this is only included once
-#define __SAVE_8X8_Y__
-
-// Module name: save_8x8_Y.asm
-//
-// Save Intra_8x8 decoded Y picture data to frame buffer
-// NotE: Every 4 rows of Y data are interleaved with the horizontal neighboring blcok
-//
-save_8x8_Y:
-
-    mov (1) MSGSRC.2:ud		0x000F000F:ud {NoDDClr}		// Block width and height (16x16)
-    mov (2) MSGSRC.0:ud		I_ORIX<2;2,1>:w {NoDDChk}	// X, Y offset
-
-//  Update message descriptor based on previous read setup
-//
-#ifdef DEV_ILK
-    add (1)		MSGDSC	MSGDSC MSG_LEN(8)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00200000:ud  // Set message descriptor
-#else
-    add (1)		MSGDSC	MSGDSC MSG_LEN(8)+DWBWMSGDSC_WC-DWBRMSGDSC_RC-0x00020000:ud  // Set message descriptor
-#endif	// DEV_ILK
-
-	mov (16)	MSGPAYLOAD(0)<1>	DEC_Y(0)<32;8,1>
-	mov (16)	MSGPAYLOAD(0,16)<1>	DEC_Y(0,8)<32;8,1>
-	mov (16)	MSGPAYLOAD(1,0)<1>	DEC_Y(0,16)<32;8,1>
-	mov (16)	MSGPAYLOAD(1,16)<1>	DEC_Y(0,24)<32;8,1>
-
-	mov (16)	MSGPAYLOAD(2)<1>	DEC_Y(2)<32;8,1>
-	mov (16)	MSGPAYLOAD(2,16)<1>	DEC_Y(2,8)<32;8,1>
-	mov (16)	MSGPAYLOAD(3,0)<1>	DEC_Y(2,16)<32;8,1>
-	mov (16)	MSGPAYLOAD(3,16)<1>	DEC_Y(2,24)<32;8,1>
-
-	mov (16)	MSGPAYLOAD(4)<1>	DEC_Y(4)<32;8,1>
-	mov (16)	MSGPAYLOAD(4,16)<1>	DEC_Y(4,8)<32;8,1>
-	mov (16)	MSGPAYLOAD(5,0)<1>	DEC_Y(4,16)<32;8,1>
-	mov (16)	MSGPAYLOAD(5,16)<1>	DEC_Y(4,24)<32;8,1>
-
-	mov (16)	MSGPAYLOAD(6)<1>	DEC_Y(6)<32;8,1>
-	mov (16)	MSGPAYLOAD(6,16)<1>	DEC_Y(6,8)<32;8,1>
-	mov (16)	MSGPAYLOAD(7,0)<1>	DEC_Y(6,16)<32;8,1>
-	mov (16)	MSGPAYLOAD(7,16)<1>	DEC_Y(6,24)<32;8,1>
-
-    send (8)	REG_WRITE_COMMIT_Y<1>:ud	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-    RETURN
-// End of save_8x8_Y
-
-#endif	// !defined(__SAVE_8X8_Y__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/save_I_PCM.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/save_I_PCM.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/save_I_PCM.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/save_I_PCM.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
- * Save I_PCM Y samples to Y picture buffer
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: save_I_PCM.asm
-//
-// First save I_PCM Y samples to Y picture buffer
-//
-    mov (1) MSGSRC.2:ud		0x000F000F:ud {NoDDClr}			// Block width and height (16x16)
-	shl (2) MSGSRC.0:ud		ORIX<2;2,1>:ub	4:w	{NoDDChk}	// Convert MB origin in pixel unit
-
-    add (1)	MSGDSC	REG_MBAFF_FIELD<0;1,0>:uw	MSG_LEN(8)+DWBWMSGDSC_WC+DESTY:ud  // Set message descriptor
-
-    $for(0; <8; 2) {
-	mov (32)	MSGPAYLOAD(%1)<1>		I_PCM_Y(%1)REGION(16,1) {Compr,NoDDClr}
-	mov (32)	MSGPAYLOAD(%1,16)<1>	I_PCM_Y(%1,16)REGION(16,1) {Compr,NoDDChk}
-    }
-
-    send (8)	REG_WRITE_COMMIT_Y<1>:ud	MSGHDR	MSGSRC<8;8,1>:ud	DAPWRITE	MSGDSC
-
-// Then save I_PCM U/V samples to U/V picture buffer
-//
-    mov (1) MSGHDR.2:ud		0x0007000F:ud			{NoDDClr}	// Block width and height (16x8)
-    asr (1) MSGHDR.1:ud		MSGSRC.1<0;1,0>:ud	1:w {NoDDChk}	// Y offset should be halved
-    add (1)	MSGDSC			MSGDSC			0x0-MSG_LEN(4)+0x1:d	// Set message descriptor for U/V
-
-#if 0
-    and.z.f0.0 (1)  NULLREG REG_CHROMA_FORMAT_IDC  CHROMA_FORMAT_IDC:ud
-	(f0.0) jmpi (1) MONOCHROME_I_PCM
-#endif
-
-#ifndef MONO
-// Non-monochrome picture
-//
-    $for(0,0; <4; 2,1) {
-	mov (16)	MSGPAYLOAD(%1)<2>		I_PCM_UV(%2)REGION(16,1)		// U data
-	mov (16)	MSGPAYLOAD(%1,1)<2>		I_PCM_UV(%2+2)REGION(16,1)		// V data
-	mov (16)	MSGPAYLOAD(%1+1)<2>		I_PCM_UV(%2,16)REGION(16,1)		// U data
-	mov (16)	MSGPAYLOAD(%1+1,1)<2>	I_PCM_UV(%2+2,16)REGION(16,1)	// V data
-	}
-#else	// defined(MONO)
-MONOCHROME_I_PCM:
-    $for(0; <4; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>		0x80808080:ud {Compr}
-	}
-
-#endif	// !defined(MONO)
-
-    send (8)	REG_WRITE_COMMIT_UV<1>:ud	MSGHDR	null:ud	DAPWRITE	MSGDSC
-
-// End of save_I_PCM
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,282 +0,0 @@
-/*
- * Dependency control scoreboard kernel
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: scoreboard.asm
-//
-// Dependency control scoreboard kernel
-//
-//  $Revision: 16 $
-//  $Date: 10/18/06 4:10p $
-//
-
-// ----------------------------------------------------
-//  Main: scoreboard
-// ----------------------------------------------------
-// ----------------------------------------------------
-//  Scoreboard structure
-// ----------------------------------------------------
-//
-//	1 DWORD per thread
-//
-//	Bit 31:	"Checking" thread, i.e. an intra MB that sends "check dependency" message
-//	Bit 30: "Completed" thread. This bit set by an "update" message from intra/inter MB.
-//	Bits 29:28:	Must set to 0
-//	Bits 27:24:	EUID
-//	Bits 23:18: Reserved
-//	Bits 17:16: TID
-//	Bits 15:8:	X offset of current MB
-//	Bits 15:5:	Reserved
-//	Bits 4:0: 5 bits of available neighbor MB flags
-
-.kernel scoreboard
-SCOREBOARD:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0xf0aa55a5:ud
-#endif
-
-#include "header.inc"
-#include "scoreboard_header.inc"
-
-//
-//  Now, begin source code....
-//
-
-.code
-
-#ifdef	AS_ENABLED
-	and.z.f0.1	(1)	NULLREG	r0.2<0;1,0>:ud	TH_RES	// Is this a restarted thread previously interrupted?
-	(f0.1) jmpi	(1)	Scoreboard_Init
-
-	#include "scoreboard_restore_AS.asm"
-
-	jmpi (1)	Scoreboard_OpenGW
-Scoreboard_Init:
-#endif	// End AS_ENABLED
-
-// Scoreboard must be initialized to 0xc000ffff, meaning all "completed"
-// And it also avoids message mis-handling for the first MB
-    $for(0; <32; 2) {
-	mov (16)	CMD_SB(%1)<1>	0xc000ffff:ud {Compr}
-	}
-#ifdef	DOUBLE_SB					// Scoreboard size needs to be doubled
-    $for(32; <64; 2) {
-	mov (16)	CMD_SB(%1)<1>	0xc000ffff:ud {Compr}
-	}
-#endif	// DOUBLE_SB
-
-//----------------------------------------------------------
-//	Open message gateway for the scoreboard thread
-//
-//	RegBase = r4 (0x04)
-//	Gateway Size = 64 GRF registers (0x6)
-//	Dispatch ID = r0.20:ub
-//	Scoreboard Thread Key = 0
-//----------------------------------------------------------
-Scoreboard_OpenGW:
-    mov (8)	MSGHDRY0<1>:ud	0x00000000:ud			// Initialize message header payload with 0
-
-	// Send a message with register base RegBase=0x04(r4) and Gateway size = 0x6 = 64 GRF reg and Key = 0
-	// 000 00000100 00000 00000 110 00000000 ==> 0000 0000 1000 0000 0000 0110 0000 0000
-#ifdef	AS_ENABLED
-	add (1) MSGHDRY0.5<1>:ud r0.20:ub	0x00800700:ud	// Allocate 128 GRFs for message gateway - for SIP to send notification MSG
-#else
-  #ifdef	DOUBLE_SB
-	add (1) MSGHDRY0.5<1>:ud r0.20:ub	0x00800600:ud	// 64 GRF's for CTG-B
-  #else
-	add (1) MSGHDRY0.5<1>:ud r0.20:ub	0x00800500:ud	// 32 GRF's for CTG-A
-  #endif	// DOUBLE_SB
-#endif
-	send (8)	NULLREG  MSGHDRY0	null:ud    MSG_GW	OGWMSGDSC
-
-//------------------------------------------------------------------------
-//	Send Thread Spawning Message to start dispatching macroblock threads
-//
-//------------------------------------------------------------------------
-#ifdef	AS_ENABLED
-	mov (8)	acc0<1>:ud	CMD_SB(31)<8;8,1>			// Ensure scoreboard data have been completely restored
-#endif	// End AS_ENABLED
-    mov (8)	MSGHDRY1<1>:ud		r0<8;8,1>:ud		// Initialize message header payload with R0
-    mov (1)	MSGHDRY1.4<1>:ud	0x00000400:ud		// Dispatch URB length = 1
-
-	send (8)	NULLREG  MSGHDRY1	null:ud    TS	TSMSGDSC
-
-    mov (8)	MSGHDRY0<1>:ud		0x00000000:ud		// Initialize message header payload with 0
-
-//------------------------------------------------------------------------
-//	Scoreboard control data initialization
-//------------------------------------------------------------------------
-#ifdef	AS_ENABLED
-	or	(1)	cr0.1:ud	cr0.1:ud	AS_INT_EN		// Enable interrupt
-	(f0.1) jmpi	(1)	Scoreboard_State_Init	// Jump if not restarted thread
-
-	// Restore scoreboard kernel control data to r1 - r3
-    mov (1)	m4.1:ud	64:ud				// Starting r1
-    mov (1)	m4.2:ud	0x0002001f:ud		// for 3 registers
-    send (8)	r1.0<1>:ud	m4	null:ud	DWBRMSGDSC_SC+0x00030000+AS_SAVE	// Restore r1 - r3
-	mov	(8)	a0.0<1>:uw	AR_SAVE<8;8,1>:uw				// Restore all address registers
-
-// Check whether all MBs have been decoded
-	cmp.e.f0.0 (1)	NULLREG	TotalMB<0;1,0>:w	0:w	// Set "Last MB" flag
-	(-f0.0) jmpi (1)	Before_First_MB
-    END_THREAD
-
-// Check whether it is before the first MB
-Before_First_MB:
-	cmp.e.f0.0 (1)	NULLREG	AVAILFLAGD<1>:ud	0x08020401:ud	// in ACBD order
-	(f0.0) jmpi (1)	Wavefront_Walk
-
-Scoreboard_State_Init:
-#endif	// End AS_ENABLED
-	mov (2) WFLen_B<2>:w		HEIGHTINMB_1<0;1,0>:w
-	mov (1)	AVAILFLAGD<1>:ud	0x08020401:ud	// in ACBD order
-	mov	(1) CASE00PTR<1>:ud	Notify_MSG_IP-No_Message_IP:ud		// Inter kernel starts
-	mov	(1) CASE10PTR<1>:ud	Dependency_Check_IP-No_Message_IP:ud	// Intra kernel starts
-#ifdef	AS_ENABLED
-	mov	(1) CASE11PTR<1>:ud	0:ud		// No message
-#else
-	mov	(1) CASE11PTR<1>:ud	MB_Loop_IP-No_Message_IP:ud		// No message
-#endif	// End AS_ENABLED
-	mov	(1) StartXD<1>:ud	0:ud
-	mov	(1) NewWFOffsetD<1>:ud	0x01ffff00:ud
-
-	mov (4) WFStart(0)<1>	0xffff:w
-	mov (1) WFStart(0)<1>	0:w
-
-	mov	(8)	a0.0<1>:uw	0x0:uw						// Initialize all pointers to 0
-
-//------------------------------------------------------------------------
-//	Scoreboard message handling loop
-//------------------------------------------------------------------------
-//
-Scoreboard_Loop:
-	// Calculate current wavefront length
-	add.ge.f0.1 (16)	acc0<1>:w	StartX<0;1,0>:w	0:w		// Used for x>2*y check
-	mac.g.f0.0 (16)	NULLREGW	WFLenY<0;1,0>:w	-2:w		// X - 2*Y > 0 ??
-	(f0.0) mov (1)	WFLen<1>:w	WFLenY<0;1,0>:w				// Use smaller vertical wavefront length
-	(-f0.0) asr.sat (1)	WFLen<1>:uw	StartX<0;1,0>:w	1:w		// Horizontal wavefront length is smaller
-
-	// Initialize 5-MB group
-#ifdef ONE_MB_WA
-	mov (2) MBINDEX(0)<1>		WFStart(0)<2;2,1>
-	(f0.1) add (4) MBINDEX(0,2)<1>		WFStart(0,1)<4;4,1>	-1:w
-	(-f0.1) add (4) MBINDEX(0,2)<1>		WFStart(0,0)<4;4,1>	-1:w
-	(-f0.1) mov (1) StartX<1>:w		0:w					// WA for 1-MB wide pictures
-#else
-	mov (2) MBINDEX(0)<1>		WFStart(0)<2;2,1>			{NoDDClr}
-	add (4) MBINDEX(0,2)<1>		WFStart(0,1)<4;4,1>	-1:w	{NoDDChk}
-#endif
-
-	// Update WFStart
-	mov (8)	acc0<1>:w	WFStart(0)<0;1,0>					// Move WFStart(0) to acc0 to remove dependency later
-	mov (4)	WFStart(0,1)<1>	WFStart(0)<4;4,1>	{NoDDClr}	// Shift WFStart(0:2) to WFStart(1:3)
-	add (1)	WFStart(0)<1>	acc0.0<0;1,0>:w		WFLen<0;1,0>:w	{NoDDChk}	// WFStart(0) = WFStart(0) + WFLen
-
-	mul (8)	MBINDEX(0)<1>	MBINDEX(0)<8;8,1>	4:w	// Adjust MB order # to be DWORD aligned
-	and (1)	DEPPTR<1>:uw	acc0<0;1,0>:w	SB_MASK*4:uw {NoDDClr}	// Wrap around scoreboard entries for current MB
-	and (4)	DEPPTRL<1>:uw	acc0.1<4;4,1>:w	SB_MASK*4:uw {NoDDChk}	// Wrap around scoreboard entries for neighbor MBs
-
-Wavefront_Walk:
-	wait	n0:ud
-//	Check for combined "checking" or "completed" threads in forwarded message
-//	2 MSB of scoreboard message indicate:
-//	0b00 = "inter start" message
-//	0b10 = "intra start" message
-//	0b11 = "No Message" or "inter complete" message
-//	0b01 = Reserved (should never occur)
-//
-MB_Loop:
-	shr	(1)	PMSGSEL<1>:uw	r[CMDPTR,CMD_SB_REG_OFF*GRFWIB+2]<0;1,0>:uw	12:w					// DWORD aligned pointer to message handler
-	and.nz.f0.1 (4) NULLREG	r[CMDPTR,CMD_SB_REG_OFF*GRFWIB]<0;1,0>:ub	AVAILFLAG<4;4,1>:ub		// f0.1 4 LSB will have the available flags in ACBD order
-	mov (1) MSGHDRY0.4<1>:ud	r[CMDPTR,CMD_SB_REG_OFF*GRFWIB]<0;1,0>:ud		// Copy MB thread info from scoreboard
-	jmpi (1)	r[PMSGSEL, INLINE_REG_OFF*GRFWIB+16]<0;1,0>:d
-
-//	Now determine whether this is "inter done" or "no message"
-//	through checking debug_counter
-//
-No_Message:
-#ifdef	AS_ENABLED
-	cmp.z.f0.1 (1)	NULLREG	n0:ud	0	// Are all messages handled?
-	and.z.f0.0 (1)	NULLREG	cr0.1:ud	AS_INT	// Poll interrupt bit
-	(-f0.1) jmpi (1)	MB_Loop			// Continue polling the remaining message from current thread
-
-// All messages have been handled
-	(f0.0) jmpi (1) Wavefront_Walk		// No interrupt occurs. Wait for next one
-
-// Interrupt has been detected
-// Save all contents and terminate the scoreboard
-//
-	#include "scoreboard_save_AS.asm"
-
-	// Save scoreboard control data as well
-	//
-	mov (8) AR_SAVE<1>:uw	a0.0<8;8,1>:uw		// All address registers needs to be saved
-    mov (1)	MSGHDR.1:ud		64:ud
-    mov (1)	MSGHDR.2:ud		0x0002001f:ud	// for 3 registers
-	$for(0; <3; 1) {
-	mov (8)	MSGPAYLOADD(%1)<1>	CMD_SB(%1-3)REGION(8,1)
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00300000+AS_SAVE	// Save r1 - r3
-
-	send (8) NULLREG MSGHDR r0:ud EOTMSGDSC+TH_INT	// Terminate with "Thread Interrupted" bit set
-#endif	// End AS_ENABLED
-
-Dependency_Check:
-//	Current thread is "checking" but not "completed" (0b10 case).
-//	Check for dependency clear using all availability bits
-//
-	(f0.1) and.z.f0.1 (4)	NULLREG	r[DEPPTRL,CMD_SB_REG_OFF*GRFWIB+3]<1,0>:ub	DONEFLAG:uw	// f0.1 4 LSB contains dependency clear
-	(f0.1.any4h) jmpi (1)	Dependency_Check		// Dependency not clear, keep polling..
-
-//	"Checking" thread and dependency cleared, send a message to let the thread go
-//
-Notify_MSG:
-	send (8)	NULLREG  MSGHDRY0	null:ud    MSG_GW	FWDMSGDSC+NOTIFYMSG
-
-//	Current macroblock has been serviced. Update to next macroblock in special zig-zag order
-//
-Update_CurMB:
-#if 0
-	add.ge.f0.0 (1)	WFLen<1>:w	WFLen<0;1,0>:w	-1:w 			// Set "End of wavefront" flag
-	add (1)	TotalMB<1>:w	TotalMB<0;1,0>:w	-1:w 			// Decrement "TotalMB"
-#else
-	add.ge.f0.0 (2)	TotalMB<2>:w	TotalMB<4;2,2>:w	-1:w 	// Set "End of wavefront" flag and decrement "TotalMB"
-#endif
-	add (8)	MBINDEX(0)<1>	MBINDEX(0)<8;8,1>	4:w				// Increment MB indices
-	and (1)	DEPPTR<1>:uw	acc0<0;1,0>:w	SB_MASK*4:uw {NoDDClr}	// Wrap around 256 scoreboard entries for current MB
-	and (4)	DEPPTRL<1>:uw	acc0.1<4;4,1>:w	SB_MASK*4:uw {NoDDChk}	// Wrap around 256 scoreboard entries for neighbor MBs
-	cmp.e.f0.1 (16)	NULLREGW  StartX<0;1,0>:uw	WIDTHINMB_1<0;1,0>:uw	// Set "on picture right boundary" flag
-#if 0
-	(f0.0) jmpi (1) Wavefront_Walk			// Continue wavefront walking
-#else
-	(f0.0.all2h) jmpi (1) Wavefront_Walk	// Continue wavefront walking
-#endif
-
-//	Start new wavefront
-//
-	cmp.e.f0.0 (1)	NULLREG	TotalMB<0;1,0>:w		0:w	// Set "Last MB" flag
-	(f0.1) add (4)	WFLen<1>:w	WFLen<4;4,1>:w		NewWFOffset<4;4,1>:b
-	(f0.1) add (4)	WFStart(0)<1>	WFStart(0)<4;4,1>	1:w
-	(-f0.1) add (1)	StartX<1>:w		StartX<0;1,0>:w	1:w		// Move to right MB
-	(-f0.1) add (1)	WFStart(0)<1>	WFStart(0)<0;1,0>	1:w
-
-	(-f0.0) jmpi (1)	Scoreboard_Loop				// Not last MB, start new wavefront walking
-
-// All MBs have decoded. Terminate the thread now
-//
-    END_THREAD
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
-
-// End of scoreboard
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/Scoreboard_header.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/Scoreboard_header.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/Scoreboard_header.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/Scoreboard_header.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
- * Common header file for both scoreboard and scoreboard_MBAFF kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SCOREBOARD_HEADER__)	// Make sure this file is only included once
-#define __SCOREBOARD_HEADER__
-
-// Module name: scoreboard_header.inc
-//
-// Common header file for both scoreboard and scoreboard_MBAFF kernels
-//
-
-#define ONE_MB_WA						// Enable WA for 1-MB wide pictures. To disable WA, simply comment out this line.
-
-#define	INLINE_REG_OFF	1
-#define INLINE_REG		r1
-#define INLINE_REG1		r2
-
-#define DONEFLAG	0x40		// Bit mask of "completed" thread flag
-
-// GRF r1 map
-//
-#define WIDTHINMB_1	INLINE_REG.0		// :uw type. Picture width in MB - 1
-#define HEIGHTINMB_1	INLINE_REG.1	// :uw type. Picture height in MB - 1
-#define TotalMB		INLINE_REG.2		// :uw type. Total number of macroblocks
-#define WFLen_B		INLINE_REG.3		// :uw type. Bottom MB Wavefront length (Reserved for MBAFF scoreboard)
-#define WFLen		INLINE_REG.4		// :uw type. Wavefront length (used as loop counter)
-#define WFLenY		INLINE_REG.5		// :uw type. Wavefront length (vertical component)
-#define StartX		INLINE_REG.6		// :uw type. Start X of current wavefront
-#define StartY		INLINE_REG.7		// :uw type. Start Y of current wavefront
-#define StartXD		INLINE_REG.3		// :ud type. Start (X,Y) of current wavefront
-#define	CASE00PTR	INLINE_REG.4		// :ud type. Pointer to "inter start" handler
-#define WFLen_Save	INLINE_REG.10		// :uw type. Saved Wavefront length (Reserved for MBAFF scoreboard)
-#define	CASE10PTR	INLINE_REG.6		// :ud type. Pointer to "intra start" handler
-#define	CASE11PTR	INLINE_REG.7		// :ud type. Pointer to "inter complete" handler
-
-// GRF r2 map
-//
-.declare    WFStart	Base=GRF(2) ElementSize=2 SrcRegion=REGION(4,1) Type=w	// Start MB of recent 4 wavefronts, actually use 5 WORDs
-.declare    WFStart_T	Base=GRF(2) ElementSize=2 SrcRegion=REGION(4,1) Type=w		// Start MB of recent 4 wavefronts
-.declare    WFStart_B	Base=GRF(2).4 ElementSize=2 SrcRegion=REGION(4,1) Type=w	// Start MB of recent 4 wavefronts
-
-#define NewWFOffsetD	INLINE_REG1.5	// :d type. Offsets used for new wavefront = 0x01ffff00 (0, -1, -1, 1)
-#define NewWFOffset	INLINE_REG1.20		// :b type. Offsets used for new wavefront = 0x01ffff00 (0, -1, -1, 1)
-
-#define AVAILFLAGD	INLINE_REG1.6		// :ud type. Neighbor available flags = 0x08020401 (in ACBD order)
-#define AVAILFLAG	INLINE_REG1.24		// :ub type. Neighbor available flags as above
-#define AVAILFLAG1D	INLINE_REG1.7		// :ud type. Top-half neighbor available flags = 0x80402010 (in A_Bxxx order)
-
-.declare    MBINDEX	Base=GRF(3) ElementSize=2 SrcRegion=REGION(16,1) Type=w	// MB order # of current MB group (Cur, ACBD and AC_B_D_)
-#define AR_SAVE		r3.8	// :uw type. Saved Address Register information
-
-#define	CMDPTR		a0.0	// :uw type. DWORD Pointer to the scoreboard
-#define DEPPTR		a0.0	// :uw type. Pointer to the dependency scoreboard - Current MB
-#define DEPPTRL		a0.1	// :uw type. Pointer to the dependency scoreboard - Left MB
-#define DEPPTRTR	a0.2	// :uw type. Pointer to the dependency scoreboard - Top right MB
-#define DEPPTRT		a0.3	// :uw type. Pointer to the dependency scoreboard - Top MB
-#define DEPPTRTL    a0.4    // :uw type. Pointer to the dependency scoreboard - Top left MB
-#define DEPPTRLB	a0.5	// :uw type. Pointer to the dependency scoreboard - Left bottom-half MB
-
-#define	PMSGSEL		a0.7	// :uw type. Pointer to current message in message handling table
-
-#define	CMD_SB_REG_OFF		4
-.declare    CMD_SB		Base=GRF(4) ElementSize=4 SrcRegion=REGION(8,1) Type=ud	// Command scoreboard (64 GRF)
-
-#ifdef	AS_ENABLED
-//	Definitions for Advanced Scheduler support
-#define AS_INT		BIT23	// "Preemption Exception Status" bit in cr0.1:ud control register
-#define AS_INT_EN	BIT10	// "Preemption Exception Enable" bit in cr0.1:ud control register
-#define TH_INT		BIT2	// "Thread Interrupted" bit in message descriptor
-#define TH_RES		BIT0	// "Thread Restart Enable" bit in R0 header r0.2
-
-#define AS_SAVE		34		// Surface state for saving scoreboard contents
-							// Ensure not to conflict with existing binding table entries
-#endif	// End AS_ENABLED
-
-// End of scoreboard_header
-
-#endif	// !defined(__SCOREBOARD_HEADER__)
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_MBAFF.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_MBAFF.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_MBAFF.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_MBAFF.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,299 +0,0 @@
-/*
- * Dependency control scoreboard kernel for MBAFF frame
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: scoreboard_MBAFF.asm
-//
-// Dependency control scoreboard kernel for MBAFF frame
-//
-//  $Revision: 16 $
-//  $Date: 10/18/06 4:10p $
-//
-
-// ----------------------------------------------------
-//  Main: scoreboard_MBAFF
-// ----------------------------------------------------
-// ----------------------------------------------------
-//  Scoreboard structure
-// ----------------------------------------------------
-//
-//	1 DWORD per thread
-//
-//	Bit 31:	"Checking" thread, i.e. an intra MB that sends "check dependency" message
-//	Bit 30: "Completed" thread. This bit set by an "update" message from intra/inter MB.
-//	Bits 29:28:	Must set to 0
-//	Bits 27:24:	EUID
-//	Bits 23:18: Reserved
-//	Bits 17:16: TID
-//	Bits 15:8:	X offset of current MB
-//	Bits 15:5:	Reserved
-//	Bits 4:0: 5 bits of available neighbor MB flags
-
-.kernel scoreboard_MBAFF
-SCOREBOARD_MBAFF:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0xffaa55a5:ud
-#endif
-
-#include "header.inc"
-#include "scoreboard_header.inc"
-
-//
-//  Now, begin source code....
-//
-
-.code
-
-#ifdef	AS_ENABLED
-	and.z.f0.1	(1)	NULLREG	r0.2<0;1,0>:ud	TH_RES	// Is this a restarted thread previously interrupted?
-	(f0.1) jmpi	(1)	MBAFF_Scoreboard_Init
-
-	#include "scoreboard_restore_AS.asm"
-
-	jmpi (1)	MBAFF_Scoreboard_OpenGW
-MBAFF_Scoreboard_Init:
-#endif	// End AS_ENABLED
-
-// Scoreboard must be initialized to 0xc000ffff, meaning all "completed"
-// And it also avoids message mis-handling for the first MB
-    $for(0; <32; 2) {
-	mov (16)	CMD_SB(%1)<1>	0xc000ffff:ud {Compr}
-	}
-#ifdef	DOUBLE_SB					// Scoreboard size needs to be doubled
-    $for(32; <64; 2) {
-	mov (16)	CMD_SB(%1)<1>	0xc000ffff:ud {Compr}
-	}
-#endif	// DOUBLE_SB
-
-//----------------------------------------------------------
-//	Open message gateway for the scoreboard thread
-//
-//	RegBase = r4 (0x04)
-//	Gateway Size = 64 GRF registers (0x6)
-//	Dispatch ID = r0.20:ub
-//	Scoreboard Thread Key = 0
-//----------------------------------------------------------
-MBAFF_Scoreboard_OpenGW:
-    mov (8)	MSGHDRY0<1>:ud	0x00000000:ud			// Initialize message header payload with 0
-
-	// Send a message with register base RegBase=0x04(r4) and Gateway size = 0x6 = 64 GRF reg and Key = 0
-	// 000 00000100 00000 00000 110 00000000 ==> 0000 0000 1000 0000 0000 0110 0000 0000
-#ifdef	AS_ENABLED
-	add (1) MSGHDRY0.5<1>:ud r0.20:ub	0x00800700:ud	// Allocate 128 GRFs for message gateway - for SIP to send notification MSG
-#else
-  #ifdef	DOUBLE_SB
-	add (1) MSGHDRY0.5<1>:ud r0.20:ub	0x00800600:ud	// 64 GRF's for CTG-B
-  #else
-	add (1) MSGHDRY0.5<1>:ud r0.20:ub	0x00800500:ud	// 32 GRF's for CTG-A
-  #endif	// DOUBLE_SB
-#endif
-
-	send (8)	NULLREG  MSGHDRY0	null:ud    MSG_GW	OGWMSGDSC
-
-//------------------------------------------------------------------------
-//	Send Thread Spawning Message to start dispatching macroblock threads
-//
-//------------------------------------------------------------------------
-#ifdef	AS_ENABLED
-	mov (8)	acc0<1>:ud	CMD_SB(31)<8;8,1>			// Ensure scoreboard data have been completely restored
-#endif	// End AS_ENABLED
-    mov (8)	MSGHDRY1<1>:ud		r0<8;8,1>:ud		// Initialize message header payload with R0
-    mov (1)	MSGHDRY1.4<1>:ud	0x00000400:ud		// Dispatch URB length = 1
-
-	send (8)	NULLREG  MSGHDRY1	null:ud    TS	TSMSGDSC
-
-    mov (8)	MSGHDRY0<1>:ud		0x00000000:ud		// Initialize message header payload with 0
-
-//------------------------------------------------------------------------
-//	Scoreboard control data initialization
-//------------------------------------------------------------------------
-#ifdef	AS_ENABLED
-	or	(1)	cr0.1:ud	cr0.1:ud	AS_INT_EN		// Enable interrupt
-	(f0.1) jmpi	(1)	MBAFF_Scoreboard_State_Init	// Jump if not restarted thread
-
-	// Restore scoreboard kernel control data to r1 - r3
-    mov (1)	m4.1:ud	64:ud				// Starting r1
-    mov (1)	m4.2:ud	0x0002001f:ud		// for 3 registers
-    send (8)	r1.0<1>:ud	m4	null:ud	DWBRMSGDSC_SC+0x00030000+AS_SAVE	// Restore r1 - r3
-	and (1)	CMDPTR<1>:uw	MBINDEX(0)<0;1,0>	SB_MASK*4:uw 	// Restore scoreboard entries for current MB
-
-// EOT if all MBs have been decoded
-	cmp.e.f0.0 (1)	NULLREG	TotalMB<0;1,0>:w	0:w	// Set "Last MB" flag
-	(-f0.0) jmpi (1)	MBAFF_Before_First_MB
-    END_THREAD
-
-// Check whether it is before the first MB
-MBAFF_Before_First_MB:
-	cmp.e.f0.0 (1)	NULLREG	AVAILFLAGD<1>:ud	0x08020401:ud	// in ACBD order
-	(f0.0) jmpi (1)	MBAFF_Wavefront_Walk
-
-MBAFF_Scoreboard_State_Init:
-#endif	// End AS_ENABLED
-	mov (2) WFLen_B<2>:w		HEIGHTINMB_1<0;1,0>:w
-	mov (1)	AVAILFLAGD<1>:ud	0x08020401:ud	// in ACBD order
-	mov (1)	AVAILFLAG1D<1>:ud	0x08020410:ud	// in A_C_B_D_ order
-	mov	(1) CASE00PTR<1>:ud	MBAFF_Notify_MSG_IP-MBAFF_No_Message_IP:ud		// Inter kernel starts
-	mov	(1) CASE10PTR<1>:ud	MBAFF_Dependency_Check_IP-MBAFF_No_Message_IP:ud	// Intra kernel starts
-#ifdef	AS_ENABLED
-	mov	(1) CASE11PTR<1>:ud	0:ud		// No message
-#else
-	mov	(1) CASE11PTR<1>:ud	MBAFF_MB_Loop_IP-MBAFF_No_Message_IP:ud		// No message
-#endif	// End AS_ENABLED
-	mov	(1) StartXD<1>:ud	0:ud
-	mov	(1) NewWFOffsetD<1>:ud	0x01ffff00:ud
-
-	mov (8) WFStart_T(0)<1>	0xffff:w
-	mov (1) WFStart_T(0)<1>	0:w
-
-	mov	(8)	a0.0<1>:uw	0x0:uw						// Initialize all pointers to 0
-
-//------------------------------------------------------------------------
-//	Scoreboard message handling loop
-//------------------------------------------------------------------------
-//
-MBAFF_Scoreboard_Loop:
-// Calculate current wavefront length (same for top and bottom MB wavefronts)
-	add.ge.f0.1 (16)	acc0<1>:w	StartX<0;1,0>:w	0:w	// Used for x>2*y check
-	mac.g.f0.0 (16)	NULLREGW	WFLenY<0;1,0>:w	-2:w	// X - 2*Y > 0 ??
-	(f0.0) mov (2)	WFLen_B<1>:w	WFLenY<0;1,0>:w		// Use smaller vertical wavefront length
-	(f0.0) mov (1)	WFLen_Save<1>:w	WFLenY<0;1,0>:w		// Save current wave front length
-	(-f0.0) asr.sat (2)	WFLen_B<1>:uw	StartX<0;1,0>:w	1:w	// Horizontal wavefront length is smaller
-	(-f0.0) asr.sat (1)	WFLen_Save<1>:uw	StartX<0;1,0>:w	1:w	// Save current wave front length
-
-// Initialize 9-MB group for top macroblock wavefront
-#ifdef ONE_MB_WA_MBAFF
-	mov (2) MBINDEX(0)<1>		WFStart_T(0)<2;2,1>
-	(f0.1) add (4) MBINDEX(0,2)<1>		WFStart_B(0,1)<4;4,1>	-1:w
-	(-f0.1) add (4) MBINDEX(0,2)<1>		WFStart_B(0,0)<4;4,1>	-1:w
-	mov (1) MBINDEX(0,5)<1>		WFStart_B(0,1)<0;1,0>
-	(-f0.1) mov (1) StartX<1>:w		0:w					// WA for 1-MB wide pictures
-#else
-	mov (2) MBINDEX(0)<1>		WFStart_T(0)<2;2,1>			{NoDDClr}
-	add (4) MBINDEX(0,2)<1>		WFStart_B(0,1)<4;4,1>	-1:w	{NoDDChk,NoDDClr}
-	mov (1) MBINDEX(0,5)<1>		WFStart_B(0,1)<0;1,0>		{NoDDChk,NoDDClr}
-	add (4) MBINDEX(0,6)<1>		WFStart_T(0,1)<4;4,1>	-1:w	{NoDDChk}	// Upper MB group (C_B_D_x)
-#endif
-
-// Update WFStart_B[0]
-	add (8)	acc0<1>:w	WFLen<0;1,0>:w	1:w				// WFLen + 1
-	add (1)	WFStart_B(0,0)<1>	acc0<0;1,0>:w	WFStart_T(0,0)<0;1,0>	// WFStart_T[0] + WFLen + 1
-
-MBAFF_Start_Wavefront:
-	mul (16)	MBINDEX(0)<1>	MBINDEX(0)REGION(16,1)	4:w		// Adjust MB order # to be DWORD aligned
-	and (1)	CMDPTR<1>:uw	acc0<0;1,0>:w	SB_MASK*4:uw 	// Wrap around scoreboard entries for current MB
-
-MBAFF_Wavefront_Walk:
-	wait	n0:ud
-
-//	Check for combined "checking" or "completed" threads in forwarded message
-//	2 MSB of scoreboard message indicate:
-//	0b00 = "inter start" message
-//	0b10 = "intra start" message
-//	0b11 = "No Message" or "inter complete" message
-//	0b01 = Reserved (should never occur)
-//
-MBAFF_MB_Loop:
-	shr	(1)	PMSGSEL<1>:uw	r[CMDPTR,CMD_SB_REG_OFF*GRFWIB+2]<0;1,0>:uw	12:w					// DWORD aligned pointer to message handler
-	and.nz.f0.1 (8) NULLREG	r[CMDPTR,CMD_SB_REG_OFF*GRFWIB]<0;1,0>:ub	AVAILFLAG<8;8,1>:ub		// f0.1 8 LSB will have the available flags in ACBDA_C_B_D_ order
-	mov (1) MSGHDRY0.4<1>:ud	r[CMDPTR,CMD_SB_REG_OFF*GRFWIB]<0;1,0>:ud		// Copy MB thread info from scoreboard
-	jmpi (1)	r[PMSGSEL, INLINE_REG_OFF*GRFWIB+16]<0;1,0>:d
-
-//	Now determine whether this is "inter done" or "no message"
-//	through checking debug_counter
-//
-MBAFF_No_Message:
-#ifdef	AS_ENABLED
-	cmp.z.f0.1 (1)	NULLREG	n0:ud	0	// Are all messages handled?
-	and.z.f0.0 (1)	NULLREG	cr0.1:ud	AS_INT	// Poll interrupt bit
-	(-f0.1) jmpi (1)	MBAFF_MB_Loop			// Continue polling the remaining message from current thread
-
-// All messages have been handled
-	(f0.0) jmpi (1) MBAFF_Wavefront_Walk		// No interrupt occurs. Wait for next one
-
-// Interrupt has been detected
-// Save all contents and terminate the scoreboard
-//
-	#include "scoreboard_save_AS.asm"
-
-	// Save scoreboard control data as well
-	//
-    mov (1)	MSGHDR.1:ud		64:ud
-    mov (1)	MSGHDR.2:ud		0x0002001f:ud	// for 3 registers
-	$for(0; <3; 1) {
-	mov (8)	MSGPAYLOADD(%1)<1>	CMD_SB(%1-3)REGION(8,1)
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00300000+AS_SAVE	// Save r1 - r3
-
-	send (8) NULLREG MSGHDR r0:ud EOTMSGDSC+TH_INT	// Terminate with "Thread Interrupted" bit set
-#endif	// End AS_ENABLED
-
-MBAFF_Dependency_Check:
-//	Current thread is "checking" but not "completed" (0b10 case).
-//	Check for dependency clear using all availability bits
-//
-	and (8)	DEPPTR<1>:uw	MBINDEX(0,1)REGION(8,1)	SB_MASK*4:uw	// Wrap around scoreboard entries for current MB
-MBAFF_Dependency_Polling:
-	(f0.1) and.z.f0.1 (8)	NULLREG	r[DEPPTR,CMD_SB_REG_OFF*GRFWIB+3]<1,0>:ub	DONEFLAG:uw	// f0.1 8 LSB contains dependency clear
-	(f0.1.any8h) jmpi (1)	MBAFF_Dependency_Polling		// Dependency not clear, keep polling..
-
-//	"Checking" thread and dependency cleared, send a message to let the thread go
-//
-MBAFF_Notify_MSG:
-	send (8)	NULLREG  MSGHDRY0	null:ud    MSG_GW	FWDMSGDSC+NOTIFYMSG
-
-//	Current macroblock has been serviced. Update to next macroblock in special zig-zag order
-//
-MBAFF_Update_CurMB:
-	add.ge.f0.0 (2)	TotalMB<2>:w	TotalMB<4;2,2>:w	-1:w 	// Set "End of wavefront" flag and decrement "TotalMB"
-	add (16)	MBINDEX(0)<1>	MBINDEX(0)REGION(16,1)	4:w		// Increment MB indices
-	and (1)	CMDPTR<1>:uw	acc0<0;1,0>:w	SB_MASK*4:uw // Wrap around scoreboard entries for current MB
-	(f0.0.all2h) jmpi (1) MBAFF_Wavefront_Walk	// Continue wavefront walking
-
-// Top macroblock wavefront walk done, start bottom MB wavefront
-	add.ge.f0.0 (1)	WFLen<1>:w	WFLen_B<0;1,0>:w	0:w	{NoDDClr}		// Set bottom MB wavefront length
-	mov (1)	WFLen_B<1>:w	-1:w	{NoDDChk}			// Reset bottom MB wavefront length
-	
-// Initialize 9-MB group for bottom macroblock wavefront
-	mov (8) MBINDEX(0)<1>		WFStart_B(0)<1;4,0>			{NoDDClr}	// Initialize with WFStart_B[0] and WFStart_B[1]
-	mov (4) MBINDEX(0,1)<1>		WFStart_T(0,1)<0;1,0>		{NoDDChk,NoDDClr}	// Initialize with WFStart_T[1]
-	mov (2) MBINDEX(0,2)<1>		WFStart_T(0)<0;1,0>			{NoDDChk,NoDDClr}	// Initialize with WFStart_T[0]
-	add (4) MBINDEX(0,6)<1>		WFStart_B(0,1)<4;4,1>	-1:w	{NoDDChk}	// Upper MB group (C_B_D_x)
-
-	(f0.0) jmpi (1) MBAFF_Start_Wavefront				// Start bottom MB wavefront walk
-
-//	Start new wavefront
-//
-	cmp.e.f0.1 (16)	NULLREGW  StartX<0;1,0>:uw	WIDTHINMB_1<0;1,0>:uw	// Set "on picture right boundary" flag
-
-	// Update WFStart_T and WFStart_B
-	add (8)	acc0<1>:w	WFStart_T(0)REGION(1,0)	1:w				// Move WFStart_T[0]+1 to acc0 to remove dependency later
-	mov (8)	WFStart_T(0,1)<1>	WFStart_T(0)<8;8,1>	{NoDDClr}	// Shift WFStart_T(B)[0:2] to WFStart_T(B)[1:3]
-	mac (1)	WFStart_T(0,0)<1>	WFLen_Save<0;1,0>:w	2:w {NoDDChk}	// WFStart_T[0] = WFStart_T[0] + 2*WFLen
-
-	cmp.e.f0.0 (1)	NULLREG	TotalMB<0;1,0>:w	0:w	// Set "Last MB" flag
-
-	(f0.1) add (4)	WFLen<1>:w	WFLen<4;4,1>:w	NewWFOffset<4;4,1>:b	// + (0, -1, -1, 1)
-	(f0.1) add (8)	WFStart_T(0)<1>	WFStart_T(0)REGION(4,1)	1:w
-	(-f0.1) add (1)	StartX<1>:w		StartX<0;1,0>:w	1:w		// Move to right MB
-	(-f0.1) add (1)	WFStart_T(0)<1>	WFStart_T(0)REGION(1,0)	1:w
-
-	(-f0.0) jmpi (1)	MBAFF_Scoreboard_Loop				// Not last MB, start new wavefront walking
-
-// All MBs have decoded. Terminate the thread now
-//
-    END_THREAD
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
-
-// End of scoreboard_MBAFF
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_restore_AS.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_restore_AS.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_restore_AS.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_restore_AS.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * Restore previously stored scoreboard data after content switching back
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: scoreboard_restore_AS.asm
-//
-// Restore previously stored scoreboard data after content switching back
-//
-//
-	// Restore scoreboard data to r4 - r67
-	// They are saved in a 2D surface with width of 32 and height of 80.
-	// Each row corresponds to one GRF register in the following order
-	// r4 - r67	: Scoreboard message
-	//
-    mov (8)	MSGSRC<1>:ud	r0.0<8;8,1>:ud {NoDDClr}	// Initialize message header payload with r0
-
-    mov (2)	MSGSRC.0:ud		0:ud {NoDDClr, NoDDChk}		// Starting r4
-    mov (1)	MSGSRC.2:ud		0x0007001f:ud {NoDDChk}		// for 8 registers
-    send (8)	CMD_SB(0)<1>	m1	MSGSRC<8;8,1>:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r4 - r11
-
-    mov (8)	m2:ud		MSGSRC<8;8,1>:ud
-    mov (1)	m2.1:ud		8:ud
-    send (8)	CMD_SB(8)<1>	m2	null:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r12 - r19
-
-    mov (8)	m3:ud		MSGSRC<8;8,1>:ud
-    mov (1)	m3.1:ud		16:ud
-    send (8)	CMD_SB(16)<1>	m3	null:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r20 - r27
-
-    mov (8)	m4:ud		MSGSRC<8;8,1>:ud
-    mov (1)	m4.1:ud		24:ud
-    send (8)	CMD_SB(24)<1>	m4	null:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r28 - r35
-
-    mov (8)	m5:ud		MSGSRC<8;8,1>:ud
-    mov (1)	m5.1:ud		32:ud
-    send (8)	CMD_SB(32)<1>	m5	null:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r36 - r43
-
-    mov (8)	m6:ud		MSGSRC<8;8,1>:ud
-    mov (1)	m6.1:ud		40:ud
-    send (8)	CMD_SB(40)<1>	m6	null:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r44 - r51
-
-    mov (8)	m7:ud		MSGSRC<8;8,1>:ud
-    mov (1)	m7.1:ud		48:ud
-    send (8)	CMD_SB(48)<1>	m7	null:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r52 - r59
-
-    mov (8)	m8:ud		MSGSRC<8;8,1>:ud
-    mov (1)	m8.1:ud		56:ud
-    send (8)	CMD_SB(56)<1>	m8	null:ud	DWBRMSGDSC_SC+0x00080000+AS_SAVE	// Restore r60 - r67
-
-// End of scoreboard_restore_AS
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_save_AS.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_save_AS.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_save_AS.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_save_AS.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/*
- * Save scoreboard data before content switching
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Module name: scoreboard_save_AS.asm
-//
-// Save scoreboard data before content switching
-//
-//
-	//	r1 - r35 need to be saved
-	// They are saved in a 2D surface with width of 32 and height of 64.
-	// Each row corresponds to one GRF register in the following order
-	// r4 - r35	: Scoreboard message
-	// r1 - r3  : Scoreboard kernel control data
-
-    mov (8)	MSGHDR<1>:ud	r0.0<8;8,1>:ud	// Initialize message header payload with r0
-    mov (1)	MSGHDR.2:ud		0x0007001f:ud	// for 8 registers
-
-    mov (2)	MSGHDR.0:ud		0:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r4 - r11
-
-    mov (1)	MSGHDR.1:ud		8:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1+8)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r12 - r19
-
-    mov (1)	MSGHDR.1:ud		16:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1+16)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r20 - r27
-
-    mov (1)	MSGHDR.1:ud		24:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1+24)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r28 - r35
-
-    mov (1)	MSGHDR.1:ud		32:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1+32)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r36 - r43
-
-    mov (1)	MSGHDR.1:ud		40:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1+40)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r44 - r51
-
-    mov (1)	MSGHDR.1:ud		48:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1+48)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r52 - r59
-
-    mov (1)	MSGHDR.1:ud		56:ud
-	$for(0; <8; 2) {
-	mov (16)	MSGPAYLOADD(%1)<1>	CMD_SB(%1+56)REGION(8,1) {Compr}
-	}
-    send (8)	NULLREG	MSGHDR	null:ud	DWBWMSGDSC+0x00800000+AS_SAVE	// Save r60 - r67
-
-// End of scoreboard_save_AS
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_sip.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_sip.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_sip.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_sip.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * Scoreboard interrupt handler
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: scoreboard_sip.asm
-//
-// scoreboard interrupt handler
-//
-// Simply send a notification message to scoreboard thread
-
-    mov (8)		m0<1>:ud	0x00000000:ud			// Initialize message header payload with 0
-#ifdef	DOUBLE_SB
-	mov (1)		m0.5<1>:ud	0x08000200:ud			// Message length = 1 DWORD, sent to GRF offset 64 registers
-#else
-	mov (1)		m0.5<1>:ud	0x04000200:ud			// Message length = 1 DWORD, sent to GRF offset 32 registers
-#endif
-	send (8)	null<1>:ud  m0	null:ud    0x03108002	// Send notification message to scoreboard kernel
-
-	and (1)		cr0.1:ud	cr0.1:ud	0x00800000		// Clear preempt exception bit
-	and (1)		cr0.0:ud	cr0.0:ud	0x7fffffff:ud	// Exit SIP routine
-	nop													// Required by B-spec
-
-.end_code
-
-
-
-
-
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_start_inter.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_start_inter.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_start_inter.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_start_inter.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
- * Scoreboard function for starting inter prediction kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SCOREBOARD_START_INTER__)
-#define __SCOREBOARD_START_INTER__
-//
-// Module name: scoreboard_start_inter.asm
-//
-//	Scoreboard function for starting inter prediction kernels
-//	This function is only used by inter prediction kernels to send message to
-//	scoreboard in order to announce the inter kernel has started
-//
-//  $Revision: 5 $
-//  $Date: 10/18/06 4:11p $
-//
-scoreboard_start_inter:
-
-// First open message gateway since intra kernels need wake-up message to resume
-// 
-    mov (8)	MSGHDRY0<1>:ud	0x00000000:ud			// Initialize message header payload with 0
-
-    // Send a message with register base RegBase = r0 (0x0) and Size = 0x0
-    // 000 00000000 00000 00000 000 00000000 ==> 0000 0000 0000 0000 0000 0000 0000 0000
-    // ---------------------------------------------------------------------------------
-	send (8)	NULLREG  MSGHDRY0	null:ud    MSG_GW	OGWMSGDSC
-
-//	Derive the scoreboard location where the inter thread writes to
-//
-    mov (8)		MSGHDRY1<1>:ud	0x00000000:ud			// Initialize message header payload with 0
-
-	// Compose M0.5:ud
-	#include "set_SB_offset.asm"
-
-	// Compose M0.0:ud, i.e. message payload
-	or	(1)		MSGHDRY1.1<1>:uw	sr0.0<0;1,0>:uw		0x0000:uw	// Set EUID/TID bits + inter start bit
-
-	send (8)	NULLREG  MSGHDRY1	null:ud    MSG_GW	FWDMSGDSC+NOTIFYMSG	// Send "Inter start" message to scoreboard kernel
-
-    RETURN
-
-#endif	// !defined(__SCOREBOARD_START_INTER__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_start_intra.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_start_intra.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_start_intra.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_start_intra.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
- * Scoreboard function for starting intra prediction kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SCOREBOARD_START_INTRA__)
-#define __SCOREBOARD_START_INTRA__
-//
-// Module name: scoreboard_start_intra.asm
-//
-//	Scoreboard function for starting intra prediction kernels
-//	This function is only used by intra prediction kernels to send message to
-//	scoreboard in order to check dependency clearance
-//
-//  $Revision: 5 $
-//  $Date: 10/18/06 4:11p $
-//
-scoreboard_start_intra:
-
-// First open message gateway since intra kernels need wake-up message to resume
-// 
-    mov (8)	MSGHDRY0<1>:ud	0x00000000:ud			// Initialize message header payload with 0
-
-    // Send a message with register base RegBase = r0 (0x0) and Size = 0x0
-    // 000 00000000 00000 00000 000 00000000 ==> 0000 0000 0000 0000 0000 0000 0000 0000
-    // ---------------------------------------------------------------------------------
-	and (1)		MSGHDRY0.8<1>:uw	REG_INTRA_PRED_AVAIL_FLAG_BYTE<0;1,0>:ub	0x1f:uw		// Set lower word of key
-	send (8)	NULLREG  MSGHDRY0	null:ud    MSG_GW	OGWMSGDSC
-
-// Send "check dependency" message to scoreboard thread
-// --------------------------
-
-//	Derive the scoreboard location where the intra thread writes to
-//
-    mov (8)		MSGHDRY1<1>:ud	0x00000000:ud			// Initialize message header payload with 0
-
-	// Compose M0.5:ud
-	#include "set_SB_offset.asm"
-
-	// Compose M0.0:ud, i.e. message payload
-	and (1)		MSGHDRY1.0<1>:uw	REG_INTRA_PRED_AVAIL_FLAG_BYTE<0;1,0>:ub	0x1f:uw		// Set lower word of message
-	or	(1)		MSGHDRY1.1<1>:uw	sr0.0<0;1,0>:uw		0x8000:uw	// Set EUID/TID bits + intra start bit
-
-	send (8)	NULLREG  MSGHDRY1	null:ud    MSG_GW	FWDMSGDSC+NOTIFYMSG	// Send "Intra start" message to scoreboard kernel
-
-    RETURN
-
-#endif	// !defined(__SCOREBOARD_START_INTRA__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_update.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_update.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/scoreboard_update.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/scoreboard_update.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/*
- * Scoreboard update function for decoding kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//
-// Module name: scoreboard_update.asm
-//
-//	Scoreboard update function for decoding kernels
-//
-//	This module is used by decoding kernels to send message to scoreboard to update the
-//	"complete" status, thus the dependency of the MB can be cleared.
-//
-//  $Revision: 6 $
-//  $Date: 10/16/06 5:19p $
-//
-    mov (8)		MSGHDRY1<1>:ud	0x00000000:ud				// Initialize message header payload with 0
-
-	// Compose M0.5:ud information
-	add (1)	MSGHDRY1.10<1>:uw	r0.20:ub	0x0200:uw				// Message length = 1 DWORD
-	and (1) MSGHDRY1.11<1>:uw	M05_STORE<0;1,0>:uw	SB_MASK*4:uw	// Retrieve stored value and wrap around scoreboard
-
-	or (1)	MSGHDRY1.0<1>:ud	M05_STORE<0;1,0>:uw	0xc0000000:ud	// Set "Completed" bits
-
-#ifndef BSDRESET_ENABLE
-#ifdef INTER_KERNEL
-	mov	(1)	gREG_WRITE_COMMIT_Y<1>:ud	gREG_WRITE_COMMIT_Y<0;1,0>:ud		// Make sure Y write is committed
-	mov	(1)	gREG_WRITE_COMMIT_UV<1>:ud	gREG_WRITE_COMMIT_UV<0;1,0>:ud		// Make sure U/V write is committed
-#else
-	mov	(1)	REG_WRITE_COMMIT_Y<1>:ud	REG_WRITE_COMMIT_Y<0;1,0>:ud		// Make sure Y write is committed
-	mov	(1)	REG_WRITE_COMMIT_UV<1>:ud	REG_WRITE_COMMIT_UV<0;1,0>:ud		// Make sure U/V write is committed
-#endif	// INTER_KERNEL
-#endif	// BSDRESET_ENABLE
-
-	send (8)	NULLREG  MSGHDRY1	null:ud    MSG_GW	FWDMSGDSC
-
-// End of scoreboard_update
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/SetHWScoreboard.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/SetHWScoreboard.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/SetHWScoreboard.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/SetHWScoreboard.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-/*
- * Set dependency control HW scoreboard kernel
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: SetHWScoreboard.asm
-//
-// Set dependency control HW scoreboard kernel
-//
-
-// ----------------------------------------------------
-//  Main: SetHWScoreboard
-// ----------------------------------------------------
-
-.kernel SetHWScoreboard
-
-SETHWSCOREBOARD:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0xf0aa55a5:ud
-#endif
-
-#include "header.inc"
-#include "SetHWScoreboard_header.inc"
-
-//
-//  Now, begin source code....
-//
-
-.code
-
-//	Separate the TotalMB so TotalMB will be multiple of 8
-//	and RemainderMB will hold the TotalMB%8
-//
-	and.z.f0.1 (1)	RemainderMB<1>:uw	TotalMB<0;1,0>:uw	0x0007:uw	// number of %8 commands
-	and.z.f0.0 (1)	TotalMB<1>:uw		TotalMB<0;1,0>:uw	0xfff8:uw	// Number of 8-command blocks
-
-	mov (1)	MB_SHIFT_MASK_W<1>:uw		0x100*16+12:w					// Set up shift values (12, 16)
-
-//	Initialize common DAP read header
-//
-	mov (8)	MRF_READ_HEADER_SRC<1>:ud	r0.0<8;8,1>:ud
-	shl (1) MRF_READ_HEADER_SRC.2<1>:ud	StartingMB<0;1,0>:uw	6:uw	// Byte-aligned offset being read
-
-//	Initialize Inter DAP write header
- 	mov (8)	MRF_INTER_WRITE_HEADER<1>:ud	r0.0<8;8,1>:ud
-
-	(f0.0) jmpi (1)	SetHWScoreboard_Remainder							// Jump if TotalMB < 8
-
-//------------------------------------------------------------------------
-//	Command buffer parsing loop
-//	Each loop will handle 8 commands
-//------------------------------------------------------------------------
-//
-SetHWScoreboard_Loop:
-//	Load block 0 (Commands 0/1)
-	mov (8)	MRF_READ_HEADER0.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	send (16)	CMD_BUFFER_W(0)<1>	MRF_READ_HEADER0	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 1  (Commands 2/3)
-	mov (8)	MRF_READ_HEADER1.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		128:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(4)<1>	MRF_READ_HEADER1	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 2  (Commands 4/5)
-	mov (8)	MRF_READ_HEADER2.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER2.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		256:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(8)<1>	MRF_READ_HEADER2	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 3  (Commands 6/7)
-	mov (8)	MRF_READ_HEADER3.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER3.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		384:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(12)<1>	MRF_READ_HEADER3	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Start parsing commands
-    $for(0; <16; 2) {
-	and.nz.f0.1 (8)	NULLREG	CMD_BUFFER_D(%1,4)<0;1,0>	IS_INTRA_MB:ud		// Is it an "Intra" MB?
-	or (1)	CMD_BUFFER_D(%1,2)<1>	CMD_BUFFER_D(%1,2)<0;1,0>	BIT21:ud	// Set "Use Scoreboard" for every MB
-	shl	(2)	CMD_BUFFER_W(%1,2)<1>	CMD_BUFFER_W(%1,14)<0;1,0>	MB_SHIFT_MASK_B<2;2,1>:b	// Set HW SB masks
-	mov (2)	CMD_BUFFER_B(%1,4)<2>	CMD_BUFFER_B(%1,20)<2;2,1>				// Set scoreboard (X,Y) for intra MB
-	(-f0.1) mov (2)	CMD_BUFFER_W(%1,2)<1>	CMD_BUFFER_B(%1,20)<2;2,1>		// Set scoreboard (X,Y) for inter MB
-	(f0.1) jmpi (1) Parse_8_Loop_%1
-
-//	Inter Macroblock
-//	Output MEDIA_OBJECT command in raster scan order
-	mul (16) acc0<1>:uw	CMD_BUFFER_B(%1,21)<0;1,0>	PicWidthMB<0;1,0>:uw	// MB offset = Y*W
-	add (16) acc0<1>:uw	acc0<8;8,1>:uw	CMD_BUFFER_B(%1,20)<0;1,0>			// MB offset = Y*W+X
- 	shl (1)	MRF_INTER_WRITE_HEADER.2<1>:ud	acc0.2<0;1,0>:uw	6:uw		// Byte-aligned MB offset
- 	mov (16)	MRF_INTER_WRITE_DATA0<1>:ud	CMD_BUFFER_D(%1)<8;8,1>	{Compr}	// Copy entire command to inter buffer
-	mov	(16)	CMD_BUFFER_D(%1)<1>		0:ud	{Compr}						// Clear original command
-	send (16)	NULLREGW	MRF_INTER_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(2)+OWBWMSGDSC+OWORD_4+BI_CMD_BUFFER
-
-Parse_8_Loop_%1:
-	}
-
-	add.z.f0.0 (1)	TotalMB<1>:w	TotalMB<0;1,0>:w	-8:w				// Update remaining number of 8-command blocks
-
-//	Output modified intra commands
-//	Write block 0
-	mov (8)	MRF_INTRA_WRITE_HEADER.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-    $for(0; <4; 2) {
-	mov (16)	MRF_CMD_BUF_D(%1)<1>	CMD_BUFFER_D(%1)<8;8,1>	{Compr}
-	}
-	send (16)	NULLREGW	MRF_INTRA_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Write block 1
-	mov (8)	m1.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	m1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		128:ud		// Point to next 2-command block
-	mov (16)	m2<1>:ud	CMD_BUFFER_D(4)<8;8,1>	{Compr}
-	mov (16)	m4<1>:ud	CMD_BUFFER_D(6)<8;8,1>	{Compr}
-	send (16)	NULLREGW	m1	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Write block 2
-	add	(1)	MRF_INTRA_WRITE_HEADER.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		256:ud		// Point to next 2-command block
-    $for(0; <4; 2) {
-	mov (16)	MRF_CMD_BUF_D(%1)<1>	CMD_BUFFER_D(%1+8)<8;8,1>	{Compr}
-	}
-	send (16)	NULLREGW	MRF_INTRA_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Write block 3
-	add	(1)	m1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		384:ud		// Point to next 2-command block
-	mov (16)	m2<1>:ud	CMD_BUFFER_D(12)<8;8,1>	{Compr}
-	mov (16)	m4<1>:ud	CMD_BUFFER_D(14)<8;8,1>	{Compr}
-	send (16)	NULLREGW	m1	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Update message header for next DAP read
-	add (1) MRF_READ_HEADER_SRC.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud	512:ud	// Point to next block of 8-commands
-
-	cmp.z.f0.1 (1)	NULLREG	RemainderMB<0;1,0>:w	0:uw	// Check if remainder MB = 0
-	(-f0.0) jmpi (1)	SetHWScoreboard_Loop			// Continue if more command blocks remain
-
-SetHWScoreboard_Remainder:
-//	f0.1 should have been set to indicate if RemainderMB = 0
-//
-	(f0.1) jmpi (1) SetHWScoreboard_Done				// Stop if all commands have been updated
-
-//	Blindly load next 8 commands anyway
-//
-//	Load block 0 (Commands 0/1)
-	mov (8)	MRF_READ_HEADER0.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	send (16)	CMD_BUFFER_W(0)<1>	MRF_READ_HEADER0	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 1  (Commands 2/3)
-	mov (8)	MRF_READ_HEADER1.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		128:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(4)<1>	MRF_READ_HEADER1	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 2  (Commands 4/5)
-	mov (8)	MRF_READ_HEADER2.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER2.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		256:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(8)<1>	MRF_READ_HEADER2	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 3  (Commands 6/7)
-	mov (8)	MRF_READ_HEADER3.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER3.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		384:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(12)<1>	MRF_READ_HEADER3	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Initialize necessary pointers
-	mov (1)	a0.1<1>:ud	((CMD_BUFFER_REG_OFF+1)*0x10000+CMD_BUFFER_REG_OFF)*32	// a0.2:w points to command buffer (first half)
-																			// a0.3:w points to command buffer (second half)
-//	Initialize Inter DAP write header
- 	mov (8)	MRF_INTER_WRITE_HEADER<1>:ud	r0.0<8;8,1>:ud
-
-SetHWScoreboard_Remainder_Loop:
-	and.nz.f0.1 (8)	NULLREG	r[a0.2,4*4]<0;1,0>:ud	IS_INTRA_MB:ud		// Is it an "Intra" MB?
-	add.z.f0.0 (1)	RemainderMB<1>:w	RemainderMB<0;1,0>:w	-1:w	// Decrement MB #
-	or (1)	r[a0.2,2*4]<1>:ud	r[a0.2,2*4]<0;1,0>:ud	BIT21:ud		// Set "Use Scoreboard" for every MB
-	shl	(2)	r[a0.2,2*2]<1>:uw	r[a0.2,14*2]<0;1,0>:uw	MB_SHIFT_MASK_B<2;2,1>:b	// Set HW SB masks
-	mov (2)	r[a0.2,4*1]<2>:ub	r[a0.2,5*4]<2;2,1>:ub					// Set scoreboard (X,Y) for intra MB
-
-	(-f0.1) mov (2)	r[a0.2,4*1]<1>:uw	r[a0.2,5*4]<2;2,1>:ub			// Set scoreboard (X,Y) for inter MB
-	(f0.1) jmpi (1)	Output_Remainder_Intra
-
-//	Inter Macroblock
-//	Output MEDIA_OBJECT command in raster scan order
-	mul (16) acc0<1>:uw	r[a0.2,21]<0;1,0>:ub	PicWidthMB<0;1,0>:uw	// MB offset = Y*W
-	add (16) acc0<1>:uw	acc0<8;8,1>:uw	r[a0.2,20]<0;1,0>:ub			// MB offset = Y*W+X
- 	shl (1)	MRF_INTER_WRITE_HEADER.2<1>:ud	acc0.2<0;1,0>:uw	6:uw	// Byte-aligned MB offset
- 	mov (16)	MRF_INTER_WRITE_DATA0<1>:ud	r[a0.2]<8;8,1>:ud	{Compr}	// Copy entire command to inter buffer
-	mov	(16)	r[a0.2]<1>:ud		0:ud	{Compr}						// Clear original command
-	send (16)	NULLREGW	MRF_INTER_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(2)+OWBWMSGDSC+OWORD_4+BI_CMD_BUFFER
-
-Output_Remainder_Intra:
-//	Intra MB command always output
-	mov (8)	MRF_INTRA_WRITE_HEADER.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
- 	mov (16)	MRF_CMD_BUF_D(0)<1>		r[a0.2]<8;8,1>:ud	{Compr}		// Copy entire command to intra buffer
-	send (16)	NULLREGW	MRF_INTRA_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(2)+OWBWMSGDSC+OWORD_4+BI_CMD_BUFFER
-
-	add	(1)	MRF_READ_HEADER_SRC.2<1>:ud		MRF_READ_HEADER_SRC.2<0;1,0>:ud		64:ud	// Point to next command
-	add (1)	a0.1<1>:ud	a0.1<0;1,0>:ud	0x00400040:ud					// Update pointers
-	(-f0.0) jmpi (1)	SetHWScoreboard_Remainder_Loop
-
-// All MBs have been decoded. Terminate the thread now
-//
-SetHWScoreboard_Done:
-    END_THREAD
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
-
-// End of SetHWScoreboard
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/SetHWScoreboard_header.inc libva-1.0.1/i965_drv_video/shaders/h264/mc/SetHWScoreboard_header.inc
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/SetHWScoreboard_header.inc	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/SetHWScoreboard_header.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,134 +0,0 @@
-/*
- * Common header file for both SetHWScoreboard and SetHWScoreboard_MBAFF kernels
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-#if !defined(__SETHWSCOREBOARD_HEADER__)	// Make sure this file is only included once
-#define __SETHWSCOREBOARD_HEADER__
-
-// Module name: SetHWScoreboard_header.inc
-//
-// Common header file for both SetHWScoreboard and SetHWScoreboard_MBAFF kernels
-//
-
-#define BI_CMD_BUF			0	// Binding table index for command buffer
-
-// GRF r1 map
-//
-// For use by setting HW scoreboard kernel for MBAFF picture
-//
-// CURBE data
-#define	TOP_FM_MASK1_D	r1.0		// Bit mask for first half of top frame MB SB mask
-#define	TOP_FM_MASK1_B	r1.0		// Bit mask for first half of top frame MB SB mask
-#define	TOP_FM_MASK2_D	r1.1		// Bit mask for second half of top frame MB SB mask
-#define	TOP_FM_MASK2_B	r1.4		// Bit mask for second half of top frame MB SB mask
-#define	BOT_FM_MASK1_D	r1.2		// Bit mask for first half of bottom frame MB SB mask
-#define	BOT_FM_MASK1_B	r1.8		// Bit mask for first half of bottom frame MB SB mask
-#define	BOT_FM_MASK2_D	r1.3		// Bit mask for second half of bottom frame MB SB mask
-#define	BOT_FM_MASK2_B	r1.12		// Bit mask for second half of bottom frame MB SB mask
-#define	TOP_FD_MASK1_D	r1.4		// Bit mask for first half of top field MB SB mask
-#define	TOP_FD_MASK1_B	r1.16		// Bit mask for first half of top field MB SB mask
-#define	TOP_FD_MASK2_D	r1.5		// Bit mask for second half of top field MB SB mask
-#define	TOP_FD_MASK2_B	r1.20		// Bit mask for second half of top field MB SB mask
-#define	BOT_FD_MASK1_D	r1.6		// Bit mask for first half of bottom field MB SB mask
-#define	BOT_FD_MASK1_B	r1.24		// Bit mask for first half of bottom field MB SB mask
-#define	BOT_FD_MASK2_D	r1.7		// Bit mask for second half of bottom field MB SB mask
-#define	BOT_FD_MASK2_B	r1.28		// Bit mask for second half of bottom field MB SB mask
-
-// For use by setting HW scoreboard kernel for non-MBAFF picture
-#define	MB_SHIFT_MASK_W		r1.0	// :w type. Shift values for two parts of the MB SB mask
-#define	MB_SHIFT_MASK_B		r1.0	// :b type. Shift values for two parts of the MB SB mask
-
-// GRF r2 map
-//
-// In-line data
-//
-#define	INLINE_REG_OFFSET	1
-#define INLINE_REG			r2
-
-#define StartingMB	INLINE_REG.0	// :uw type. Starting MB number
-#define TotalMB		INLINE_REG.1	// :uw type. Total number of MB to be processed
-#define PicWidthMB	INLINE_REG.2	// :uw type. Picture width in MB
-
-// GRF r3 map
-//
-// Temporary variables
-//
-#define RemainderMB	r3.0			// :uw type. Remainder of MB (<16) to be processed
-
-#define	TEMP_FD_X_W	r3.2			// :w type. Temporary variable for field MB X origin in MBAFF picture
-#define	TEMP_FD_X_B	r3.4			// :b type. Temporary variable for field MB X origin in MBAFF picture
-#define	TEMP_FD_Y_W	r3.3			// :w type. Temporary variable for field MB Y origin in MBAFF picture
-#define	TEMP_FD_Y_B	r3.6			// :b type. Temporary variable for field MB Y origin in MBAFF picture
-
-#define	TEMP_INTRA_FLAG_W	r3.4	// :uw type. Temporary intra available flag
-
-#define MB_MASK_D	r3.4			// :ud type. Bit masks for MBAFF MB
-#define MB_MASK_B	r3.16			// :ub type. Bit masks for MBAFF MB
-
-#define	MRF_READ_HEADER_SRC	r63
-
-// MEDIA_OBJECT_EX Command map
-//
-// In DW1 of each MEDIA_OBJECT_EX command (VFE DWORD)
-#define	CUR_X	0	// Byte 0
-#define	CUR_Y	0	// Byte 2
-
-// In DW2 of each MEDIA_OBJECT_EX command
-#define	USE_SCOREBOARD	BIT21
-
-// In DW4 of each MEDIA_OBJECT_EX command
-#define	F_FLAG		BIT4
-#define	IS_INTRA_MB	BIT13
-#define IS_FIELD_MB	BIT14
-#define IS_INTRA8X8	BIT15
-#define IS_BOT_FD	BIT24
-
-// In DW7 of each MEDIA_OBJECT_EX command
-#define	A_FLAG		BIT0
-#define	B_FLAG		BIT1
-#define	C_FLAG		BIT2
-#define	D_FLAG		BIT3
-#define	E_FLAG		BIT4
-
-#define	CMD_BUFFER_REG_OFF		4
-.declare    CMD_BUFFER_D		Base=GRF(4) ElementSize=4 SrcRegion=REGION(8,1) Type=ud		// Command buffer (32 GRF)
-.declare    CMD_BUFFER_W		Base=GRF(4) ElementSize=2 SrcRegion=REGION(16,1) Type=uw	// Command buffer (32 GRF)
-.declare    CMD_BUFFER_B		Base=GRF(4) ElementSize=1 SrcRegion=REGION(16,1) Type=ub	// Command buffer (32 GRF)
-
-#define	MRF_READ_HEADER		m1
-#define	MRF_READ_HEADER0	m1
-#define	MRF_READ_HEADER1	m2
-#define	MRF_READ_HEADER2	m3
-#define	MRF_READ_HEADER3	m4
-
-#define	MRF_INTER_WRITE_HEADER	m5
-#define	MRF_INTER_WRITE_DATA0	m6
-#define	MRF_INTER_WRITE_DATA1	m7
-
-#define	MRF_WRITE_HEADER		m11
-#define	MRF_INTRA_WRITE_HEADER	m11
-
-#define MRF_CMD_BUF_REG_OFF		12
-.declare	MRF_CMD_BUF_D		Base=m12 ElementSize=4 SrcRegion=REGION(8,1) Type=ud		// Command buffer stored in MRF
-.declare	MRF_CMD_BUF_W		Base=m12 ElementSize=2 SrcRegion=REGION(16,1) Type=uw		// Command buffer stored in MRF
-.declare	MRF_CMD_BUF_B		Base=m12 ElementSize=1 SrcRegion=REGION(16,1) Type=ub		// Command buffer stored in MRF
-
-#define	BI_CMD_BUFFER	0
-
-#define OWBRMSGDSC_SC	 0x02088000	// OWORD Block Read Message Descriptor, reading from sampler cache = A.
-#define OWBWMSGDSC		 0x02080000	// OWORD Block Write Message Descriptor
-
-#define OWORD_1	0x000
-#define OWORD_2	0x200
-#define OWORD_4	0x300
-#define OWORD_8	0x400
-
-// End of SETHWSCOREBOARD_HEADER
-
-#endif	// !defined(__SETHWSCOREBOARD_HEADER__)
-
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/SetHWScoreboard_MBAFF.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/SetHWScoreboard_MBAFF.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/SetHWScoreboard_MBAFF.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/SetHWScoreboard_MBAFF.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,279 +0,0 @@
-/*
- * Set dependency control HW scoreboard kernel for MBAFF picture
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: SetHWScoreboard_MBAFF.asm
-//
-// Set dependency control HW scoreboard kernel for MBAFF picture
-//
-
-// ----------------------------------------------------
-//  Main: SetHWScoreboard_MBAFF
-// ----------------------------------------------------
-
-.kernel SetHWScoreboard_MBAFF
-
-SETHWSCOREBOARD_MBAFF:
-
-#ifdef _DEBUG
-// WA for FULSIM so we'll know which kernel is being debugged
-mov (1) acc0:ud 0xf1aa55a5:ud
-#endif
-
-#include "header.inc"
-#include "SetHWScoreboard_header.inc"
-
-//
-//  Now, begin source code....
-//
-
-.code
-
-//	Separate the TotalMB so TotalMB will be multiple of 8
-//	and RemainderMB will hold the TotalMB%8
-//
-	and.z.f0.1 (1)	RemainderMB<1>:uw	TotalMB<0;1,0>:uw	0x0007:uw	// number of %8 commands
-	and.z.f0.0 (1)	TotalMB<1>:uw		TotalMB<0;1,0>:uw	0xfff8:uw	// Number of 8-command blocks
-
-//	Initialize common DAP read header
-//
-	mov (8)	MRF_READ_HEADER_SRC<1>:ud	r0.0<8;8,1>:ud
-	shl (1) MRF_READ_HEADER_SRC.2<1>:ud	StartingMB<0;1,0>:uw	6:uw	// Byte-aligned offset being read
-
-//	Initialize Inter DAP write header
- 	mov (8)	MRF_INTER_WRITE_HEADER<1>:ud	r0.0<8;8,1>:ud
-
-	(f0.0) jmpi (1)	SetHWScoreboard_MBAFF_Remainder						// Jump if TatalMB < 8
-
-//------------------------------------------------------------------------
-//	Command buffer parsing loop
-//	Each loop will handle 8 commands
-//------------------------------------------------------------------------
-//
-SetHWScoreboard_MBAFF_Loop:
-//	Load block 0 (Commands 0/1)
-	mov (8)	MRF_READ_HEADER0.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	send (16)	CMD_BUFFER_W(0)<1>	MRF_READ_HEADER0	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 1  (Commands 2/3)
-	mov (8)	MRF_READ_HEADER1.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		128:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(4)<1>	MRF_READ_HEADER1	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 2  (Commands 4/5)
-	mov (8)	MRF_READ_HEADER2.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER2.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		256:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(8)<1>	MRF_READ_HEADER2	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 3  (Commands 6/7)
-	mov (8)	MRF_READ_HEADER3.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER3.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		384:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(12)<1>	MRF_READ_HEADER3	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Start parsing commands
-    $for(0; <16; 2) {
-//	Adjust MB Y origin for field MBs
-//
-	mov (2)	TEMP_FD_X_W<1>:uw	CMD_BUFFER_B(%1,20)<2;2,1>					// Initialize temp (X,Y) location
-	and.nz.f0.1 (8)	NULLREG	CMD_BUFFER_D(%1,4)<0;1,0>	IS_BOT_FD:ud		// Is it a "Bottom Field MB"?
-	and.nz.f0.0 (8)	NULLREG	CMD_BUFFER_D(%1,4)<0;1,0>	IS_FIELD_MB:ud		// Is it a "Field MB"?
-	mul (8)	acc0<1>:w	CMD_BUFFER_B(%1,21)<0;1,0>	2:w
-	(-f0.1) mov (1)	TEMP_FD_Y_W<1>:w	acc0<0;1,0>:w
-	(f0.1) add (1)	TEMP_FD_Y_W<1>:w	acc0<0;1,0>:w	1:w
-	(-f0.0) mov (1)	TEMP_FD_Y_W<1>:w	CMD_BUFFER_B(%1,21)<0;1,0>			// Discard field MB Y origin handling
-
-	and.nz.f0.0 (8)	NULLREG	CMD_BUFFER_D(%1,4)<0;1,0>	IS_INTRA_MB:ud		// Is it an "Intra" MB?
-	and.nz.f0.1	(8)	NULLREG	TEMP_FD_Y_W<0;1,0>:uw	BIT0					// Is it "Bottom MB"?
-	or (1)	CMD_BUFFER_D(%1,2)<1>	CMD_BUFFER_D(%1,2)<0;1,0>	BIT21		// Set "Use Scoreboard"
-	mov (2)	CMD_BUFFER_W(%1,2)<1>	TEMP_FD_X_W<2;2,1>:uw					// Set scoreboard (X,Y) for inter MB
-	(f0.0) jmpi (1)	SET_SB_MBAFF_INTRA_%1									// Jump if intra MB.
-
-//	Inter Macroblock
-//	Output MEDIA_OBJECT command in raster scan order
-	mul (16) acc0<1>:uw	TEMP_FD_Y_W<0;1,0>:uw	PicWidthMB<0;1,0>:uw		// MB offset = Y*W
-	add (16) acc0<1>:uw	acc0<8;8,1>:uw			TEMP_FD_X_W<0;1,0>:uw		// MB offset = Y*W+X
- 	shl (1)	MRF_INTER_WRITE_HEADER.2<1>:ud	acc0.2<0;1,0>:uw	6:uw		// Byte-aligned MB offset
- 	mov (16)	MRF_INTER_WRITE_DATA0<1>:ud	CMD_BUFFER_D(%1)<8;8,1>	{Compr}	// Copy entire command to inter buffer
-	mov	(16)	CMD_BUFFER_D(%1)<1>		0:ud	{Compr}						// Clear original command
-	send (16)	NULLREGW	MRF_INTER_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(2)+OWBWMSGDSC+OWORD_4+BI_CMD_BUFFER
-	jmpi (1)	NEXT_MB_MBAFF_%1			// Done for inter MB. Move to next MB.
-
-SET_SB_MBAFF_INTRA_%1:
-//	Intra MB
-//
-	and.nz.f0.0 (8)	NULLREG	CMD_BUFFER_D(%1,4)<0;1,0>	IS_FIELD_MB:ud		// Is it an "Field" MB?
-	(f0.1) sel (2)	MB_MASK_D<1>:ud		BOT_FD_MASK1_D<2;2,1>:ud	TOP_FD_MASK1_D<2;2,1>:ud	// Assume field MB
-	mov (1)	TEMP_INTRA_FLAG_W<1>:uw		CMD_BUFFER_W(%1,14)<0;1,0>			// Don't want to alter original in-line data
-	(f0.0) jmpi (1)	SET_SB_MBAFF_%1					// Jump if it's really field MB
-
-//	Frame MB
-//
-//	Derive E'
-	and.nz.f0.0	(8)	NULLREG	CMD_BUFFER_W(%1,14)<0;1,0>	E_FLAG		// Is "E" = 1
-	(f0.1) sel (2)	MB_MASK_D<1>:ud		BOT_FM_MASK1_D<2;2,1>:ud	TOP_FM_MASK1_D<2;2,1>:ud
-	and.z.f0.1 (8)	NULLREG	CMD_BUFFER_W(%1,14)<0;1,0>	A_FLAG		// "A" = 0?
-	(f0.0) jmpi (1)	SET_SB_MBAFF_%1				// If "E" flag = 1, skip the rest of derivation
-	(f0.1) and.nz.f0.1 (8)	NULLREG	CMD_BUFFER_D(%1,4)<0;1,0>	IS_INTRA8X8
-	(f0.1) and.nz.f0.1 (8)	NULLREG	CMD_BUFFER_W(%1,14)<0;1,0>	F_FLAG
-	(f0.1) or (1)	TEMP_INTRA_FLAG_W<1>:uw	CMD_BUFFER_W(%1,14)<0;1,0>	E_FLAG
-
-SET_SB_MBAFF_%1:
-	and.nz.f0.1	(16)	NULLREGW	TEMP_INTRA_FLAG_W<0;1,0>:uw	MB_MASK_B<0;8,1>:ub
-	shl	(1)	CMD_BUFFER_W(%1,2)<1>	f0.1<0;1,0>:uw	12:w		// Masks 0-3
-	and (1)	CMD_BUFFER_W(%1,3)<1>	f0.1<0;1,0>:uw	0xf000:uw	// Masks 4-7
-
-	mov (2)	CMD_BUFFER_B(%1,4)<2>	TEMP_FD_X_B<4;2,2>:ub		// Set scoreboard (X,Y) for intra MB
-
-NEXT_MB_MBAFF_%1:
-	}
-
-	add.z.f0.0 (1)	TotalMB<1>:w	TotalMB<0;1,0>:w	-8:w				// Update remaining number of 8-command blocks
-
-//	Output modified intra commands
-//	Write block 0
-	mov (8)	MRF_INTRA_WRITE_HEADER.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-    $for(0; <4; 2) {
-	mov (16)	MRF_CMD_BUF_D(%1)<1>	CMD_BUFFER_D(%1)<8;8,1>	{Compr}
-	}
-	send (16)	NULLREGW	MRF_INTRA_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Write block 1
-	mov (8)	m1.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	m1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		128:ud		// Point to next 2-command block
-	mov (16)	m2<1>:ud	CMD_BUFFER_D(4)<8;8,1>	{Compr}
-	mov (16)	m4<1>:ud	CMD_BUFFER_D(6)<8;8,1>	{Compr}
-	send (16)	NULLREGW	m1	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Write block 2
-	add	(1)	MRF_INTRA_WRITE_HEADER.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		256:ud		// Point to next 2-command block
-    $for(0; <4; 2) {
-	mov (16)	MRF_CMD_BUF_D(%1)<1>	CMD_BUFFER_D(%1+8)<8;8,1>	{Compr}
-	}
-	send (16)	NULLREGW	MRF_INTRA_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Write block 3
-	add	(1)	m1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		384:ud		// Point to next 2-command block
-	mov (16)	m2<1>:ud	CMD_BUFFER_D(12)<8;8,1>	{Compr}
-	mov (16)	m4<1>:ud	CMD_BUFFER_D(14)<8;8,1>	{Compr}
-	send (16)	NULLREGW	m1	null:uw	DAPWRITE	MSG_LEN(4)+OWBWMSGDSC+OWORD_8+BI_CMD_BUFFER
-
-//	Update message header for next DAP read
-	add (1) MRF_READ_HEADER_SRC.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud	512:ud	// Point to next block of 8-commands
-
-	cmp.z.f0.1 (1)	NULLREG	RemainderMB<0;1,0>:w	0:uw		// Check if remaining MB = 0
-	(-f0.0) jmpi (1)	SetHWScoreboard_MBAFF_Loop			// Continue if more command blocks remain
-
-SetHWScoreboard_MBAFF_Remainder:
-//	f0.1 should have been set to indicate if RemainderMB = 0
-//
-	(f0.1) jmpi (1) SetHWScoreboard_MBAFF_Done				// Stop if all commands have been updated
-
-//	Blindly load next 8 commands anyway
-//
-//	Load block 0 (Commands 0/1)
-	mov (8)	MRF_READ_HEADER0.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	send (16)	CMD_BUFFER_W(0)<1>	MRF_READ_HEADER0	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 1  (Commands 2/3)
-	mov (8)	MRF_READ_HEADER1.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER1.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		128:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(4)<1>	MRF_READ_HEADER1	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 2  (Commands 4/5)
-	mov (8)	MRF_READ_HEADER2.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER2.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		256:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(8)<1>	MRF_READ_HEADER2	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Load block 3  (Commands 6/7)
-	mov (8)	MRF_READ_HEADER3.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
-	add	(1)	MRF_READ_HEADER3.2<1>:ud	MRF_READ_HEADER_SRC.2<0;1,0>:ud		384:ud		// Point to next 2-command block
-	send (16)	CMD_BUFFER_W(12)<1>	MRF_READ_HEADER3	null:uw	DAPREAD	RESP_LEN(4)+OWBRMSGDSC_SC+OWORD_8+BI_CMD_BUFFER
-
-//	Initialize necessary pointers
-	mov (1)	a0.1<1>:ud	((CMD_BUFFER_REG_OFF+1)*0x10000+CMD_BUFFER_REG_OFF)*32	// a0.2:w points to command buffer (first half)
-																			// a0.3:w points to command buffer (second half)
-//	Initialize Inter DAP write header
- 	mov (8)	MRF_INTER_WRITE_HEADER<1>:ud	r0.0<8;8,1>:ud
-
-SetHWScoreboard_MBAFF_Remainder_Loop:
-//	Adjust MB Y origin for field MBs
-//
-	mov (2)	TEMP_FD_X_W<1>:uw	r[a0.2,5*4]<2;2,1>:ub					// Initialize temp (X,Y) location
-	and.nz.f0.1 (8)	NULLREG	r[a0.2,4*4]<0;1,0>:ud	IS_BOT_FD:ud		// Is it a "Bottom Field MB"?
-	and.nz.f0.0 (8)	NULLREG	r[a0.2,4*4]<0;1,0>:ud	IS_FIELD_MB:ud		// Is it a "Field MB"?
-	mul (8)	acc0<1>:w	r[a0.2,21]<0;1,0>:ub	2:w
-	(-f0.1) mov (1)	TEMP_FD_Y_W<1>:w	acc0<0;1,0>:w
-	(f0.1) add (1)	TEMP_FD_Y_W<1>:w	acc0<0;1,0>:w	1:w
-	(-f0.0) mov (1)	TEMP_FD_Y_W<1>:w	r[a0.2,5*4+1]<0;1,0>:ub			// Discard field MB Y origin handling
-
-	and.nz.f0.0 (8)	NULLREG	r[a0.2,4*4]<0;1,0>:ud	IS_INTRA_MB:ud		// Is it an "Intra" MB?
-	add.z.f0.1 (1)	RemainderMB<1>:w	RemainderMB<0;1,0>:w	-1:w	// Decrement MB #
-	or (1)	r[a0.2,2*4]<1>:ud	r[a0.2,2*4]<0;1,0>:ud	BIT21:ud		// Set "Use Scoreboard"
-	mov (2)	r[a0.2,2*2]<1>:uw	TEMP_FD_X_W<2;2,1>:uw					// Set scoreboard (X,Y) for inter MB
-	(f0.0) jmpi (1)	SET_SB_MBAFF_REM_INTRA								// Jump if intra MB.
-
-//	Inter Macroblock
-//	Output MEDIA_OBJECT command in raster scan order
-	mul (16) acc0<1>:uw	TEMP_FD_Y_W<0;1,0>:uw	PicWidthMB<0;1,0>:uw	// MB offset = Y*W
-	add (16) acc0<1>:uw	acc0<8;8,1>:uw			TEMP_FD_X_W<0;1,0>:uw	// MB offset = Y*W+X
- 	shl (1)	MRF_INTER_WRITE_HEADER.2<1>:ud	acc0.2<0;1,0>:uw	6:uw	// Byte-aligned MB offset
- 	mov (16)	MRF_INTER_WRITE_DATA0<1>:ud	r[a0.2]<8;8,1>:ud {Compr}	// Copy entire command to inter buffer
-	mov	(16)	r[a0.2]<1>:ud		0:ud	{Compr}							// Clear original command
-	send (16)	NULLREGW	MRF_INTER_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(2)+OWBWMSGDSC+OWORD_4+BI_CMD_BUFFER
-	jmpi (1)	Output_MBAFF_Remainder_Intra							// Done for inter MB. Move to dump intra MB.
-
-SET_SB_MBAFF_REM_INTRA:
-//	Intra MB
-//
-	and.nz.f0.1	(8)	NULLREG	TEMP_FD_Y_W<0;1,0>:uw	BIT0:ud			// Is it "Bottom MB"?
-	and.nz.f0.0 (8)	NULLREG	r[a0.2,4*4]<0;1,0>:ud	IS_FIELD_MB:ud	// Is it "Field MB"?
-	mov (1)	TEMP_INTRA_FLAG_W<1>:uw	r[a0.2,14*2]<0;1,0>:uw			// Don't want to alter original in-line data
-	(f0.1) sel (2)	MB_MASK_D<1>:ud		BOT_FD_MASK1_D<2;2,1>:ud	TOP_FD_MASK1_D<2;2,1>:ud	// Assume field MB
-	(f0.0) jmpi (1)	SET_SB_MBAFF_REM					// Jump if it's really field MB
-
-//	Frame MB
-//
-//	Derive E'
-	and.nz.f0.0	(8)	NULLREG	r[a0.2,14*2]<0;1,0>:uw	E_FLAG		// Is "E" = 1
-	(f0.1) sel (2)	MB_MASK_D<1>:ud		BOT_FM_MASK1_D<2;2,1>:ud	TOP_FM_MASK1_D<2;2,1>:ud
-	and.z.f0.1 (8)	NULLREG	r[a0.2,14*2]<0;1,0>:uw	A_FLAG		// "A" = 0?
-	(f0.0) jmpi (1)	SET_SB_MBAFF_REM				// If "E" flag = 1, skip the rest of derivation
-	(f0.1) and.nz.f0.1 (8)	NULLREG	r[a0.2,4*4]<0;1,0>:ud	IS_INTRA8X8
-	(f0.1) and.nz.f0.1 (8)	NULLREG	r[a0.2,14*2]<0;1,0>:uw	F_FLAG
-	(f0.1) or (1)	TEMP_INTRA_FLAG_W<1>:uw	r[a0.2,14*2]<0;1,0>:uw	E_FLAG
-
-SET_SB_MBAFF_REM:
-	and.nz.f0.0	(16)	NULLREGW	TEMP_INTRA_FLAG_W<0;1,0>:uw	MB_MASK_B<0;8,1>:ub
-	add.z.f0.1 (1)	RemainderMB<1>:w	RemainderMB<0;1,0>:w	0:w		// Check remaining MB #
-	shl	(1)	r[a0.2,2*2]<1>:uw	f0.0<0;1,0>:uw	12:w		// Masks 0-3
-	and (1)	r[a0.2,3*2]<1>:uw	f0.0<0;1,0>:uw	0xf000:uw	// Masks 4-7
-
-	mov (2)	r[a0.2,4*1]<2>:ub	TEMP_FD_X_B<4;2,2>:ub		// Set scoreboard (X,Y) for intra MB
-
-Output_MBAFF_Remainder_Intra:
-//	Intra MB command always output
-	mov (8)	MRF_INTRA_WRITE_HEADER.0<1>:ud	MRF_READ_HEADER_SRC.0<8;8,1>:ud
- 	mov (16)	MRF_CMD_BUF_D(0)<1>		r[a0.2]<8;8,1>:ud	{Compr}		// Copy entire command to intra buffer
-	send (16)	NULLREGW	MRF_INTRA_WRITE_HEADER	null:uw	DAPWRITE	MSG_LEN(2)+OWBWMSGDSC+OWORD_4+BI_CMD_BUFFER
-
-	add	(1)	MRF_READ_HEADER_SRC.2<1>:ud		MRF_READ_HEADER_SRC.2<0;1,0>:ud		64:ud	// Point to next command
-	add (1)	a0.1<1>:ud	a0.1<0;1,0>:ud	0x00400040:ud					// Update pointers
-	(-f0.1) jmpi (1)	SetHWScoreboard_MBAFF_Remainder_Loop
-
-// All MBs have been decoded. Terminate the thread now
-//
-SetHWScoreboard_MBAFF_Done:
-    END_THREAD
-
-#if !defined(COMBINED_KERNEL)		// For standalone kernel only
-.end_code
-
-.end_kernel
-#endif
-
-// End of SetHWScoreboard_MBAFF
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/set_SB_offset.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/set_SB_offset.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/set_SB_offset.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/set_SB_offset.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/*
- * Common module to set offset into the scoreboard
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-//
-// Module name: set_SB_offset.asm
-//
-// Common module to set offset into the scoreboard
-//	Note: This is to encapsulate the way M0.5:ud in ForwardMsg is filled.
-//
-//  $Revision: 2 $
-//  $Date: 10/16/06 5:19p $
-//
-	add (1)		MSGHDRY1.10<1>:uw r0.20:ub	0x0200:uw			// Message length = 1 DWORD
-
-	add	(16)	acc0<1>:w	r0.12<0;1,0>:uw	-LEADING_THREAD:w	// 0-based thread count derived from r0.6:ud
-	shl (1)		M05_STORE<1>:uw		acc0<0;1,0>:uw	0x2:uw		// Store for future "update" use, in DWORD unit
-	and	(16)	acc0<1>:w	acc0<16;16,1>:uw	SB_MASK:uw		// Wrap around scoreboard
-	shl (1)		MSGHDRY1.11<1>:uw	acc0<0;1,0>:uw	0x2:uw		// Convert to DWORD offset
-
-// End of set_SB_offset
\ No newline at end of file
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/SetupForHWMC.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/SetupForHWMC.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/SetupForHWMC.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/SetupForHWMC.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-/*
- * Initial setup for running HWMC kernels in HWMC-Only decoding mode
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: SetupForHWMC.asm
-//
-// Initial setup for running HWMC kernels in HWMC-Only decoding mode
-//
-#include "header.inc"
-#include "intra_Header.inc"
-
-#if !defined(__SETUPFORHWMC__)	// Make sure the following are only included once
-#define __SETUPFORHWMC__
-
-.reg_count_total    64
-.reg_count_payload  2
-
-//
-//  Now, begin source code....
-//
-
-.code
-#endif	// !defined(__SETUPFORHWMC__)
-
-    mov (8)	MSGSRC<1>:ud	r0.0<8;8,1>:ud			// Initialize message header payload with R0
-	shl (2) I_ORIX<1>:uw	ORIX<2;2,1>:ub	4:w		// Convert MB origin to pixel unit
-
-// End of SetupForHWMC
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/weightedPred.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/weightedPred.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/weightedPred.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/weightedPred.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-/*
- * Weighted prediction of luminance and chrominance
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: WeightedPred.asm
-//
-// Weighted prediction of luminance and chrominance
-//
-
-
-//#if !defined(__WeightedPred__)		// Make sure this is only included once
-//#define __WeightedPred__
-
-
-	and.z.f0.0 (1) gWEIGHTFLAG:w	gWPREDFLAG:ub					nWBIDIR_MASK:w
-	cmp.e.f0.1 (1) null:w			gPREDFLAG:w						2:w
-	(-f0.0)	jmpi INTERLABEL(WeightedPred)
-	(f0.1) jmpi INTERLABEL(DefaultWeightedPred_BiPred)
-	
-INTERLABEL(DefaultWeightedPred_UniPred):
-
-	cmp.e.f0.0 (1) null:w			gPREDFLAG:w						0:w
-	(f0.0) jmpi INTERLABEL(Return_WeightedPred)
-
-	// luma
-	mov (32)	gubYPRED(0)<2>		gubINTPY1(0)	{Compr}
-	mov (32)	gubYPRED(2)<2>		gubINTPY1(2)	{Compr}
-
-#ifndef MONO
-	// chroma	
-	mov (32)	gubCPRED(0)<2>		gubINTPC1(0)	{Compr}
-#endif
-
-	jmpi INTERLABEL(Return_WeightedPred)
-	
-INTERLABEL(DefaultWeightedPred_BiPred):
-
-	// luma
-	avg.sat (32) gubYPRED(0)<2>		gubINTPY0(0)					gubINTPY1(0)	{Compr}
-	avg.sat (32) gubYPRED(2)<2>		gubINTPY0(2)					gubINTPY1(2)	{Compr}
-	
-#ifndef MONO
-	// chroma
-	avg.sat (32) gubCPRED(0)<2>		gubINTPC0(0)					gubINTPC1(0)	{Compr}
-#endif
-	
-	jmpi INTERLABEL(Return_WeightedPred)
-	
-INTERLABEL(WeightedPred):
-	cmp.e.f0.1 (1) null:w			gWEIGHTFLAG:w					0x80:w
-	(-f0.1) jmpi INTERLABEL(WeightedPred_Explicit)
-	
-	cmp.e.f0.0 (1) null:w			gPREDFLAG:w						2:w
-	(-f0.0) jmpi INTERLABEL(DefaultWeightedPred_UniPred)
-
-	mov (2)		gYADD<1>:w			32:w								{NoDDClr}	
-	mov (2)		gYSHIFT<1>:w		6:w									{NoDDChk}
-	mov (4)		gOFFSET<1>:w		0:w
-	mov (8)		gWT0<2>:w			r[pWGT,0]<0;2,1>:w
-	
-	jmpi INTERLABEL(WeightedPred_LOOP)
-	
-	// Explicit Prediction
-INTERLABEL(WeightedPred_Explicit):
-	
-	// WA for weighted prediction - 2007/09/06	
-#ifdef	SW_W_128		// CTG SW WA
-	cmp.e.f0.1 (8) null:ud			r[pWGT,0]<8;8,1>:uw				gudW128(0)<0;1,0>
-#else					// ILK HW solution
-	and.ne.f0.1 (8) null:uw			r[pWGT,12]<0;1,0>:ub			0x88848421:v	// Expand W=128 flag to all components. 2 MSB are don't care
-#endif	
-	asr.nz.f0.0 (2)	gBIPRED<1>:w	gPREDFLAG<0;1,0>:w				1:w
-	asr (1)		gWEIGHTFLAG:w		gWEIGHTFLAG:w					6:w	
-	(-f0.0) mov (2)	gPREDFLAG1<1>:w	gPREDFLAG<0;1,0>:w								
-	(f0.0) mov (2)	gPREDFLAG0<1>:ud 0x00010001:ud
-	(-f0.0) add (2) gPREDFLAG0<1>:w	-gPREDFLAG1<2;2,1>:w			1:w
-	
-	// WA for weighted prediction - 2007/09/06	
-	(f0.1) mov (8)	gWT0<1>:ud		0x00000080:ud
-	(-f0.1) mov (8) gWT0<2>:w		r[pWGT,0]<16;8,2>:b
-	(-f0.1) mov (8) gO0<2>:w		r[pWGT,1]<16;8,2>:b
-	mul (16)		gWT0<1>:w		gWT0<16;16,1>:w					gPREDFLAG0<0;4,1>:w
-
-	// Compute addition
-	cmp.e.f0.1 (2) null<1>:w		gYWDENOM<2;2,1>:ub				0:w
-	(-f0.1) shl (2) gW0<1>:w		gWEIGHTFLAG<0;1,0>:w			gYWDENOM<2;2,1>:ub
-	(f0.1) mov (2) gW0<1>:w			0:w
-	(-f0.1) asr (2) gW0<1>:w		gW0<2;2,1>:w					1:w
-	shl (2)		gYADD<1>:w			gW0<2;2,1>:w					gBIPRED<0;1,0>:w
-	(f0.1) add (2)	gYADD<1>:w		gYADD<2;2,1>:w					gBIPRED<0;1,0>:w
-	
-	// Compute shift
-	add (2)		gYSHIFT<1>:w		gYWDENOM<2;2,1>:ub				gBIPRED<0;1,0>:w
-	
-	// Compute offset
-	add (4)		acc0<1>:w			gO0<16;4,4>:w					gO1<16;4,4>:w
-	add (4)		acc0<1>:w			acc0<4;4,1>:w					gBIPRED<0;1,0>:w
-	asr (4)		gOFFSET<1>:w		acc0<4;4,1>:w					gBIPRED<0;1,0>:w
-
-INTERLABEL(WeightedPred_LOOP):	
-	// luma
-	$for(0;<4;2) {	
-	mul (16)	acc0<1>:w			gubINTPY0(%1)					gWT0<0;1,0>:w
-	mul (16)	acc1<1>:w			gubINTPY0(%1+1)					gWT0<0;1,0>:w
-	mac (16)	acc0<1>:w			gubINTPY1(%1)					gWT1<0;1,0>:w
-	mac (16)	acc1<1>:w			gubINTPY1(%1+1)					gWT1<0;1,0>:w
-	add (16)	acc0<1>:w			acc0<16;16,1>:w					gYADD:w
-	add (16)	acc1<1>:w			acc1<16;16,1>:w					gYADD:w
-	// Accumulator cannot be used as destination for ASR
-	asr (16)	gwINTERIM_BUF3(0)<1> acc0<16;16,1>:w				gYSHIFT:w
-	asr (16)	gwINTERIM_BUF3(1)<1> acc1<16;16,1>:w				gYSHIFT:w
-	add.sat (16) gubYPRED(%1)<2>	gwINTERIM_BUF3(0)				gOFFSET:w
-	add.sat (16) gubYPRED(%1+1)<2>	gwINTERIM_BUF3(1)				gOFFSET:w
-	}	
-
-#ifndef MONO
-	// chroma
-	mul (16)	acc0<1>:w			gubINTPC0(0)					gUW0<0;2,4>:w
-	mul (16)	acc1<1>:w			gubINTPC0(1)					gUW0<0;2,4>:w
-	mac (16)	acc0<1>:w			gubINTPC1(0)					gUW1<0;2,4>:w
-	mac (16)	acc1<1>:w			gubINTPC1(1)					gUW1<0;2,4>:w
-	add (16)	acc0<1>:w			acc0<16;16,1>:w					gCADD:w
-	add (16)	acc1<1>:w			acc1<16;16,1>:w					gCADD:w
-	// Accumulator cannot be used as destination for ASR
-	asr (16)	gwINTERIM_BUF3(0)<1> acc0<16;16,1>:w				gCSHIFT:w
-	asr (16)	gwINTERIM_BUF3(1)<1> acc1<16;16,1>:w				gCSHIFT:w
-	add.sat (16) gubCPRED(0)<2>		gwINTERIM_BUF3(0)				gUOFFSET<0;2,1>:w
-	add.sat (16) gubCPRED(1)<2>		gwINTERIM_BUF3(1)				gUOFFSET<0;2,1>:w
-#endif
-
-
-INTERLABEL(Return_WeightedPred):
-
-        
-//#endif	// !defined(__WeightedPred__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/writeRecon_C_8x4.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/writeRecon_C_8x4.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/writeRecon_C_8x4.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/writeRecon_C_8x4.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: WriteRecon_C_8x4.asm
-//
-//  $Revision: 10 $
-//  $Date: 10/03/06 5:28p $
-//
-
-
-//#if !defined(__WRITERECON_C_8x4__)		// Make sure this is only included once
-//#define __WRITERECON_C_8x4__
-
-
-	// TODO: Why did I use p0?
-#ifndef MONO
-    add (1)		p0:w					pERRORC:w				-16:w
-	mov (16)	mbMSGPAYLOADC(0,0)<2>	r[p0,0]<32;16,2>:ub				{NoDDClr}
-	mov (16)	mbMSGPAYLOADC(0,1)<2>	r[p0,128]<32;16,2>:ub			{NoDDChk}
-	mov (16)	mbMSGPAYLOADC(1,0)<2>	r[p0,32]<32;16,2>:ub			{NoDDClr}
-	mov (16)	mbMSGPAYLOADC(1,1)<2>	r[p0,128+32]<32;16,2>:ub		{NoDDChk}
-#else	// defined(MONO)
-	mov (16)	mbMSGPAYLOADC(0)<1>		0x80808080:ud {Compr}
-#endif	// !defined(MONO)
-
- #if defined(MBAFF)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(2)+nDWBWMSGDSC+nBDIX_DESTC+ENWRCOM:ud
- #elif defined(FIELD)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(2)+nDWBWMSGDSC_TF+nBDIX_DESTC+ENWRCOM:ud
- #endif
-
-    asr (1)		gMSGSRC.1:d				gMSGSRC.1:d					1:w	{NoDDClr}
-    mov (1)		gMSGSRC.2:ud			0x0003000f:ud					{NoDDChk} // NV12 (16x4)
-
-#if defined(FRAME)
-    send (8)	gREG_WRITE_COMMIT_UV<1>:ud		mMSGHDRCW				gMSGSRC<8;8,1>:ud		DAPWRITE	MSG_LEN(2)+nDWBWMSGDSC+nBDIX_DESTC+ENWRCOM
-#else
-    send (8)	gREG_WRITE_COMMIT_UV<1>:ud		mMSGHDRCW				gMSGSRC<8;8,1>:ud		DAPWRITE	pMSGDSC:ud
-#endif	// defined(FRAME)
-
-//#endif	// !defined(__WRITERECON_C_8x4__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/writeRecon_Y_16x8.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/writeRecon_Y_16x8.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/writeRecon_Y_16x8.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/writeRecon_Y_16x8.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: WriteRecon_Y_16x8.asm
-//
-//  $Revision: 10 $
-//  $Date: 10/03/06 5:28p $
-//
-
-
-//#if !defined(__WRITERECON_Y_16x8__)		// Make sure this is only included once
-//#define __WRITERECON_Y_16x8__
-
-
-    add (1)		p0:w					pERRORY:w				-256:w
-    add (1)		p1:w					pERRORY:w				-128:w
-    
-	$for(0; <4; 1) {
-    mov (16)	mbMSGPAYLOADY(%1,0)<1>	r[p0,%1*32+0]<8,2>:ub		{NoDDClr}
-    mov (16)	mbMSGPAYLOADY(%1,16)<1>	r[p0,%1*32+16]<8,2>:ub		{NoDDChk}
-    }    
- 
- #if defined(MBAFF)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(4)+nDWBWMSGDSC+nBDIX_DESTY+ENWRCOM:ud
- #elif defined(FIELD)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(4)+nDWBWMSGDSC_TF+nBDIX_DESTY+ENWRCOM:ud
- #endif
-
-    mov	(2)		gMSGSRC.0<1>:d			gX<2;2,1>:w		{NoDDClr}
-    mov (1)		gMSGSRC.2:ud			0x0007000f:ud	{NoDDChk}
-    
-#if defined(FRAME)
-    send (8)	gREG_WRITE_COMMIT_Y<1>:ud		mMSGHDRYW				gMSGSRC<8;8,1>:ud		DAPWRITE	MSG_LEN(4)+nDWBWMSGDSC+nBDIX_DESTY+ENWRCOM
-#else
-    send (8)	gREG_WRITE_COMMIT_Y<1>:ud		mMSGHDRYW				gMSGSRC<8;8,1>:ud		DAPWRITE	pMSGDSC:ud
-#endif
-
-//#endif	// !defined(__WRITERECON_Y_16x8__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/h264/mc/writeRecon_YC.asm libva-1.0.1/i965_drv_video/shaders/h264/mc/writeRecon_YC.asm
--- libva-1.0.4/i965_drv_video/shaders/h264/mc/writeRecon_YC.asm	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/h264/mc/writeRecon_YC.asm	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright © <2010>, Intel Corporation.
- *
- * This program is licensed under the terms and conditions of the
- * Eclipse Public License (EPL), version 1.0.  The full text of the EPL is at
- * http://www.opensource.org/licenses/eclipse-1.0.php.
- *
- */
-// Kernel name: WriteRecon_YC.asm
-//
-//  $Revision: 10 $
-//  $Date: 10/03/06 5:28p $
-//
-
-
-//#if !defined(__WRITERECON_YC__)		// Make sure this is only included once
-//#define __WRITERECON_YC__
-
-    // TODO: Merge two inst to one.
-    mov (1)		p0:w					nOFFSET_ERRORY:w
-    mov (1)		p1:w					nOFFSET_ERRORY+128:w
-    
-	$for(0; <4; 1) {
-    mov (16)	mbMSGPAYLOADY(%1,0)<1>	r[p0,%1*32+0]<8,2>:ub		{NoDDClr}
-    mov (16)	mbMSGPAYLOADY(%1,16)<1>	r[p0,%1*32+16]<8,2>:ub		{NoDDChk}
-    }    
-	$for(0; <4; 1) {
-    mov (16)	mbMSGPAYLOADY(%1+4,0)<1>	r[p0,%1*32+256]<8,2>:ub			{NoDDClr}
-    mov (16)	mbMSGPAYLOADY(%1+4,16)<1>	r[p0,%1*32+16+256]<8,2>:ub		{NoDDChk}
-    }    
-    
- 
- #if defined(MBAFF)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(8)+nDWBWMSGDSC+nBDIX_DESTY+ENWRCOM:ud
- #elif defined(FIELD)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(8)+nDWBWMSGDSC_TF+nBDIX_DESTY+ENWRCOM:ud
- #endif
-
-    mov	(2)		gMSGSRC.0<1>:d			gX<2;2,1>:w		{NoDDClr}
-    mov (1)		gMSGSRC.2:ud			0x000f000f:ud	{NoDDChk}
-    
-#if defined(FRAME)
-    send (8)	gREG_WRITE_COMMIT_Y<1>:ud		mMSGHDRYW				gMSGSRC<8;8,1>:ud		DAPWRITE	MSG_LEN(8)+nDWBWMSGDSC+nBDIX_DESTY+ENWRCOM
-#else
-    send (8)	gREG_WRITE_COMMIT_Y<1>:ud		mMSGHDRYW				gMSGSRC<8;8,1>:ud		DAPWRITE	pMSGDSC:ud
-#endif
-
-#ifndef MONO
-	// TODO: Why did I use p0?
-    mov (1)		p0:w					nOFFSET_ERRORC:w
-	mov (16)	mbMSGPAYLOADC(0,0)<2>	r[p0,0]<32;16,2>:ub				{NoDDClr}
-	mov (16)	mbMSGPAYLOADC(0,1)<2>	r[p0,128]<32;16,2>:ub			{NoDDChk}
-	mov (16)	mbMSGPAYLOADC(1,0)<2>	r[p0,32]<32;16,2>:ub			{NoDDClr}
-	mov (16)	mbMSGPAYLOADC(1,1)<2>	r[p0,128+32]<32;16,2>:ub		{NoDDChk}
-	mov (16)	mbMSGPAYLOADC(2,0)<2>	r[p0,64]<32;16,2>:ub			{NoDDClr}
-	mov (16)	mbMSGPAYLOADC(2,1)<2>	r[p0,128+64]<32;16,2>:ub		{NoDDChk}
-	mov (16)	mbMSGPAYLOADC(3,0)<2>	r[p0,96]<32;16,2>:ub			{NoDDClr}
-	mov (16)	mbMSGPAYLOADC(3,1)<2>	r[p0,128+96]<32;16,2>:ub		{NoDDChk}
-
-
- #if defined(MBAFF)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(4)+nDWBWMSGDSC+nBDIX_DESTC+ENWRCOM:ud
- #elif defined(FIELD)
-	add (1)		pMSGDSC:ud				gFIELDFLAGS:uw			MSG_LEN(4)+nDWBWMSGDSC_TF+nBDIX_DESTC+ENWRCOM:ud
- #endif
-
-    asr (1)		gMSGSRC.1:d				gMSGSRC.1:d					1:w	{NoDDClr}
-    mov (1)		gMSGSRC.2:ud			0x0007000f:ud					{NoDDChk} // NV12 (16x4)
-
-#if defined(FRAME)
-    send (8)	gREG_WRITE_COMMIT_UV<1>:ud		mMSGHDRCW				gMSGSRC<8;8,1>:ud		DAPWRITE	MSG_LEN(4)+nDWBWMSGDSC+nBDIX_DESTC+ENWRCOM
-#else
-    send (8)	gREG_WRITE_COMMIT_UV<1>:ud		mMSGHDRCW				gMSGSRC<8;8,1>:ud		DAPWRITE	pMSGDSC:ud
-#endif	// defined(FRAME)
-
-#endif	// !defined(MONO)
-
-
-//#endif	// !defined(__WRITERECON_YC__)
diff -Nru libva-1.0.4/i965_drv_video/shaders/Makefile.am libva-1.0.1/i965_drv_video/shaders/Makefile.am
--- libva-1.0.4/i965_drv_video/shaders/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -1 +1 @@
-SUBDIRS = h264 mpeg2 render
+SUBDIRS = mpeg2 render
diff -Nru libva-1.0.4/i965_drv_video/shaders/Makefile.in libva-1.0.1/i965_drv_video/shaders/Makefile.in
--- libva-1.0.4/i965_drv_video/shaders/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -113,8 +113,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -155,15 +153,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -226,7 +220,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = h264 mpeg2 render
+SUBDIRS = mpeg2 render
 all: all-recursive
 
 .SUFFIXES:
diff -Nru libva-1.0.4/i965_drv_video/shaders/mpeg2/Makefile.in libva-1.0.1/i965_drv_video/shaders/mpeg2/Makefile.in
--- libva-1.0.4/i965_drv_video/shaders/mpeg2/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/mpeg2/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -113,8 +113,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -155,15 +153,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
diff -Nru libva-1.0.4/i965_drv_video/shaders/mpeg2/vld/Makefile.in libva-1.0.1/i965_drv_video/shaders/mpeg2/vld/Makefile.in
--- libva-1.0.4/i965_drv_video/shaders/mpeg2/vld/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/mpeg2/vld/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -73,8 +73,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -115,15 +113,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/exa_wm.g4i libva-1.0.1/i965_drv_video/shaders/render/exa_wm.g4i
--- libva-1.0.4/i965_drv_video/shaders/render/exa_wm.g4i	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/exa_wm.g4i	2009-12-17 03:05:38.000000000 +0000
@@ -35,9 +35,6 @@
 define(`screen_x0', `g1.0<0,1,0>F')
 define(`screen_y0', `g1.4<0,1,0>F')
 
-/* UV flag */
-define(`interleaved_uv', `g2.0<0,1,0>UW')
-
 /* Source transformation parameters */
 define(`src_du_dx', `g3.0<0,1,0>F')
 define(`src_du_dy', `g3.4<0,1,0>F')
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4a libva-1.0.1/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4a
--- libva-1.0.4/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4a	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4a	2009-12-17 03:05:38.000000000 +0000
@@ -34,54 +34,32 @@
 /* use simd16 sampler, param 0 is u, param 1 is v. */
 /* 'payload' loading, assuming tex coord start from g4 */
 
-and.nz (1) null interleaved_uv 0x01UW {align1};
-(f0) jmpi INTERLEAVED_UV;
-
 /* load r */
 mov (1) g0.8<1>UD	0x0000e000UD { align1 mask_disable };
 
 /* src_msg will be copied with g0, as it contains send desc */
 /* emit sampler 'send' cmd */
 
-/* sample U (Cr) */
+/* sample Y */
 send (16) src_msg_ind		/* msg reg index */
 	src_sample_g<1>UW 	/* readback */
 	g0<8,8,1>UW		/* copy to msg start reg*/
-	sampler (3,2,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+	sampler (1,0,F)		/* sampler message description, (binding_table,sampler_index,datatype)
 				/* here(src->dst) we should use src_sampler and src_surface */
 	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
 	
-/* sample V (Cb) */
-send (16) src_msg_ind		/* msg reg index */
-	src_sample_b<1>UW 	/* readback */
-	g0<8,8,1>UW		/* copy to msg start reg*/
-	sampler (5,4,F)		/* sampler message description, (binding_table,sampler_index,datatype)
-				/* here(src->dst) we should use src_sampler and src_surface */
-	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
-
-jmpi SAMPLE_Y;
-
-INTERLEAVED_UV:
-/* load r */
-mov (1) g0.8<1>UD	0x0000c000UD { align1 mask_disable };
-
-/* sample UV (CrCb) */
+/* sample U (Cr) */
 send (16) src_msg_ind		/* msg reg index */
-	src_sample_g<1>UW 	/* readback */
+	src_sample_r<1>UW 	/* readback */
 	g0<8,8,1>UW		/* copy to msg start reg*/
 	sampler (3,2,F)		/* sampler message description, (binding_table,sampler_index,datatype)
 				/* here(src->dst) we should use src_sampler and src_surface */
-	mlen 5 rlen 4 { align1 };   /* required message len 5, readback len 8 */
-
-/* load r */
-mov (1) g0.8<1>UD	0x0000e000UD { align1 mask_disable };
-
-SAMPLE_Y:
-/* sample Y */
+	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
+	
+/* sample V (Cb) */
 send (16) src_msg_ind		/* msg reg index */
-	src_sample_r<1>UW 	/* readback */
+	src_sample_b<1>UW 	/* readback */
 	g0<8,8,1>UW		/* copy to msg start reg*/
-	sampler (1,0,F)		/* sampler message description, (binding_table,sampler_index,datatype)
+	sampler (5,4,F)		/* sampler message description, (binding_table,sampler_index,datatype)
 				/* here(src->dst) we should use src_sampler and src_surface */
 	mlen 5 rlen 2 { align1 };   /* required message len 5, readback len 8 */
-	
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b libva-1.0.1/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b
--- libva-1.0.4/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b	2009-12-17 03:05:38.000000000 +0000
@@ -1,10 +1,4 @@
-   { 0x02000005, 0x20002d3c, 0x00000040, 0x00010001 },
-   { 0x00010020, 0x34001c00, 0x00001400, 0x00000004 },
    { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
-   { 0x01800031, 0x22001d29, 0x008d0000, 0x02520203 },
+   { 0x01800031, 0x22001d29, 0x008d0000, 0x02520001 },
+   { 0x01800031, 0x21c01d29, 0x008d0000, 0x02520203 },
    { 0x01800031, 0x22401d29, 0x008d0000, 0x02520405 },
-   { 0x00000020, 0x34001c00, 0x00001400, 0x00000003 },
-   { 0x00000201, 0x20080061, 0x00000000, 0x0000c000 },
-   { 0x01800031, 0x22001d29, 0x008d0000, 0x02540203 },
-   { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
-   { 0x01800031, 0x21c01d29, 0x008d0000, 0x02520001 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b.gen5 libva-1.0.1/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b.gen5
--- libva-1.0.4/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b.gen5	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/exa_wm_src_sample_planar.g4b.gen5	2009-12-17 03:05:38.000000000 +0000
@@ -1,10 +1,4 @@
-   { 0x02000005, 0x20002d3c, 0x00000040, 0x00010001 },
-   { 0x00010020, 0x34001c00, 0x00001400, 0x00000008 },
    { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
-   { 0x01800031, 0x22001d29, 0x208d0000, 0x0a2a0203 },
+   { 0x01800031, 0x22001d29, 0x208d0000, 0x0a2a0001 },
+   { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a2a0203 },
    { 0x01800031, 0x22401d29, 0x208d0000, 0x0a2a0405 },
-   { 0x00000020, 0x34001c00, 0x00001400, 0x00000006 },
-   { 0x00000201, 0x20080061, 0x00000000, 0x0000c000 },
-   { 0x01800031, 0x22001d29, 0x208d0000, 0x0a4a0203 },
-   { 0x00000201, 0x20080061, 0x00000000, 0x0000e000 },
-   { 0x01800031, 0x21c01d29, 0x208d0000, 0x0a2a0001 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4a libva-1.0.1/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4a
--- libva-1.0.4/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4a	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4a	2009-12-17 03:05:38.000000000 +0000
@@ -30,25 +30,25 @@
 
 define(`YCbCr_base',	`src_sample_base')
 
-define(`Cr',		`src_sample_b')
-define(`Cr_01',		`src_sample_b_01')
-define(`Cr_23',		`src_sample_b_23')
-
-define(`Y',		`src_sample_r')
-define(`Y_01',		`src_sample_r_01')
-define(`Y_23',		`src_sample_r_23')
-
-define(`Cb',		`src_sample_g')
-define(`Cb_01',		`src_sample_g_01')
-define(`Cb_23',		`src_sample_g_23')
-
-define(`Crn',		`mask_sample_g')
-define(`Crn_01',	`mask_sample_g_01')
-define(`Crn_23',	`mask_sample_g_23')
-
-define(`Yn',		`mask_sample_r')
-define(`Yn_01',		`mask_sample_r_01')
-define(`Yn_23',		`mask_sample_r_23')
+define(`Cr',		`src_sample_r')
+define(`Cr_01',		`src_sample_r_01')
+define(`Cr_23',		`src_sample_r_23')
+
+define(`Y',		`src_sample_g')
+define(`Y_01',		`src_sample_g_01')
+define(`Y_23',		`src_sample_g_23')
+
+define(`Cb',		`src_sample_b')
+define(`Cb_01',		`src_sample_b_01')
+define(`Cb_23',		`src_sample_b_23')
+
+define(`Crn',		`mask_sample_r')
+define(`Crn_01',	`mask_sample_r_01')
+define(`Crn_23',	`mask_sample_r_23')
+
+define(`Yn',		`mask_sample_g')
+define(`Yn_01',		`mask_sample_g_01')
+define(`Yn_23',		`mask_sample_g_23')
 
 define(`Cbn',		`mask_sample_b')
 define(`Cbn_01',	`mask_sample_b_01')
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b libva-1.0.1/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b
--- libva-1.0.4/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b	2009-12-17 03:05:38.000000000 +0000
@@ -1,11 +1,11 @@
-   { 0x00802040, 0x22c07fbd, 0x008d01c0, 0xbd808081 },
-   { 0x00802041, 0x22c07fbd, 0x008d02c0, 0x3f94fdf4 },
-   { 0x00802040, 0x23007fbd, 0x008d0240, 0xbf008084 },
-   { 0x00802040, 0x23407fbd, 0x008d0200, 0xbf008084 },
-   { 0x00802001, 0x240003bc, 0x008d02c0, 0x00000000 },
-   { 0x80802048, 0x21c07fbd, 0x008d0300, 0x3fcc49ba },
-   { 0x00802001, 0x240003bc, 0x008d02c0, 0x00000000 },
-   { 0x00802048, 0x24007fbc, 0x008d0300, 0xbf5020c5 },
+   { 0x00802040, 0x23007fbd, 0x008d0200, 0xbd808081 },
+   { 0x00802041, 0x23007fbd, 0x008d0300, 0x3f94fdf4 },
+   { 0x00802040, 0x22c07fbd, 0x008d01c0, 0xbf008084 },
+   { 0x00802040, 0x23407fbd, 0x008d0240, 0xbf008084 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x80802048, 0x21c07fbd, 0x008d02c0, 0x3fcc49ba },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x00802048, 0x24007fbc, 0x008d02c0, 0xbf5020c5 },
    { 0x80802048, 0x22007fbd, 0x008d0340, 0xbec8b439 },
-   { 0x00802001, 0x240003bc, 0x008d02c0, 0x00000000 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
    { 0x80802048, 0x22407fbd, 0x008d0340, 0x40011687 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b.gen5 libva-1.0.1/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b.gen5
--- libva-1.0.4/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b.gen5	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/exa_wm_yuv_rgb.g4b.gen5	2009-12-17 03:05:38.000000000 +0000
@@ -1,11 +1,11 @@
-   { 0x00802040, 0x22c07fbd, 0x008d01c0, 0xbd808081 },
-   { 0x00802041, 0x22c07fbd, 0x008d02c0, 0x3f94fdf4 },
-   { 0x00802040, 0x23007fbd, 0x008d0240, 0xbf008084 },
-   { 0x00802040, 0x23407fbd, 0x008d0200, 0xbf008084 },
-   { 0x00802001, 0x240003bc, 0x008d02c0, 0x00000000 },
-   { 0x80802048, 0x21c07fbd, 0x008d0300, 0x3fcc49ba },
-   { 0x00802001, 0x240003bc, 0x008d02c0, 0x00000000 },
-   { 0x00802048, 0x24007fbc, 0x008d0300, 0xbf5020c5 },
+   { 0x00802040, 0x23007fbd, 0x008d0200, 0xbd808081 },
+   { 0x00802041, 0x23007fbd, 0x008d0300, 0x3f94fdf4 },
+   { 0x00802040, 0x22c07fbd, 0x008d01c0, 0xbf008084 },
+   { 0x00802040, 0x23407fbd, 0x008d0240, 0xbf008084 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x80802048, 0x21c07fbd, 0x008d02c0, 0x3fcc49ba },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
+   { 0x00802048, 0x24007fbc, 0x008d02c0, 0xbf5020c5 },
    { 0x80802048, 0x22007fbd, 0x008d0340, 0xbec8b439 },
-   { 0x00802001, 0x240003bc, 0x008d02c0, 0x00000000 },
+   { 0x00802001, 0x240003bc, 0x008d0300, 0x00000000 },
    { 0x80802048, 0x22407fbd, 0x008d0340, 0x40011687 },
diff -Nru libva-1.0.4/i965_drv_video/shaders/render/Makefile.in libva-1.0.1/i965_drv_video/shaders/render/Makefile.in
--- libva-1.0.4/i965_drv_video/shaders/render/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/i965_drv_video/shaders/render/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -73,8 +73,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -115,15 +113,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
diff -Nru libva-1.0.4/libva-glx.pc.in libva-1.0.1/libva-glx.pc.in
--- libva-1.0.4/libva-glx.pc.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/libva-glx.pc.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-display=glx
-
-Name: libva-${display}
-Description: Userspace Video Acceleration (VA) ${display} interface
-Requires: libva
-Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lva-${display}
-Cflags: -I${includedir}
diff -Nru libva-1.0.4/libva-x11.pc.in libva-1.0.1/libva-x11.pc.in
--- libva-1.0.4/libva-x11.pc.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/libva-x11.pc.in	2009-12-17 03:05:38.000000000 +0000
@@ -6,7 +6,6 @@
 
 Name: libva-${display}
 Description: Userspace Video Acceleration (VA) ${display} interface
-Requires: libva
 Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lva-${display}
 Cflags: -I${includedir}
diff -Nru libva-1.0.4/Makefile.am libva-1.0.1/Makefile.am
--- libva-1.0.4/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -22,7 +22,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = va test
+SUBDIRS = src test
 if BUILD_DUMMY_DRIVER
 SUBDIRS += dummy_drv_video
 endif
@@ -32,13 +32,10 @@
 
 pcfiles = libva.pc
 pcfiles += libva-x11.pc
-if USE_GLX
-pcfiles += libva-glx.pc
-endif
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = $(pcfiles)
 
-EXTRA_DIST = libva.pc.in libva-x11.pc.in libva-glx.pc.in
+EXTRA_DIST = libva.pc.in libva-x11.pc.in
 
 CLEANFILES = $(pcfiles)
diff -Nru libva-1.0.4/Makefile.in libva-1.0.1/Makefile.in
--- libva-1.0.4/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/Makefile.in	2010-02-12 17:47:57.000000000 +0000
@@ -58,13 +58,12 @@
 host_triplet = @host@
 @BUILD_DUMMY_DRIVER_TRUE@am__append_1 = dummy_drv_video
 @BUILD_I965_DRIVER_TRUE@am__append_2 = i965_drv_video
-@USE_GLX_TRUE@am__append_3 = libva-glx.pc
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/libva-glx.pc.in $(srcdir)/libva-x11.pc.in \
-	$(srcdir)/libva.pc.in $(top_srcdir)/configure COPYING \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+	$(srcdir)/libva-x11.pc.in $(srcdir)/libva.pc.in \
+	$(top_srcdir)/configure COPYING config.guess config.sub \
+	depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -73,7 +72,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libva.pc libva-x11.pc libva-glx.pc
+CONFIG_CLEAN_FILES = libva.pc libva-x11.pc
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -114,7 +113,7 @@
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = va test dummy_drv_video i965_drv_video
+DIST_SUBDIRS = src test dummy_drv_video i965_drv_video
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -178,8 +177,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -220,15 +217,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -292,10 +285,10 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = va test $(am__append_1) $(am__append_2)
-pcfiles = libva.pc libva-x11.pc $(am__append_3)
+SUBDIRS = src test $(am__append_1) $(am__append_2)
+pcfiles = libva.pc libva-x11.pc
 pkgconfig_DATA = $(pcfiles)
-EXTRA_DIST = libva.pc.in libva-x11.pc.in libva-glx.pc.in
+EXTRA_DIST = libva.pc.in libva-x11.pc.in
 CLEANFILES = $(pcfiles)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -356,8 +349,6 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libva-x11.pc: $(top_builddir)/config.status $(srcdir)/libva-x11.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-libva-glx.pc: $(top_builddir)/config.status $(srcdir)/libva-glx.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff -Nru libva-1.0.4/src/Makefile.am libva-1.0.1/src/Makefile.am
--- libva-1.0.4/src/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,55 @@
+# Copyright (c) 2007 Intel Corporation. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+INCLUDES = \
+	$(LIBVA_CFLAGS) -I$(top_srcdir)/src/x11 \
+	-DIN_LIBVA \
+	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
+
+LDADD = \
+	$(LIBVA_LT_LDFLAGS)
+
+lib_LTLIBRARIES = \
+	libva.la \
+	libva-x11.la
+
+libva_ladir = $(libdir)
+libva_la_LDFLAGS = $(LDADD) -no-undefined
+libva_la_LIBADD = $(LIBVA_LIBS) -ldl
+
+libva_x11_la_SOURCES = 
+libva_x11_la_LIBADD  = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
+libva_x11_la_LDFLAGS = $(LDADD)
+libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
+
+SUBDIRS = x11
+
+libva_la_SOURCES = va.c
+
+libvaincludedir = ${includedir}/va
+libvainclude_HEADERS = va.h va_backend.h va_version.h
+
+DISTCLEANFILES = \
+	va_version.h
+
+EXTRA_DIST = \
+	va_version.h.in
diff -Nru libva-1.0.4/src/Makefile.in libva-1.0.1/src/Makefile.in
--- libva-1.0.4/src/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -0,0 +1,774 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# Copyright (c) 2007 Intel Corporation. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src
+DIST_COMMON = $(libvainclude_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/va_version.h.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = va_version.h
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libvaincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+am_libva_x11_la_OBJECTS =
+libva_x11_la_OBJECTS = $(am_libva_x11_la_OBJECTS)
+libva_x11_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libva_x11_la_LDFLAGS) $(LDFLAGS) -o $@
+libva_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libva_la_OBJECTS = va.lo
+libva_la_OBJECTS = $(am_libva_la_OBJECTS)
+libva_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libva_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libva_x11_la_SOURCES) $(libva_la_SOURCES)
+DIST_SOURCES = $(libva_x11_la_SOURCES) $(libva_la_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+	html-recursive info-recursive install-data-recursive \
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+HEADERS = $(libvainclude_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRM_CFLAGS = @DRM_CFLAGS@
+DRM_LIBS = @DRM_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBVA_CFLAGS = @LIBVA_CFLAGS@
+LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
+LIBVA_LIBS = @LIBVA_LIBS@
+LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
+LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
+LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
+LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
+LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
+LIBVA_VERSION = @LIBVA_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libvabackendlib = @libvabackendlib@
+libvacorelib = @libvacorelib@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+INCLUDES = \
+	$(LIBVA_CFLAGS) -I$(top_srcdir)/src/x11 \
+	-DIN_LIBVA \
+	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
+
+LDADD = \
+	$(LIBVA_LT_LDFLAGS)
+
+lib_LTLIBRARIES = \
+	libva.la \
+	libva-x11.la
+
+libva_ladir = $(libdir)
+libva_la_LDFLAGS = $(LDADD) -no-undefined
+libva_la_LIBADD = $(LIBVA_LIBS) -ldl
+libva_x11_la_SOURCES = 
+libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
+libva_x11_la_LDFLAGS = $(LDADD)
+libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
+SUBDIRS = x11
+libva_la_SOURCES = va.c
+libvaincludedir = ${includedir}/va
+libvainclude_HEADERS = va.h va_backend.h va_version.h
+DISTCLEANFILES = \
+	va_version.h
+
+EXTRA_DIST = \
+	va_version.h.in
+
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+va_version.h: $(top_builddir)/config.status $(srcdir)/va_version.h.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libva-x11.la: $(libva_x11_la_OBJECTS) $(libva_x11_la_DEPENDENCIES) 
+	$(libva_x11_la_LINK) -rpath $(libdir) $(libva_x11_la_OBJECTS) $(libva_x11_la_LIBADD) $(LIBS)
+libva.la: $(libva_la_OBJECTS) $(libva_la_DEPENDENCIES) 
+	$(libva_la_LINK) -rpath $(libdir) $(libva_la_OBJECTS) $(libva_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libvaincludeHEADERS: $(libvainclude_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libvaincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libvaincludedir)"
+	@list='$(libvainclude_HEADERS)'; test -n "$(libvaincludedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libvaincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libvaincludedir)" || exit $$?; \
+	done
+
+uninstall-libvaincludeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libvainclude_HEADERS)'; test -n "$(libvaincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libvaincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libvaincludedir)" && rm -f $$files
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
+	for f in x $$MAKEFLAGS; do \
+	  case $$f in \
+	    *=* | --[!k]*);; \
+	    *k*) failcom='fail=yes';; \
+	  esac; \
+	done; \
+	dot_seen=no; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
+	done; \
+	rev="$$rev ."; \
+	target=`echo $@ | sed s/-recursive//`; \
+	for subdir in $$rev; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done && test -z "$$fail"
+tags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	done
+ctags-recursive:
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test -d "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-recursive
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libvaincludedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-libvaincludeHEADERS
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-libLTLIBRARIES uninstall-libvaincludeHEADERS
+
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
+
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic \
+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES \
+	install-libvaincludeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-libLTLIBRARIES uninstall-libvaincludeHEADERS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru libva-1.0.4/src/va_backend.h libva-1.0.1/src/va_backend.h
--- libva-1.0.4/src/va_backend.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/va_backend.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,426 @@
+/*
+ * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * Video Decode Acceleration -Backend API
+ */
+
+#ifndef _VA_BACKEND_H_
+#define _VA_BACKEND_H_
+
+#ifdef IN_LIBVA
+#include "va.h"
+#include "x11/va_x11.h"
+#else
+#include <va/va.h>
+#include <va/va_x11.h>
+#endif
+
+#include <stdlib.h>
+#include <linux/videodev2.h>
+
+
+typedef struct VADriverContext *VADriverContextP;
+typedef struct VADisplayContext *VADisplayContextP;
+
+struct VADriverVTable
+{
+	VAStatus (*vaTerminate) ( VADriverContextP ctx );
+
+	VAStatus (*vaQueryConfigProfiles) (
+		VADriverContextP ctx,
+		VAProfile *profile_list,	/* out */
+		int *num_profiles			/* out */
+	);
+
+	VAStatus (*vaQueryConfigEntrypoints) (
+		VADriverContextP ctx,
+		VAProfile profile,
+		VAEntrypoint  *entrypoint_list,	/* out */
+		int *num_entrypoints			/* out */
+	);
+
+	VAStatus (*vaGetConfigAttributes) (
+		VADriverContextP ctx,
+		VAProfile profile,
+		VAEntrypoint entrypoint,
+		VAConfigAttrib *attrib_list,	/* in/out */
+		int num_attribs
+	);
+
+	VAStatus (*vaCreateConfig) (
+		VADriverContextP ctx,
+		VAProfile profile, 
+		VAEntrypoint entrypoint, 
+		VAConfigAttrib *attrib_list,
+		int num_attribs,
+		VAConfigID *config_id		/* out */
+	);
+
+	VAStatus (*vaDestroyConfig) (
+		VADriverContextP ctx,
+		VAConfigID config_id
+	);
+
+	VAStatus (*vaQueryConfigAttributes) (
+		VADriverContextP ctx,
+		VAConfigID config_id, 
+		VAProfile *profile,		/* out */
+		VAEntrypoint *entrypoint, 	/* out */
+		VAConfigAttrib *attrib_list,	/* out */
+		int *num_attribs		/* out */
+	);
+
+	VAStatus (*vaCreateSurfaces) (
+		VADriverContextP ctx,
+		int width,
+		int height,
+		int format,
+		int num_surfaces,
+		VASurfaceID *surfaces		/* out */
+	);
+
+	VAStatus (*vaDestroySurfaces) (
+		VADriverContextP ctx,
+		VASurfaceID *surface_list,
+		int num_surfaces
+	);
+
+	VAStatus (*vaCreateContext) (
+		VADriverContextP ctx,
+		VAConfigID config_id,
+		int picture_width,
+		int picture_height,
+		int flag,
+		VASurfaceID *render_targets,
+		int num_render_targets,
+		VAContextID *context		/* out */
+	);
+
+	VAStatus (*vaDestroyContext) (
+		VADriverContextP ctx,
+		VAContextID context
+	);
+
+	VAStatus (*vaCreateBuffer) (
+		VADriverContextP ctx,
+		VAContextID context,		/* in */
+		VABufferType type,		/* in */
+		unsigned int size,		/* in */
+		unsigned int num_elements,	/* in */
+		void *data,			/* in */
+		VABufferID *buf_id		/* out */
+	);
+
+	VAStatus (*vaBufferSetNumElements) (
+		VADriverContextP ctx,
+		VABufferID buf_id,	/* in */
+		unsigned int num_elements	/* in */
+	);
+
+	VAStatus (*vaMapBuffer) (
+		VADriverContextP ctx,
+		VABufferID buf_id,	/* in */
+		void **pbuf         /* out */
+	);
+
+	VAStatus (*vaUnmapBuffer) (
+		VADriverContextP ctx,
+		VABufferID buf_id	/* in */
+	);
+
+	VAStatus (*vaDestroyBuffer) (
+		VADriverContextP ctx,
+		VABufferID buffer_id
+	);
+
+	VAStatus (*vaBeginPicture) (
+		VADriverContextP ctx,
+		VAContextID context,
+		VASurfaceID render_target
+	);
+
+	VAStatus (*vaRenderPicture) (
+		VADriverContextP ctx,
+		VAContextID context,
+		VABufferID *buffers,
+		int num_buffers
+	);
+
+	VAStatus (*vaEndPicture) (
+		VADriverContextP ctx,
+		VAContextID context
+	);
+
+	VAStatus (*vaSyncSurface) (
+		VADriverContextP ctx,
+		VASurfaceID render_target
+	);
+
+	VAStatus (*vaQuerySurfaceStatus) (
+		VADriverContextP ctx,
+		VASurfaceID render_target,
+		VASurfaceStatus *status	/* out */
+	);
+
+	VAStatus (*vaPutSurface) (
+    		VADriverContextP ctx,
+		VASurfaceID surface,
+		Drawable draw, /* X Drawable */
+		short srcx,
+		short srcy,
+		unsigned short srcw,
+		unsigned short srch,
+		short destx,
+		short desty,
+		unsigned short destw,
+		unsigned short desth,
+		VARectangle *cliprects, /* client supplied clip list */
+		unsigned int number_cliprects, /* number of clip rects in the clip list */
+		unsigned int flags /* de-interlacing flags */
+	);
+
+	VAStatus (*vaQueryImageFormats) (
+		VADriverContextP ctx,
+		VAImageFormat *format_list,        /* out */
+		int *num_formats           /* out */
+	);
+
+	VAStatus (*vaCreateImage) (
+		VADriverContextP ctx,
+		VAImageFormat *format,
+		int width,
+		int height,
+		VAImage *image     /* out */
+	);
+
+	VAStatus (*vaDeriveImage) (
+		VADriverContextP ctx,
+		VASurfaceID surface,
+		VAImage *image     /* out */
+	);
+
+	VAStatus (*vaDestroyImage) (
+		VADriverContextP ctx,
+		VAImageID image
+	);
+	
+	VAStatus (*vaSetImagePalette) (
+	        VADriverContextP ctx,
+	        VAImageID image,
+	        /*
+                 * pointer to an array holding the palette data.  The size of the array is
+                 * num_palette_entries * entry_bytes in size.  The order of the components
+                 * in the palette is described by the component_order in VAImage struct
+                 */
+                unsigned char *palette
+	);
+	
+	VAStatus (*vaGetImage) (
+		VADriverContextP ctx,
+		VASurfaceID surface,
+		int x,     /* coordinates of the upper left source pixel */
+		int y,
+		unsigned int width, /* width and height of the region */
+		unsigned int height,
+		VAImageID image
+	);
+
+	VAStatus (*vaPutImage) (
+		VADriverContextP ctx,
+		VASurfaceID surface,
+		VAImageID image,
+		int src_x,
+		int src_y,
+		unsigned int src_width,
+		unsigned int src_height,
+		int dest_x,
+		int dest_y,
+		unsigned int dest_width,
+		unsigned int dest_height
+	);
+
+	VAStatus (*vaQuerySubpictureFormats) (
+		VADriverContextP ctx,
+		VAImageFormat *format_list,        /* out */
+		unsigned int *flags,       /* out */
+		unsigned int *num_formats  /* out */
+	);
+
+	VAStatus (*vaCreateSubpicture) (
+		VADriverContextP ctx,
+		VAImageID image,
+		VASubpictureID *subpicture   /* out */
+	);
+
+	VAStatus (*vaDestroySubpicture) (
+		VADriverContextP ctx,
+		VASubpictureID subpicture
+	);
+
+        VAStatus (*vaSetSubpictureImage) (
+                VADriverContextP ctx,
+                VASubpictureID subpicture,
+                VAImageID image
+        );
+
+	VAStatus (*vaSetSubpictureChromakey) (
+		VADriverContextP ctx,
+		VASubpictureID subpicture,
+		unsigned int chromakey_min,
+		unsigned int chromakey_max,
+		unsigned int chromakey_mask
+	);
+
+	VAStatus (*vaSetSubpictureGlobalAlpha) (
+		VADriverContextP ctx,
+		VASubpictureID subpicture,
+		float global_alpha 
+	);
+
+	VAStatus (*vaAssociateSubpicture) (
+		VADriverContextP ctx,
+		VASubpictureID subpicture,
+		VASurfaceID *target_surfaces,
+		int num_surfaces,
+		short src_x, /* upper left offset in subpicture */
+		short src_y,
+		unsigned short src_width,
+		unsigned short src_height,
+		short dest_x, /* upper left offset in surface */
+		short dest_y,
+		unsigned short dest_width,
+		unsigned short dest_height,
+		/*
+		 * whether to enable chroma-keying or global-alpha
+		 * see VA_SUBPICTURE_XXX values
+		 */
+		unsigned int flags
+	);
+
+	VAStatus (*vaDeassociateSubpicture) (
+		VADriverContextP ctx,
+		VASubpictureID subpicture,
+		VASurfaceID *target_surfaces,
+		int num_surfaces
+	);
+
+	VAStatus (*vaQueryDisplayAttributes) (
+		VADriverContextP ctx,
+		VADisplayAttribute *attr_list,	/* out */
+		int *num_attributes		/* out */
+        );
+
+	VAStatus (*vaGetDisplayAttributes) (
+		VADriverContextP ctx,
+		VADisplayAttribute *attr_list,	/* in/out */
+		int num_attributes
+        );
+        
+        VAStatus (*vaSetDisplayAttributes) (
+		VADriverContextP ctx,
+                VADisplayAttribute *attr_list,
+                int num_attributes
+        );
+
+        /* device specific */
+	VAStatus (*vaCreateSurfaceFromCIFrame) (
+		VADriverContextP ctx,
+		unsigned long frame_id,
+		VASurfaceID *surface		/* out */
+	);
+    
+    
+        VAStatus (*vaCreateSurfaceFromV4L2Buf) (
+		VADriverContextP ctx,
+                int v4l2_fd,         /* file descriptor of V4L2 device */
+                struct v4l2_format *v4l2_fmt,       /* format of V4L2 */
+                struct v4l2_buffer *v4l2_buf,       /* V4L2 buffer */
+                VASurfaceID *surface	           /* out */
+        );
+    
+        VAStatus (*vaCopySurfaceToBuffer) (
+		VADriverContextP ctx,
+                VASurfaceID surface,
+                unsigned int *fourcc, /* out  for follow argument */
+                unsigned int *luma_stride,
+                unsigned int *chroma_u_stride,
+                unsigned int *chroma_v_stride,
+                unsigned int *luma_offset,
+                unsigned int *chroma_u_offset,
+                unsigned int *chroma_v_offset,
+                void **buffer
+        );
+};
+
+struct VADriverContext
+{
+    void *pDriverData;
+    struct VADriverVTable vtable;
+
+    Display *x11_dpy;
+    int x11_screen;
+    int version_major;
+    int version_minor;
+    int max_profiles;
+    int max_entrypoints;
+    int max_attributes;
+    int max_image_formats;
+    int max_subpic_formats;
+    int max_display_attributes;
+    const char *str_vendor;
+
+    void *handle;			/* dlopen handle */
+    
+    void *dri_state;
+};
+
+#define VA_DISPLAY_MAGIC 0x56414430 /* VAD0 */
+struct VADisplayContext
+{
+    int vadpy_magic;
+    
+    VADisplayContextP pNext;
+    VADriverContextP pDriverContext;
+
+    int (*vaIsValid) (
+	VADisplayContextP ctx
+    );
+
+    void (*vaDestroy) (
+	VADisplayContextP ctx
+    );
+
+    VAStatus (*vaGetDriverName) (
+	VADisplayContextP ctx,
+	char **driver_name
+    );
+};
+
+typedef VAStatus (*VADriverInit) (
+    VADriverContextP driver_context
+);
+
+
+#endif /* _VA_BACKEND_H_ */
diff -Nru libva-1.0.4/src/va.c libva-1.0.1/src/va.c
--- libva-1.0.4/src/va.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/va.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,1266 @@
+/*
+ * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define _GNU_SOURCE 1
+#include "va.h"
+#include "va_backend.h"
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <dlfcn.h>
+#include <unistd.h>
+
+#include <linux/videodev2.h>
+#include "va_dri.h"
+#include "va_dri2.h"
+#include "va_dricommon.h"
+
+
+#define DRIVER_INIT_FUNC	"__vaDriverInit_0_31"
+
+#define DRIVER_EXTENSION	"_drv_video.so"
+
+#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
+#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
+
+#define ASSERT		assert
+#define CHECK_VTABLE(s, ctx, func) if (!va_checkVtable(ctx->vtable.va##func, #func)) s = VA_STATUS_ERROR_UNKNOWN;
+#define CHECK_MAXIMUM(s, ctx, var) if (!va_checkMaximum(ctx->max_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
+#define CHECK_STRING(s, ctx, var) if (!va_checkString(ctx->str_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
+
+#define TRACE(func) if (va_debug_trace) va_infoMessage("[TR] %s\n", #func);
+
+static int va_debug_trace = 0;
+
+static int vaDisplayIsValid(VADisplay dpy)
+{
+  VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
+  return pDisplayContext && (pDisplayContext->vadpy_magic == VA_DISPLAY_MAGIC) && pDisplayContext->vaIsValid(pDisplayContext);
+}
+
+static void va_errorMessage(const char *msg, ...)
+{
+    va_list args;
+
+    fprintf(stderr, "libva error: ");
+    va_start(args, msg);
+    vfprintf(stderr, msg, args);
+    va_end(args);
+}
+
+static void va_infoMessage(const char *msg, ...)
+{
+    va_list args;
+
+    fprintf(stderr, "libva: ");
+    va_start(args, msg);
+    vfprintf(stderr, msg, args);
+    va_end(args);
+}
+
+static Bool va_checkVtable(void *ptr, char *function)
+{
+    if (!ptr)
+    {
+        va_errorMessage("No valid vtable entry for va%s\n", function);
+        return False;
+    }
+    return True;
+}
+
+static Bool va_checkMaximum(int value, char *variable)
+{
+    if (!value)
+    {
+        va_errorMessage("Failed to define max_%s in init\n", variable);
+        return False;
+    }
+    return True;
+}
+
+static Bool va_checkString(const char* value, char *variable)
+{
+    if (!value)
+    {
+        va_errorMessage("Failed to define str_%s in init\n", variable);
+        return False;
+    }
+    return True;
+}
+
+static VAStatus va_getDriverName(VADisplay dpy, char **driver_name)
+{
+    VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
+
+    return pDisplayContext->vaGetDriverName(pDisplayContext, driver_name);
+}
+
+static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
+{
+    VADriverContextP ctx = CTX(dpy);
+    VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
+    char *search_path = NULL;
+    char *saveptr;
+    char *driver_dir;
+    
+    if (geteuid() == getuid())
+    {
+        /* don't allow setuid apps to use LIBVA_DRIVERS_PATH */
+        search_path = getenv("LIBVA_DRIVERS_PATH");
+        if (!search_path)
+        {
+            search_path = getenv("LIBGL_DRIVERS_PATH");
+        }
+    }
+    if (!search_path)
+    {
+        search_path = VA_DRIVERS_PATH;
+    }
+
+    search_path = strdup((const char *)search_path);
+    driver_dir = strtok_r((const char *)search_path, ":", &saveptr);
+    while(driver_dir)
+    {
+        void *handle = NULL;
+        char *driver_path = (char *) malloc( strlen(driver_dir) +
+                                             strlen(driver_name) +
+                                             strlen(DRIVER_EXTENSION) + 2 );
+        strncpy( driver_path, driver_dir, strlen(driver_dir) + 1);
+        strncat( driver_path, "/", strlen("/") );
+        strncat( driver_path, driver_name, strlen(driver_name) );
+        strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) );
+        
+        va_infoMessage("Trying to open %s\n", driver_path);
+
+        handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
+        if (!handle)
+        {
+            /* Don't give errors for non-existing files */
+            if (0 == access( driver_path, F_OK))
+            {	
+                va_errorMessage("dlopen of %s failed: %s\n", driver_path, dlerror());
+            }
+        }
+        else
+        {
+            VADriverInit init_func;
+            init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC);
+            if (!init_func)
+            {
+                va_errorMessage("%s has no function %s\n", driver_path, DRIVER_INIT_FUNC);
+                dlclose(handle);
+            }
+            else
+            {
+                vaStatus = (*init_func)(ctx);
+
+                if (VA_STATUS_SUCCESS == vaStatus)
+                {
+                    CHECK_MAXIMUM(vaStatus, ctx, profiles);
+                    CHECK_MAXIMUM(vaStatus, ctx, entrypoints);
+                    CHECK_MAXIMUM(vaStatus, ctx, attributes);
+                    CHECK_MAXIMUM(vaStatus, ctx, image_formats);
+                    CHECK_MAXIMUM(vaStatus, ctx, subpic_formats);
+                    CHECK_MAXIMUM(vaStatus, ctx, display_attributes);
+                    CHECK_STRING(vaStatus, ctx, vendor);
+                    CHECK_VTABLE(vaStatus, ctx, Terminate);
+                    CHECK_VTABLE(vaStatus, ctx, QueryConfigProfiles);
+                    CHECK_VTABLE(vaStatus, ctx, QueryConfigEntrypoints);
+                    CHECK_VTABLE(vaStatus, ctx, QueryConfigAttributes);
+                    CHECK_VTABLE(vaStatus, ctx, CreateConfig);
+                    CHECK_VTABLE(vaStatus, ctx, DestroyConfig);
+                    CHECK_VTABLE(vaStatus, ctx, GetConfigAttributes);
+                    CHECK_VTABLE(vaStatus, ctx, CreateSurfaces);
+                    CHECK_VTABLE(vaStatus, ctx, DestroySurfaces);
+                    CHECK_VTABLE(vaStatus, ctx, CreateContext);
+                    CHECK_VTABLE(vaStatus, ctx, DestroyContext);
+                    CHECK_VTABLE(vaStatus, ctx, CreateBuffer);
+                    CHECK_VTABLE(vaStatus, ctx, BufferSetNumElements);
+                    CHECK_VTABLE(vaStatus, ctx, MapBuffer);
+                    CHECK_VTABLE(vaStatus, ctx, UnmapBuffer);
+                    CHECK_VTABLE(vaStatus, ctx, DestroyBuffer);
+                    CHECK_VTABLE(vaStatus, ctx, BeginPicture);
+                    CHECK_VTABLE(vaStatus, ctx, RenderPicture);
+                    CHECK_VTABLE(vaStatus, ctx, EndPicture);
+                    CHECK_VTABLE(vaStatus, ctx, SyncSurface);
+                    CHECK_VTABLE(vaStatus, ctx, QuerySurfaceStatus);
+                    CHECK_VTABLE(vaStatus, ctx, PutSurface);
+                    CHECK_VTABLE(vaStatus, ctx, QueryImageFormats);
+                    CHECK_VTABLE(vaStatus, ctx, CreateImage);
+                    CHECK_VTABLE(vaStatus, ctx, DeriveImage);
+                    CHECK_VTABLE(vaStatus, ctx, DestroyImage);
+                    CHECK_VTABLE(vaStatus, ctx, SetImagePalette);
+                    CHECK_VTABLE(vaStatus, ctx, GetImage);
+                    CHECK_VTABLE(vaStatus, ctx, PutImage);
+                    CHECK_VTABLE(vaStatus, ctx, QuerySubpictureFormats);
+                    CHECK_VTABLE(vaStatus, ctx, CreateSubpicture);
+                    CHECK_VTABLE(vaStatus, ctx, DestroySubpicture);
+                    CHECK_VTABLE(vaStatus, ctx, SetSubpictureImage);
+                    CHECK_VTABLE(vaStatus, ctx, SetSubpictureChromakey);
+                    CHECK_VTABLE(vaStatus, ctx, SetSubpictureGlobalAlpha);
+                    CHECK_VTABLE(vaStatus, ctx, AssociateSubpicture);
+                    CHECK_VTABLE(vaStatus, ctx, DeassociateSubpicture);
+                    CHECK_VTABLE(vaStatus, ctx, QueryDisplayAttributes);
+                    CHECK_VTABLE(vaStatus, ctx, GetDisplayAttributes);
+                    CHECK_VTABLE(vaStatus, ctx, SetDisplayAttributes);
+                }
+                if (VA_STATUS_SUCCESS != vaStatus)
+                {
+                    va_errorMessage("%s init failed\n", driver_path);
+                    dlclose(handle);
+                }
+                if (VA_STATUS_SUCCESS == vaStatus)
+                {
+                    ctx->handle = handle;
+                }
+                free(driver_path);
+                break;
+            }
+        }
+        free(driver_path);
+        
+        driver_dir = strtok_r(NULL, ":", &saveptr);
+    }
+    
+    free(search_path);    
+    
+    return vaStatus;
+}
+
+VAPrivFunc vaGetLibFunc(VADisplay dpy, const char *func)
+{
+    VADriverContextP ctx;
+    if( !vaDisplayIsValid(dpy) )
+        return NULL;
+    ctx = CTX(dpy);
+
+    if (NULL == ctx->handle)
+        return NULL;
+        
+    return (VAPrivFunc) dlsym(ctx->handle, func);
+}
+
+
+/*
+ * Returns a short english description of error_status
+ */
+const char *vaErrorStr(VAStatus error_status)
+{
+    switch(error_status)
+    {
+        case VA_STATUS_SUCCESS:
+            return "success (no error)";
+        case VA_STATUS_ERROR_OPERATION_FAILED:
+            return "operation failed";
+        case VA_STATUS_ERROR_ALLOCATION_FAILED:
+            return "resource allocation failed";
+        case VA_STATUS_ERROR_INVALID_DISPLAY:
+            return "invalid VADisplay";
+        case VA_STATUS_ERROR_INVALID_CONFIG:
+            return "invalid VAConfigID";
+        case VA_STATUS_ERROR_INVALID_CONTEXT:
+            return "invalid VAContextID";
+        case VA_STATUS_ERROR_INVALID_SURFACE:
+            return "invalid VASurfaceID";
+        case VA_STATUS_ERROR_INVALID_BUFFER:
+            return "invalid VABufferID";
+        case VA_STATUS_ERROR_INVALID_IMAGE:
+            return "invalid VAImageID";
+        case VA_STATUS_ERROR_INVALID_SUBPICTURE:
+            return "invalid VASubpictureID";
+        case VA_STATUS_ERROR_ATTR_NOT_SUPPORTED:
+            return "attribute not supported";
+        case VA_STATUS_ERROR_MAX_NUM_EXCEEDED:
+            return "list argument exceeds maximum number";
+        case VA_STATUS_ERROR_UNSUPPORTED_PROFILE:
+            return "the requested VAProfile is not supported";
+        case VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT:
+            return "the requested VAEntryPoint is not supported";
+        case VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT:
+            return "the requested RT Format is not supported";
+        case VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE:
+            return "the requested VABufferType is not supported";
+        case VA_STATUS_ERROR_SURFACE_BUSY:
+            return "surface is in use";
+        case VA_STATUS_ERROR_FLAG_NOT_SUPPORTED:
+            return "flag not supported";
+        case VA_STATUS_ERROR_INVALID_PARAMETER:
+            return "invalid parameter";
+        case VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED:
+            return "resolution not supported";
+        case VA_STATUS_ERROR_UNIMPLEMENTED:
+            return "the requested function is not implemented";
+        case VA_STATUS_ERROR_SURFACE_IN_DISPLAYING:
+            return "surface is in displaying (may by overlay)" ;
+        case VA_STATUS_ERROR_UNKNOWN:
+            return "unknown libva error";
+    }
+    return "unknown libva error / description missing";
+}
+      
+VAStatus vaInitialize (
+    VADisplay dpy,
+    int *major_version,	 /* out */
+    int *minor_version 	 /* out */
+)
+{
+  char *driver_name = NULL;
+  VAStatus vaStatus;
+  
+  CHECK_DISPLAY(dpy);
+
+  va_debug_trace = (getenv("LIBVA_DEBUG_TRACE") != NULL);
+
+  va_infoMessage("libva version %s\n", VA_VERSION_S);
+
+  vaStatus = va_getDriverName(dpy, &driver_name);
+  va_infoMessage("va_getDriverName() returns %d\n", vaStatus);
+  
+  if (VA_STATUS_SUCCESS == vaStatus)
+  {
+      vaStatus = va_openDriver(dpy, driver_name);
+      va_infoMessage("va_openDriver() returns %d\n", vaStatus);
+      
+      *major_version = VA_MAJOR_VERSION;
+      *minor_version = VA_MINOR_VERSION;
+  }
+
+  if (driver_name)
+      free(driver_name);
+  return vaStatus;
+}
+
+
+/*
+ * After this call, all library internal resources will be cleaned up
+ */ 
+VAStatus vaTerminate (
+    VADisplay dpy
+)
+{
+  VAStatus vaStatus = VA_STATUS_SUCCESS;
+  VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
+  VADriverContextP old_ctx;
+
+  CHECK_DISPLAY(dpy);
+  old_ctx = CTX(dpy);
+
+  if (old_ctx->handle)
+  {
+      vaStatus = old_ctx->vtable.vaTerminate(old_ctx);
+      dlclose(old_ctx->handle);
+      old_ctx->handle = NULL;
+  }
+
+  if (VA_STATUS_SUCCESS == vaStatus)
+      pDisplayContext->vaDestroy(pDisplayContext);
+  return vaStatus;
+}
+
+/*
+ * vaQueryVendorString returns a pointer to a zero-terminated string
+ * describing some aspects of the VA implemenation on a specific
+ * hardware accelerator. The format of the returned string is:
+ * <vendorname>-<major_version>-<minor_version>-<addtional_info>
+ * e.g. for the Intel GMA500 implementation, an example would be:
+ * "IntelGMA500-1.0-0.2-patch3
+ */
+const char *vaQueryVendorString (
+    VADisplay dpy
+)
+{
+  if( !vaDisplayIsValid(dpy) )
+      return NULL;
+  
+  return CTX(dpy)->str_vendor;
+}
+
+
+/* Get maximum number of profiles supported by the implementation */
+int vaMaxNumProfiles (
+    VADisplay dpy
+)
+{
+  if( !vaDisplayIsValid(dpy) )
+      return 0;
+  
+  return CTX(dpy)->max_profiles;
+}
+
+/* Get maximum number of entrypoints supported by the implementation */
+int vaMaxNumEntrypoints (
+    VADisplay dpy
+)
+{
+  if( !vaDisplayIsValid(dpy) )
+      return 0;
+  
+  return CTX(dpy)->max_entrypoints;
+}
+
+
+/* Get maximum number of attributs supported by the implementation */
+int vaMaxNumConfigAttributes (
+    VADisplay dpy
+)
+{
+  if( !vaDisplayIsValid(dpy) )
+      return 0;
+  
+  return CTX(dpy)->max_attributes;
+}
+
+VAStatus vaQueryConfigEntrypoints (
+    VADisplay dpy,
+    VAProfile profile,
+    VAEntrypoint *entrypoints,	/* out */
+    int *num_entrypoints	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaQueryConfigEntrypoints);
+  return ctx->vtable.vaQueryConfigEntrypoints ( ctx, profile, entrypoints, num_entrypoints);
+}
+
+VAStatus vaGetConfigAttributes (
+    VADisplay dpy,
+    VAProfile profile,
+    VAEntrypoint entrypoint,
+    VAConfigAttrib *attrib_list, /* in/out */
+    int num_attribs
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaGetConfigAttributes);
+  return ctx->vtable.vaGetConfigAttributes ( ctx, profile, entrypoint, attrib_list, num_attribs );
+}
+
+VAStatus vaQueryConfigProfiles (
+    VADisplay dpy,
+    VAProfile *profile_list,	/* out */
+    int *num_profiles		/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaQueryConfigProfiles);
+  return ctx->vtable.vaQueryConfigProfiles ( ctx, profile_list, num_profiles );
+}
+
+VAStatus vaCreateConfig (
+    VADisplay dpy,
+    VAProfile profile, 
+    VAEntrypoint entrypoint, 
+    VAConfigAttrib *attrib_list,
+    int num_attribs,
+    VAConfigID *config_id /* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCreateConfig);
+  return ctx->vtable.vaCreateConfig ( ctx, profile, entrypoint, attrib_list, num_attribs, config_id );
+}
+
+VAStatus vaDestroyConfig (
+    VADisplay dpy,
+    VAConfigID config_id
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDestroyConfig);
+  return ctx->vtable.vaDestroyConfig ( ctx, config_id );
+}
+
+VAStatus vaQueryConfigAttributes (
+    VADisplay dpy,
+    VAConfigID config_id, 
+    VAProfile *profile, 	/* out */
+    VAEntrypoint *entrypoint, 	/* out */
+    VAConfigAttrib *attrib_list,/* out */
+    int *num_attribs		/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaQueryConfigAttributes);
+  return ctx->vtable.vaQueryConfigAttributes( ctx, config_id, profile, entrypoint, attrib_list, num_attribs);
+}
+
+VAStatus vaCreateSurfaces (
+    VADisplay dpy,
+    int width,
+    int height,
+    int format,
+    int num_surfaces,
+    VASurfaceID *surfaces	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCreateSurfaces);
+  return ctx->vtable.vaCreateSurfaces( ctx, width, height, format, num_surfaces, surfaces );
+}
+
+
+VAStatus vaDestroySurfaces (
+    VADisplay dpy,
+    VASurfaceID *surface_list,
+    int num_surfaces
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDestroySurfaces);
+  return ctx->vtable.vaDestroySurfaces( ctx, surface_list, num_surfaces );
+}
+
+VAStatus vaCreateContext (
+    VADisplay dpy,
+    VAConfigID config_id,
+    int picture_width,
+    int picture_height,
+    int flag,
+    VASurfaceID *render_targets,
+    int num_render_targets,
+    VAContextID *context		/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCreateContext);
+  return ctx->vtable.vaCreateContext( ctx, config_id, picture_width, picture_height,
+                                      flag, render_targets, num_render_targets, context );
+}
+
+VAStatus vaDestroyContext (
+    VADisplay dpy,
+    VAContextID context
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDestroyContext);
+  return ctx->vtable.vaDestroyContext( ctx, context );
+}
+
+VAStatus vaCreateBuffer (
+    VADisplay dpy,
+    VAContextID context,	/* in */
+    VABufferType type,		/* in */
+    unsigned int size,		/* in */
+    unsigned int num_elements,	/* in */
+    void *data,			/* in */
+    VABufferID *buf_id		/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCreateBuffer);
+  return ctx->vtable.vaCreateBuffer( ctx, context, type, size, num_elements, data, buf_id);
+}
+
+VAStatus vaBufferSetNumElements (
+    VADisplay dpy,
+    VABufferID buf_id,	/* in */
+    unsigned int num_elements /* in */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaBufferSetNumElements);
+  return ctx->vtable.vaBufferSetNumElements( ctx, buf_id, num_elements );
+}
+
+
+VAStatus vaMapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id,	/* in */
+    void **pbuf 	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaMapBuffer);
+  return ctx->vtable.vaMapBuffer( ctx, buf_id, pbuf );
+}
+
+VAStatus vaUnmapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id	/* in */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaUnmapBuffer);
+  return ctx->vtable.vaUnmapBuffer( ctx, buf_id );
+}
+
+VAStatus vaDestroyBuffer (
+    VADisplay dpy,
+    VABufferID buffer_id
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDestroyBuffer);
+  return ctx->vtable.vaDestroyBuffer( ctx, buffer_id );
+}
+
+VAStatus vaBeginPicture (
+    VADisplay dpy,
+    VAContextID context,
+    VASurfaceID render_target
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaBeginPicture);
+  return ctx->vtable.vaBeginPicture( ctx, context, render_target );
+}
+
+VAStatus vaRenderPicture (
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID *buffers,
+    int num_buffers
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaRenderPicture);
+  return ctx->vtable.vaRenderPicture( ctx, context, buffers, num_buffers );
+}
+
+VAStatus vaEndPicture (
+    VADisplay dpy,
+    VAContextID context
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaEndPicture);
+  return ctx->vtable.vaEndPicture( ctx, context );
+}
+
+VAStatus vaSyncSurface (
+    VADisplay dpy,
+    VASurfaceID render_target
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaSyncSurface);
+  return ctx->vtable.vaSyncSurface( ctx, render_target );
+}
+
+VAStatus vaQuerySurfaceStatus (
+    VADisplay dpy,
+    VASurfaceID render_target,
+    VASurfaceStatus *status	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaQuerySurfaceStatus);
+  return ctx->vtable.vaQuerySurfaceStatus( ctx, render_target, status );
+}
+
+VAStatus vaPutSurface (
+    VADisplay dpy,
+    VASurfaceID surface,
+    Drawable draw, /* X Drawable */
+    short srcx,
+    short srcy,
+    unsigned short srcw,
+    unsigned short srch,
+    short destx,
+    short desty,
+    unsigned short destw,
+    unsigned short desth,
+    VARectangle *cliprects, /* client supplied clip list */
+    unsigned int number_cliprects, /* number of clip rects in the clip list */
+    unsigned int flags /* de-interlacing flags */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaPutSurface);
+  return ctx->vtable.vaPutSurface( ctx, surface, draw, srcx, srcy, srcw, srch,
+                                   destx, desty, destw, desth,
+                                   cliprects, number_cliprects, flags );
+}
+
+/* Get maximum number of image formats supported by the implementation */
+int vaMaxNumImageFormats (
+    VADisplay dpy
+)
+{
+  if( !vaDisplayIsValid(dpy) )
+      return 0;
+  
+  return CTX(dpy)->max_image_formats;
+}
+
+VAStatus vaQueryImageFormats (
+    VADisplay dpy,
+    VAImageFormat *format_list,	/* out */
+    int *num_formats		/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaQueryImageFormats);
+  return ctx->vtable.vaQueryImageFormats ( ctx, format_list, num_formats);
+}
+
+/* 
+ * The width and height fields returned in the VAImage structure may get 
+ * enlarged for some YUV formats. The size of the data buffer that needs
+ * to be allocated will be given in the "data_size" field in VAImage.
+ * Image data is not allocated by this function.  The client should
+ * allocate the memory and fill in the VAImage structure's data field
+ * after looking at "data_size" returned from the library.
+ */
+VAStatus vaCreateImage (
+    VADisplay dpy,
+    VAImageFormat *format,
+    int width,
+    int height,
+    VAImage *image	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCreateImage);
+  return ctx->vtable.vaCreateImage ( ctx, format, width, height, image);
+}
+
+/*
+ * Should call DestroyImage before destroying the surface it is bound to
+ */
+VAStatus vaDestroyImage (
+    VADisplay dpy,
+    VAImageID image
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDestroyImage);
+  return ctx->vtable.vaDestroyImage ( ctx, image);
+}
+
+VAStatus vaSetImagePalette (
+    VADisplay dpy,
+    VAImageID image,
+    unsigned char *palette
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaSetImagePalette);
+  return ctx->vtable.vaSetImagePalette ( ctx, image, palette);
+}
+
+/*
+ * Retrieve surface data into a VAImage
+ * Image must be in a format supported by the implementation
+ */
+VAStatus vaGetImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    int x,	/* coordinates of the upper left source pixel */
+    int y,
+    unsigned int width, /* width and height of the region */
+    unsigned int height,
+    VAImageID image
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaGetImage);
+  return ctx->vtable.vaGetImage ( ctx, surface, x, y, width, height, image);
+}
+
+/*
+ * Copy data from a VAImage to a surface
+ * Image must be in a format supported by the implementation
+ */
+VAStatus vaPutImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAImageID image,
+    int src_x,
+    int src_y,
+    unsigned int src_width,
+    unsigned int src_height,
+    int dest_x,
+    int dest_y,
+    unsigned int dest_width,
+    unsigned int dest_height
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaPutImage);
+  return ctx->vtable.vaPutImage ( ctx, surface, image, src_x, src_y, src_width, src_height, dest_x, dest_y, dest_width, dest_height );
+}
+
+/*
+ * Derive an VAImage from an existing surface.
+ * This interface will derive a VAImage and corresponding image buffer from
+ * an existing VA Surface. The image buffer can then be mapped/unmapped for
+ * direct CPU access. This operation is only possible on implementations with
+ * direct rendering capabilities and internal surface formats that can be
+ * represented with a VAImage. When the operation is not possible this interface
+ * will return VA_STATUS_ERROR_OPERATION_FAILED. Clients should then fall back
+ * to using vaCreateImage + vaPutImage to accomplish the same task in an
+ * indirect manner.
+ *
+ * Implementations should only return success when the resulting image buffer
+ * would be useable with vaMap/Unmap.
+ *
+ * When directly accessing a surface special care must be taken to insure
+ * proper synchronization with the graphics hardware. Clients should call
+ * vaQuerySurfaceStatus to insure that a surface is not the target of concurrent
+ * rendering or currently being displayed by an overlay.
+ *
+ * Additionally nothing about the contents of a surface should be assumed
+ * following a vaPutSurface. Implementations are free to modify the surface for
+ * scaling or subpicture blending within a call to vaPutImage.
+ *
+ * Calls to vaPutImage or vaGetImage using the same surface from which the image
+ * has been derived will return VA_STATUS_ERROR_SURFACE_BUSY. vaPutImage or
+ * vaGetImage with other surfaces is supported.
+ *
+ * An image created with vaDeriveImage should be freed with vaDestroyImage. The
+ * image and image buffer structures will be destroyed; however, the underlying
+ * surface will remain unchanged until freed with vaDestroySurfaces.
+ */
+VAStatus vaDeriveImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAImage *image	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDeriveImage);
+  return ctx->vtable.vaDeriveImage ( ctx, surface, image );
+}
+
+
+/* Get maximum number of subpicture formats supported by the implementation */
+int vaMaxNumSubpictureFormats (
+    VADisplay dpy
+)
+{
+  if( !vaDisplayIsValid(dpy) )
+      return 0;
+  
+  return CTX(dpy)->max_subpic_formats;
+}
+
+/* 
+ * Query supported subpicture formats 
+ * The caller must provide a "format_list" array that can hold at
+ * least vaMaxNumSubpictureFormats() entries. The flags arrary holds the flag 
+ * for each format to indicate additional capabilities for that format. The actual 
+ * number of formats returned in "format_list" is returned in "num_formats".
+ */
+VAStatus vaQuerySubpictureFormats (
+    VADisplay dpy,
+    VAImageFormat *format_list,	/* out */
+    unsigned int *flags,	/* out */
+    unsigned int *num_formats	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaQuerySubpictureFormats);
+  return ctx->vtable.vaQuerySubpictureFormats ( ctx, format_list, flags, num_formats);
+}
+
+/* 
+ * Subpictures are created with an image associated. 
+ */
+VAStatus vaCreateSubpicture (
+    VADisplay dpy,
+    VAImageID image,
+    VASubpictureID *subpicture	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCreateSubpicture);
+  return ctx->vtable.vaCreateSubpicture ( ctx, image, subpicture );
+}
+
+/*
+ * Destroy the subpicture before destroying the image it is assocated to
+ */
+VAStatus vaDestroySubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDestroySubpicture);
+  return ctx->vtable.vaDestroySubpicture ( ctx, subpicture);
+}
+
+VAStatus vaSetSubpictureImage (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VAImageID image
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaSetSubpictureImage);
+  return ctx->vtable.vaSetSubpictureImage ( ctx, subpicture, image);
+}
+
+
+/*
+ * If chromakey is enabled, then the area where the source value falls within
+ * the chromakey [min, max] range is transparent
+ */
+VAStatus vaSetSubpictureChromakey (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    unsigned int chromakey_min,
+    unsigned int chromakey_max,
+    unsigned int chromakey_mask
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaSetSubpictureChromakey);
+  return ctx->vtable.vaSetSubpictureChromakey ( ctx, subpicture, chromakey_min, chromakey_max, chromakey_mask );
+}
+
+
+/*
+ * Global alpha value is between 0 and 1. A value of 1 means fully opaque and 
+ * a value of 0 means fully transparent. If per-pixel alpha is also specified then
+ * the overall alpha is per-pixel alpha multiplied by the global alpha
+ */
+VAStatus vaSetSubpictureGlobalAlpha (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    float global_alpha 
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaSetSubpictureGlobalAlpha);
+  return ctx->vtable.vaSetSubpictureGlobalAlpha ( ctx, subpicture, global_alpha );
+}
+
+/*
+  vaAssociateSubpicture associates the subpicture with the target_surface.
+  It defines the region mapping between the subpicture and the target 
+  surface through source and destination rectangles (with the same width and height).
+  Both will be displayed at the next call to vaPutSurface.  Additional
+  associations before the call to vaPutSurface simply overrides the association.
+*/
+VAStatus vaAssociateSubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VASurfaceID *target_surfaces,
+    int num_surfaces,
+    short src_x, /* upper left offset in subpicture */
+    short src_y,
+    unsigned short src_width,
+    unsigned short src_height,
+    short dest_x, /* upper left offset in surface */
+    short dest_y,
+    unsigned short dest_width,
+    unsigned short dest_height,
+    /*
+     * whether to enable chroma-keying or global-alpha
+     * see VA_SUBPICTURE_XXX values
+     */
+    unsigned int flags
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaAssociateSubpicture);
+  return ctx->vtable.vaAssociateSubpicture ( ctx, subpicture, target_surfaces, num_surfaces, src_x, src_y, src_width, src_height, dest_x, dest_y, dest_width, dest_height, flags );
+}
+
+/*
+ * vaDeassociateSubpicture removes the association of the subpicture with target_surfaces.
+ */
+VAStatus vaDeassociateSubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VASurfaceID *target_surfaces,
+    int num_surfaces
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaDeassociateSubpicture);
+  return ctx->vtable.vaDeassociateSubpicture ( ctx, subpicture, target_surfaces, num_surfaces );
+}
+
+
+/* Get maximum number of display attributes supported by the implementation */
+int vaMaxNumDisplayAttributes (
+    VADisplay dpy
+)
+{
+  if( !vaDisplayIsValid(dpy) )
+      return 0;
+  
+  return CTX(dpy)->max_display_attributes;
+}
+
+/* 
+ * Query display attributes 
+ * The caller must provide a "attr_list" array that can hold at
+ * least vaMaxNumDisplayAttributes() entries. The actual number of attributes
+ * returned in "attr_list" is returned in "num_attributes".
+ */
+VAStatus vaQueryDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,	/* out */
+    int *num_attributes			/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaQueryDisplayAttributes);
+  return ctx->vtable.vaQueryDisplayAttributes ( ctx, attr_list, num_attributes );
+}
+
+/* 
+ * Get display attributes 
+ * This function returns the current attribute values in "attr_list".
+ * Only attributes returned with VA_DISPLAY_ATTRIB_GETTABLE set in the "flags" field
+ * from vaQueryDisplayAttributes() can have their values retrieved.  
+ */
+VAStatus vaGetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,	/* in/out */
+    int num_attributes
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaGetDisplayAttributes);
+  return ctx->vtable.vaGetDisplayAttributes ( ctx, attr_list, num_attributes );
+}
+
+/* 
+ * Set display attributes 
+ * Only attributes returned with VA_DISPLAY_ATTRIB_SETTABLE set in the "flags" field
+ * from vaQueryDisplayAttributes() can be set.  If the attribute is not settable or 
+ * the value is out of range, the function returns VA_STATUS_ERROR_ATTR_NOT_SUPPORTED
+ */
+VAStatus vaSetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,
+    int num_attributes
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaSetDisplayAttributes);
+  return ctx->vtable.vaSetDisplayAttributes ( ctx, attr_list, num_attributes );
+}
+
+/* Wrap a CI (camera imaging) frame as a VA surface to share captured video between camear
+ * and VA encode. With frame_id, VA driver need to call CI interfaces to get the information
+ * of the frame, and to determine if the frame can be wrapped as a VA surface
+ *
+ * Application should make sure the frame is idle before the frame is passed into VA stack
+ * and also a vaSyncSurface should be called before application tries to access the frame
+ * from CI stack
+ */
+VAStatus vaCreateSurfaceFromCIFrame (
+    VADisplay dpy,
+    unsigned long frame_id,
+    VASurfaceID *surface	/* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCreateSurfacesFromCIFrame);
+
+  if (ctx->vtable.vaCreateSurfaceFromCIFrame)
+      return ctx->vtable.vaCreateSurfaceFromCIFrame( ctx, frame_id, surface );
+  else
+      return VA_STATUS_ERROR_UNKNOWN;
+}
+
+
+/* Wrap a V4L2 buffer as a VA surface, so that V4L2 camera, VA encode
+ * can share the data without copy
+ * The VA driver should query the camera device from v4l2_fd to see
+ * if camera device memory/buffer can be wrapped into a VA surface
+ * Buffer information is passed in by v4l2_fmt and v4l2_buf structure,
+ * VA driver also needs do further check if the buffer can meet encode
+ * hardware requirement, such as dimension, fourcc, stride, etc
+ *
+ * Application should make sure the buffer is idle before the frame into VA stack
+ * and also a vaSyncSurface should be called before application tries to access the frame
+ * from V4L2 stack
+ */
+VAStatus vaCreateSurfaceFromV4L2Buf(
+    VADisplay dpy,
+    int v4l2_fd,         /* file descriptor of V4L2 device */
+    struct v4l2_format *v4l2_fmt,       /* format of V4L2 */
+    struct v4l2_buffer *v4l2_buf,       /* V4L2 buffer */
+    VASurfaceID *surface	       /* out */
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vtable.vaCreateSurfaceFromV4L2Buf);
+
+  if (ctx->vtable.vaCreateSurfaceFromV4L2Buf) 
+      return ctx->vtable.vaCreateSurfaceFromV4L2Buf( ctx, v4l2_fd, v4l2_fmt, v4l2_buf, surface );
+  else
+      return VA_STATUS_ERROR_UNKNOWN;
+}
+
+/* It is a debug interface, and isn't exported in core VAAPI
+ * It is used to dump surface data into system memory
+ * Application should explicitly call free to release the buffer memory
+ */
+
+VAStatus vaCopySurfaceToBuffer(VADisplay dpy,
+    VASurfaceID surface,
+    unsigned int *fourcc, /* following are output argument */
+    unsigned int *luma_stride,
+    unsigned int *chroma_u_stride,
+    unsigned int *chroma_v_stride,
+    unsigned int *luma_offset,
+    unsigned int *chroma_u_offset,
+    unsigned int *chroma_v_offset,
+    void **buffer 
+)
+{
+  VADriverContextP ctx;
+  CHECK_DISPLAY(dpy);
+  ctx = CTX(dpy);
+
+  TRACE(vaCopySurfaceToBuffer);
+  if (ctx->vtable.vaCopySurfaceToBuffer)
+      return ctx->vtable.vaCopySurfaceToBuffer( ctx, surface, fourcc, luma_stride, chroma_u_stride, chroma_v_stride, luma_offset, chroma_u_offset, chroma_v_offset, buffer);
+  else
+      return VA_STATUS_ERROR_UNKNOWN;
+}
diff -Nru libva-1.0.4/src/va.h libva-1.0.1/src/va.h
--- libva-1.0.4/src/va.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/va.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,1717 @@
+/*
+ * Copyright (c) 2007-2009 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * Video Acceleration (VA) API Specification
+ *
+ * Rev. 0.30
+ * <jonathan.bian@intel.com>
+ *
+ * Revision History:
+ * rev 0.10 (12/10/2006 Jonathan Bian) - Initial draft
+ * rev 0.11 (12/15/2006 Jonathan Bian) - Fixed some errors
+ * rev 0.12 (02/05/2007 Jonathan Bian) - Added VC-1 data structures for slice level decode
+ * rev 0.13 (02/28/2007 Jonathan Bian) - Added GetDisplay()
+ * rev 0.14 (04/13/2007 Jonathan Bian) - Fixed MPEG-2 PictureParameter structure, cleaned up a few funcs.
+ * rev 0.15 (04/20/2007 Jonathan Bian) - Overhauled buffer management
+ * rev 0.16 (05/02/2007 Jonathan Bian) - Added error codes and fixed some issues with configuration
+ * rev 0.17 (05/07/2007 Jonathan Bian) - Added H.264/AVC data structures for slice level decode.
+ * rev 0.18 (05/14/2007 Jonathan Bian) - Added data structures for MPEG-4 slice level decode 
+ *                                       and MPEG-2 motion compensation.
+ * rev 0.19 (08/06/2007 Jonathan Bian) - Removed extra type for bitplane data.
+ * rev 0.20 (08/08/2007 Jonathan Bian) - Added missing fields to VC-1 PictureParameter structure.
+ * rev 0.21 (08/20/2007 Jonathan Bian) - Added image and subpicture support.
+ * rev 0.22 (08/27/2007 Jonathan Bian) - Added support for chroma-keying and global alpha.
+ * rev 0.23 (09/11/2007 Jonathan Bian) - Fixed some issues with images and subpictures.
+ * rev 0.24 (09/18/2007 Jonathan Bian) - Added display attributes.
+ * rev 0.25 (10/18/2007 Jonathan Bian) - Changed to use IDs only for some types.
+ * rev 0.26 (11/07/2007 Waldo Bastian) - Change vaCreateBuffer semantics
+ * rev 0.27 (11/19/2007 Matt Sottek)   - Added DeriveImage
+ * rev 0.28 (12/06/2007 Jonathan Bian) - Added new versions of PutImage and AssociateSubpicture 
+ *                                       to enable scaling
+ * rev 0.29 (02/07/2008 Jonathan Bian) - VC1 parameter fixes,
+ *                                       added VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED
+ * rev 0.30 (03/01/2009 Jonathan Bian) - Added encoding support for H.264 BP and MPEG-4 SP and fixes
+ *                                       for ISO C conformance.
+ * rev 0.31 (09/02/2009 Gwenole Beauchesne) - VC-1/H264 fields change for VDPAU and XvBA backend
+ *                                       Application needs to relink with the new library.
+ *
+ * Acknowledgements:
+ *  Some concepts borrowed from XvMC and XvImage.
+ *  Waldo Bastian (Intel), Matt Sottek (Intel),  Austin Yuan (Intel), and Gwenole Beauchesne (SDS)
+ *  contributed to various aspects of the API.
+ */
+
+#ifndef _VA_H_
+#define _VA_H_
+
+#ifdef IN_LIBVA
+#include "va_version.h"
+#else
+#include <va/va_version.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* 
+Overview 
+
+The VA API is intended to provide an interface between a video decode/encode/display
+application (client) and a hardware accelerator (server), to off-load 
+video decode/encode/display operations from the host to the hardware accelerator at various 
+entry-points.
+
+The basic operation steps are:
+
+- Negotiate a mutually acceptable configuration with the server to lock
+  down profile, entrypoints, and other attributes that will not change on 
+  a frame-by-frame basis.
+- Create a decode context which represents a "virtualized" hardware decode 
+  device
+- Get and fill decode buffers with picture level, slice level and macroblock 
+  level data (depending on entrypoints)
+- Pass the decode buffers to the server to decode the current frame
+
+Initialization & Configuration Management 
+
+- Find out supported profiles
+- Find out entrypoints for a given profile
+- Find out configuration attributes for a given profile/entrypoint pair
+- Create a configuration for use by the decoder
+
+*/
+
+typedef void* VADisplay;	/* window system dependent */
+
+typedef int VAStatus;	/* Return status type from functions */
+/* Values for the return status */
+#define VA_STATUS_SUCCESS			0x00000000
+#define VA_STATUS_ERROR_OPERATION_FAILED	0x00000001
+#define VA_STATUS_ERROR_ALLOCATION_FAILED	0x00000002
+#define VA_STATUS_ERROR_INVALID_DISPLAY		0x00000003
+#define VA_STATUS_ERROR_INVALID_CONFIG		0x00000004
+#define VA_STATUS_ERROR_INVALID_CONTEXT		0x00000005
+#define VA_STATUS_ERROR_INVALID_SURFACE		0x00000006
+#define VA_STATUS_ERROR_INVALID_BUFFER		0x00000007
+#define VA_STATUS_ERROR_INVALID_IMAGE		0x00000008
+#define VA_STATUS_ERROR_INVALID_SUBPICTURE	0x00000009
+#define VA_STATUS_ERROR_ATTR_NOT_SUPPORTED	0x0000000a
+#define VA_STATUS_ERROR_MAX_NUM_EXCEEDED	0x0000000b
+#define VA_STATUS_ERROR_UNSUPPORTED_PROFILE	0x0000000c
+#define VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT	0x0000000d
+#define VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT	0x0000000e
+#define VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE	0x0000000f
+#define VA_STATUS_ERROR_SURFACE_BUSY		0x00000010
+#define VA_STATUS_ERROR_FLAG_NOT_SUPPORTED      0x00000011
+#define VA_STATUS_ERROR_INVALID_PARAMETER	0x00000012
+#define VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED 0x00000013
+#define VA_STATUS_ERROR_UNIMPLEMENTED           0x00000014
+#define VA_STATUS_ERROR_SURFACE_IN_DISPLAYING   0x00000015
+#define VA_STATUS_ERROR_UNKNOWN			0xFFFFFFFF
+
+/*
+ * Returns a short english description of error_status
+ */
+const char *vaErrorStr(VAStatus error_status);
+
+/*
+ * Initialization:
+ * A display must be obtained by calling vaGetDisplay() before calling
+ * vaInitialize() and other functions. This connects the API to the 
+ * native window system.
+ * For X Windows, native_dpy would be from XOpenDisplay()
+ */
+typedef void* NativeDisplay;	/* window system dependent */
+
+/*
+ * Initialize the library 
+ */
+VAStatus vaInitialize (
+    VADisplay dpy,
+    int *major_version,	 /* out */
+    int *minor_version 	 /* out */
+);
+
+/*
+ * After this call, all library internal resources will be cleaned up
+ */ 
+VAStatus vaTerminate (
+    VADisplay dpy
+);
+
+/*
+ * vaQueryVendorString returns a pointer to a zero-terminated string
+ * describing some aspects of the VA implemenation on a specific    
+ * hardware accelerator. The format of the returned string is vendor
+ * specific and at the discretion of the implementer.
+ * e.g. for the Intel GMA500 implementation, an example would be:
+ * "Intel GMA500 - 2.0.0.32L.0005"
+ */
+const char *vaQueryVendorString (
+    VADisplay dpy
+);
+
+typedef int (*VAPrivFunc)();
+
+/*
+ * Return a function pointer given a function name in the library.
+ * This allows private interfaces into the library
+ */ 
+VAPrivFunc vaGetLibFunc (
+    VADisplay dpy,
+    const char *func
+);
+
+/* Currently defined profiles */
+typedef enum
+{
+    VAProfileMPEG2Simple		= 0,
+    VAProfileMPEG2Main			= 1,
+    VAProfileMPEG4Simple		= 2,
+    VAProfileMPEG4AdvancedSimple	= 3,
+    VAProfileMPEG4Main			= 4,
+    VAProfileH264Baseline		= 5,
+    VAProfileH264Main			= 6,
+    VAProfileH264High			= 7,
+    VAProfileVC1Simple			= 8,
+    VAProfileVC1Main			= 9,
+    VAProfileVC1Advanced		= 10,
+    VAProfileH263Baseline		= 11
+} VAProfile;
+
+/* 
+ *  Currently defined entrypoints 
+ */
+typedef enum
+{
+    VAEntrypointVLD		= 1,
+    VAEntrypointIZZ		= 2,
+    VAEntrypointIDCT		= 3,
+    VAEntrypointMoComp		= 4,
+    VAEntrypointDeblocking	= 5,
+    VAEntrypointEncSlice	= 6	/* slice level encode */
+} VAEntrypoint;
+
+/* Currently defined configuration attribute types */
+typedef enum
+{
+    VAConfigAttribRTFormat		= 0,
+    VAConfigAttribSpatialResidual	= 1,
+    VAConfigAttribSpatialClipping	= 2,
+    VAConfigAttribIntraResidual		= 3,
+    VAConfigAttribEncryption		= 4,
+    VAConfigAttribRateControl		= 5
+} VAConfigAttribType;
+
+/*
+ * Configuration attributes
+ * If there is more than one value for an attribute, a default
+ * value will be assigned to the attribute if the client does not
+ * specify the attribute when creating a configuration
+ */
+typedef struct _VAConfigAttrib {
+    VAConfigAttribType type;
+    unsigned int value; /* OR'd flags (bits) for this attribute */
+} VAConfigAttrib;
+
+/* attribute value for VAConfigAttribRTFormat */
+#define VA_RT_FORMAT_YUV420	0x00000001	
+#define VA_RT_FORMAT_YUV422	0x00000002
+#define VA_RT_FORMAT_YUV444	0x00000004
+#define VA_RT_FORMAT_PROTECTED	0x80000000
+
+/* attribute value for VAConfigAttribRateControl */
+#define VA_RC_NONE	0x00000001	
+#define VA_RC_CBR	0x00000002	
+#define VA_RC_VBR	0x00000004	
+
+/*
+ * if an attribute is not applicable for a given
+ * profile/entrypoint pair, then set the value to the following 
+ */
+#define VA_ATTRIB_NOT_SUPPORTED 0x80000000
+
+/* Get maximum number of profiles supported by the implementation */
+int vaMaxNumProfiles (
+    VADisplay dpy
+);
+
+/* Get maximum number of entrypoints supported by the implementation */
+int vaMaxNumEntrypoints (
+    VADisplay dpy
+);
+
+/* Get maximum number of attributs supported by the implementation */
+int vaMaxNumConfigAttributes (
+    VADisplay dpy
+);
+
+/* 
+ * Query supported profiles 
+ * The caller must provide a "profile_list" array that can hold at
+ * least vaMaxNumProfile() entries. The actual number of profiles
+ * returned in "profile_list" is returned in "num_profile".
+ */
+VAStatus vaQueryConfigProfiles (
+    VADisplay dpy,
+    VAProfile *profile_list,	/* out */
+    int *num_profiles		/* out */
+);
+
+/* 
+ * Query supported entrypoints for a given profile 
+ * The caller must provide an "entrypoint_list" array that can hold at
+ * least vaMaxNumEntrypoints() entries. The actual number of entrypoints 
+ * returned in "entrypoint_list" is returned in "num_entrypoints".
+ */
+VAStatus vaQueryConfigEntrypoints (
+    VADisplay dpy,
+    VAProfile profile,
+    VAEntrypoint *entrypoint_list,	/* out */
+    int *num_entrypoints		/* out */
+);
+
+/* 
+ * Get attributes for a given profile/entrypoint pair 
+ * The caller must provide an "attrib_list" with all attributes to be 
+ * retrieved.  Upon return, the attributes in "attrib_list" have been 
+ * updated with their value.  Unknown attributes or attributes that are 
+ * not supported for the given profile/entrypoint pair will have their 
+ * value set to VA_ATTRIB_NOT_SUPPORTED
+ */
+VAStatus vaGetConfigAttributes (
+    VADisplay dpy,
+    VAProfile profile,
+    VAEntrypoint entrypoint,
+    VAConfigAttrib *attrib_list, /* in/out */
+    int num_attribs
+);
+
+/* Generic ID type, can be re-typed for specific implementation */
+typedef unsigned int VAGenericID;
+
+typedef VAGenericID VAConfigID;
+
+/* 
+ * Create a configuration for the decode pipeline 
+ * it passes in the attribute list that specifies the attributes it cares 
+ * about, with the rest taking default values.  
+ */
+VAStatus vaCreateConfig (
+    VADisplay dpy,
+    VAProfile profile, 
+    VAEntrypoint entrypoint, 
+    VAConfigAttrib *attrib_list,
+    int num_attribs,
+    VAConfigID *config_id /* out */
+);
+
+/* 
+ * Free resources associdated with a given config 
+ */
+VAStatus vaDestroyConfig (
+    VADisplay dpy,
+    VAConfigID config_id
+);
+
+/* 
+ * Query all attributes for a given configuration 
+ * The profile of the configuration is returned in "profile"
+ * The entrypoint of the configuration is returned in "entrypoint"
+ * The caller must provide an "attrib_list" array that can hold at least 
+ * vaMaxNumConfigAttributes() entries. The actual number of attributes 
+ * returned in "attrib_list" is returned in "num_attribs"
+ */
+VAStatus vaQueryConfigAttributes (
+    VADisplay dpy,
+    VAConfigID config_id, 
+    VAProfile *profile, 	/* out */
+    VAEntrypoint *entrypoint, 	/* out */
+    VAConfigAttrib *attrib_list,/* out */
+    int *num_attribs 		/* out */
+);
+
+
+/*
+ * Contexts and Surfaces
+ *
+ * Context represents a "virtual" video decode pipeline. Surfaces are render 
+ * targets for a given context. The data in the surfaces are not accessible  
+ * to the client and the internal data format of the surface is implementatin 
+ * specific. 
+ *
+ * Surfaces will be bound to a context when the context is created. Once
+ * a surface is bound to a given context, it can not be used to create  
+ * another context. The association is removed when the context is destroyed
+ * 
+ * Both contexts and surfaces are identified by unique IDs and its
+ * implementation specific internals are kept opaque to the clients
+ */
+
+typedef VAGenericID VAContextID;
+
+typedef VAGenericID VASurfaceID;
+
+#define VA_INVALID_ID		0xffffffff
+#define VA_INVALID_SURFACE	VA_INVALID_ID
+
+/* 
+ * vaCreateSurfaces - Create an array of surfaces used for decode and display  
+ *  dpy: display
+ *  width: surface width
+ *  height: surface height
+ *  format: VA_RT_FORMAT_YUV420, VA_RT_FORMAT_YUV422 or VA_RT_FORMAT_YUV444
+ *  num_surfaces: number of surfaces to be created
+ *  surfaces: array of surfaces created upon return
+ */
+VAStatus vaCreateSurfaces (
+    VADisplay dpy,
+    int width,
+    int height,
+    int format,
+    int num_surfaces,
+    VASurfaceID *surfaces	/* out */
+);
+
+/* Wrap a CI (camera imaging) frame as a VA surface to share captured video between camear
+ * and VA encode. With frame_id, VA driver need to call CI interfaces to get the information
+ * of the frame, and to determine if the frame can be wrapped as a VA surface
+ *
+ * Application should make sure the frame is idle before the frame is passed into VA stack
+ * and also a vaSyncSurface should be called before application tries to access the frame
+ * from CI stack
+ */
+VAStatus vaCreateSurfaceFromCIFrame (
+    VADisplay dpy,
+    unsigned long frame_id,
+    VASurfaceID *surface	/* out */
+);
+    
+    
+/*
+ * vaDestroySurfaces - Destroy resources associated with surfaces. 
+ *  Surfaces can only be destroyed after the context associated has been 
+ *  destroyed.  
+ *  dpy: display
+ *  surfaces: array of surfaces to destroy
+ *  num_surfaces: number of surfaces in the array to be destroyed.
+ */
+VAStatus vaDestroySurfaces (
+    VADisplay dpy,
+    VASurfaceID *surfaces,
+    int num_surfaces
+);
+
+#define VA_PROGRESSIVE 0x1
+/*
+ * vaCreateContext - Create a context
+ *  dpy: display
+ *  config_id: configuration for the context
+ *  picture_width: coded picture width
+ *  picture_height: coded picture height
+ *  flag: any combination of the following:
+ *    VA_PROGRESSIVE (only progressive frame pictures in the sequence when set)
+ *  render_targets: render targets (surfaces) tied to the context
+ *  num_render_targets: number of render targets in the above array
+ *  context: created context id upon return
+ */
+VAStatus vaCreateContext (
+    VADisplay dpy,
+    VAConfigID config_id,
+    int picture_width,
+    int picture_height,
+    int flag,
+    VASurfaceID *render_targets,
+    int num_render_targets,
+    VAContextID *context		/* out */
+);
+
+/*
+ * vaDestroyContext - Destroy a context 
+ *  dpy: display
+ *  context: context to be destroyed
+ */
+VAStatus vaDestroyContext (
+    VADisplay dpy,
+    VAContextID context
+);
+
+/*
+ * Buffers 
+ * Buffers are used to pass various types of data from the
+ * client to the server. The server maintains a data store
+ * for each buffer created, and the client idenfies a buffer
+ * through a unique buffer id assigned by the server.
+ */
+
+typedef VAGenericID VABufferID;
+
+typedef enum
+{
+    VAPictureParameterBufferType	= 0,
+    VAIQMatrixBufferType		= 1,
+    VABitPlaneBufferType		= 2,
+    VASliceGroupMapBufferType		= 3,
+    VASliceParameterBufferType		= 4,
+    VASliceDataBufferType		= 5,
+    VAMacroblockParameterBufferType	= 6,
+    VAResidualDataBufferType		= 7,
+    VADeblockingParameterBufferType	= 8,
+    VAImageBufferType			= 9,
+    VAProtectedSliceDataBufferType	= 10,
+/* Following are encode buffer types */
+    VAEncCodedBufferType		= 21,
+    VAEncSequenceParameterBufferType	= 22,
+    VAEncPictureParameterBufferType	= 23,
+    VAEncSliceParameterBufferType	= 24,
+    VAEncH264VUIBufferType		= 25,
+    VAEncH264SEIBufferType		= 26,
+} VABufferType;
+
+
+/* 
+ * There will be cases where the bitstream buffer will not have enough room to hold
+ * the data for the entire slice, and the following flags will be used in the slice
+ * parameter to signal to the server for the possible cases.
+ * If a slice parameter buffer and slice data buffer pair is sent to the server with 
+ * the slice data partially in the slice data buffer (BEGIN and MIDDLE cases below), 
+ * then a slice parameter and data buffer needs to be sent again to complete this slice. 
+ */
+#define VA_SLICE_DATA_FLAG_ALL		0x00	/* whole slice is in the buffer */
+#define VA_SLICE_DATA_FLAG_BEGIN	0x01	/* The beginning of the slice is in the buffer but the end if not */
+#define VA_SLICE_DATA_FLAG_MIDDLE	0x02	/* Neither beginning nor end of the slice is in the buffer */
+#define VA_SLICE_DATA_FLAG_END		0x04	/* end of the slice is in the buffer */
+
+/* Codec-independent Slice Parameter Buffer base */
+typedef struct _VASliceParameterBufferBase
+{
+    unsigned int slice_data_size;	/* number of bytes in the slice data buffer for this slice */
+    unsigned int slice_data_offset;	/* the offset to the first byte of slice data */
+    unsigned int slice_data_flag;	/* see VA_SLICE_DATA_FLAG_XXX definitions */
+} VASliceParameterBufferBase;
+
+/****************************
+ * MPEG-2 data structures
+ ****************************/
+ 
+/* MPEG-2 Picture Parameter Buffer */
+/* 
+ * For each frame or field, and before any slice data, a single
+ * picture parameter buffer must be send.
+ */
+typedef struct _VAPictureParameterBufferMPEG2
+{
+    unsigned short horizontal_size;
+    unsigned short vertical_size;
+    VASurfaceID forward_reference_picture;
+    VASurfaceID backward_reference_picture;
+    /* meanings of the following fields are the same as in the standard */
+    int picture_coding_type;
+    int f_code; /* pack all four fcode into this */
+    union {
+        struct {
+            unsigned int intra_dc_precision		: 2; 
+            unsigned int picture_structure		: 2; 
+            unsigned int top_field_first		: 1; 
+            unsigned int frame_pred_frame_dct		: 1; 
+            unsigned int concealment_motion_vectors	: 1;
+            unsigned int q_scale_type			: 1;
+            unsigned int intra_vlc_format		: 1;
+            unsigned int alternate_scan			: 1;
+            unsigned int repeat_first_field		: 1;
+            unsigned int progressive_frame		: 1;
+            unsigned int is_first_field			: 1; /* indicate whether the current field
+                                                              * is the first field for field picture
+                                                              */
+        } bits;
+        unsigned int value;
+    } picture_coding_extension;
+} VAPictureParameterBufferMPEG2;
+
+/* MPEG-2 Inverse Quantization Matrix Buffer */
+typedef struct _VAIQMatrixBufferMPEG2
+{
+    int load_intra_quantiser_matrix;
+    int load_non_intra_quantiser_matrix;
+    int load_chroma_intra_quantiser_matrix;
+    int load_chroma_non_intra_quantiser_matrix;
+    unsigned char intra_quantiser_matrix[64];
+    unsigned char non_intra_quantiser_matrix[64];
+    unsigned char chroma_intra_quantiser_matrix[64];
+    unsigned char chroma_non_intra_quantiser_matrix[64];
+} VAIQMatrixBufferMPEG2;
+
+/* MPEG-2 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferMPEG2
+{
+    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    unsigned int slice_data_offset;/* the offset to the first byte of slice data */
+    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    unsigned int macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
+    unsigned int slice_horizontal_position;
+    unsigned int slice_vertical_position;
+    int quantiser_scale_code;
+    int intra_slice_flag;
+} VASliceParameterBufferMPEG2;
+
+/* MPEG-2 Macroblock Parameter Buffer */
+typedef struct _VAMacroblockParameterBufferMPEG2
+{
+    unsigned short macroblock_address;
+    /* 
+     * macroblock_address (in raster scan order)
+     * top-left: 0
+     * bottom-right: picture-height-in-mb*picture-width-in-mb - 1
+     */
+    unsigned char macroblock_type;  /* see definition below */
+    union {
+        struct {
+            unsigned int frame_motion_type		: 2; 
+            unsigned int field_motion_type		: 2; 
+            unsigned int dct_type			: 1; 
+        } bits;
+        unsigned int value;
+    } macroblock_modes;
+    unsigned char motion_vertical_field_select; 
+    /* 
+     * motion_vertical_field_select:
+     * see section 6.3.17.2 in the spec
+     * only the lower 4 bits are used
+     * bit 0: first vector forward
+     * bit 1: first vector backward
+     * bit 2: second vector forward
+     * bit 3: second vector backward
+     */
+    short PMV[2][2][2]; /* see Table 7-7 in the spec */
+    unsigned short coded_block_pattern;
+    /* 
+     * The bitplanes for coded_block_pattern are described 
+     * in Figure 6.10-12 in the spec
+     */
+     
+    /* Number of skipped macroblocks after this macroblock */
+    unsigned short num_skipped_macroblocks;
+} VAMacroblockParameterBufferMPEG2;
+
+/* 
+ * OR'd flags for macroblock_type (section 6.3.17.1 in the spec)
+ */
+#define VA_MB_TYPE_MOTION_FORWARD	0x02
+#define VA_MB_TYPE_MOTION_BACKWARD	0x04
+#define VA_MB_TYPE_MOTION_PATTERN	0x08
+#define VA_MB_TYPE_MOTION_INTRA		0x10
+
+/* 
+ * MPEG-2 Residual Data Buffer 
+ * For each macroblock, there wil be 64 shorts (16-bit) in the 
+ * residual data buffer
+ */
+
+/****************************
+ * MPEG-4 Part 2 data structures
+ ****************************/
+ 
+/* MPEG-4 Picture Parameter Buffer */
+/* 
+ * For each frame or field, and before any slice data, a single
+ * picture parameter buffer must be send.
+ */
+typedef struct _VAPictureParameterBufferMPEG4
+{
+    unsigned short vop_width;
+    unsigned short vop_height;
+    VASurfaceID forward_reference_picture;
+    VASurfaceID backward_reference_picture;
+    union {
+        struct {
+            unsigned int short_video_header		: 1; 
+            unsigned int chroma_format			: 2; 
+            unsigned int interlaced			: 1; 
+            unsigned int obmc_disable			: 1; 
+            unsigned int sprite_enable			: 2; 
+            unsigned int sprite_warping_accuracy	: 2; 
+            unsigned int quant_type			: 1; 
+            unsigned int quarter_sample			: 1; 
+            unsigned int data_partitioned		: 1; 
+            unsigned int reversible_vlc			: 1; 
+            unsigned int resync_marker_disable		: 1; 
+        } bits;
+        unsigned int value;
+    } vol_fields;
+    unsigned char no_of_sprite_warping_points;
+    short sprite_trajectory_du[3];
+    short sprite_trajectory_dv[3];
+    unsigned char quant_precision;
+    union {
+        struct {
+            unsigned int vop_coding_type		: 2; 
+            unsigned int backward_reference_vop_coding_type	: 2; 
+            unsigned int vop_rounding_type		: 1; 
+            unsigned int intra_dc_vlc_thr		: 3; 
+            unsigned int top_field_first		: 1; 
+            unsigned int alternate_vertical_scan_flag	: 1; 
+        } bits;
+        unsigned int value;
+    } vop_fields;
+    unsigned char vop_fcode_forward;
+    unsigned char vop_fcode_backward;
+    unsigned short vop_time_increment_resolution;
+    /* short header related */
+    unsigned char num_gobs_in_vop;
+    unsigned char num_macroblocks_in_gob;
+    /* for direct mode prediction */
+    short TRB;
+    short TRD;
+} VAPictureParameterBufferMPEG4;
+
+/* MPEG-4 Inverse Quantization Matrix Buffer */
+typedef struct _VAIQMatrixBufferMPEG4
+{
+    int load_intra_quant_mat;
+    int load_non_intra_quant_mat;
+    unsigned char intra_quant_mat[64];
+    unsigned char non_intra_quant_mat[64];
+} VAIQMatrixBufferMPEG4;
+
+/* MPEG-4 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferMPEG4
+{
+    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    unsigned int slice_data_offset;/* the offset to the first byte of slice data */
+    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    unsigned int macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
+    unsigned int macroblock_number;
+    int quant_scale;
+} VASliceParameterBufferMPEG4;
+
+/*
+ VC-1 data structures
+*/
+
+typedef enum   /* see 7.1.1.32 */
+{
+    VAMvMode1Mv                        = 0,
+    VAMvMode1MvHalfPel                 = 1,
+    VAMvMode1MvHalfPelBilinear         = 2,
+    VAMvModeMixedMv                    = 3,
+    VAMvModeIntensityCompensation      = 4 
+} VAMvModeVC1;
+
+/* VC-1 Picture Parameter Buffer */
+/* 
+ * For each picture, and before any slice data, a picture parameter
+ * buffer must be send. Multiple picture parameter buffers may be
+ * sent for a single picture. In that case picture parameters will
+ * apply to all slice data that follow it until a new picture
+ * parameter buffer is sent.
+ *
+ * Notes:
+ *   pic_quantizer_type should be set to the applicable quantizer
+ *   type as defined by QUANTIZER (J.1.19) and either
+ *   PQUANTIZER (7.1.1.8) or PQINDEX (7.1.1.6)
+ */
+typedef struct _VAPictureParameterBufferVC1
+{
+    VASurfaceID forward_reference_picture;
+    VASurfaceID backward_reference_picture;
+    /* if out-of-loop post-processing is done on the render
+       target, then we need to keep the in-loop decoded 
+       picture as a reference picture */
+    VASurfaceID inloop_decoded_picture;
+
+    /* sequence layer for AP or meta data for SP and MP */
+    union {
+        struct {
+            unsigned int pulldown	: 1; /* SEQUENCE_LAYER::PULLDOWN */
+            unsigned int interlace	: 1; /* SEQUENCE_LAYER::INTERLACE */
+            unsigned int tfcntrflag	: 1; /* SEQUENCE_LAYER::TFCNTRFLAG */
+            unsigned int finterpflag	: 1; /* SEQUENCE_LAYER::FINTERPFLAG */
+            unsigned int psf		: 1; /* SEQUENCE_LAYER::PSF */
+            unsigned int multires	: 1; /* METADATA::MULTIRES */
+            unsigned int overlap	: 1; /* METADATA::OVERLAP */
+            unsigned int syncmarker	: 1; /* METADATA::SYNCMARKER */
+            unsigned int rangered	: 1; /* METADATA::RANGERED */
+            unsigned int max_b_frames	: 3; /* METADATA::MAXBFRAMES */
+        } bits;
+        unsigned int value;
+    } sequence_fields;
+
+    unsigned short coded_width;		/* ENTRY_POINT_LAYER::CODED_WIDTH */
+    unsigned short coded_height;	/* ENTRY_POINT_LAYER::CODED_HEIGHT */
+    union {
+	struct {
+            unsigned int broken_link	: 1; /* ENTRY_POINT_LAYER::BROKEN_LINK */
+            unsigned int closed_entry	: 1; /* ENTRY_POINT_LAYER::CLOSED_ENTRY */
+            unsigned int panscan_flag	: 1; /* ENTRY_POINT_LAYER::PANSCAN_FLAG */
+            unsigned int loopfilter	: 1; /* ENTRY_POINT_LAYER::LOOPFILTER */
+	} bits;
+	unsigned int value;
+    } entrypoint_fields;
+    unsigned char conditional_overlap_flag; /* ENTRY_POINT_LAYER::CONDOVER */
+    unsigned char fast_uvmc_flag;	/* ENTRY_POINT_LAYER::FASTUVMC */
+    union {
+        struct {
+            unsigned int luma_flag	: 1; /* ENTRY_POINT_LAYER::RANGE_MAPY_FLAG */
+            unsigned int luma		: 3; /* ENTRY_POINT_LAYER::RANGE_MAPY */
+            unsigned int chroma_flag	: 1; /* ENTRY_POINT_LAYER::RANGE_MAPUV_FLAG */
+            unsigned int chroma		: 3; /* ENTRY_POINT_LAYER::RANGE_MAPUV */
+        } bits;
+        unsigned int value;
+    } range_mapping_fields;
+
+    unsigned char b_picture_fraction;	/* PICTURE_LAYER::BFRACTION */
+    unsigned char cbp_table;		/* PICTURE_LAYER::CBPTAB/ICBPTAB */
+    unsigned char mb_mode_table;	/* PICTURE_LAYER::MBMODETAB */
+    unsigned char range_reduction_frame;/* PICTURE_LAYER::RANGEREDFRM */
+    unsigned char rounding_control;	/* PICTURE_LAYER::RNDCTRL */
+    unsigned char post_processing;	/* PICTURE_LAYER::POSTPROC */
+    unsigned char picture_resolution_index;	/* PICTURE_LAYER::RESPIC */
+    unsigned char luma_scale;		/* PICTURE_LAYER::LUMSCALE */
+    unsigned char luma_shift;		/* PICTURE_LAYER::LUMSHIFT */
+    union {
+        struct {
+            unsigned int picture_type		: 3; /* PICTURE_LAYER::PTYPE */
+            unsigned int frame_coding_mode	: 3; /* PICTURE_LAYER::FCM */
+            unsigned int top_field_first	: 1; /* PICTURE_LAYER::TFF */
+            unsigned int is_first_field		: 1; /* set to 1 if it is the first field */
+            unsigned int intensity_compensation	: 1; /* PICTURE_LAYER::INTCOMP */
+        } bits;
+        unsigned int value;
+    } picture_fields;
+    union {
+        struct {
+            unsigned int mv_type_mb	: 1; 	/* PICTURE::MVTYPEMB */
+            unsigned int direct_mb	: 1; 	/* PICTURE::DIRECTMB */
+            unsigned int skip_mb	: 1; 	/* PICTURE::SKIPMB */
+            unsigned int field_tx	: 1; 	/* PICTURE::FIELDTX */
+            unsigned int forward_mb	: 1;	/* PICTURE::FORWARDMB */
+            unsigned int ac_pred	: 1;	/* PICTURE::ACPRED */
+            unsigned int overflags	: 1;	/* PICTURE::OVERFLAGS */
+        } flags;
+        unsigned int value;
+    } raw_coding;
+    union {
+        struct {
+            unsigned int bp_mv_type_mb   : 1;    /* PICTURE::MVTYPEMB */
+            unsigned int bp_direct_mb    : 1;    /* PICTURE::DIRECTMB */
+            unsigned int bp_skip_mb      : 1;    /* PICTURE::SKIPMB */  
+            unsigned int bp_field_tx     : 1;    /* PICTURE::FIELDTX */ 
+            unsigned int bp_forward_mb   : 1;    /* PICTURE::FORWARDMB */
+            unsigned int bp_ac_pred      : 1;    /* PICTURE::ACPRED */   
+            unsigned int bp_overflags    : 1;    /* PICTURE::OVERFLAGS */
+        } flags;
+        unsigned int value;
+    } bitplane_present; /* signal what bitplane is being passed via the bitplane buffer */
+    union {
+        struct {
+            unsigned int reference_distance_flag : 1;/* PICTURE_LAYER::REFDIST_FLAG */
+            unsigned int reference_distance	: 5;/* PICTURE_LAYER::REFDIST */
+            unsigned int num_reference_pictures: 1;/* PICTURE_LAYER::NUMREF */
+            unsigned int reference_field_pic_indicator	: 1;/* PICTURE_LAYER::REFFIELD */
+        } bits;
+        unsigned int value;
+    } reference_fields;
+    union {
+        struct {
+            unsigned int mv_mode		: 3; /* PICTURE_LAYER::MVMODE */
+            unsigned int mv_mode2		: 3; /* PICTURE_LAYER::MVMODE2 */
+            unsigned int mv_table		: 3; /* PICTURE_LAYER::MVTAB/IMVTAB */
+            unsigned int two_mv_block_pattern_table: 2; /* PICTURE_LAYER::2MVBPTAB */
+            unsigned int four_mv_switch		: 1; /* PICTURE_LAYER::4MVSWITCH */
+            unsigned int four_mv_block_pattern_table : 2; /* PICTURE_LAYER::4MVBPTAB */
+            unsigned int extended_mv_flag	: 1; /* ENTRY_POINT_LAYER::EXTENDED_MV */
+            unsigned int extended_mv_range	: 2; /* PICTURE_LAYER::MVRANGE */
+            unsigned int extended_dmv_flag	: 1; /* ENTRY_POINT_LAYER::EXTENDED_DMV */
+            unsigned int extended_dmv_range	: 2; /* PICTURE_LAYER::DMVRANGE */
+        } bits;
+        unsigned int value;
+    } mv_fields;
+    union {
+        struct {
+            unsigned int dquant	: 2; 	/* ENTRY_POINT_LAYER::DQUANT */
+            unsigned int quantizer     : 2; 	/* ENTRY_POINT_LAYER::QUANTIZER */
+            unsigned int half_qp	: 1; 	/* PICTURE_LAYER::HALFQP */
+            unsigned int pic_quantizer_scale : 5;/* PICTURE_LAYER::PQUANT */
+            unsigned int pic_quantizer_type : 1;/* PICTURE_LAYER::PQUANTIZER */
+            unsigned int dq_frame	: 1; 	/* VOPDQUANT::DQUANTFRM */
+            unsigned int dq_profile	: 2; 	/* VOPDQUANT::DQPROFILE */
+            unsigned int dq_sb_edge	: 2; 	/* VOPDQUANT::DQSBEDGE */
+            unsigned int dq_db_edge 	: 2; 	/* VOPDQUANT::DQDBEDGE */
+            unsigned int dq_binary_level : 1; 	/* VOPDQUANT::DQBILEVEL */
+            unsigned int alt_pic_quantizer : 5;/* VOPDQUANT::ALTPQUANT */
+        } bits;
+        unsigned int value;
+    } pic_quantizer_fields;
+    union {
+        struct {
+            unsigned int variable_sized_transform_flag	: 1;/* ENTRY_POINT_LAYER::VSTRANSFORM */
+            unsigned int mb_level_transform_type_flag	: 1;/* PICTURE_LAYER::TTMBF */
+            unsigned int frame_level_transform_type	: 2;/* PICTURE_LAYER::TTFRM */
+            unsigned int transform_ac_codingset_idx1	: 2;/* PICTURE_LAYER::TRANSACFRM */
+            unsigned int transform_ac_codingset_idx2	: 2;/* PICTURE_LAYER::TRANSACFRM2 */
+            unsigned int intra_transform_dc_table	: 1;/* PICTURE_LAYER::TRANSDCTAB */
+        } bits;
+        unsigned int value;
+    } transform_fields;
+} VAPictureParameterBufferVC1;
+
+/* VC-1 Bitplane Buffer 
+There will be at most three bitplanes coded in any picture header. To send 
+the bitplane data more efficiently, each byte is divided in two nibbles, with
+each nibble carrying three bitplanes for one macroblock.  The following table
+shows the bitplane data arrangement within each nibble based on the picture
+type.
+
+Picture Type	Bit3		Bit2		Bit1		Bit0
+I or BI				OVERFLAGS	ACPRED		FIELDTX
+P				MYTYPEMB	SKIPMB		DIRECTMB
+B				FORWARDMB	SKIPMB		DIRECTMB
+
+Within each byte, the lower nibble is for the first MB and the upper nibble is 
+for the second MB.  E.g. the lower nibble of the first byte in the bitplane
+buffer is for Macroblock #1 and the upper nibble of the first byte is for 
+Macroblock #2 in the first row.
+*/
+
+/* VC-1 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferVC1
+{
+    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    unsigned int slice_data_offset;/* the offset to the first byte of slice data */
+    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    unsigned int macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
+    unsigned int slice_vertical_position;
+} VASliceParameterBufferVC1;
+
+/* VC-1 Slice Data Buffer */
+/* 
+This is simplely a buffer containing raw bit-stream bytes 
+*/
+
+/****************************
+ * H.264/AVC data structures
+ ****************************/
+
+typedef struct _VAPictureH264
+{
+    VASurfaceID picture_id;
+    unsigned int frame_idx;
+    unsigned int flags;
+    unsigned int TopFieldOrderCnt;
+    unsigned int BottomFieldOrderCnt;
+} VAPictureH264;
+/* flags in VAPictureH264 could be OR of the following */
+#define VA_PICTURE_H264_INVALID			0x00000001
+#define VA_PICTURE_H264_TOP_FIELD		0x00000002
+#define VA_PICTURE_H264_BOTTOM_FIELD		0x00000004
+#define VA_PICTURE_H264_SHORT_TERM_REFERENCE	0x00000008
+#define VA_PICTURE_H264_LONG_TERM_REFERENCE	0x00000010
+
+/* H.264 Picture Parameter Buffer */
+/* 
+ * For each picture, and before any slice data, a single
+ * picture parameter buffer must be send.
+ */
+typedef struct _VAPictureParameterBufferH264
+{
+    VAPictureH264 CurrPic;
+    VAPictureH264 ReferenceFrames[16];	/* in DPB */
+    unsigned short picture_width_in_mbs_minus1;
+    unsigned short picture_height_in_mbs_minus1;
+    unsigned char bit_depth_luma_minus8;
+    unsigned char bit_depth_chroma_minus8;
+    unsigned char num_ref_frames;
+    union {
+        struct {
+            unsigned int chroma_format_idc			: 2; 
+            unsigned int residual_colour_transform_flag		: 1; 
+            unsigned int gaps_in_frame_num_value_allowed_flag	: 1; 
+            unsigned int frame_mbs_only_flag			: 1; 
+            unsigned int mb_adaptive_frame_field_flag		: 1; 
+            unsigned int direct_8x8_inference_flag		: 1; 
+            unsigned int MinLumaBiPredSize8x8			: 1; /* see A.3.3.2 */
+            unsigned int log2_max_frame_num_minus4		: 4;
+            unsigned int pic_order_cnt_type			: 2;
+            unsigned int log2_max_pic_order_cnt_lsb_minus4	: 4;
+            unsigned int delta_pic_order_always_zero_flag	: 1;
+        } bits;
+        unsigned int value;
+    } seq_fields;
+    unsigned char num_slice_groups_minus1;
+    unsigned char slice_group_map_type;
+    unsigned short slice_group_change_rate_minus1;
+    signed char pic_init_qp_minus26;
+    signed char pic_init_qs_minus26;
+    signed char chroma_qp_index_offset;
+    signed char second_chroma_qp_index_offset;
+    union {
+        struct {
+            unsigned int entropy_coding_mode_flag	: 1;
+            unsigned int weighted_pred_flag		: 1;
+            unsigned int weighted_bipred_idc		: 2;
+            unsigned int transform_8x8_mode_flag	: 1;
+            unsigned int field_pic_flag			: 1;
+            unsigned int constrained_intra_pred_flag	: 1;
+            unsigned int pic_order_present_flag			: 1;
+            unsigned int deblocking_filter_control_present_flag : 1;
+            unsigned int redundant_pic_cnt_present_flag		: 1;
+            unsigned int reference_pic_flag			: 1; /* nal_ref_idc != 0 */
+        } bits;
+        unsigned int value;
+    } pic_fields;
+    unsigned short frame_num;
+} VAPictureParameterBufferH264;
+
+/* H.264 Inverse Quantization Matrix Buffer */
+typedef struct _VAIQMatrixBufferH264
+{
+    unsigned char ScalingList4x4[6][16];
+    unsigned char ScalingList8x8[2][64];
+} VAIQMatrixBufferH264;
+
+/* 
+ * H.264 Slice Group Map Buffer 
+ * When VAPictureParameterBufferH264::num_slice_group_minus1 is not equal to 0,
+ * A slice group map buffer should be sent for each picture if required. The buffer
+ * is sent only when there is a change in the mapping values.
+ * The slice group map buffer map "map units" to slice groups as specified in 
+ * section 8.2.2 of the H.264 spec. The buffer will contain one byte for each macroblock 
+ * in raster scan order
+ */ 
+
+/* H.264 Slice Parameter Buffer */
+typedef struct _VASliceParameterBufferH264
+{
+    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
+    unsigned int slice_data_offset;/* the offset to the NAL start code for this slice */
+    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
+    unsigned short slice_data_bit_offset; /* bit offset from NAL start code to the beginning of slice data */
+    unsigned short first_mb_in_slice;
+    unsigned char slice_type;
+    unsigned char direct_spatial_mv_pred_flag;
+    unsigned char num_ref_idx_l0_active_minus1;
+    unsigned char num_ref_idx_l1_active_minus1;
+    unsigned char cabac_init_idc;
+    char slice_qp_delta;
+    unsigned char disable_deblocking_filter_idc;
+    char slice_alpha_c0_offset_div2;
+    char slice_beta_offset_div2;
+    VAPictureH264 RefPicList0[32];	/* See 8.2.4.2 */
+    VAPictureH264 RefPicList1[32];	/* See 8.2.4.2 */
+    unsigned char luma_log2_weight_denom;
+    unsigned char chroma_log2_weight_denom;
+    unsigned char luma_weight_l0_flag;
+    short luma_weight_l0[32];
+    short luma_offset_l0[32];
+    unsigned char chroma_weight_l0_flag;
+    short chroma_weight_l0[32][2];
+    short chroma_offset_l0[32][2];
+    unsigned char luma_weight_l1_flag;
+    short luma_weight_l1[32];
+    short luma_offset_l1[32];
+    unsigned char chroma_weight_l1_flag;
+    short chroma_weight_l1[32][2];
+    short chroma_offset_l1[32][2];
+} VASliceParameterBufferH264;
+
+/****************************
+ * Common encode data structures 
+ ****************************/
+typedef enum
+{
+    VAEncPictureTypeIntra		= 0,
+    VAEncPictureTypePredictive		= 1,
+    VAEncPictureTypeBidirectional	= 2,
+} VAEncPictureType;
+
+/* Encode Slice Parameter Buffer */
+typedef struct _VAEncSliceParameterBuffer
+{
+    unsigned int start_row_number;	/* starting MB row number for this slice */
+    unsigned int slice_height;	/* slice height measured in MB */
+    union {
+        struct {
+            unsigned int is_intra	: 1;
+            unsigned int disable_deblocking_filter_idc : 2;
+        } bits;
+        unsigned int value;
+    } slice_flags;
+} VAEncSliceParameterBuffer;
+
+/****************************
+ * H.264 specific encode data structures
+ ****************************/
+
+typedef struct _VAEncSequenceParameterBufferH264
+{
+    unsigned char seq_parameter_set_id;
+    unsigned char level_idc;
+    unsigned int intra_period;
+    unsigned int picture_width_in_mbs;
+    unsigned int picture_height_in_mbs;
+    unsigned int bits_per_second;
+    unsigned int frame_rate;
+    unsigned int initial_qp;
+    unsigned int min_qp;
+    unsigned int basic_unit_size;
+    unsigned char vui_flag;
+} VAEncSequenceParameterBufferH264;
+
+typedef struct _VAEncPictureParameterBufferH264
+{
+    VASurfaceID reference_picture;
+    VASurfaceID reconstructed_picture;
+    VABufferID coded_buf;
+    unsigned short picture_width;
+    unsigned short picture_height;
+    unsigned char last_picture; /* if set to 1 it indicates the last picture in the sequence */
+} VAEncPictureParameterBufferH264;
+
+/****************************
+ * H.263 specific encode data structures
+ ****************************/
+
+typedef struct _VAEncSequenceParameterBufferH263
+{
+    unsigned int intra_period;
+    unsigned int bits_per_second;
+    unsigned int frame_rate;
+    unsigned int initial_qp;
+    unsigned int min_qp;
+} VAEncSequenceParameterBufferH263;
+
+typedef struct _VAEncPictureParameterBufferH263
+{
+    VASurfaceID reference_picture;
+    VASurfaceID reconstructed_picture;
+    VABufferID coded_buf;
+    unsigned short picture_width;
+    unsigned short picture_height;
+    VAEncPictureType picture_type;
+} VAEncPictureParameterBufferH263;
+
+/****************************
+ * MPEG-4 specific encode data structures
+ ****************************/
+
+typedef struct _VAEncSequenceParameterBufferMPEG4
+{
+    unsigned char profile_and_level_indication;
+    unsigned int intra_period;
+    unsigned int video_object_layer_width;
+    unsigned int video_object_layer_height;
+    unsigned int vop_time_increment_resolution;
+    unsigned int fixed_vop_rate;
+    unsigned int fixed_vop_time_increment;
+    unsigned int bits_per_second;
+    unsigned int frame_rate;
+    unsigned int initial_qp;
+    unsigned int min_qp;
+} VAEncSequenceParameterBufferMPEG4;
+
+typedef struct _VAEncPictureParameterBufferMPEG4
+{
+    VASurfaceID reference_picture;
+    VASurfaceID reconstructed_picture;
+    VABufferID coded_buf;
+    unsigned short picture_width;
+    unsigned short picture_height;
+    unsigned int modulo_time_base; /* number of 1s */
+    unsigned int vop_time_increment;
+    VAEncPictureType picture_type;
+} VAEncPictureParameterBufferMPEG4;
+
+
+
+/* Buffer functions */
+
+/*
+ * Creates a buffer for "num_elements" elements of "size" bytes and 
+ * initalize with "data".
+ * if "data" is null, then the contents of the buffer data store
+ * are undefined.
+ * Basically there are two ways to get buffer data to the server side. One is 
+ * to call vaCreateBuffer() with a non-null "data", which results the data being
+ * copied to the data store on the server side.  A different method that 
+ * eliminates this copy is to pass null as "data" when calling vaCreateBuffer(),
+ * and then use vaMapBuffer() to map the data store from the server side to the
+ * client address space for access.
+ *  Note: image buffers are created by the library, not the client. Please see 
+ *        vaCreateImage on how image buffers are managed.
+ */
+VAStatus vaCreateBuffer (
+    VADisplay dpy,
+    VAContextID context,
+    VABufferType type,	/* in */
+    unsigned int size,	/* in */
+    unsigned int num_elements, /* in */
+    void *data,		/* in */
+    VABufferID *buf_id	/* out */
+);
+
+/*
+ * Convey to the server how many valid elements are in the buffer. 
+ * e.g. if multiple slice parameters are being held in a single buffer,
+ * this will communicate to the server the number of slice parameters
+ * that are valid in the buffer.
+ */
+VAStatus vaBufferSetNumElements (
+    VADisplay dpy,
+    VABufferID buf_id,	/* in */
+    unsigned int num_elements /* in */
+);
+
+/*
+ * Map data store of the buffer into the client's address space
+ * vaCreateBuffer() needs to be called with "data" set to NULL before
+ * calling vaMapBuffer()
+ */
+VAStatus vaMapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id,	/* in */
+    void **pbuf 	/* out */
+);
+
+/*
+ * After client making changes to a mapped data store, it needs to
+ * "Unmap" it to let the server know that the data is ready to be
+ * consumed by the server
+ */
+VAStatus vaUnmapBuffer (
+    VADisplay dpy,
+    VABufferID buf_id	/* in */
+);
+
+/*
+ * After this call, the buffer is deleted and this buffer_id is no longer valid
+ * Only call this if the buffer is not going to be passed to vaRenderBuffer
+ */
+VAStatus vaDestroyBuffer (
+    VADisplay dpy,
+    VABufferID buffer_id
+);
+
+/*
+Render (Decode) Pictures
+
+A picture represents either a frame or a field.
+
+The Begin/Render/End sequence sends the decode buffers to the server
+*/
+
+/*
+ * Get ready to decode a picture to a target surface
+ */
+VAStatus vaBeginPicture (
+    VADisplay dpy,
+    VAContextID context,
+    VASurfaceID render_target
+);
+
+/* 
+ * Send decode buffers to the server.
+ * Buffers are automatically destroyed afterwards
+ */
+VAStatus vaRenderPicture (
+    VADisplay dpy,
+    VAContextID context,
+    VABufferID *buffers,
+    int num_buffers
+);
+
+/* 
+ * Make the end of rendering for a picture. 
+ * The server should start processing all pending operations for this 
+ * surface. This call is non-blocking. The client can start another 
+ * Begin/Render/End sequence on a different render target.
+ */
+VAStatus vaEndPicture (
+    VADisplay dpy,
+    VAContextID context
+);
+
+/*
+
+Synchronization 
+
+*/
+
+/* 
+ * This function blocks until all pending operations on the render target
+ * have been completed.  Upon return it is safe to use the render target for a 
+ * different picture. 
+ */
+VAStatus vaSyncSurface (
+    VADisplay dpy,
+    VASurfaceID render_target
+);
+
+typedef enum
+{
+    VASurfaceRendering	= 1, /* Rendering in progress */ 
+    VASurfaceDisplaying	= 2, /* Displaying in progress (not safe to render into it) */ 
+                             /* this status is useful if surface is used as the source */
+                             /* of an overlay */
+    VASurfaceReady	= 4, /* not being rendered or displayed */
+    VASurfaceSkipped	= 8  /* Indicate a skipped frame during encode */
+} VASurfaceStatus;
+
+/*
+ * Find out any pending ops on the render target 
+ */
+VAStatus vaQuerySurfaceStatus (
+    VADisplay dpy,
+    VASurfaceID render_target,
+    VASurfaceStatus *status	/* out */
+);
+
+/*
+ * Images and Subpictures
+ * VAImage is used to either get the surface data to client memory, or 
+ * to copy image data in client memory to a surface. 
+ * Both images, subpictures and surfaces follow the same 2D coordinate system where origin 
+ * is at the upper left corner with positive X to the right and positive Y down
+ */
+#define VA_FOURCC(ch0, ch1, ch2, ch3) \
+    ((unsigned long)(unsigned char) (ch0) | ((unsigned long)(unsigned char) (ch1) << 8) | \
+    ((unsigned long)(unsigned char) (ch2) << 16) | ((unsigned long)(unsigned char) (ch3) << 24 ))
+
+/* a few common FourCCs */
+#define VA_FOURCC_NV12		0x3231564E
+#define VA_FOURCC_AI44		0x34344149
+#define VA_FOURCC_RGBA		0x41424752
+#define VA_FOURCC_UYVY          0x59565955
+#define VA_FOURCC_YUY2          0x32595559
+#define VA_FOURCC_AYUV          0x56555941
+#define VA_FOURCC_NV11          0x3131564e
+#define VA_FOURCC_YV12          0x32315659
+#define VA_FOURCC_P208          0x38303250
+#define VA_FOURCC_IYUV          0x56555949
+
+/* byte order */
+#define VA_LSB_FIRST		1
+#define VA_MSB_FIRST		2
+
+typedef struct _VAImageFormat
+{
+    unsigned int	fourcc;
+    unsigned int	byte_order; /* VA_LSB_FIRST, VA_MSB_FIRST */
+    unsigned int	bits_per_pixel;
+    /* for RGB formats */
+    unsigned int	depth; /* significant bits per pixel */
+    unsigned int	red_mask;
+    unsigned int	green_mask;
+    unsigned int	blue_mask;
+    unsigned int	alpha_mask;
+} VAImageFormat;
+
+typedef VAGenericID VAImageID;
+
+typedef struct _VAImage
+{
+    VAImageID		image_id; /* uniquely identify this image */
+    VAImageFormat	format;
+    VABufferID		buf;	/* image data buffer */
+    /*
+     * Image data will be stored in a buffer of type VAImageBufferType to facilitate
+     * data store on the server side for optimal performance. The buffer will be 
+     * created by the CreateImage function, and proper storage allocated based on the image
+     * size and format. This buffer is managed by the library implementation, and 
+     * accessed by the client through the buffer Map/Unmap functions.
+     */
+    unsigned short	width; 
+    unsigned short	height;
+    unsigned int	data_size;
+    unsigned int	num_planes;	/* can not be greater than 3 */
+    /* 
+     * An array indicating the scanline pitch in bytes for each plane.
+     * Each plane may have a different pitch. Maximum 3 planes for planar formats
+     */
+    unsigned int	pitches[3];
+    /* 
+     * An array indicating the byte offset from the beginning of the image data 
+     * to the start of each plane.
+     */
+    unsigned int	offsets[3];
+
+    /* The following fields are only needed for paletted formats */
+    int num_palette_entries;   /* set to zero for non-palette images */
+    /* 
+     * Each component is one byte and entry_bytes indicates the number of components in 
+     * each entry (eg. 3 for YUV palette entries). set to zero for non-palette images   
+     */
+    int entry_bytes; 
+    /*
+     * An array of ascii characters describing the order of the components within the bytes.
+     * Only entry_bytes characters of the string are used.
+     */
+    char component_order[4];
+} VAImage;
+
+/* Get maximum number of image formats supported by the implementation */
+int vaMaxNumImageFormats (
+    VADisplay dpy
+);
+
+/* 
+ * Query supported image formats 
+ * The caller must provide a "format_list" array that can hold at
+ * least vaMaxNumImageFormats() entries. The actual number of formats
+ * returned in "format_list" is returned in "num_formats".
+ */
+VAStatus vaQueryImageFormats (
+    VADisplay dpy,
+    VAImageFormat *format_list,	/* out */
+    int *num_formats		/* out */
+);
+
+/* 
+ * Create a VAImage structure
+ * The width and height fields returned in the VAImage structure may get 
+ * enlarged for some YUV formats. Upon return from this function, 
+ * image->buf has been created and proper storage allocated by the library. 
+ * The client can access the image through the Map/Unmap calls.
+ */
+VAStatus vaCreateImage (
+    VADisplay dpy,
+    VAImageFormat *format,
+    int width,
+    int height,
+    VAImage *image	/* out */
+);
+
+/*
+ * Should call DestroyImage before destroying the surface it is bound to
+ */
+VAStatus vaDestroyImage (
+    VADisplay dpy,
+    VAImageID image
+);
+
+VAStatus vaSetImagePalette (
+    VADisplay dpy,
+    VAImageID image,
+    /* 
+     * pointer to an array holding the palette data.  The size of the array is 
+     * num_palette_entries * entry_bytes in size.  The order of the components 
+     * in the palette is described by the component_order in VAImage struct    
+     */
+    unsigned char *palette 
+);
+
+/*
+ * Retrive surface data into a VAImage
+ * Image must be in a format supported by the implementation
+ */
+VAStatus vaGetImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    int x,	/* coordinates of the upper left source pixel */
+    int y,
+    unsigned int width, /* width and height of the region */
+    unsigned int height,
+    VAImageID image
+);
+
+/*
+ * Copy data from a VAImage to a surface
+ * Image must be in a format supported by the implementation
+ * Returns a VA_STATUS_ERROR_SURFACE_BUSY if the surface
+ * shouldn't be rendered into when this is called
+ */
+VAStatus vaPutImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAImageID image,
+    int src_x,
+    int src_y,
+    unsigned int src_width,
+    unsigned int src_height,
+    int dest_x,
+    int dest_y,
+    unsigned int dest_width,
+    unsigned int dest_height
+);
+
+/*
+ * Derive an VAImage from an existing surface.
+ * This interface will derive a VAImage and corresponding image buffer from
+ * an existing VA Surface. The image buffer can then be mapped/unmapped for
+ * direct CPU access. This operation is only possible on implementations with
+ * direct rendering capabilities and internal surface formats that can be
+ * represented with a VAImage. When the operation is not possible this interface
+ * will return VA_STATUS_ERROR_OPERATION_FAILED. Clients should then fall back
+ * to using vaCreateImage + vaPutImage to accomplish the same task in an
+ * indirect manner.
+ *
+ * Implementations should only return success when the resulting image buffer
+ * would be useable with vaMap/Unmap.
+ *
+ * When directly accessing a surface special care must be taken to insure
+ * proper synchronization with the graphics hardware. Clients should call
+ * vaQuerySurfaceStatus to insure that a surface is not the target of concurrent
+ * rendering or currently being displayed by an overlay.
+ *
+ * Additionally nothing about the contents of a surface should be assumed
+ * following a vaPutSurface. Implementations are free to modify the surface for
+ * scaling or subpicture blending within a call to vaPutImage.
+ *
+ * Calls to vaPutImage or vaGetImage using the same surface from which the image
+ * has been derived will return VA_STATUS_ERROR_SURFACE_BUSY. vaPutImage or
+ * vaGetImage with other surfaces is supported.
+ *
+ * An image created with vaDeriveImage should be freed with vaDestroyImage. The
+ * image and image buffer structures will be destroyed; however, the underlying
+ * surface will remain unchanged until freed with vaDestroySurfaces.
+ */
+VAStatus vaDeriveImage (
+    VADisplay dpy,
+    VASurfaceID surface,
+    VAImage *image	/* out */
+);
+
+/*
+ * Subpictures 
+ * Subpicture is a special type of image that can be blended 
+ * with a surface during vaPutSurface(). Subpicture can be used to render
+ * DVD sub-titles or closed captioning text etc.  
+ */
+
+typedef VAGenericID VASubpictureID;
+
+/* Get maximum number of subpicture formats supported by the implementation */
+int vaMaxNumSubpictureFormats (
+    VADisplay dpy
+);
+
+/* flags for subpictures */
+#define VA_SUBPICTURE_CHROMA_KEYING	0x0001
+#define VA_SUBPICTURE_GLOBAL_ALPHA	0x0002
+/* 
+ * Query supported subpicture formats 
+ * The caller must provide a "format_list" array that can hold at
+ * least vaMaxNumSubpictureFormats() entries. The flags arrary holds the flag 
+ * for each format to indicate additional capabilities for that format. The actual 
+ * number of formats returned in "format_list" is returned in "num_formats".
+ *  flags: returned value to indicate addtional capabilities
+ *         VA_SUBPICTURE_CHROMA_KEYING - supports chroma-keying
+ *         VA_SUBPICTURE_GLOBAL_ALPHA - supports global alpha  
+ */
+VAStatus vaQuerySubpictureFormats (
+    VADisplay dpy,
+    VAImageFormat *format_list,	/* out */
+    unsigned int *flags,	/* out */
+    unsigned int *num_formats	/* out */
+);
+
+/* 
+ * Subpictures are created with an image associated. 
+ */
+VAStatus vaCreateSubpicture (
+    VADisplay dpy,
+    VAImageID image,
+    VASubpictureID *subpicture	/* out */
+);
+
+/*
+ * Destroy the subpicture before destroying the image it is assocated to
+ */
+VAStatus vaDestroySubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture
+);
+
+/* 
+ * Bind an image to the subpicture. This image will now be associated with 
+ * the subpicture instead of the one at creation.
+ */
+VAStatus vaSetSubpictureImage (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VAImageID image
+);
+
+/*
+ * If chromakey is enabled, then the area where the source value falls within
+ * the chromakey [min, max] range is transparent
+ * The chromakey component format is the following:
+ *  For RGB: [0:7] Red [8:15] Blue [16:23] Green   
+ *  For YUV: [0:7] V [8:15] U [16:23] Y
+ * The chromakey mask can be used to mask out certain components for chromakey
+ * comparision
+ */
+VAStatus vaSetSubpictureChromakey (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    unsigned int chromakey_min,
+    unsigned int chromakey_max,
+    unsigned int chromakey_mask
+);
+
+/*
+ * Global alpha value is between 0 and 1. A value of 1 means fully opaque and 
+ * a value of 0 means fully transparent. If per-pixel alpha is also specified then
+ * the overall alpha is per-pixel alpha multiplied by the global alpha
+ */
+VAStatus vaSetSubpictureGlobalAlpha (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    float global_alpha 
+);
+
+/*
+ * vaAssociateSubpicture associates the subpicture with target_surfaces.
+ * It defines the region mapping between the subpicture and the target  
+ * surfaces through source and destination rectangles (with the same width and height).
+ * Both will be displayed at the next call to vaPutSurface.  Additional
+ * associations before the call to vaPutSurface simply overrides the association.
+ */
+VAStatus vaAssociateSubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VASurfaceID *target_surfaces,
+    int num_surfaces,
+    short src_x, /* upper left offset in subpicture */
+    short src_y,
+    unsigned short src_width,
+    unsigned short src_height,
+    short dest_x, /* upper left offset in surface */
+    short dest_y,
+    unsigned short dest_width,
+    unsigned short dest_height,
+    /*
+     * whether to enable chroma-keying or global-alpha
+     * see VA_SUBPICTURE_XXX values
+     */
+    unsigned int flags
+);
+
+/*
+ * vaDeassociateSubpicture removes the association of the subpicture with target_surfaces.
+ */
+VAStatus vaDeassociateSubpicture (
+    VADisplay dpy,
+    VASubpictureID subpicture,
+    VASurfaceID *target_surfaces,
+    int num_surfaces
+);
+
+typedef struct _VARectangle
+{
+    short x;
+    short y;
+    unsigned short width;
+    unsigned short height;
+} VARectangle;
+
+/*
+ * Display attributes
+ * Display attributes are used to control things such as contrast, hue, saturation,
+ * brightness etc. in the rendering process.  The application can query what
+ * attributes are supported by the driver, and then set the appropriate attributes
+ * before calling vaPutSurface()
+ */
+
+/* Currently defined display attribute types */
+typedef enum
+{
+    VADisplayAttribBrightness		= 0,
+    VADisplayAttribContrast		= 1,
+    VADisplayAttribHue			= 2,
+    VADisplayAttribSaturation		= 3,
+    /* client can specifiy a background color for the target window */
+    VADisplayAttribBackgroundColor      = 4,
+    /*
+     * this is a gettable only attribute. For some implementations that use the
+     * hardware overlay, after PutSurface is called, the surface can not be    
+     * re-used until after the subsequent PutSurface call. If this is the case 
+     * then the value for this attribute will be set to 1 so that the client   
+     * will not attempt to re-use the surface right after returning from a call
+     * to PutSurface.
+     */
+    VADisplayAttribDirectSurface       = 5,
+} VADisplayAttribType;
+
+/* flags for VADisplayAttribute */
+#define VA_DISPLAY_ATTRIB_NOT_SUPPORTED	0x0000
+#define VA_DISPLAY_ATTRIB_GETTABLE	0x0001
+#define VA_DISPLAY_ATTRIB_SETTABLE	0x0002
+
+typedef struct _VADisplayAttribute
+{
+    VADisplayAttribType type;
+    int min_value;
+    int max_value;
+    int value;	/* used by the set/get attribute functions */
+/* flags can be VA_DISPLAY_ATTRIB_GETTABLE or VA_DISPLAY_ATTRIB_SETTABLE or OR'd together */
+    unsigned int flags;
+} VADisplayAttribute;
+
+/* Get maximum number of display attributs supported by the implementation */
+int vaMaxNumDisplayAttributes (
+    VADisplay dpy
+);
+
+/* 
+ * Query display attributes 
+ * The caller must provide a "attr_list" array that can hold at
+ * least vaMaxNumDisplayAttributes() entries. The actual number of attributes
+ * returned in "attr_list" is returned in "num_attributes".
+ */
+VAStatus vaQueryDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,	/* out */
+    int *num_attributes			/* out */
+);
+
+/* 
+ * Get display attributes 
+ * This function returns the current attribute values in "attr_list".
+ * Only attributes returned with VA_DISPLAY_ATTRIB_GETTABLE set in the "flags" field
+ * from vaQueryDisplayAttributes() can have their values retrieved.  
+ */
+VAStatus vaGetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,	/* in/out */
+    int num_attributes
+);
+
+/* 
+ * Set display attributes 
+ * Only attributes returned with VA_DISPLAY_ATTRIB_SETTABLE set in the "flags" field
+ * from vaQueryDisplayAttributes() can be set.  If the attribute is not settable or 
+ * the value is out of range, the function returns VA_STATUS_ERROR_ATTR_NOT_SUPPORTED
+ */
+VAStatus vaSetDisplayAttributes (
+    VADisplay dpy,
+    VADisplayAttribute *attr_list,
+    int num_attributes
+);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _VA_H_ */
diff -Nru libva-1.0.4/src/va_version.h.in libva-1.0.1/src/va_version.h.in
--- libva-1.0.4/src/va_version.h.in	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/va_version.h.in	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef VA_VERSION_H
+#define VA_VERSION_H
+
+/**
+ * VA_MAJOR_VERSION:
+ *
+ * The major version of the VA library (1, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MAJOR_VERSION   (@LIBVA_MAJOR_VERSION@)
+
+/**
+ * VA_MINOR_VERSION:
+ *
+ * The minor version of the VA library (2, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MINOR_VERSION   (@LIBVA_MINOR_VERSION@)
+
+/**
+ * VA_MICRO_VERSION:
+ *
+ * The micro version of the VA library (3, if %VA_VERSION is 1.2.3)
+ */
+#define VA_MICRO_VERSION   (@LIBVA_MICRO_VERSION@)
+
+/**
+ * VA_VERSION:
+ *
+ * The full version of the VA library, like 1.2.3
+ */
+#define VA_VERSION         @LIBVA_VERSION@
+
+/**
+ * VA_VERSION_S:
+ *
+ * The full version of the VA library, in string form (suited for
+ * string concatenation)
+ */
+#define VA_VERSION_S       "@LIBVA_VERSION@"
+
+/**
+ * VA_VERSION_HEX:
+ *
+ * Numerically encoded version of the VA library, like 0x010203
+ */
+#define VA_VERSION_HEX     ((VA_MAJOR_VERSION << 24) | \
+                            (VA_MINOR_VERSION << 16) | \
+                            (VA_MICRO_VERSION << 8))
+
+/**
+ * VA_CHECK_VERSION:
+ * @major: major version, like 1 in 1.2.3
+ * @minor: minor version, like 2 in 1.2.3
+ * @micro: micro version, like 3 in 1.2.3
+ *
+ * Evaluates to %TRUE if the version of the VA library is greater
+ * than @major, @minor and @micro
+ */
+#define VA_CHECK_VERSION(major,minor,micro) \
+        (VA_MAJOR_VERSION > (major) || \
+         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \
+         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_MICRO_VERSION >= (micro)))
+
+#endif /* VA_VERSION_H */
diff -Nru libva-1.0.4/src/x11/dri1_util.c libva-1.0.1/src/x11/dri1_util.c
--- libva-1.0.4/src/x11/dri1_util.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/dri1_util.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,157 @@
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <assert.h>
+
+#include <xf86drm.h>
+
+#include "X11/Xlib.h"
+#include "va.h"
+#include "va_backend.h"
+
+#include "va_dri.h"
+#include "va_dricommon.h"
+
+struct dri1_drawable 
+{
+    struct dri_drawable base;
+    union dri_buffer buffer;
+    int width;
+    int height;
+};
+
+static struct dri_drawable * 
+dri1CreateDrawable(VADriverContextP ctx, XID x_drawable)
+{
+    struct dri1_drawable *dri1_drawable;
+
+    dri1_drawable = calloc(1, sizeof(*dri1_drawable));
+
+    if (!dri1_drawable)
+        return NULL;
+
+    dri1_drawable->base.x_drawable = x_drawable;
+
+    return &dri1_drawable->base;
+}
+
+static void 
+dri1DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+    free(dri_drawable);
+}
+
+static void 
+dri1SwapBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+
+}
+
+static union dri_buffer *
+dri1GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+    struct dri1_drawable *dri1_drawable = (struct dri1_drawable *)dri_drawable;
+
+    return &dri1_drawable->buffer;
+}
+
+static void
+dri1Close(VADriverContextP ctx)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+
+    free_drawable_hashtable(ctx);
+    VA_DRIDestroyContext(ctx->x11_dpy, ctx->x11_screen, dri_state->hwContextID);
+    assert(dri_state->pSAREA != MAP_FAILED);
+    drmUnmap(dri_state->pSAREA, SAREA_MAX);
+    assert(dri_state->fd >= 0);
+    drmCloseOnce(dri_state->fd);
+    VA_DRICloseConnection(ctx->x11_dpy, ctx->x11_screen);
+}
+
+Bool 
+isDRI1Connected(VADriverContextP ctx, char **driver_name)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+    int direct_capable;
+    int driver_major;
+    int driver_minor;
+    int driver_patch;
+    int newlyopened;
+    char *BusID;
+    drm_magic_t magic;        
+
+    *driver_name = NULL;
+    dri_state->fd = -1;
+    dri_state->pSAREA = MAP_FAILED;
+    dri_state->driConnectedFlag = VA_NONE;
+
+    if (!VA_DRIQueryDirectRenderingCapable(ctx->x11_dpy, 
+                                           ctx->x11_screen, 
+                                           &direct_capable))
+        goto err_out0;
+
+    if (!direct_capable)
+        goto err_out0;
+
+    if (!VA_DRIGetClientDriverName(ctx->x11_dpy, ctx->x11_screen, 
+                                   &driver_major, &driver_minor,
+                                   &driver_patch, driver_name))
+        goto err_out0;
+
+    if (!VA_DRIOpenConnection(ctx->x11_dpy, ctx->x11_screen, 
+                              &dri_state->hSAREA, &BusID))
+        goto err_out0;
+
+    
+    dri_state->fd = drmOpenOnce(NULL, BusID, &newlyopened);
+    XFree(BusID);
+
+    if (dri_state->fd < 0)
+        goto err_out1;
+
+
+    if (drmGetMagic(dri_state->fd, &magic))
+        goto err_out1;
+
+    if (newlyopened && !VA_DRIAuthConnection(ctx->x11_dpy, ctx->x11_screen, magic))
+        goto err_out1;
+
+    if (drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA))
+        goto err_out1;
+
+    if (!VA_DRICreateContext(ctx->x11_dpy, ctx->x11_screen,
+                             DefaultVisual(ctx->x11_dpy, ctx->x11_screen),
+                             &dri_state->hwContextID, &dri_state->hwContext))
+        goto err_out1;
+
+    dri_state->driConnectedFlag = VA_DRI1;
+    dri_state->createDrawable = dri1CreateDrawable;
+    dri_state->destroyDrawable = dri1DestroyDrawable;
+    dri_state->swapBuffer = dri1SwapBuffer;
+    dri_state->getRenderingBuffer = dri1GetRenderingBuffer;
+    dri_state->close = dri1Close;
+
+    return True;
+
+err_out1:
+    if (dri_state->pSAREA != MAP_FAILED)
+        drmUnmap(dri_state->pSAREA, SAREA_MAX);
+
+    if (dri_state->fd >= 0)
+        drmCloseOnce(dri_state->fd);
+
+    VA_DRICloseConnection(ctx->x11_dpy, ctx->x11_screen);
+
+err_out0:
+    if (*driver_name)
+        XFree(*driver_name);
+
+    dri_state->pSAREA = MAP_FAILED;
+    dri_state->fd = -1;
+    *driver_name = NULL;
+    
+    return False;
+}
+
diff -Nru libva-1.0.4/src/x11/dri2_util.c libva-1.0.1/src/x11/dri2_util.c
--- libva-1.0.4/src/x11/dri2_util.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/dri2_util.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,200 @@
+#include <stdlib.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <assert.h>
+
+#include <xf86drm.h>
+
+#include <X11/Xlibint.h>
+#include <X11/Xlib.h>
+#include "va.h"
+#include "va_backend.h"
+
+#include "va_dri2.h"
+#include "va_dri2tokens.h"
+#include "va_dricommon.h"
+
+#define __DRI_BUFFER_FRONT_LEFT         0
+#define __DRI_BUFFER_BACK_LEFT          1
+#define __DRI_BUFFER_FRONT_RIGHT        2
+#define __DRI_BUFFER_BACK_RIGHT         3
+#define __DRI_BUFFER_DEPTH              4
+#define __DRI_BUFFER_STENCIL            5
+#define __DRI_BUFFER_ACCUM              6
+#define __DRI_BUFFER_FAKE_FRONT_LEFT    7
+#define __DRI_BUFFER_FAKE_FRONT_RIGHT   8
+
+struct dri2_drawable 
+{
+    struct dri_drawable base;
+    union dri_buffer buffers[5];
+    int width;
+    int height;
+    int has_backbuffer;
+    int back_index;
+    int front_index;
+};
+
+static struct dri_drawable * 
+dri2CreateDrawable(VADriverContextP ctx, XID x_drawable)
+{
+    struct dri2_drawable *dri2_drawable;
+
+    dri2_drawable = calloc(1, sizeof(*dri2_drawable));
+
+    if (!dri2_drawable)
+        return NULL;
+
+    dri2_drawable->base.x_drawable = x_drawable;
+    dri2_drawable->base.x = 0;
+    dri2_drawable->base.y = 0;
+    VA_DRI2CreateDrawable(ctx->x11_dpy, x_drawable);
+
+    return &dri2_drawable->base;
+}
+
+static void 
+dri2DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+    VA_DRI2DestroyDrawable(ctx->x11_dpy, dri_drawable->x_drawable);
+    free(dri_drawable);
+}
+
+static void 
+dri2SwapBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+    struct dri2_drawable *dri2_drawable = (struct dri2_drawable *)dri_drawable;
+    XRectangle xrect;
+    XserverRegion region;
+
+    if (dri2_drawable->has_backbuffer) {
+        xrect.x = 0;
+        xrect.y = 0;
+        xrect.width = dri2_drawable->width;
+        xrect.height = dri2_drawable->height;
+
+        region = XFixesCreateRegion(ctx->x11_dpy, &xrect, 1);
+        VA_DRI2CopyRegion(ctx->x11_dpy, dri_drawable->x_drawable, region,
+                       DRI2BufferFrontLeft, DRI2BufferBackLeft);
+        XFixesDestroyRegion(ctx->x11_dpy, region);
+    }
+}
+
+static union dri_buffer *
+dri2GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+    struct dri2_drawable *dri2_drawable = (struct dri2_drawable *)dri_drawable;
+    int i;
+    int count;
+    unsigned int attachments[5];
+    VA_DRI2Buffer *buffers;
+    
+    i = 0;
+    attachments[i++] = __DRI_BUFFER_BACK_LEFT;
+    attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
+    buffers = VA_DRI2GetBuffers(ctx->x11_dpy, dri_drawable->x_drawable,
+			     &dri2_drawable->width, &dri2_drawable->height, 
+                             attachments, i, &count);
+    assert(buffers);
+    if (buffers == NULL)
+        return NULL;
+
+    dri2_drawable->has_backbuffer = 0;
+
+    for (i = 0; i < count; i++) {
+        dri2_drawable->buffers[i].dri2.attachment = buffers[i].attachment;
+        dri2_drawable->buffers[i].dri2.name = buffers[i].name;
+        dri2_drawable->buffers[i].dri2.pitch = buffers[i].pitch;
+        dri2_drawable->buffers[i].dri2.cpp = buffers[i].cpp;
+        dri2_drawable->buffers[i].dri2.flags = buffers[i].flags;
+        
+        if (buffers[i].attachment == __DRI_BUFFER_BACK_LEFT) {
+            dri2_drawable->has_backbuffer = 1;
+            dri2_drawable->back_index = i;
+        }
+
+        if (buffers[i].attachment == __DRI_BUFFER_FRONT_LEFT)
+            dri2_drawable->front_index = i;
+    }
+    
+    dri_drawable->width = dri2_drawable->width;
+    dri_drawable->height = dri2_drawable->height;
+    Xfree(buffers);
+
+    if (dri2_drawable->has_backbuffer)
+        return &dri2_drawable->buffers[dri2_drawable->back_index];
+
+    return &dri2_drawable->buffers[dri2_drawable->front_index];
+}
+
+static void
+dri2Close(VADriverContextP ctx)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+
+    free_drawable_hashtable(ctx);
+    assert(dri_state->fd >= 0);
+    close(dri_state->fd);
+}
+
+Bool 
+isDRI2Connected(VADriverContextP ctx, char **driver_name)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+    int major, minor;
+    int error_base;
+    int event_base;
+    char *device_name = NULL;
+    drm_magic_t magic;        
+    *driver_name = NULL;
+    dri_state->fd = -1;
+    dri_state->driConnectedFlag = VA_NONE;
+    if (!VA_DRI2QueryExtension(ctx->x11_dpy, &event_base, &error_base))
+        goto err_out;
+
+    if (!VA_DRI2QueryVersion(ctx->x11_dpy, &major, &minor))
+        goto err_out;
+
+
+    if (!VA_DRI2Connect(ctx->x11_dpy, RootWindow(ctx->x11_dpy, ctx->x11_screen),
+                     driver_name, &device_name))
+        goto err_out;
+
+    dri_state->fd = open(device_name, O_RDWR);
+    assert(dri_state->fd >= 0);
+
+    if (dri_state->fd < 0)
+        goto err_out;
+
+    if (drmGetMagic(dri_state->fd, &magic))
+        goto err_out;
+
+    if (!VA_DRI2Authenticate(ctx->x11_dpy, RootWindow(ctx->x11_dpy, ctx->x11_screen),
+                          magic))
+        goto err_out;
+
+    dri_state->driConnectedFlag = VA_DRI2;
+    dri_state->createDrawable = dri2CreateDrawable;
+    dri_state->destroyDrawable = dri2DestroyDrawable;
+    dri_state->swapBuffer = dri2SwapBuffer;
+    dri_state->getRenderingBuffer = dri2GetRenderingBuffer;
+    dri_state->close = dri2Close;
+
+    return True;
+
+err_out:
+    if (device_name)
+        Xfree(device_name);
+
+    if (*driver_name)
+        Xfree(*driver_name);
+
+    if (dri_state->fd >= 0)
+        close(dri_state->fd);
+
+    *driver_name = NULL;
+    dri_state->fd = -1;
+    
+    return False;
+}
+
diff -Nru libva-1.0.4/src/x11/Makefile.am libva-1.0.1/src/x11/Makefile.am
--- libva-1.0.4/src/x11/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,30 @@
+# INTEL CONFIDENTIAL
+# Copyright 2007 Intel Corporation. All Rights Reserved.
+#
+# The source code contained or described herein and all documents related to
+# the source code ("Material") are owned by Intel Corporation or its suppliers
+# or licensors. Title to the Material remains with Intel Corporation or its
+# suppliers and licensors. The Material may contain trade secrets and
+# proprietary and confidential information of Intel Corporation and its
+# suppliers and licensors, and is protected by worldwide copyright and trade
+# secret laws and treaty provisions. No part of the Material may be used,
+# copied, reproduced, modified, published, uploaded, posted, transmitted,
+# distributed, or disclosed in any way without Intel's prior express written
+# permission. 
+# 
+# No license under any patent, copyright, trade secret or other intellectual
+# property right is granted to or conferred upon you by disclosure or delivery
+# of the Materials, either expressly, by implication, inducement, estoppel or
+# otherwise. Any license under such intellectual property rights must be
+# express and approved by Intel in writing.
+
+AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src $(DRM_CFLAGS)
+
+noinst_LTLIBRARIES = libva_x11.la	
+
+libva_x11includedir = ${includedir}/va
+libva_x11include_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h
+
+libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c
+
+EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h
diff -Nru libva-1.0.4/src/x11/Makefile.in libva-1.0.1/src/x11/Makefile.in
--- libva-1.0.4/src/x11/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -0,0 +1,566 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# INTEL CONFIDENTIAL
+# Copyright 2007 Intel Corporation. All Rights Reserved.
+#
+# The source code contained or described herein and all documents related to
+# the source code ("Material") are owned by Intel Corporation or its suppliers
+# or licensors. Title to the Material remains with Intel Corporation or its
+# suppliers and licensors. The Material may contain trade secrets and
+# proprietary and confidential information of Intel Corporation and its
+# suppliers and licensors, and is protected by worldwide copyright and trade
+# secret laws and treaty provisions. No part of the Material may be used,
+# copied, reproduced, modified, published, uploaded, posted, transmitted,
+# distributed, or disclosed in any way without Intel's prior express written
+# permission. 
+# 
+# No license under any patent, copyright, trade secret or other intellectual
+# property right is granted to or conferred upon you by disclosure or delivery
+# of the Materials, either expressly, by implication, inducement, estoppel or
+# otherwise. Any license under such intellectual property rights must be
+# express and approved by Intel in writing.
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/x11
+DIST_COMMON = $(libva_x11include_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+LTLIBRARIES = $(noinst_LTLIBRARIES)
+libva_x11_la_LIBADD =
+am_libva_x11_la_OBJECTS = va_x11.lo va_dri.lo va_dri2.lo \
+	va_dricommon.lo dri2_util.lo dri1_util.lo va_nvctrl.lo
+libva_x11_la_OBJECTS = $(am_libva_x11_la_OBJECTS)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libva_x11_la_SOURCES)
+DIST_SOURCES = $(libva_x11_la_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(libva_x11includedir)"
+HEADERS = $(libva_x11include_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRM_CFLAGS = @DRM_CFLAGS@
+DRM_LIBS = @DRM_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
+GEN4ASM_LIBS = @GEN4ASM_LIBS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBVA_CFLAGS = @LIBVA_CFLAGS@
+LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
+LIBVA_LIBS = @LIBVA_LIBS@
+LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
+LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
+LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
+LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
+LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
+LIBVA_VERSION = @LIBVA_VERSION@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+X11_CFLAGS = @X11_CFLAGS@
+X11_LIBS = @X11_LIBS@
+XEXT_CFLAGS = @XEXT_CFLAGS@
+XEXT_LIBS = @XEXT_LIBS@
+XFIXES_CFLAGS = @XFIXES_CFLAGS@
+XFIXES_LIBS = @XFIXES_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+libvabackendlib = @libvabackendlib@
+libvacorelib = @libvacorelib@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src $(DRM_CFLAGS)
+noinst_LTLIBRARIES = libva_x11.la	
+libva_x11includedir = ${includedir}/va
+libva_x11include_HEADERS = va_x11.h va_dri.h va_dri2.h va_dricommon.h
+libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c
+EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/x11/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/x11/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+clean-noinstLTLIBRARIES:
+	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libva_x11.la: $(libva_x11_la_OBJECTS) $(libva_x11_la_DEPENDENCIES) 
+	$(LINK)  $(libva_x11_la_OBJECTS) $(libva_x11_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dri1_util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dri2_util.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dri.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dri2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dricommon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_nvctrl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_x11.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-libva_x11includeHEADERS: $(libva_x11include_HEADERS)
+	@$(NORMAL_INSTALL)
+	test -z "$(libva_x11includedir)" || $(MKDIR_P) "$(DESTDIR)$(libva_x11includedir)"
+	@list='$(libva_x11include_HEADERS)'; test -n "$(libva_x11includedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libva_x11includedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libva_x11includedir)" || exit $$?; \
+	done
+
+uninstall-libva_x11includeHEADERS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(libva_x11include_HEADERS)'; test -n "$(libva_x11includedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libva_x11includedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libva_x11includedir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(libva_x11includedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-libva_x11includeHEADERS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-libva_x11includeHEADERS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
+	install-libva_x11includeHEADERS install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-libva_x11includeHEADERS
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru libva-1.0.4/src/x11/va_dri2.c libva-1.0.1/src/x11/va_dri2.c
--- libva-1.0.4/src/x11/va_dri2.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dri2.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,307 @@
+/*
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+
+#define NEED_REPLIES
+#include <X11/Xlibint.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
+#include "xf86drm.h"
+#include "va_dri2.h"
+#include "va_dri2str.h"
+#include "va_dri2tokens.h"
+
+#ifndef DRI2DriverDRI
+#define DRI2DriverDRI 0
+#endif
+
+static char va_dri2ExtensionName[] = DRI2_NAME;
+static XExtensionInfo _va_dri2_info_data;
+static XExtensionInfo *va_dri2Info = &_va_dri2_info_data;
+static XEXT_GENERATE_CLOSE_DISPLAY (VA_DRI2CloseDisplay, va_dri2Info)
+static /* const */ XExtensionHooks va_dri2ExtensionHooks = {
+    NULL,				/* create_gc */
+    NULL,				/* copy_gc */
+    NULL,				/* flush_gc */
+    NULL,				/* free_gc */
+    NULL,				/* create_font */
+    NULL,				/* free_font */
+    VA_DRI2CloseDisplay,		/* close_display */
+    NULL,				/* wire_to_event */
+    NULL,				/* event_to_wire */
+    NULL,				/* error */
+    NULL,				/* error_string */
+};
+
+static XEXT_GENERATE_FIND_DISPLAY (DRI2FindDisplay, va_dri2Info, 
+				   va_dri2ExtensionName, 
+				   &va_dri2ExtensionHooks, 
+				   0, NULL)
+
+Bool VA_DRI2QueryExtension(Display *dpy, int *eventBase, int *errorBase)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
+
+    if (XextHasExtension(info)) {
+	*eventBase = info->codes->first_event;
+	*errorBase = info->codes->first_error;
+	return True;
+    }
+
+    return False;
+}
+
+Bool VA_DRI2QueryVersion(Display *dpy, int *major, int *minor)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay (dpy);
+    xDRI2QueryVersionReply rep;
+    xDRI2QueryVersionReq *req;
+
+    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
+
+    LockDisplay(dpy);
+    GetReq(DRI2QueryVersion, req);
+    req->reqType = info->codes->major_opcode;
+    req->dri2ReqType = X_DRI2QueryVersion;
+    req->majorVersion = DRI2_MAJOR;
+    req->minorVersion = DRI2_MINOR;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return False;
+    }
+    *major = rep.majorVersion;
+    *minor = rep.minorVersion;
+    UnlockDisplay(dpy);
+    SyncHandle();
+
+    return True;
+}
+
+Bool VA_DRI2Connect(Display *dpy, XID window,
+		 char **driverName, char **deviceName)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
+    xDRI2ConnectReply rep;
+    xDRI2ConnectReq *req;
+
+    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
+
+    LockDisplay(dpy);
+    GetReq(DRI2Connect, req);
+    req->reqType = info->codes->major_opcode;
+    req->dri2ReqType = X_DRI2Connect;
+    req->window = window;
+    req->driverType = DRI2DriverDRI;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return False;
+    }
+
+    if (rep.driverNameLength == 0 && rep.deviceNameLength == 0) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return False;
+    }
+
+    *driverName = Xmalloc(rep.driverNameLength + 1);
+    if (*driverName == NULL) {
+	_XEatData(dpy, 
+		  ((rep.driverNameLength + 3) & ~3) +
+		  ((rep.deviceNameLength + 3) & ~3));
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return False;
+    }
+    _XReadPad(dpy, *driverName, rep.driverNameLength);
+    (*driverName)[rep.driverNameLength] = '\0';
+
+    *deviceName = Xmalloc(rep.deviceNameLength + 1);
+    if (*deviceName == NULL) {
+	Xfree(*driverName);
+	_XEatData(dpy, ((rep.deviceNameLength + 3) & ~3));
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return False;
+    }
+    _XReadPad(dpy, *deviceName, rep.deviceNameLength);
+    (*deviceName)[rep.deviceNameLength] = '\0';
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+
+    return True;
+}
+
+Bool VA_DRI2Authenticate(Display *dpy, XID window, drm_magic_t magic)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
+    xDRI2AuthenticateReq *req;
+    xDRI2AuthenticateReply rep;
+
+    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
+
+    LockDisplay(dpy);
+    GetReq(DRI2Authenticate, req);
+    req->reqType = info->codes->major_opcode;
+    req->dri2ReqType = X_DRI2Authenticate;
+    req->window = window;
+    req->magic = magic;
+
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return False;
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+
+    return rep.authenticated;
+}
+
+void VA_DRI2CreateDrawable(Display *dpy, XID drawable)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
+    xDRI2CreateDrawableReq *req;
+
+    XextSimpleCheckExtension (dpy, info, va_dri2ExtensionName);
+
+    LockDisplay(dpy);
+    GetReq(DRI2CreateDrawable, req);
+    req->reqType = info->codes->major_opcode;
+    req->dri2ReqType = X_DRI2CreateDrawable;
+    req->drawable = drawable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+}
+
+void VA_DRI2DestroyDrawable(Display *dpy, XID drawable)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
+    xDRI2DestroyDrawableReq *req;
+
+    XextSimpleCheckExtension (dpy, info, va_dri2ExtensionName);
+
+    XSync(dpy, False);
+
+    LockDisplay(dpy);
+    GetReq(DRI2DestroyDrawable, req);
+    req->reqType = info->codes->major_opcode;
+    req->dri2ReqType = X_DRI2DestroyDrawable;
+    req->drawable = drawable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+}
+
+VA_DRI2Buffer *VA_DRI2GetBuffers(Display *dpy, XID drawable,
+			   int *width, int *height,
+			   unsigned int *attachments, int count,
+			   int *outCount)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
+    xDRI2GetBuffersReply rep;
+    xDRI2GetBuffersReq *req;
+    VA_DRI2Buffer *buffers;
+    xDRI2Buffer repBuffer;
+    CARD32 *p;
+    int i;
+
+    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
+
+    LockDisplay(dpy);
+    GetReqExtra(DRI2GetBuffers, count * 4, req);
+    req->reqType = info->codes->major_opcode;
+    req->dri2ReqType = X_DRI2GetBuffers;
+    req->drawable = drawable;
+    req->count = count;
+    p = (CARD32 *) &req[1];
+    for (i = 0; i < count; i++)
+	p[i] = attachments[i];
+
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return NULL;
+    }
+
+    *width = rep.width;
+    *height = rep.height;
+    *outCount = rep.count;
+
+    buffers = Xmalloc(rep.count * sizeof buffers[0]);
+    if (buffers == NULL) {
+	_XEatData(dpy, rep.count * sizeof repBuffer);
+	UnlockDisplay(dpy);
+	SyncHandle();
+	return NULL;
+    }
+
+    for (i = 0; i < rep.count; i++) {
+	_XReadPad(dpy, (char *) &repBuffer, sizeof repBuffer);
+	buffers[i].attachment = repBuffer.attachment;
+	buffers[i].name = repBuffer.name;
+	buffers[i].pitch = repBuffer.pitch;
+	buffers[i].cpp = repBuffer.cpp;
+	buffers[i].flags = repBuffer.flags;
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+
+    return buffers;
+}
+
+void VA_DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region,
+		    CARD32 dest, CARD32 src)
+{
+    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
+    xDRI2CopyRegionReq *req;
+    xDRI2CopyRegionReply rep;
+
+    XextSimpleCheckExtension (dpy, info, va_dri2ExtensionName);
+
+    LockDisplay(dpy);
+    GetReq(DRI2CopyRegion, req);
+    req->reqType = info->codes->major_opcode;
+    req->dri2ReqType = X_DRI2CopyRegion;
+    req->drawable = drawable;
+    req->region = region;
+    req->dest = dest;
+    req->src = src;
+
+    _XReply(dpy, (xReply *)&rep, 0, xFalse);
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+}
diff -Nru libva-1.0.4/src/x11/va_dri2.h libva-1.0.1/src/x11/va_dri2.h
--- libva-1.0.4/src/x11/va_dri2.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dri2.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2007,2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+#ifndef _VA_DRI2_H_
+#define _VA_DRI2_H_
+
+#include <X11/extensions/Xfixes.h>
+#include <X11/Xfuncproto.h>
+#include <xf86drm.h>
+
+typedef struct {
+    unsigned int attachment;
+    unsigned int name;
+    unsigned int pitch;
+    unsigned int cpp;
+    unsigned int flags;
+} VA_DRI2Buffer;
+
+extern Bool
+VA_DRI2QueryExtension(Display *display, int *eventBase, int *errorBase);
+extern Bool
+VA_DRI2QueryVersion(Display *display, int *major, int *minor);
+extern Bool
+VA_DRI2Connect(Display *display, XID window,
+	    char **driverName, char **deviceName);
+extern Bool
+VA_DRI2Authenticate(Display *display, XID window, drm_magic_t magic);
+extern void
+VA_DRI2CreateDrawable(Display *display, XID drawable);
+extern void
+VA_DRI2DestroyDrawable(Display *display, XID handle);
+extern VA_DRI2Buffer *
+VA_DRI2GetBuffers(Display *dpy, XID drawable,
+	       int *width, int *height,
+	       unsigned int *attachments, int count,
+	       int *outCount);
+#if 0
+extern void
+VA_DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region,
+	       CARD32 dest, CARD32 src);
+#endif
+#endif
diff -Nru libva-1.0.4/src/x11/va_dri2str.h libva-1.0.1/src/x11/va_dri2str.h
--- libva-1.0.4/src/x11/va_dri2str.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dri2str.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,193 @@
+/*
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+#ifndef _DRI2_PROTO_H_
+#define _DRI2_PROTO_H_
+
+#define DRI2_NAME			"DRI2"
+#define DRI2_MAJOR			1
+#define DRI2_MINOR			0
+
+#define DRI2NumberErrors		0
+#define DRI2NumberEvents		0
+#define DRI2NumberRequests		7
+
+#define X_DRI2QueryVersion		0
+#define X_DRI2Connect			1
+#define X_DRI2Authenticate		2
+#define X_DRI2CreateDrawable		3
+#define X_DRI2DestroyDrawable		4
+#define X_DRI2GetBuffers		5
+#define X_DRI2CopyRegion		6
+
+typedef struct {
+    CARD32  attachment B32;
+    CARD32  name B32;
+    CARD32  pitch B32;
+    CARD32  cpp B32;
+    CARD32  flags B32;
+} xDRI2Buffer;
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  majorVersion B32;
+    CARD32  minorVersion B32;
+} xDRI2QueryVersionReq;
+#define sz_xDRI2QueryVersionReq   12
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  majorVersion B32;
+    CARD32  minorVersion B32;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+} xDRI2QueryVersionReply;
+#define sz_xDRI2QueryVersionReply	32
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  window B32;
+    CARD32  driverType B32;
+} xDRI2ConnectReq;
+#define sz_xDRI2ConnectReq	12
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  driverNameLength B32;
+    CARD32  deviceNameLength B32;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+} xDRI2ConnectReply;
+#define sz_xDRI2ConnectReply	32
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  window B32;
+    CARD32  magic B32;
+} xDRI2AuthenticateReq;
+#define sz_xDRI2AuthenticateReq   12
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  authenticated B32;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+    CARD32  pad6 B32;
+} xDRI2AuthenticateReply;
+#define sz_xDRI2AuthenticateReply	32
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  drawable B32;
+} xDRI2CreateDrawableReq;
+#define sz_xDRI2CreateDrawableReq   8
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  drawable B32;
+} xDRI2DestroyDrawableReq;
+#define sz_xDRI2DestroyDrawableReq   8
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  drawable B32;
+    CARD32  count B32;
+} xDRI2GetBuffersReq;
+#define sz_xDRI2GetBuffersReq   12
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  width B32;
+    CARD32  height B32;
+    CARD32  count B32;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+} xDRI2GetBuffersReply;
+#define sz_xDRI2GetBuffersReply	32
+
+typedef struct {
+    CARD8   reqType;
+    CARD8   dri2ReqType;
+    CARD16  length B16;
+    CARD32  drawable B32;
+    CARD32  region B32;
+    CARD32  dest B32;
+    CARD32  src B32;
+} xDRI2CopyRegionReq;
+#define sz_xDRI2CopyRegionReq   20
+
+typedef struct {
+    BYTE    type;   /* X_Reply */
+    BYTE    pad1;
+    CARD16  sequenceNumber B16;
+    CARD32  length B32;
+    CARD32  pad2 B32;
+    CARD32  pad3 B32;
+    CARD32  pad4 B32;
+    CARD32  pad5 B32;
+    CARD32  pad6 B32;
+    CARD32  pad7 B32;
+} xDRI2CopyRegionReply;
+#define sz_xDRI2CopyRegionReply	32
+
+#endif
diff -Nru libva-1.0.4/src/x11/va_dri2tokens.h libva-1.0.1/src/x11/va_dri2tokens.h
--- libva-1.0.4/src/x11/va_dri2tokens.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dri2tokens.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2008 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Authors:
+ *   Kristian Høgsberg (krh@redhat.com)
+ */
+
+#ifndef _DRI2_TOKENS_H_
+#define _DRI2_TOKENS_H_
+
+#define DRI2BufferFrontLeft		0
+#define DRI2BufferBackLeft		1
+#define DRI2BufferFrontRight		2
+#define DRI2BufferBackRight		3
+#define DRI2BufferDepth			4
+#define DRI2BufferStencil		5
+#define DRI2BufferAccum			6
+#define DRI2BufferFakeFrontLeft		7
+#define DRI2BufferFakeFrontRight	8
+
+#define DRI2DriverDRI			0
+
+#endif
diff -Nru libva-1.0.4/src/x11/va_dri.c libva-1.0.1/src/x11/va_dri.c
--- libva-1.0.4/src/x11/va_dri.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dri.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,624 @@
+/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+Copyright 2007 Intel Corporation
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <martin@valinux.com>
+ *   Jens Owen <jens@tungstengraphics.com>
+ *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD */
+
+#define NEED_REPLIES
+#include <X11/Xlibint.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
+#include "va_dristr.h"
+
+#define PUBLIC
+
+static XExtensionInfo _va_dri_info_data;
+static XExtensionInfo *va_dri_info = &_va_dri_info_data;
+static char va_dri_extension_name[] = VA_DRINAME;
+
+#define VA_DRICheckExtension(dpy,i,val) \
+  XextCheckExtension (dpy, i, va_dri_extension_name, val)
+
+/*****************************************************************************
+ *                                                                           *
+ *			   private utility routines                          *
+ *                                                                           *
+ *****************************************************************************/
+
+static int close_display(Display *dpy, XExtCodes *extCodes);
+static /* const */ XExtensionHooks va_dri_extension_hooks = {
+    NULL,				/* create_gc */
+    NULL,				/* copy_gc */
+    NULL,				/* flush_gc */
+    NULL,				/* free_gc */
+    NULL,				/* create_font */
+    NULL,				/* free_font */
+    close_display,			/* close_display */
+    NULL,				/* wire_to_event */
+    NULL,				/* event_to_wire */
+    NULL,				/* error */
+    NULL,				/* error_string */
+};
+
+static XEXT_GENERATE_FIND_DISPLAY (find_display, va_dri_info, 
+				   va_dri_extension_name, 
+				   &va_dri_extension_hooks, 
+				   0, NULL)
+
+static XEXT_GENERATE_CLOSE_DISPLAY (close_display, va_dri_info)
+
+
+/*****************************************************************************
+ *                                                                           *
+ *		    public XFree86-DRI Extension routines                    *
+ *                                                                           *
+ *****************************************************************************/
+
+#if 0
+#include <stdio.h>
+#define TRACE(msg)  fprintf(stderr,"XF86DRI%s\n", msg);
+#else
+#define TRACE(msg)
+#endif
+
+
+PUBLIC Bool VA_DRIQueryExtension (dpy, event_basep, error_basep)
+    Display *dpy;
+    int *event_basep, *error_basep;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+
+    TRACE("QueryExtension...");
+    if (XextHasExtension(info)) {
+	*event_basep = info->codes->first_event;
+	*error_basep = info->codes->first_error;
+        TRACE("QueryExtension... return True");
+	return True;
+    } else {
+        TRACE("QueryExtension... return False");
+	return False;
+    }
+}
+
+PUBLIC Bool VA_DRIQueryVersion(dpy, majorVersion, minorVersion, patchVersion)
+    Display* dpy;
+    int* majorVersion; 
+    int* minorVersion;
+    int* patchVersion;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIQueryVersionReply rep;
+    xVA_DRIQueryVersionReq *req;
+
+    TRACE("QueryVersion...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIQueryVersion, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIQueryVersion;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("QueryVersion... return False");
+	return False;
+    }
+    *majorVersion = rep.majorVersion;
+    *minorVersion = rep.minorVersion;
+    *patchVersion = rep.patchVersion;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("QueryVersion... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIQueryDirectRenderingCapable(dpy, screen, isCapable)
+    Display* dpy;
+    int screen;
+    Bool* isCapable;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIQueryDirectRenderingCapableReply rep;
+    xVA_DRIQueryDirectRenderingCapableReq *req;
+
+    TRACE("QueryDirectRenderingCapable...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIQueryDirectRenderingCapable, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIQueryDirectRenderingCapable;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("QueryDirectRenderingCapable... return False");
+	return False;
+    }
+    *isCapable = rep.isCapable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("QueryDirectRenderingCapable... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIOpenConnection(dpy, screen, hSAREA, busIdString)
+    Display* dpy;
+    int screen;
+    drm_handle_t * hSAREA;
+    char **busIdString;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIOpenConnectionReply rep;
+    xVA_DRIOpenConnectionReq *req;
+
+    TRACE("OpenConnection...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIOpenConnection, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIOpenConnection;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("OpenConnection... return False");
+	return False;
+    }
+
+    *hSAREA = rep.hSAREALow;
+    if (sizeof(drm_handle_t) == 8) {
+       int shift = 32; /* var to prevent warning on next line */
+       *hSAREA |= ((drm_handle_t) rep.hSAREAHigh) << shift;
+    }
+
+    if (rep.length) {
+        if (!(*busIdString = (char *)Xcalloc(rep.busIdStringLength + 1, 1))) {
+            _XEatData(dpy, ((rep.busIdStringLength+3) & ~3));
+            UnlockDisplay(dpy);
+            SyncHandle();
+            TRACE("OpenConnection... return False");
+            return False;
+        }
+	_XReadPad(dpy, *busIdString, rep.busIdStringLength);
+    } else {
+        *busIdString = NULL;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("OpenConnection... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIAuthConnection(dpy, screen, magic)
+    Display* dpy;
+    int screen;
+    drm_magic_t magic;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIAuthConnectionReq *req;
+    xVA_DRIAuthConnectionReply rep;
+
+    TRACE("AuthConnection...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIAuthConnection, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIAuthConnection;
+    req->screen = screen;
+    req->magic = magic;
+    rep.authenticated = 0;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse) || !rep.authenticated) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("AuthConnection... return False");
+	return False;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("AuthConnection... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRICloseConnection(dpy, screen)
+    Display* dpy;
+    int screen;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRICloseConnectionReq *req;
+
+    TRACE("CloseConnection...");
+
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRICloseConnection, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRICloseConnection;
+    req->screen = screen;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("CloseConnection... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIGetClientDriverName(dpy, screen, ddxDriverMajorVersion, 
+	ddxDriverMinorVersion, ddxDriverPatchVersion, clientDriverName)
+    Display* dpy;
+    int screen;
+    int* ddxDriverMajorVersion;
+    int* ddxDriverMinorVersion;
+    int* ddxDriverPatchVersion;
+    char** clientDriverName;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIGetClientDriverNameReply rep;
+    xVA_DRIGetClientDriverNameReq *req;
+
+    TRACE("GetClientDriverName...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIGetClientDriverName, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIGetClientDriverName;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("GetClientDriverName... return False");
+	return False;
+    }
+
+    *ddxDriverMajorVersion = rep.ddxDriverMajorVersion;
+    *ddxDriverMinorVersion = rep.ddxDriverMinorVersion;
+    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
+
+    if (rep.length) {
+        if (!(*clientDriverName = (char *)Xcalloc(rep.clientDriverNameLength + 1, 1))) {
+            _XEatData(dpy, ((rep.clientDriverNameLength+3) & ~3));
+            UnlockDisplay(dpy);
+            SyncHandle();
+            TRACE("GetClientDriverName... return False");
+            return False;
+        }
+	_XReadPad(dpy, *clientDriverName, rep.clientDriverNameLength);
+    } else {
+        *clientDriverName = NULL;
+    }
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("GetClientDriverName... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRICreateContextWithConfig(dpy, screen, configID, context,
+	hHWContext)
+    Display* dpy;
+    int screen;
+    int configID;
+    XID* context;
+    drm_context_t * hHWContext;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRICreateContextReply rep;
+    xVA_DRICreateContextReq *req;
+
+    TRACE("CreateContext...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRICreateContext, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRICreateContext;
+    req->visual = configID;
+    req->screen = screen;
+    *context = XAllocID(dpy);
+    req->context = *context;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("CreateContext... return False");
+	return False;
+    }
+    *hHWContext = rep.hHWContext;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("CreateContext... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRICreateContext(dpy, screen, visual, context, hHWContext)
+    Display* dpy;
+    int screen;
+    Visual* visual;
+    XID* context;
+    drm_context_t * hHWContext;
+{
+    return VA_DRICreateContextWithConfig( dpy, screen, visual->visualid,
+					   context, hHWContext );
+}
+
+PUBLIC Bool VA_DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, 
+    __DRIid context )
+{
+    Display * const dpy = (Display *) ndpy;
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIDestroyContextReq *req;
+
+    TRACE("DestroyContext...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIDestroyContext, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIDestroyContext;
+    req->screen = screen;
+    req->context = context;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("DestroyContext... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRICreateDrawable( __DRInativeDisplay * ndpy, int screen, 
+    __DRIid drawable, drm_drawable_t * hHWDrawable )
+{
+    Display * const dpy = (Display *) ndpy;
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRICreateDrawableReply rep;
+    xVA_DRICreateDrawableReq *req;
+
+    TRACE("CreateDrawable...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRICreateDrawable, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRICreateDrawable;
+    req->screen = screen;
+    req->drawable = drawable;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("CreateDrawable... return False");
+	return False;
+    }
+    *hHWDrawable = rep.hHWDrawable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("CreateDrawable... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
+    __DRIid drawable )
+{
+    Display * const dpy = (Display *) ndpy;
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIDestroyDrawableReq *req;
+
+    TRACE("DestroyDrawable...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIDestroyDrawable, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIDestroyDrawable;
+    req->screen = screen;
+    req->drawable = drawable;
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("DestroyDrawable... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIGetDrawableInfo(Display* dpy, int screen, Drawable drawable,
+    unsigned int* index, unsigned int* stamp,
+    int* X, int* Y, int* W, int* H,
+    int* numClipRects, drm_clip_rect_t ** pClipRects,
+    int* backX, int* backY,
+    int* numBackClipRects, drm_clip_rect_t ** pBackClipRects )
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIGetDrawableInfoReply rep;
+    xVA_DRIGetDrawableInfoReq *req;
+    int total_rects;
+
+    TRACE("GetDrawableInfo...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIGetDrawableInfo, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIGetDrawableInfo;
+    req->screen = screen;
+    req->drawable = drawable;
+
+    if (!_XReply(dpy, (xReply *)&rep, 1, xFalse)) 
+    {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("GetDrawableInfo... return False");
+	return False;
+    }
+    *index = rep.drawableTableIndex;
+    *stamp = rep.drawableTableStamp;
+    *X = (int)rep.drawableX;
+    *Y = (int)rep.drawableY;
+    *W = (int)rep.drawableWidth;
+    *H = (int)rep.drawableHeight;
+    *numClipRects = rep.numClipRects;
+    total_rects = *numClipRects;
+
+    *backX = rep.backX;
+    *backY = rep.backY;
+    *numBackClipRects = rep.numBackClipRects;
+    total_rects += *numBackClipRects;
+
+#if 0
+    /* Because of the fix in Xserver/GL/dri/xf86dri.c, this check breaks
+     * backwards compatibility (Because of the >> 2 shift) but the fix
+     * enables multi-threaded apps to work.
+     */
+    if (rep.length !=  ((((SIZEOF(xVA_DRIGetDrawableInfoReply) - 
+		       SIZEOF(xGenericReply) + 
+		       total_rects * sizeof(drm_clip_rect_t)) + 3) & ~3) >> 2)) {
+        _XEatData(dpy, rep.length);
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("GetDrawableInfo... return False");
+        return False;
+    }
+#endif
+
+    if (*numClipRects) {
+       int len = sizeof(drm_clip_rect_t) * (*numClipRects);
+
+       *pClipRects = (drm_clip_rect_t *)Xcalloc(len, 1);
+       if (*pClipRects) 
+	  _XRead(dpy, (char*)*pClipRects, len);
+    } else {
+        *pClipRects = NULL;
+    }
+
+    if (*numBackClipRects) {
+       int len = sizeof(drm_clip_rect_t) * (*numBackClipRects);
+
+       *pBackClipRects = (drm_clip_rect_t *)Xcalloc(len, 1);
+       if (*pBackClipRects) 
+	  _XRead(dpy, (char*)*pBackClipRects, len);
+    } else {
+        *pBackClipRects = NULL;
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("GetDrawableInfo... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIGetDeviceInfo(dpy, screen, hFrameBuffer, 
+	fbOrigin, fbSize, fbStride, devPrivateSize, pDevPrivate)
+    Display* dpy;
+    int screen;
+    drm_handle_t * hFrameBuffer;
+    int* fbOrigin;
+    int* fbSize;
+    int* fbStride;
+    int* devPrivateSize;
+    void** pDevPrivate;
+{
+    XExtDisplayInfo *info = find_display (dpy);
+    xVA_DRIGetDeviceInfoReply rep;
+    xVA_DRIGetDeviceInfoReq *req;
+
+    TRACE("GetDeviceInfo...");
+    VA_DRICheckExtension (dpy, info, False);
+
+    LockDisplay(dpy);
+    GetReq(VA_DRIGetDeviceInfo, req);
+    req->reqType = info->codes->major_opcode;
+    req->driReqType = X_VA_DRIGetDeviceInfo;
+    req->screen = screen;
+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
+	UnlockDisplay(dpy);
+	SyncHandle();
+        TRACE("GetDeviceInfo... return False");
+	return False;
+    }
+
+    *hFrameBuffer = rep.hFrameBufferLow;
+    if (sizeof(drm_handle_t) == 8) {
+       int shift = 32; /* var to prevent warning on next line */
+       *hFrameBuffer |= ((drm_handle_t) rep.hFrameBufferHigh) << shift;
+    }
+
+    *fbOrigin = rep.framebufferOrigin;
+    *fbSize = rep.framebufferSize;
+    *fbStride = rep.framebufferStride;
+    *devPrivateSize = rep.devPrivateSize;
+
+    if (rep.length) {
+        if (!(*pDevPrivate = (void *)Xcalloc(rep.devPrivateSize, 1))) {
+            _XEatData(dpy, ((rep.devPrivateSize+3) & ~3));
+            UnlockDisplay(dpy);
+            SyncHandle();
+            TRACE("GetDeviceInfo... return False");
+            return False;
+        }
+	_XRead(dpy, (char*)*pDevPrivate, rep.devPrivateSize);
+    } else {
+        *pDevPrivate = NULL;
+    }
+
+    UnlockDisplay(dpy);
+    SyncHandle();
+    TRACE("GetDeviceInfo... return True");
+    return True;
+}
+
+PUBLIC Bool VA_DRIOpenFullScreen(dpy, screen, drawable)
+    Display* dpy;
+    int screen;
+    Drawable drawable;
+{
+    /* This function and the underlying X protocol are deprecated.
+     */
+    (void) dpy;
+    (void) screen;
+    (void) drawable;
+    return False;
+}
+
+PUBLIC Bool VA_DRICloseFullScreen(dpy, screen, drawable)
+    Display* dpy;
+    int screen;
+    Drawable drawable;
+{
+    /* This function and the underlying X protocol are deprecated.
+     */
+    (void) dpy;
+    (void) screen;
+    (void) drawable;
+    return True;
+}
+
+#undef TRACE
+
diff -Nru libva-1.0.4/src/x11/va_dricommon.c libva-1.0.1/src/x11/va_dricommon.c
--- libva-1.0.4/src/x11/va_dricommon.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dricommon.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,62 @@
+#include "va_dricommon.h"
+
+static struct dri_drawable *                                                                                                                                                                                   
+do_drawable_hash(VADriverContextP ctx, XID drawable)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+    int index = drawable % DRAWABLE_HASH_SZ;
+    struct dri_drawable *dri_drawable = dri_state->drawable_hash[index];
+
+    while (dri_drawable) {
+        if (dri_drawable->x_drawable == drawable)
+            return dri_drawable;
+        dri_drawable = dri_drawable->next;
+    }
+
+    dri_drawable = dri_state->createDrawable(ctx, drawable);
+    dri_drawable->x_drawable = drawable;
+    dri_drawable->next = dri_state->drawable_hash[index];
+    dri_state->drawable_hash[index] = dri_drawable;
+
+    return dri_drawable;
+}
+
+void
+free_drawable_hashtable(VADriverContextP ctx)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+    int i;
+    struct dri_drawable *dri_drawable, *prev;
+
+    for (i = 0; i < DRAWABLE_HASH_SZ; i++) {
+        dri_drawable = dri_state->drawable_hash[i];
+
+        while (dri_drawable) {
+            prev = dri_drawable;
+            dri_drawable = prev->next;
+            dri_state->destroyDrawable(ctx, prev);
+        }
+    }
+}
+
+struct dri_drawable *
+dri_get_drawable(VADriverContextP ctx, XID drawable)
+{
+    return do_drawable_hash(ctx, drawable);
+}
+
+void 
+dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+
+    dri_state->swapBuffer(ctx, dri_drawable);
+}
+
+union dri_buffer *
+dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
+{
+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
+    
+    return dri_state->getRenderingBuffer(ctx, dri_drawable);
+}
diff -Nru libva-1.0.4/src/x11/va_dricommon.h libva-1.0.1/src/x11/va_dricommon.h
--- libva-1.0.4/src/x11/va_dricommon.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dricommon.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,68 @@
+#ifndef _VA_DRICOMMON_H_
+#define _VA_DRICOMMON_H_
+
+#include <X11/Xlib.h>
+
+#include <xf86drm.h>
+#include <drm.h>
+#include <drm_sarea.h>
+
+#include "va_backend.h"
+
+enum
+{
+    VA_NONE = 0,
+    VA_DRI1 = 1,
+    VA_DRI2 = 2
+};
+
+union dri_buffer 
+{
+    struct {
+        unsigned int attachment;
+        unsigned int name;
+        unsigned int pitch;
+        unsigned int cpp;
+        unsigned int flags;
+    } dri2;
+
+    struct {
+    } dri1;
+};
+
+struct dri_drawable 
+{
+    XID x_drawable;
+    int x;
+    int y;
+    unsigned int width;
+    unsigned int height;
+    struct dri_drawable *next;
+};
+
+#define DRAWABLE_HASH_SZ 32
+struct dri_state 
+{
+    int fd;
+    int driConnectedFlag; /* 0: disconnected, 1: DRI, 2: DRI2 */
+    drm_handle_t hSAREA;
+    drm_context_t hwContext;
+    drmAddress pSAREA;
+    XID hwContextID;
+    struct dri_drawable *drawable_hash[DRAWABLE_HASH_SZ];
+
+    struct dri_drawable *(*createDrawable)(VADriverContextP ctx, XID x_drawable);
+    void (*destroyDrawable)(VADriverContextP ctx, struct dri_drawable *dri_drawable);
+    void (*swapBuffer)(VADriverContextP ctx, struct dri_drawable *dri_drawable);
+    union dri_buffer *(*getRenderingBuffer)(VADriverContextP ctx, struct dri_drawable *dri_drawable);
+    void (*close)(VADriverContextP ctx);
+};
+
+Bool isDRI2Connected(VADriverContextP ctx, char **driver_name);
+Bool isDRI1Connected(VADriverContextP ctx, char **driver_name);
+void free_drawable_hashtable(VADriverContextP ctx);
+struct dri_drawable *dri_get_drawable(VADriverContextP ctx, XID drawable);
+void dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
+union dri_buffer *dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
+
+#endif /* _VA_DRICOMMON_H_ */
diff -Nru libva-1.0.4/src/x11/va_dri.h libva-1.0.1/src/x11/va_dri.h
--- libva-1.0.4/src/x11/va_dri.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dri.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,120 @@
+/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.8 2002/10/30 12:51:25 alanh Exp $ */
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+Copyright 2007 Intel Corporation
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/**
+ * \file xf86dri.h
+ * Protocol numbers and function prototypes for DRI X protocol.
+ *
+ * \author Kevin E. Martin <martin@valinux.com>
+ * \author Jens Owen <jens@tungstengraphics.com>
+ * \author Rickard E. (Rik) Faith <faith@valinux.com>
+ */
+
+#ifndef _VA_DRI_H_
+#define _VA_DRI_H_
+
+#include <X11/Xfuncproto.h>
+#include <xf86drm.h>
+
+#define X_VA_DRIQueryVersion			0
+#define X_VA_DRIQueryDirectRenderingCapable	1
+#define X_VA_DRIOpenConnection			2
+#define X_VA_DRICloseConnection		3
+#define X_VA_DRIGetClientDriverName		4
+#define X_VA_DRICreateContext			5
+#define X_VA_DRIDestroyContext			6
+#define X_VA_DRICreateDrawable			7
+#define X_VA_DRIDestroyDrawable		8
+#define X_VA_DRIGetDrawableInfo		9
+#define X_VA_DRIGetDeviceInfo			10
+#define X_VA_DRIAuthConnection                 11
+#define X_VA_DRIOpenFullScreen                 12   /* Deprecated */
+#define X_VA_DRICloseFullScreen                13   /* Deprecated */
+
+#define VA_DRINumberEvents		0
+
+#define VA_DRIClientNotLocal		0
+#define VA_DRIOperationNotSupported	1
+#define VA_DRINumberErrors		(VA_DRIOperationNotSupported + 1)
+
+typedef unsigned long __DRIid;
+typedef void __DRInativeDisplay;
+
+_XFUNCPROTOBEGIN
+
+Bool VA_DRIQueryExtension( Display *dpy, int *event_base, int *error_base );
+
+Bool VA_DRIQueryVersion( Display *dpy, int *majorVersion, int *minorVersion,
+    int *patchVersion );
+
+Bool VA_DRIQueryDirectRenderingCapable( Display *dpy, int screen,
+    Bool *isCapable );
+
+Bool VA_DRIOpenConnection( Display *dpy, int screen, drm_handle_t *hSAREA,
+    char **busIDString );
+
+Bool VA_DRIAuthConnection( Display *dpy, int screen, drm_magic_t magic );
+
+Bool VA_DRICloseConnection( Display *dpy, int screen );
+
+Bool VA_DRIGetClientDriverName( Display *dpy, int screen,
+    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
+    int *ddxDriverPatchVersion, char **clientDriverName );
+
+Bool VA_DRICreateContext( Display *dpy, int screen, Visual *visual,
+    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
+
+Bool VA_DRICreateContextWithConfig( Display *dpy, int screen, int configID,
+    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
+
+Bool VA_DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
+    __DRIid context_id );
+
+Bool VA_DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
+    __DRIid drawable, drm_drawable_t *hHWDrawable );
+
+Bool VA_DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, 
+    __DRIid drawable);
+
+Bool VA_DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
+    unsigned int *index, unsigned int *stamp, 
+    int *X, int *Y, int *W, int *H,
+    int *numClipRects, drm_clip_rect_t ** pClipRects,
+    int *backX, int *backY,
+    int *numBackClipRects, drm_clip_rect_t **pBackClipRects );
+
+Bool VA_DRIGetDeviceInfo( Display *dpy, int screen,
+    drm_handle_t *hFrameBuffer, int *fbOrigin, int *fbSize,
+    int *fbStride, int *devPrivateSize, void **pDevPrivate );
+
+_XFUNCPROTOEND
+
+#endif /* _VA_DRI_H_ */
+
diff -Nru libva-1.0.4/src/x11/va_dristr.h libva-1.0.1/src/x11/va_dristr.h
--- libva-1.0.4/src/x11/va_dristr.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_dristr.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,344 @@
+/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.10 2002/10/30 12:51:25 alanh Exp $ */
+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+Copyright 2007 Intel Corporation
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Kevin E. Martin <martin@valinux.com>
+ *   Jens Owen <jens@tungstengraphics.com>
+ *   Rickard E. (Rik) Fiath <faith@valinux.com>
+ *
+ */
+
+#ifndef _VA_DRISTR_H_
+#define _VA_DRISTR_H_
+
+#include "va_dri.h"
+
+#define VA_DRINAME "XFree86-DRI"
+
+/* The DRI version number.  This was originally set to be the same of the
+ * XFree86 version number.  However, this version is really indepedent of
+ * the XFree86 version.
+ *
+ * Version History:
+ *    4.0.0: Original
+ *    4.0.1: Patch to bump clipstamp when windows are destroyed, 28 May 02
+ *    4.1.0: Add transition from single to multi in DRMInfo rec, 24 Jun 02
+ */
+#define VA_DRI_MAJOR_VERSION	4
+#define VA_DRI_MINOR_VERSION	1
+#define VA_DRI_PATCH_VERSION	0
+
+typedef struct _VA_DRIQueryVersion {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRIQueryVersion */
+    CARD16	length B16;
+} xVA_DRIQueryVersionReq;
+#define sz_xVA_DRIQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of DRI protocol */
+    CARD16	minorVersion B16;	/* minor version of DRI protocol */
+    CARD32	patchVersion B32;       /* patch version of DRI protocol */
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xVA_DRIQueryVersionReply;
+#define sz_xVA_DRIQueryVersionReply	32
+
+typedef struct _VA_DRIQueryDirectRenderingCapable {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* X_DRIQueryDirectRenderingCapable */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xVA_DRIQueryDirectRenderingCapableReq;
+#define sz_xVA_DRIQueryDirectRenderingCapableReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    BOOL	isCapable;
+    BOOL	pad2;
+    BOOL	pad3;
+    BOOL	pad4;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+    CARD32	pad8 B32;
+    CARD32	pad9 B32;
+} xVA_DRIQueryDirectRenderingCapableReply;
+#define sz_xVA_DRIQueryDirectRenderingCapableReply	32
+
+typedef struct _VA_DRIOpenConnection {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRIOpenConnection */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xVA_DRIOpenConnectionReq;
+#define sz_xVA_DRIOpenConnectionReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	hSAREALow B32;
+    CARD32	hSAREAHigh B32;
+    CARD32	busIdStringLength B32;
+    CARD32	pad6 B32;
+    CARD32	pad7 B32;
+    CARD32	pad8 B32;
+} xVA_DRIOpenConnectionReply;
+#define sz_xVA_DRIOpenConnectionReply	32
+
+typedef struct _VA_DRIAuthConnection {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRICloseConnection */
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32      magic B32;
+} xVA_DRIAuthConnectionReq;
+#define sz_xVA_DRIAuthConnectionReq	12
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad1;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD32      authenticated B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+    CARD32      pad6 B32;
+} xVA_DRIAuthConnectionReply;
+#define zx_xVA_DRIAuthConnectionReply  32
+
+typedef struct _VA_DRICloseConnection {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRICloseConnection */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xVA_DRICloseConnectionReq;
+#define sz_xVA_DRICloseConnectionReq	8
+
+typedef struct _VA_DRIGetClientDriverName {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRIGetClientDriverName */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xVA_DRIGetClientDriverNameReq;
+#define sz_xVA_DRIGetClientDriverNameReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	ddxDriverMajorVersion B32;
+    CARD32	ddxDriverMinorVersion B32;
+    CARD32	ddxDriverPatchVersion B32;
+    CARD32	clientDriverNameLength B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xVA_DRIGetClientDriverNameReply;
+#define sz_xVA_DRIGetClientDriverNameReply	32
+
+typedef struct _VA_DRICreateContext {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRICreateContext */
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	visual B32;
+    CARD32	context B32;
+} xVA_DRICreateContextReq;
+#define sz_xVA_DRICreateContextReq	16
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	hHWContext B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xVA_DRICreateContextReply;
+#define sz_xVA_DRICreateContextReply	32
+
+typedef struct _VA_DRIDestroyContext {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRIDestroyContext */
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	context B32;
+} xVA_DRIDestroyContextReq;
+#define sz_xVA_DRIDestroyContextReq	12
+
+typedef struct _VA_DRICreateDrawable {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRICreateDrawable */
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	drawable B32;
+} xVA_DRICreateDrawableReq;
+#define sz_xVA_DRICreateDrawableReq	12
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	hHWDrawable B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xVA_DRICreateDrawableReply;
+#define sz_xVA_DRICreateDrawableReply	32
+
+typedef struct _VA_DRIDestroyDrawable {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRIDestroyDrawable */
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	drawable B32;
+} xVA_DRIDestroyDrawableReq;
+#define sz_xVA_DRIDestroyDrawableReq	12
+
+typedef struct _VA_DRIGetDrawableInfo {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRIGetDrawableInfo */
+    CARD16	length B16;
+    CARD32	screen B32;
+    CARD32	drawable B32;
+} xVA_DRIGetDrawableInfoReq;
+#define sz_xVA_DRIGetDrawableInfoReq	12
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	drawableTableIndex B32;
+    CARD32	drawableTableStamp B32;
+    INT16	drawableX B16;
+    INT16	drawableY B16;
+    INT16	drawableWidth B16;
+    INT16	drawableHeight B16;
+    CARD32	numClipRects B32;
+    INT16       backX B16;
+    INT16       backY B16;
+    CARD32      numBackClipRects B32;
+} xVA_DRIGetDrawableInfoReply;
+
+#define sz_xVA_DRIGetDrawableInfoReply	36
+
+
+typedef struct _VA_DRIGetDeviceInfo {
+    CARD8	reqType;		/* always DRIReqCode */
+    CARD8	driReqType;		/* always X_DRIGetDeviceInfo */
+    CARD16	length B16;
+    CARD32	screen B32;
+} xVA_DRIGetDeviceInfoReq;
+#define sz_xVA_DRIGetDeviceInfoReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	hFrameBufferLow B32;
+    CARD32	hFrameBufferHigh B32;
+    CARD32	framebufferOrigin B32;
+    CARD32	framebufferSize B32;
+    CARD32	framebufferStride B32;
+    CARD32	devPrivateSize B32;
+} xVA_DRIGetDeviceInfoReply;
+#define sz_xVA_DRIGetDeviceInfoReply	32
+
+typedef struct _VA_DRIOpenFullScreen {
+    CARD8       reqType;	/* always DRIReqCode */
+    CARD8       driReqType;	/* always X_DRIOpenFullScreen */
+    CARD16      length B16;
+    CARD32      screen B32;
+    CARD32      drawable B32;
+} xVA_DRIOpenFullScreenReq;
+#define sz_xVA_DRIOpenFullScreenReq    12
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad1;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD32      isFullScreen B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+    CARD32      pad6 B32;
+} xVA_DRIOpenFullScreenReply;
+#define sz_xVA_DRIOpenFullScreenReply  32
+
+typedef struct _VA_DRICloseFullScreen {
+    CARD8       reqType;	/* always DRIReqCode */
+    CARD8       driReqType;	/* always X_DRICloseFullScreen */
+    CARD16      length B16;
+    CARD32      screen B32;
+    CARD32      drawable B32;
+} xVA_DRICloseFullScreenReq;
+#define sz_xVA_DRICloseFullScreenReq   12
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad1;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+    CARD32      pad6 B32;
+    CARD32      pad7 B32;
+} xVA_DRICloseFullScreenReply;
+#define sz_xVA_DRICloseFullScreenReply  32
+
+
+#endif /* _VA_DRISTR_H_ */
diff -Nru libva-1.0.4/src/x11/va_nvctrl.c libva-1.0.1/src/x11/va_nvctrl.c
--- libva-1.0.4/src/x11/va_nvctrl.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_nvctrl.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2008 NVIDIA, Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#define _GNU_SOURCE 1
+#include <string.h>
+
+#define NEED_REPLIES
+#include <stdlib.h>
+#include <X11/Xlibint.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
+#include "va_nvctrl.h"
+
+#define NV_CONTROL_ERRORS 0
+#define NV_CONTROL_EVENTS 5
+#define NV_CONTROL_NAME "NV-CONTROL"
+
+#define NV_CTRL_TARGET_TYPE_X_SCREEN   0
+#define NV_CTRL_TARGET_TYPE_GPU        1
+#define NV_CTRL_TARGET_TYPE_FRAMELOCK  2
+#define NV_CTRL_TARGET_TYPE_VCSC       3 /* Visual Computing System */
+
+#define NV_CTRL_STRING_NVIDIA_DRIVER_VERSION                    3  /* R--G */
+
+#define X_nvCtrlQueryExtension                      0
+#define X_nvCtrlIsNv                                1
+#define X_nvCtrlQueryStringAttribute                4
+
+typedef struct {
+    CARD8 reqType;
+    CARD8 nvReqType;
+    CARD16 length B16;
+} xnvCtrlQueryExtensionReq;
+#define sz_xnvCtrlQueryExtensionReq 4
+
+typedef struct {
+    BYTE type;   /* X_Reply */
+    CARD8 padb1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD16 major B16;
+    CARD16 minor B16;
+    CARD32 padl4 B32;
+    CARD32 padl5 B32;
+    CARD32 padl6 B32;
+    CARD32 padl7 B32;
+    CARD32 padl8 B32;
+} xnvCtrlQueryExtensionReply;
+#define sz_xnvCtrlQueryExtensionReply 32
+
+typedef struct {
+    CARD8 reqType;
+    CARD8 nvReqType;
+    CARD16 length B16;
+    CARD32 screen B32;
+} xnvCtrlIsNvReq;
+#define sz_xnvCtrlIsNvReq 8
+
+typedef struct {
+    BYTE type;   /* X_Reply */
+    CARD8 padb1;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD32 isnv B32;
+    CARD32 padl4 B32;
+    CARD32 padl5 B32;
+    CARD32 padl6 B32;
+    CARD32 padl7 B32;
+    CARD32 padl8 B32;
+} xnvCtrlIsNvReply;
+#define sz_xnvCtrlIsNvReply 32
+
+typedef struct {
+    CARD8 reqType;
+    CARD8 nvReqType;
+    CARD16 length B16;
+    CARD16 target_id B16;    /* X screen number or GPU number */
+    CARD16 target_type B16;  /* X screen or GPU */
+    CARD32 display_mask B32;
+    CARD32 attribute B32;
+} xnvCtrlQueryStringAttributeReq;
+#define sz_xnvCtrlQueryStringAttributeReq 16
+
+typedef struct {
+    BYTE type;
+    BYTE pad0;
+    CARD16 sequenceNumber B16;
+    CARD32 length B32;
+    CARD32 flags B32;
+    CARD32 n B32;    /* Length of string */
+    CARD32 pad4 B32;
+    CARD32 pad5 B32;
+    CARD32 pad6 B32;
+    CARD32 pad7 B32;
+} xnvCtrlQueryStringAttributeReply;
+#define sz_xnvCtrlQueryStringAttributeReply 32
+
+#define NVCTRL_EXT_NEED_CHECK          (XPointer)(~0)
+#define NVCTRL_EXT_NEED_NOTHING        (XPointer)(0)
+#define NVCTRL_EXT_NEED_TARGET_SWAP    (XPointer)(1)
+
+static XExtensionInfo _nvctrl_ext_info_data;
+static XExtensionInfo *nvctrl_ext_info = &_nvctrl_ext_info_data;
+static /* const */ char *nvctrl_extension_name = NV_CONTROL_NAME;
+
+#define XNVCTRLCheckExtension(dpy,i,val) \
+  XextCheckExtension (dpy, i, nvctrl_extension_name, val)
+#define XNVCTRLSimpleCheckExtension(dpy,i) \
+  XextSimpleCheckExtension (dpy, i, nvctrl_extension_name)
+
+static int close_display();
+static /* const */ XExtensionHooks nvctrl_extension_hooks = {
+    NULL,                               /* create_gc */
+    NULL,                               /* copy_gc */
+    NULL,                               /* flush_gc */
+    NULL,                               /* free_gc */
+    NULL,                               /* create_font */
+    NULL,                               /* free_font */
+    close_display,                      /* close_display */
+    NULL,                               /* wire_to_event */
+    NULL,                               /* event_to_wire */
+    NULL,                               /* error */
+    NULL,                               /* error_string */
+};
+
+static XEXT_GENERATE_FIND_DISPLAY (find_display, nvctrl_ext_info,
+                                   nvctrl_extension_name, 
+                                   &nvctrl_extension_hooks,
+                                   NV_CONTROL_EVENTS, NVCTRL_EXT_NEED_CHECK)
+
+static XEXT_GENERATE_CLOSE_DISPLAY (close_display, nvctrl_ext_info)
+
+static Bool XNVCTRLQueryVersion (Display *dpy, int *major, int *minor);
+
+/*
+ * NV-CONTROL versions 1.8 and 1.9 pack the target_type and target_id
+ * fields in reversed order.  In order to talk to one of these servers,
+ * we need to swap these fields.
+ */
+static void XNVCTRLCheckTargetData(Display *dpy, XExtDisplayInfo *info,
+                                   int *target_type, int *target_id)
+{
+    /* Find out what the server's NV-CONTROL version is and
+     * setup for swapping if we need to.
+     */
+    if (info->data == NVCTRL_EXT_NEED_CHECK) {
+        int major, minor;
+
+        if (XNVCTRLQueryVersion(dpy, &major, &minor)) {
+            if (major == 1 &&
+                (minor == 8 || minor == 9)) {
+                info->data = NVCTRL_EXT_NEED_TARGET_SWAP;
+            } else {
+                info->data = NVCTRL_EXT_NEED_NOTHING;
+            }
+        } else {
+            info->data = NVCTRL_EXT_NEED_NOTHING;
+        }
+    }
+
+    /* We need to swap the target_type and target_id */
+    if (info->data == NVCTRL_EXT_NEED_TARGET_SWAP) {
+        int tmp;
+        tmp = *target_type;
+        *target_type = *target_id;
+        *target_id = tmp;
+    }
+}
+
+
+static Bool XNVCTRLQueryExtension (
+    Display *dpy,
+    int *event_basep,
+    int *error_basep
+){
+    XExtDisplayInfo *info = find_display (dpy);
+
+    if (XextHasExtension(info)) {
+        if (event_basep) *event_basep = info->codes->first_event;
+        if (error_basep) *error_basep = info->codes->first_error;
+        return True;
+    } else {
+        return False;
+    }
+}
+
+
+static Bool XNVCTRLQueryVersion (
+    Display *dpy,
+    int *major,
+    int *minor
+){
+    XExtDisplayInfo *info = find_display (dpy);
+    xnvCtrlQueryExtensionReply rep;
+    xnvCtrlQueryExtensionReq   *req;
+
+    if(!XextHasExtension(info))
+        return False;
+
+    XNVCTRLCheckExtension (dpy, info, False);
+
+    LockDisplay (dpy);
+    GetReq (nvCtrlQueryExtension, req);
+    req->reqType = info->codes->major_opcode;
+    req->nvReqType = X_nvCtrlQueryExtension;
+    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
+        UnlockDisplay (dpy);
+        SyncHandle ();
+        return False;
+    }
+    if (major) *major = rep.major;
+    if (minor) *minor = rep.minor;
+    UnlockDisplay (dpy);
+    SyncHandle ();
+    return True;
+}
+
+
+static Bool XNVCTRLIsNvScreen (
+    Display *dpy,
+    int screen
+){
+    XExtDisplayInfo *info = find_display (dpy);
+    xnvCtrlIsNvReply rep;
+    xnvCtrlIsNvReq   *req;
+    Bool isnv;
+
+    if(!XextHasExtension(info))
+        return False;
+
+    XNVCTRLCheckExtension (dpy, info, False);
+
+    LockDisplay (dpy);
+    GetReq (nvCtrlIsNv, req);
+    req->reqType = info->codes->major_opcode;
+    req->nvReqType = X_nvCtrlIsNv;
+    req->screen = screen;
+    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
+        UnlockDisplay (dpy);
+        SyncHandle ();
+        return False;
+    }
+    isnv = rep.isnv;
+    UnlockDisplay (dpy);
+    SyncHandle ();
+    return isnv;
+}
+
+
+static Bool XNVCTRLQueryTargetStringAttribute (
+    Display *dpy,
+    int target_type,
+    int target_id,
+    unsigned int display_mask,
+    unsigned int attribute,
+    char **ptr
+){
+    XExtDisplayInfo *info = find_display (dpy);
+    xnvCtrlQueryStringAttributeReply rep;
+    xnvCtrlQueryStringAttributeReq   *req;
+    Bool exists;
+    int length, numbytes, slop;
+
+    if (!ptr) return False;
+
+    if(!XextHasExtension(info))
+        return False;
+
+    XNVCTRLCheckExtension (dpy, info, False);
+    XNVCTRLCheckTargetData(dpy, info, &target_type, &target_id);
+
+    LockDisplay (dpy);
+    GetReq (nvCtrlQueryStringAttribute, req);
+    req->reqType = info->codes->major_opcode;
+    req->nvReqType = X_nvCtrlQueryStringAttribute;
+    req->target_type = target_type;
+    req->target_id = target_id;
+    req->display_mask = display_mask;
+    req->attribute = attribute;
+    if (!_XReply (dpy, (xReply *) &rep, 0, False)) {
+        UnlockDisplay (dpy);
+        SyncHandle ();
+        return False;
+    }
+    length = rep.length;
+    numbytes = rep.n;
+    slop = numbytes & 3;
+    *ptr = (char *) Xmalloc(numbytes);
+    if (! *ptr) {
+        _XEatData(dpy, length);
+        UnlockDisplay (dpy);
+        SyncHandle ();
+        return False;
+    } else {
+        _XRead(dpy, (char *) *ptr, numbytes);
+        if (slop) _XEatData(dpy, 4-slop);
+    }
+    exists = rep.flags;
+    UnlockDisplay (dpy);
+    SyncHandle ();
+    return exists;
+}
+
+static Bool XNVCTRLQueryStringAttribute (
+    Display *dpy,
+    int screen,
+    unsigned int display_mask,
+    unsigned int attribute,
+    char **ptr
+){
+    return XNVCTRLQueryTargetStringAttribute(dpy, NV_CTRL_TARGET_TYPE_X_SCREEN,
+                                             screen, display_mask,
+                                             attribute, ptr);
+}
+
+
+Bool VA_NVCTRLQueryDirectRenderingCapable( Display *dpy, int screen,
+    Bool *isCapable )
+{
+    int event_base;
+    int error_base;
+
+    if (isCapable)
+        *isCapable = False;
+
+    if (!XNVCTRLQueryExtension(dpy, &event_base, &error_base))
+        return False;
+
+    if (isCapable && XNVCTRLIsNvScreen(dpy, screen))
+        *isCapable = True;
+
+    return True;
+}
+
+Bool VA_NVCTRLGetClientDriverName( Display *dpy, int screen,
+    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
+    int *ddxDriverPatchVersion, char **clientDriverName )
+{
+    if (ddxDriverMajorVersion)
+        *ddxDriverMajorVersion = 0;
+    if (ddxDriverMinorVersion)
+        *ddxDriverMinorVersion = 0;
+    if (ddxDriverPatchVersion)
+        *ddxDriverPatchVersion = 0;
+    if (clientDriverName)
+        *clientDriverName = NULL;
+
+    char *nvidia_driver_version = NULL;
+    if (!XNVCTRLQueryStringAttribute(dpy, screen, 0, NV_CTRL_STRING_NVIDIA_DRIVER_VERSION, &nvidia_driver_version))
+        return False;
+
+    char *end, *str = nvidia_driver_version;
+    unsigned long v = strtoul(str, &end, 10);
+    if (end && end != str) {
+        if (ddxDriverMajorVersion)
+            *ddxDriverMajorVersion = v;
+        if (*(str = end) == '.') {
+            v = strtoul(str + 1, &end, 10);
+            if (end && end != str && (*end == '.' || *end == '\0')) {
+                if (ddxDriverMinorVersion)
+                    *ddxDriverMinorVersion = v;
+                if (*(str = end) == '.') {
+                    v = strtoul(str + 1, &end, 10);
+                    if (end && end != str && *end == '\0') {
+                        if (ddxDriverPatchVersion)
+                            *ddxDriverPatchVersion = v;
+                    }
+                }
+            }
+        }
+    }
+    Xfree(nvidia_driver_version);
+
+    if (clientDriverName)
+        *clientDriverName = strdup("nvidia");
+
+    return True;
+}
diff -Nru libva-1.0.4/src/x11/va_nvctrl.h libva-1.0.1/src/x11/va_nvctrl.h
--- libva-1.0.4/src/x11/va_nvctrl.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_nvctrl.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2008 NVIDIA, Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef VA_NVCTRLLIB_H
+#define VA_NVCTRLLIB_H
+
+#include <X11/Xlib.h>
+
+Bool VA_NVCTRLQueryDirectRenderingCapable( Display *dpy, int screen,
+    Bool *isCapable );
+
+Bool VA_NVCTRLGetClientDriverName( Display *dpy, int screen,
+    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
+    int *ddxDriverPatchVersion, char **clientDriverName );
+
+#endif /* VA_NVCTRLLIB_H */
diff -Nru libva-1.0.4/src/x11/va_x11.c libva-1.0.1/src/x11/va_x11.c
--- libva-1.0.4/src/x11/va_x11.c	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_x11.c	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#define _GNU_SOURCE 1
+#include "config.h"
+#include "va.h"
+#include "va_backend.h"
+#include "va_x11.h"
+#include "va_dri.h"
+#include "va_dri2.h"
+#include "va_dricommon.h"
+#include "va_nvctrl.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+static VADisplayContextP pDisplayContexts = NULL;
+
+static int va_DisplayContextIsValid (
+    VADisplayContextP pDisplayContext
+)
+{
+    VADisplayContextP ctx = pDisplayContexts;
+
+    while (ctx)
+    {
+	if (ctx == pDisplayContext && pDisplayContext->pDriverContext)
+	    return 1;
+	ctx = ctx->pNext;
+    }
+    return 0;
+}
+
+static void va_DisplayContextDestroy (
+    VADisplayContextP pDisplayContext
+)
+{
+    VADisplayContextP *ctx = &pDisplayContexts;
+
+    /* Throw away pDisplayContext */
+    while (*ctx)
+    {
+	if (*ctx == pDisplayContext)
+	{
+	    *ctx = pDisplayContext->pNext;
+	    pDisplayContext->pNext = NULL;
+	    break;
+	}
+	ctx = &((*ctx)->pNext);
+    }
+    free(pDisplayContext->pDriverContext->dri_state);
+    free(pDisplayContext->pDriverContext);
+    free(pDisplayContext);
+}
+
+
+static VAStatus va_DRI2GetDriverName (
+    VADisplayContextP pDisplayContext,
+    char **driver_name
+)
+{
+    VADriverContextP ctx = pDisplayContext->pDriverContext;
+
+    if (!isDRI2Connected(ctx, driver_name))
+        return VA_STATUS_ERROR_UNKNOWN;
+
+    return VA_STATUS_SUCCESS;
+}
+
+static VAStatus va_DRIGetDriverName (
+    VADisplayContextP pDisplayContext,
+    char **driver_name
+)
+{
+    VADriverContextP ctx = pDisplayContext->pDriverContext;
+
+    if (!isDRI1Connected(ctx, driver_name))
+        return VA_STATUS_ERROR_UNKNOWN;
+
+    return VA_STATUS_SUCCESS;
+}
+
+static VAStatus va_NVCTRL_GetDriverName (
+    VADisplayContextP pDisplayContext,
+    char **driver_name
+)
+{
+    VADriverContextP ctx = pDisplayContext->pDriverContext;
+    int direct_capable, driver_major, driver_minor, driver_patch;
+    Bool result;
+
+    result = VA_NVCTRLQueryDirectRenderingCapable(ctx->x11_dpy, ctx->x11_screen,
+                                                  &direct_capable);
+    if (!result || !direct_capable)
+        return VA_STATUS_ERROR_UNKNOWN;
+
+    result = VA_NVCTRLGetClientDriverName(ctx->x11_dpy, ctx->x11_screen,
+                                          &driver_major, &driver_minor,
+                                          &driver_patch, driver_name);
+    if (!result)
+        return VA_STATUS_ERROR_UNKNOWN;
+
+    return VA_STATUS_SUCCESS;
+}
+
+static VAStatus va_DisplayContextGetDriverName (
+    VADisplayContextP pDisplayContext,
+    char **driver_name
+)
+{
+    VAStatus vaStatus;
+    char *driver_name_env;
+
+    if (driver_name)
+	*driver_name = NULL;
+
+    if ((driver_name_env = getenv("LIBVA_DRIVER_NAME")) != NULL
+        && geteuid() == getuid())
+    {
+        /* don't allow setuid apps to use LIBVA_DRIVER_NAME */
+        *driver_name = strdup(driver_name_env);
+        return VA_STATUS_SUCCESS;
+    }
+
+    vaStatus = va_DRI2GetDriverName(pDisplayContext, driver_name);
+    if (vaStatus != VA_STATUS_SUCCESS)
+        vaStatus = va_DRIGetDriverName(pDisplayContext, driver_name);
+    if (vaStatus != VA_STATUS_SUCCESS)
+        vaStatus = va_NVCTRL_GetDriverName(pDisplayContext, driver_name);
+   
+    return vaStatus;
+}
+
+
+VADisplay vaGetDisplay (
+    Display *native_dpy /* implementation specific */
+)
+{
+  VADisplay dpy = NULL;
+  VADisplayContextP pDisplayContext = pDisplayContexts;
+
+  if (!native_dpy)
+      return NULL;
+
+  while (pDisplayContext)
+  {
+      if (pDisplayContext->pDriverContext &&
+	  pDisplayContext->pDriverContext->x11_dpy == native_dpy)
+      {
+          dpy = (VADisplay)pDisplayContext;
+          break;
+      }
+      pDisplayContext = pDisplayContext->pNext;
+  }
+
+  if (!dpy)
+  {
+      /* create new entry */
+      VADriverContextP pDriverContext;
+      struct dri_state *dri_state;
+      pDisplayContext = calloc(1, sizeof(*pDisplayContext));
+      pDriverContext  = calloc(1, sizeof(*pDriverContext));
+      dri_state       = calloc(1, sizeof(*dri_state));
+      if (pDisplayContext && pDriverContext && dri_state)
+      {
+	  pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
+
+	  pDriverContext->x11_dpy          = native_dpy;
+	  pDisplayContext->pNext           = pDisplayContexts;
+	  pDisplayContext->pDriverContext  = pDriverContext;
+	  pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
+	  pDisplayContext->vaDestroy       = va_DisplayContextDestroy;
+	  pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
+	  pDisplayContexts                 = pDisplayContext;
+	  pDriverContext->dri_state 	   = dri_state;
+	  dpy                              = (VADisplay)pDisplayContext;
+      }
+      else
+      {
+	  if (pDisplayContext)
+	      free(pDisplayContext);
+	  if (pDriverContext)
+	      free(pDriverContext);
+          if (dri_state)
+              free(dri_state);
+      }
+  }
+  
+  return dpy;
+}
diff -Nru libva-1.0.4/src/x11/va_x11.h libva-1.0.1/src/x11/va_x11.h
--- libva-1.0.4/src/x11/va_x11.h	1970-01-01 00:00:00.000000000 +0000
+++ libva-1.0.1/src/x11/va_x11.h	2009-12-17 03:05:38.000000000 +0000
@@ -0,0 +1,67 @@
+#ifndef _VA_X11_H_
+#define _VA_X11_H_
+
+#ifdef IN_LIBVA
+#include "va.h"
+#else
+#include <va/va.h>
+#endif
+#include <X11/Xlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Returns a suitable VADisplay for VA API
+ */
+VADisplay vaGetDisplay (
+    Display *dpy
+);
+
+/*
+ * Output rendering
+ * Following is the rendering interface for X windows, 
+ * to get the decode output surface to a X drawable
+ * It basically performs a de-interlacing (if needed), 
+ * color space conversion and scaling to the destination
+ * rectangle
+ */
+/* de-interlacing flags for vaPutSurface */
+#define VA_FRAME_PICTURE	0x00000000 
+#define VA_TOP_FIELD		0x00000001
+#define VA_BOTTOM_FIELD		0x00000002
+
+/* 
+ * clears the drawable with background color.
+ * for hardware overlay based implementation this flag
+ * can be used to turn off the overlay
+ */
+#define VA_CLEAR_DRAWABLE	0x00000008 
+
+/* color space conversion flags for vaPutSurface */
+#define VA_SRC_BT601		0x00000010
+#define VA_SRC_BT709		0x00000020
+
+VAStatus vaPutSurface (
+    VADisplay dpy,
+    VASurfaceID surface,	
+    Drawable draw, /* X Drawable */
+    short srcx,
+    short srcy,
+    unsigned short srcw,
+    unsigned short srch,
+    short destx,
+    short desty,
+    unsigned short destw,
+    unsigned short desth,
+    VARectangle *cliprects, /* client supplied destination clip list */
+    unsigned int number_cliprects, /* number of clip rects in the clip list */
+    unsigned int flags /* PutSurface flags */
+);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _VA_X11_H_ */
diff -Nru libva-1.0.4/test/basic/Makefile.am libva-1.0.1/test/basic/Makefile.am
--- libva-1.0.4/test/basic/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/basic/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -23,9 +23,9 @@
 bin_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
 		test_07 test_08 test_09 test_10 test_11
 
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
 
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 
 test_01_LDADD = $(TEST_LIBS)
 test_01_SOURCES = test_01.c
diff -Nru libva-1.0.4/test/basic/Makefile.in libva-1.0.1/test/basic/Makefile.in
--- libva-1.0.4/test/basic/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/basic/Makefile.in	2010-02-12 17:47:57.000000000 +0000
@@ -156,8 +156,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -198,15 +196,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -269,8 +263,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 test_01_LDADD = $(TEST_LIBS)
 test_01_SOURCES = test_01.c
 test_02_LDADD = $(TEST_LIBS)
diff -Nru libva-1.0.4/test/basic/test.c libva-1.0.1/test/basic/test.c
--- libva-1.0.4/test/basic/test.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/basic/test.c	2009-12-17 03:05:38.000000000 +0000
@@ -22,7 +22,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef IN_LIBVA
+#include <va_x11.h>
+#else
 #include <va/va_x11.h>
+#endif
 
 #include "assert.h"
 #include <stdarg.h>
diff -Nru libva-1.0.4/test/basic/test_common.c libva-1.0.1/test/basic/test_common.c
--- libva-1.0.4/test/basic/test_common.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/basic/test_common.c	2009-12-17 03:05:38.000000000 +0000
@@ -22,7 +22,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef IN_LIBVA
+#include <va_x11.h>
+#else
 #include <va/va_x11.h>
+#endif
 
 #include "assert.h"
 #include <stdarg.h>
diff -Nru libva-1.0.4/test/decode/Makefile.am libva-1.0.1/test/decode/Makefile.am
--- libva-1.0.4/test/decode/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/decode/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -22,9 +22,9 @@
 
 bin_PROGRAMS = mpeg2vldemo
 
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
 
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 
 mpeg2vldemo_LDADD = $(TEST_LIBS)
 mpeg2vldemo_SOURCES = mpeg2vldemo.c
diff -Nru libva-1.0.4/test/decode/Makefile.in libva-1.0.1/test/decode/Makefile.in
--- libva-1.0.4/test/decode/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/decode/Makefile.in	2010-02-12 17:47:57.000000000 +0000
@@ -117,8 +117,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -159,15 +157,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -230,8 +224,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 mpeg2vldemo_LDADD = $(TEST_LIBS)
 mpeg2vldemo_SOURCES = mpeg2vldemo.c
 all: all-am
diff -Nru libva-1.0.4/test/decode/mpeg2vldemo.c libva-1.0.1/test/decode/mpeg2vldemo.c
--- libva-1.0.4/test/decode/mpeg2vldemo.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/decode/mpeg2vldemo.c	2009-12-17 03:05:38.000000000 +0000
@@ -47,8 +47,8 @@
 
 #include <assert.h>
 
-#include <va/va.h>
-#include <va/va_x11.h>
+#include "va.h"
+#include "va_x11.h"
 
 #define CHECK_VASTATUS(va_status,func)                                  \
 if (va_status != VA_STATUS_SUCCESS) {                                   \
diff -Nru libva-1.0.4/test/encode/h264encode.c libva-1.0.1/test/encode/h264encode.c
--- libva-1.0.4/test/encode/h264encode.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/encode/h264encode.c	2009-12-17 03:05:38.000000000 +0000
@@ -26,7 +26,7 @@
  * it is a real program to show how VAAPI encoding work,
  * It does H264 element stream level encoding on auto-generated YUV data
  *
- * gcc -o  h264encode  h264encode -lva -lva-x11
+ * gcc -o  h264encode  h264encode -lva -lva-x11 -I/usr/include/va
  * ./h264encode -w <width> -h <height> -n <frame_num>
  *
  */  
@@ -44,8 +44,9 @@
 
 #include <assert.h>
 
-#include <va/va.h>
-#include <va/va_x11.h>
+#include "va.h"
+#include "va_x11.h"
+
 
 #define CHECK_VASTATUS(va_status,func)                                  \
 if (va_status != VA_STATUS_SUCCESS) {                                   \
@@ -105,16 +106,20 @@
 static int save_coded_buf(VABufferID coded_buf, int current_frame, int frame_skipped)
 {    
     void *coded_p=NULL;
-    VACodedBufferSegment *buf_list = NULL;
+    int coded_size,coded_offset,wrt_size;
     VAStatus va_status;
-    unsigned int coded_size = 0;
-    
-    va_status = vaMapBuffer(va_dpy,coded_buf,(void **)(&buf_list));
+
+    va_status = vaMapBuffer(va_dpy,coded_buf,&coded_p);
     CHECK_VASTATUS(va_status,"vaMapBuffer");
-    while (buf_list != NULL) {
-        printf("Write %d bytes\n", buf_list->size);
-        coded_size += write(coded_fd, buf_list->buf, buf_list->size);
-        buf_list = buf_list->next;
+    
+    coded_size = *((unsigned long *) coded_p); /* first DWord is the coded video size */
+    coded_offset = *((unsigned long *) (coded_p + 4)); /* second DWord is byte offset */
+
+    wrt_size = write(coded_fd,coded_p+coded_offset,coded_size);
+    if (wrt_size != coded_size) {
+        fprintf(stderr, "Trying to write %d bytes, but actual %d bytes\n",
+                coded_size, wrt_size);
+        exit(1);
     }
     vaUnmapBuffer(va_dpy,coded_buf);
 
@@ -207,11 +212,10 @@
     VAEncPictureParameterBufferH264 pic_h264;
     VAEncSliceParameterBuffer slice_h264;
     VAStatus va_status;
-    VABufferID seq_param_buf, pic_param_buf, slice_param_buf;
+    VABufferID coded_buf, seq_param_buf, pic_param_buf, slice_param_buf;
     int codedbuf_size;
     VASurfaceStatus surface_status;
     int src_surface, dst_surface, ref_surface;
-    int codedbuf_idx = 0;
     int frame_skipped = 0;
     int i;
 
@@ -225,24 +229,12 @@
     
     codedbuf_size = (frame_width * frame_height * 400) / (16*16);
 
-    for (i = 0; i < CODEDBUF_NUM; i++) {
-        /* create coded buffer once for all
-         * other VA buffers which won't be used again after vaRenderPicture.
-         * so APP can always vaCreateBuffer for every frame
-         * but coded buffer need to be mapped and accessed after vaRenderPicture/vaEndPicture
-         * so VA won't maintain the coded buffer
-         */
-        va_status = vaCreateBuffer(va_dpy,context_id,VAEncCodedBufferType,
-                                   codedbuf_size, 1, NULL, &coded_buf[i]);
-        CHECK_VASTATUS(va_status,"vaBeginPicture");
-    }
-
     src_surface = 0;
     /* the last two frames are reference/reconstructed frame */
     dst_surface = SURFACE_NUM - 1;
     ref_surface = SURFACE_NUM - 2;
     
-    for (i = 0; i < frame_count; i++) {
+    for (i=0; i < frame_count; i++) {
         va_status = vaBeginPicture(va_dpy, context_id, surface_id[src_surface]);
         CHECK_VASTATUS(va_status,"vaBeginPicture");
 
@@ -257,7 +249,7 @@
             seq_h264.frame_rate = frame_rate;
             seq_h264.initial_qp = initial_qp;
             seq_h264.min_qp = minimal_qp;
-            seq_h264.basic_unit_size = 0;
+            seq_h264.basic_unit_size = 6;
             seq_h264.intra_period = intra_count;
             
             va_status = vaCreateBuffer(va_dpy, context_id,
@@ -269,10 +261,12 @@
             CHECK_VASTATUS(va_status,"vaRenderPicture");;
         }
 
+        va_status = vaCreateBuffer(va_dpy,context_id,VAEncCodedBufferType,
+                                   codedbuf_size, 1, NULL, &coded_buf);
 
         pic_h264.reference_picture = surface_id[ref_surface];
         pic_h264.reconstructed_picture= surface_id[dst_surface];
-        pic_h264.coded_buf = coded_buf[codedbuf_idx];
+        pic_h264.coded_buf = coded_buf;
         pic_h264.picture_width = frame_width;
         pic_h264.picture_height = frame_height;
         pic_h264.last_picture = (i==frame_count);
@@ -306,7 +300,7 @@
         va_status = vaQuerySurfaceStatus(va_dpy, surface_id[src_surface],&surface_status);
         frame_skipped = (surface_status & VASurfaceSkipped);
 
-        save_coded_buf(coded_buf[codedbuf_idx], i, frame_skipped);
+        save_coded_buf(coded_buf, i, frame_skipped);
         
         /* should display reconstructed frame, but just diplay source frame */
         if (frame_display) {
@@ -322,11 +316,6 @@
         if (src_surface == (SURFACE_NUM - 2))
             src_surface = 0;
 
-        /* use next codedbuf */
-        codedbuf_idx++;
-        if (codedbuf_idx == (CODEDBUF_NUM - 1))
-            codedbuf_idx = 0;
-        
         /* if a frame is skipped, current frame still use last reference frame */
         if (frame_skipped == 0) {
             /* swap ref/dst */
@@ -386,8 +375,7 @@
                 case '?':
                     printf("./h264encode <options>\n");
                     printf("   -w -h: resolution\n");
-                    printf("   -n frame number\n"); 
-                    printf("   -d display the source frame\n");
+                    printf("   -n frame number\n");
                     printf("   -p P frame count between two I frames\n");
                     printf("   -f frame rate\n");
                     printf("   -r bit rate\n");
diff -Nru libva-1.0.4/test/encode/Makefile.am libva-1.0.1/test/encode/Makefile.am
--- libva-1.0.4/test/encode/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/encode/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -22,9 +22,9 @@
 
 bin_PROGRAMS = h264encode
 
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
 
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 
 h264encode_LDADD = $(TEST_LIBS)
 h264encode_SOURCES = h264encode.c
diff -Nru libva-1.0.4/test/encode/Makefile.in libva-1.0.1/test/encode/Makefile.in
--- libva-1.0.4/test/encode/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/encode/Makefile.in	2010-02-12 17:47:57.000000000 +0000
@@ -117,8 +117,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -159,15 +157,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -230,8 +224,8 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 h264encode_LDADD = $(TEST_LIBS)
 h264encode_SOURCES = h264encode.c
 all: all-am
diff -Nru libva-1.0.4/test/Makefile.am libva-1.0.1/test/Makefile.am
--- libva-1.0.4/test/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -23,10 +23,11 @@
 
 bin_PROGRAMS = vainfo
 
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
 
-vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
-vainfo_DEPENDENCIES =  $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
+
+vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
+vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
 vainfo_SOURCES = vainfo.c
 
 SUBDIRS = basic decode encode putsurface
diff -Nru libva-1.0.4/test/Makefile.in libva-1.0.1/test/Makefile.in
--- libva-1.0.4/test/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/Makefile.in	2010-02-12 17:47:56.000000000 +0000
@@ -154,8 +154,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -196,15 +194,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -267,9 +261,9 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11
-vainfo_LDADD = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
-vainfo_DEPENDENCIES = $(top_builddir)/va/$(libvacorelib) $(top_builddir)/va/$(libvabackendlib)
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
+vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
+vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
 vainfo_SOURCES = vainfo.c
 SUBDIRS = basic decode encode putsurface
 all: all-recursive
diff -Nru libva-1.0.4/test/putsurface/Makefile.am libva-1.0.1/test/putsurface/Makefile.am
--- libva-1.0.4/test/putsurface/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/putsurface/Makefile.am	2009-12-17 03:05:38.000000000 +0000
@@ -22,15 +22,13 @@
 
 bin_PROGRAMS = putsurface
 
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
 
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 
 putsurface_LDADD = $(TEST_LIBS)
 putsurface_SOURCES = putsurface.c
 
-EXTRA_DIST = loadsurface.h
-
 
 valgrind:	$(bin_PROGRAMS)
 	for a in $(bin_PROGRAMS); do \
diff -Nru libva-1.0.4/test/putsurface/Makefile.in libva-1.0.1/test/putsurface/Makefile.in
--- libva-1.0.4/test/putsurface/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/putsurface/Makefile.in	2010-02-12 17:47:57.000000000 +0000
@@ -71,8 +71,7 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_putsurface_OBJECTS = putsurface.$(OBJEXT)
 putsurface_OBJECTS = $(am_putsurface_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/va/$(libvabackendlib)
-putsurface_DEPENDENCIES = $(am__DEPENDENCIES_1)
+putsurface_DEPENDENCIES = $(TEST_LIBS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -118,8 +117,6 @@
 FGREP = @FGREP@
 GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
 GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -160,15 +157,11 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
 VERSION = @VERSION@
 X11_CFLAGS = @X11_CFLAGS@
 X11_LIBS = @X11_LIBS@
@@ -231,11 +224,10 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
 putsurface_LDADD = $(TEST_LIBS)
 putsurface_SOURCES = putsurface.c
-EXTRA_DIST = loadsurface.h
 all: all-am
 
 .SUFFIXES:
diff -Nru libva-1.0.4/test/putsurface/putsurface.c libva-1.0.1/test/putsurface/putsurface.c
--- libva-1.0.4/test/putsurface/putsurface.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/putsurface/putsurface.c	2009-12-17 03:05:38.000000000 +0000
@@ -23,7 +23,7 @@
  */
 
 
-/* gcc -o putsurface putsurface.c -lva -lva-x11 */
+/* gcc -o putsurface putsurface.c -lva -lva-x11 -I/usr/include/va */
 
 #include <stdio.h>
 #include <string.h>
@@ -39,8 +39,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <va/va.h>
-#include <va/va_x11.h>
+#include "va.h"
+#include "va_x11.h"
 
 #include <assert.h>
 
diff -Nru libva-1.0.4/test/vainfo.c libva-1.0.1/test/vainfo.c
--- libva-1.0.4/test/vainfo.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/test/vainfo.c	2009-12-17 03:05:38.000000000 +0000
@@ -22,7 +22,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef IN_LIBVA
+#include <va_x11.h>
+#else
 #include <va/va_x11.h>
+#endif
 
 #include <stdarg.h>
 #include <stdio.h>
diff -Nru libva-1.0.4/va/android/drmtest.c libva-1.0.1/va/android/drmtest.c
--- libva-1.0.4/va/android/drmtest.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/android/drmtest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <string.h>
-#include <fcntl.h>
-#include <fnmatch.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include "drmtest.h"
-
-#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
-#include <libudev.h>
-
-static int is_master(int fd)
-{
-	drm_client_t client;
-	int ret;
-
-	/* Check that we're the only opener and authed. */
-	client.idx = 0;
-	ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
-	assert (ret == 0);
-	if (!client.auth)
-		return 0;
-	client.idx = 1;
-	ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
-	if (ret != -1 || errno != EINVAL)
-		return 0;
-
-	return 1;
-}
-
-/** Open the first DRM device matching the criteria */
-int drm_open_matching(const char *pci_glob, int flags, int *vendor_id, int *device_id)
-{
-	struct udev *udev;
-	struct udev_enumerate *e;
-	struct udev_device *device, *parent;
-        struct udev_list_entry *entry;
-	const char *pci_id, *path;
-        char *tmp;
-	int fd;
-
-        *vendor_id = 0;
-        *device_id = 0;
-        
-	udev = udev_new();
-	if (udev == NULL) {
-		fprintf(stderr, "failed to initialize udev context\n");
-                return -1;
-		//abort();
-	}
-
-	fd = -1;
-	e = udev_enumerate_new(udev);
-	udev_enumerate_add_match_subsystem(e, "drm");
-        udev_enumerate_scan_devices(e);
-        udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(e)) {
-		path = udev_list_entry_get_name(entry);
-		device = udev_device_new_from_syspath(udev, path);
-		parent = udev_device_get_parent(device);
-		/* Filter out KMS output devices. */
-		if (strcmp(udev_device_get_subsystem(parent), "pci") != 0)
-			continue;
-		pci_id = udev_device_get_property_value(parent, "PCI_ID");
-		if (fnmatch(pci_glob, pci_id, 0) != 0)
-			continue;
-		fd = open(udev_device_get_devnode(device), O_RDWR);
-		if (fd < 0)
-			continue;
-		if ((flags & DRM_TEST_MASTER) && !is_master(fd)) {
-			close(fd);
-			fd = -1;
-			continue;
-		}
-
-		break;
-	}
-        udev_enumerate_unref(e);
-	udev_unref(udev);
-
-        *vendor_id = (int) strtol(pci_id, &tmp, 16);
-        *device_id = (int) strtol((tmp+1), NULL, 16);
-        
-	return fd;
-}
-
-int drm_open_any(int *vendor_id, int *device_id)
-{
-        int fd = drm_open_matching("*:*", 0, vendor_id, device_id);
-
-	if (fd < 0) {
-		fprintf(stderr, "failed to open any drm device\n");
-		//abort();
-	}
-
-	return fd;
-}
-
-/**
- * Open the first DRM device we can find where we end up being the master.
- */
-int drm_open_any_master(void)
-{
-        int vendor_id, device_id;
-	int fd = drm_open_matching("*:*", DRM_TEST_MASTER, &vendor_id, &device_id);
-
-	if (fd < 0) {
-		fprintf(stderr, "failed to open any drm device\n");
-		abort();
-	}
-
-	return fd;
-
-}
diff -Nru libva-1.0.4/va/android/drmtest.h libva-1.0.1/va/android/drmtest.h
--- libva-1.0.4/va/android/drmtest.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/android/drmtest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-
-#include "xf86drm.h"
-
-#define DRM_TEST_MASTER 0x01
-
-int drm_open_any(int *vendor_id, int *device_id);
-int drm_open_any_master(void);
-int drm_open_matching(const char *pci_glob, int flags, int *vendor_id, int *device_id);
diff -Nru libva-1.0.4/va/android/Makefile.am libva-1.0.1/va/android/Makefile.am
--- libva-1.0.4/va/android/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/android/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# INTEL CONFIDENTIAL
-# Copyright 2007 Intel Corporation. All Rights Reserved.
-#
-# The source code contained or described herein and all documents related to
-# the source code ("Material") are owned by Intel Corporation or its suppliers
-# or licensors. Title to the Material remains with Intel Corporation or its
-# suppliers and licensors. The Material may contain trade secrets and
-# proprietary and confidential information of Intel Corporation and its
-# suppliers and licensors, and is protected by worldwide copyright and trade
-# secret laws and treaty provisions. No part of the Material may be used,
-# copied, reproduced, modified, published, uploaded, posted, transmitted,
-# distributed, or disclosed in any way without Intel's prior express written
-# permission. 
-# 
-# No license under any patent, copyright, trade secret or other intellectual
-# property right is granted to or conferred upon you by disclosure or delivery
-# of the Materials, either expressly, by implication, inducement, estoppel or
-# otherwise. Any license under such intellectual property rights must be
-# express and approved by Intel in writing.
-
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 $(DRM_CFLAGS)
-
-noinst_LTLIBRARIES = libva_dummy.la	
-
-libva_dummy_la_LIBADD = $(LIBVA_LIBS) -ldl -ludev
-
-libva_dummyincludedir = ${includedir}/va
-
-libva_dummy_la_SOURCES = va_dummy.c drmtest.c
-
diff -Nru libva-1.0.4/va/android/Makefile.in libva-1.0.1/va/android/Makefile.in
--- libva-1.0.4/va/android/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/android/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,517 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# INTEL CONFIDENTIAL
-# Copyright 2007 Intel Corporation. All Rights Reserved.
-#
-# The source code contained or described herein and all documents related to
-# the source code ("Material") are owned by Intel Corporation or its suppliers
-# or licensors. Title to the Material remains with Intel Corporation or its
-# suppliers and licensors. The Material may contain trade secrets and
-# proprietary and confidential information of Intel Corporation and its
-# suppliers and licensors, and is protected by worldwide copyright and trade
-# secret laws and treaty provisions. No part of the Material may be used,
-# copied, reproduced, modified, published, uploaded, posted, transmitted,
-# distributed, or disclosed in any way without Intel's prior express written
-# permission. 
-# 
-# No license under any patent, copyright, trade secret or other intellectual
-# property right is granted to or conferred upon you by disclosure or delivery
-# of the Materials, either expressly, by implication, inducement, estoppel or
-# otherwise. Any license under such intellectual property rights must be
-# express and approved by Intel in writing.
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = va/dummy
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libva_dummy_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libva_dummy_la_OBJECTS = va_dummy.lo drmtest.lo
-libva_dummy_la_OBJECTS = $(am_libva_dummy_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libva_dummy_la_SOURCES)
-DIST_SOURCES = $(libva_dummy_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
-GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
-LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
-LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
-LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
-LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
-LIBVA_VERSION = @LIBVA_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XFIXES_CFLAGS = @XFIXES_CFLAGS@
-XFIXES_LIBS = @XFIXES_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libvabackendlib = @libvabackendlib@
-libvacorelib = @libvacorelib@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 $(DRM_CFLAGS)
-noinst_LTLIBRARIES = libva_dummy.la	
-libva_dummy_la_LIBADD = $(LIBVA_LIBS) -ldl -ludev
-libva_dummyincludedir = ${includedir}/va
-libva_dummy_la_SOURCES = va_dummy.c drmtest.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/dummy/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu va/dummy/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libva_dummy.la: $(libva_dummy_la_OBJECTS) $(libva_dummy_la_DEPENDENCIES) 
-	$(LINK)  $(libva_dummy_la_OBJECTS) $(libva_dummy_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drmtest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dummy.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru libva-1.0.4/va/android/va_android.cpp libva-1.0.1/va/android/va_android.cpp
--- libva-1.0.4/va/android/va_android.cpp	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/android/va_android.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va.h"
-#include "va_backend.h"
-#include "va_android.h"
-#include "va_dricommon.h" /* needs some helper functions from this file */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <errno.h>
-#ifndef ANDROID
-#include <libudev.h>
-#include "drmtest.h"
-#endif
-
-#define CHECK_SYMBOL(func) { if (!func) printf("func %s not found\n", #func); return VA_STATUS_ERROR_UNKNOWN; }
-#define DEVICE_NAME "/dev/card0"
-
-static VADisplayContextP pDisplayContexts = NULL;
-
-static int open_device (char *dev_name)
-{
-    struct stat st;
-    int fd;
-
-    if (-1 == stat (dev_name, &st))
-    {
-        printf ("Cannot identify '%s': %d, %s\n",
-                dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    if (!S_ISCHR (st.st_mode))
-    {
-        printf ("%s is no device\n", dev_name);
-        return -1;
-    }
-
-    fd = open (dev_name, O_RDWR);
-
-    if (-1 == fd)
-    {
-        fprintf (stderr, "Cannot open '%s': %d, %s\n",
-                 dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    return fd;
-}
-
-static int va_DisplayContextIsValid (
-    VADisplayContextP pDisplayContext
-                                  )
-{
-    VADisplayContextP ctx = pDisplayContexts;
-
-    while (ctx)
-    {
-	if (ctx == pDisplayContext && pDisplayContext->pDriverContext)
-	    return 1;
-	ctx = ctx->pNext;
-    }
-    return 0;
-}
-
-static void va_DisplayContextDestroy (
-    VADisplayContextP pDisplayContext
-)
-{
-    VADisplayContextP *ctx = &pDisplayContexts;
-
-    /* Throw away pDisplayContext */
-    while (*ctx)
-    {
-	if (*ctx == pDisplayContext)
-	{
-	    *ctx = pDisplayContext->pNext;
-	    pDisplayContext->pNext = NULL;
-	    break;
-	}
-	ctx = &((*ctx)->pNext);
-    }
-    free(pDisplayContext->pDriverContext->dri_state);
-    free(pDisplayContext->pDriverContext);
-    free(pDisplayContext);
-}
-
-#ifdef ANDROID
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = open_device(DEVICE_NAME);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-
-    /* TBD: other vendor driver names */
-    vendor_id = devices[0].vendor_id;
-    device_id = devices[0].device_id;
-    *driver_name = strdup(devices[0].driver_name);
-        
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#else
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    int i = 0;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = drm_open_any(&vendor_id, &device_id);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-    
-    /* TBD: other vendor driver names */
-
-    while (devices[i].device_id != 0) {
-        if ((devices[i].vendor_id == vendor_id) &&
-            (devices[i].device_id == device_id))
-            break;
-        i++;
-    }
-
-    if (devices[i].device_id != 0)
-        *driver_name = strdup(devices[i].driver_name);
-    else {
-        fprintf(stderr,"device (0x%04x:0x%04x) is not supported\n",
-                vendor_id, device_id);
-        
-        return VA_STATUS_ERROR_UNKNOWN;
-    }            
-
-    printf("DRM device is opened, loading driver %s for device 0x%04x:0x%04x\n",
-           driver_name, vendor_id, device_id);
-    
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#endif
-
-VADisplay vaGetDisplay (
-    void *native_dpy /* implementation specific */
-)
-{
-    VADisplay dpy = NULL;
-    VADisplayContextP pDisplayContext = pDisplayContexts;
-
-    if (!native_dpy)
-        return NULL;
-
-    while (pDisplayContext)
-    {
-        if (pDisplayContext->pDriverContext &&
-            pDisplayContext->pDriverContext->native_dpy == (void *)native_dpy)
-        {
-            dpy = (VADisplay)pDisplayContext;
-            break;
-        }
-        pDisplayContext = pDisplayContext->pNext;
-    }
-
-
-    if (!dpy)
-    {
-        /* create new entry */
-        VADriverContextP pDriverContext;
-        struct dri_state *dri_state;
-        pDisplayContext = (VADisplayContextP)calloc(1, sizeof(*pDisplayContext));
-        pDriverContext  = (VADriverContextP)calloc(1, sizeof(*pDriverContext));
-        dri_state       = (struct dri_state*)calloc(1, sizeof(*dri_state));
-        if (pDisplayContext && pDriverContext && dri_state)
-        {
-            pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
-
-            pDriverContext->native_dpy       = (void *)native_dpy;
-            pDisplayContext->pNext           = pDisplayContexts;
-            pDisplayContext->pDriverContext  = pDriverContext;
-            pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
-            pDisplayContext->vaDestroy       = va_DisplayContextDestroy;
-            pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
-            pDisplayContexts                 = pDisplayContext;
-            pDriverContext->dri_state 	   = dri_state;
-            dpy                              = (VADisplay)pDisplayContext;
-        }
-        else
-        {
-            if (pDisplayContext)
-                free(pDisplayContext);
-            if (pDriverContext)
-                free(pDriverContext);
-            if (dri_state)
-                free(dri_state);
-        }
-    }
-  
-    return dpy;
-}
-
-#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
-#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-
-
-#ifdef ANDROID
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,
-    sp<ISurface> draw, /* Android Surface/Window */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-)
-{
-    VADriverContextP ctx;
-
-    CHECK_DISPLAY(dpy);
-    ctx = CTX(dpy);
-    return ctx->vtable.vaPutSurface( ctx, surface, static_cast<void*>(&draw), srcx, srcy, srcw, srch, 
-                                     destx, desty, destw, desth,
-                                     cliprects, number_cliprects, flags );
-}
-#endif
diff -Nru libva-1.0.4/va/android/va_dummy.c libva-1.0.1/va/android/va_dummy.c
--- libva-1.0.4/va/android/va_dummy.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/android/va_dummy.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va.h"
-#include "va_backend.h"
-#include "va_android.h"
-#include "va_dricommon.h" /* needs some helper functions from this file */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <errno.h>
-#ifndef ANDROID
-#include <libudev.h>
-#include "drmtest.h"
-#endif
-
-#define CHECK_SYMBOL(func) { if (!func) printf("func %s not found\n", #func); return VA_STATUS_ERROR_UNKNOWN; }
-#define DEVICE_NAME "/dev/card0"
-
-static VADisplayContextP pDisplayContexts = NULL;
-
-static int open_device (char *dev_name)
-{
-    struct stat st;
-    int fd;
-
-    if (-1 == stat (dev_name, &st))
-    {
-        printf ("Cannot identify '%s': %d, %s\n",
-                dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    if (!S_ISCHR (st.st_mode))
-    {
-        printf ("%s is no device\n", dev_name);
-        return -1;
-    }
-
-    fd = open (dev_name, O_RDWR);
-
-    if (-1 == fd)
-    {
-        fprintf (stderr, "Cannot open '%s': %d, %s\n",
-                 dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    return fd;
-}
-
-static int va_DisplayContextIsValid (
-    VADisplayContextP pDisplayContext
-                                  )
-{
-    VADisplayContextP ctx = pDisplayContexts;
-
-    while (ctx)
-    {
-	if (ctx == pDisplayContext && pDisplayContext->pDriverContext)
-	    return 1;
-	ctx = ctx->pNext;
-    }
-    return 0;
-}
-
-static void va_DisplayContextDestroy (
-    VADisplayContextP pDisplayContext
-)
-{
-    VADisplayContextP *ctx = &pDisplayContexts;
-
-    /* Throw away pDisplayContext */
-    while (*ctx)
-    {
-	if (*ctx == pDisplayContext)
-	{
-	    *ctx = pDisplayContext->pNext;
-	    pDisplayContext->pNext = NULL;
-	    break;
-	}
-	ctx = &((*ctx)->pNext);
-    }
-    free(pDisplayContext->pDriverContext->dri_state);
-    free(pDisplayContext->pDriverContext);
-    free(pDisplayContext);
-}
-
-#ifdef ANDROID
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = open_device(DEVICE_NAME);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-
-    /* TBD: other vendor driver names */
-    vendor_id = devices[0].vendor_id;
-    device_id = devices[0].device_id;
-    *driver_name = strdup(devices[0].driver_name);
-        
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#else
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    int i = 0;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = drm_open_any(&vendor_id, &device_id);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-    
-    /* TBD: other vendor driver names */
-
-    while (devices[i].device_id != 0) {
-        if ((devices[i].vendor_id == vendor_id) &&
-            (devices[i].device_id == device_id))
-            break;
-        i++;
-    }
-
-    if (devices[i].device_id != 0)
-        *driver_name = strdup(devices[i].driver_name);
-    else {
-        fprintf(stderr,"device (0x%04x:0x%04x) is not supported\n",
-                vendor_id, device_id);
-        
-        return VA_STATUS_ERROR_UNKNOWN;
-    }            
-
-    printf("DRM device is opened, loading driver %s for device 0x%04x:0x%04x\n",
-           driver_name, vendor_id, device_id);
-    
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#endif
-
-VADisplay vaGetDisplay (
-    void *native_dpy /* implementation specific */
-)
-{
-    VADisplay dpy = NULL;
-    VADisplayContextP pDisplayContext = pDisplayContexts;
-
-    if (!native_dpy)
-        return NULL;
-
-    while (pDisplayContext)
-    {
-        if (pDisplayContext->pDriverContext &&
-            pDisplayContext->pDriverContext->native_dpy == (void *)native_dpy)
-        {
-            dpy = (VADisplay)pDisplayContext;
-            break;
-        }
-        pDisplayContext = pDisplayContext->pNext;
-    }
-
-
-    if (!dpy)
-    {
-        /* create new entry */
-        VADriverContextP pDriverContext;
-        struct dri_state *dri_state;
-        pDisplayContext = (VADisplayContextP)calloc(1, sizeof(*pDisplayContext));
-        pDriverContext  = (VADriverContextP)calloc(1, sizeof(*pDriverContext));
-        dri_state       = (struct dri_state*)calloc(1, sizeof(*dri_state));
-        if (pDisplayContext && pDriverContext && dri_state)
-        {
-            pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
-
-            pDriverContext->native_dpy       = (void *)native_dpy;
-            pDisplayContext->pNext           = pDisplayContexts;
-            pDisplayContext->pDriverContext  = pDriverContext;
-            pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
-            pDisplayContext->vaDestroy       = va_DisplayContextDestroy;
-            pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
-            pDisplayContexts                 = pDisplayContext;
-            pDriverContext->dri_state 	   = dri_state;
-            dpy                              = (VADisplay)pDisplayContext;
-        }
-        else
-        {
-            if (pDisplayContext)
-                free(pDisplayContext);
-            if (pDriverContext)
-                free(pDriverContext);
-            if (dri_state)
-                free(dri_state);
-        }
-    }
-  
-    return dpy;
-}
-
-#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
-#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-
-
-#ifdef ANDROID
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,
-    sp<ISurface> draw, /* Android Surface/Window */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-)
-{
-    VADriverContextP ctx;
-
-    CHECK_DISPLAY(dpy);
-    ctx = CTX(dpy);
-    return ctx->vtable.vaPutSurface( ctx, surface, static_cast<void*>(&draw), srcx, srcy, srcw, srch, 
-                                     destx, desty, destw, desth,
-                                     cliprects, number_cliprects, flags );
-}
-#endif
diff -Nru libva-1.0.4/va/Android.mk libva-1.0.1/va/Android.mk
--- libva-1.0.4/va/Android.mk	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/Android.mk	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-# For libva
-# =====================================================
-
-LOCAL_PATH:= $(call my-dir)
-
-LIBVA_DRIVERS_PATH = /system/lib
-
-include $(CLEAR_VARS)
-
-#LIBVA_MINOR_VERSION := 31
-#LIBVA_MAJOR_VERSION := 0 
-
-LOCAL_SRC_FILES := \
-	va.c \
-	va_trace.c \
-
-LOCAL_CFLAGS += \
-	-DANDROID \
-	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
-
-LOCAL_C_INCLUDES += \
-	$(TARGET_OUT_HEADERS)/libva \
-	$(LOCAL_PATH)/x11 \
-	$(LOCAL_PATH)/..
-
-LOCAL_COPY_HEADERS := \
-	va.h \
-	va_version.h \
-	va_backend.h \
-	va_version.h.in \
-	x11/va_dricommon.h 
-
-LOCAL_COPY_HEADERS_TO := libva/va
-
-LOCAL_MODULE := libva
-
-LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-# For libva-android
-# =====================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	android/va_android.cpp
-
-LOCAL_CFLAGS += \
-	-DANDROID 
-
-LOCAL_C_INCLUDES += \
-	$(TARGET_OUT_HEADERS)/libva \
-	$(LOCAL_PATH)/x11
-
-LOCAL_COPY_HEADERS_TO := libva/va
-
-LOCAL_COPY_HEADERS := va_android.h		
-
-LOCAL_MODULE := libva-android
-
-LOCAL_SHARED_LIBRARIES := libva
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-# For libva-tpi
-# =====================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := va_tpi.c
-
-LOCAL_CFLAGS += -DANDROID
-
-LOCAL_C_INCLUDES += \
-	$(TARGET_OUT_HEADERS)/libva \
-	$(LOCAL_PATH)/..
-
-LOCAL_COPY_HEADERS_TO := libva/va
-
-LOCAL_COPY_HEADERS := \
-	va_tpi.h \
-	va_backend_tpi.h
-
-LOCAL_SHARED_LIBRARIES := libva
-
-LOCAL_MODULE := libva-tpi
-
-include $(BUILD_SHARED_LIBRARY)
diff -Nru libva-1.0.4/va/dummy/drmtest.c libva-1.0.1/va/dummy/drmtest.c
--- libva-1.0.4/va/dummy/drmtest.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/dummy/drmtest.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <string.h>
-#include <fcntl.h>
-#include <fnmatch.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include "drmtest.h"
-
-#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
-#include <libudev.h>
-
-static int is_master(int fd)
-{
-	drm_client_t client;
-	int ret;
-
-	/* Check that we're the only opener and authed. */
-	client.idx = 0;
-	ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
-	assert (ret == 0);
-	if (!client.auth)
-		return 0;
-	client.idx = 1;
-	ret = ioctl(fd, DRM_IOCTL_GET_CLIENT, &client);
-	if (ret != -1 || errno != EINVAL)
-		return 0;
-
-	return 1;
-}
-
-/** Open the first DRM device matching the criteria */
-int drm_open_matching(const char *pci_glob, int flags, int *vendor_id, int *device_id)
-{
-	struct udev *udev;
-	struct udev_enumerate *e;
-	struct udev_device *device, *parent;
-        struct udev_list_entry *entry;
-	const char *pci_id, *path;
-        char *tmp;
-	int fd;
-
-        *vendor_id = 0;
-        *device_id = 0;
-        
-	udev = udev_new();
-	if (udev == NULL) {
-		fprintf(stderr, "failed to initialize udev context\n");
-                return -1;
-		//abort();
-	}
-
-	fd = -1;
-	e = udev_enumerate_new(udev);
-	udev_enumerate_add_match_subsystem(e, "drm");
-        udev_enumerate_scan_devices(e);
-        udev_list_entry_foreach(entry, udev_enumerate_get_list_entry(e)) {
-		path = udev_list_entry_get_name(entry);
-		device = udev_device_new_from_syspath(udev, path);
-		parent = udev_device_get_parent(device);
-		/* Filter out KMS output devices. */
-		if (strcmp(udev_device_get_subsystem(parent), "pci") != 0)
-			continue;
-		pci_id = udev_device_get_property_value(parent, "PCI_ID");
-		if (fnmatch(pci_glob, pci_id, 0) != 0)
-			continue;
-		fd = open(udev_device_get_devnode(device), O_RDWR);
-		if (fd < 0)
-			continue;
-		if ((flags & DRM_TEST_MASTER) && !is_master(fd)) {
-			close(fd);
-			fd = -1;
-			continue;
-		}
-
-		break;
-	}
-        udev_enumerate_unref(e);
-	udev_unref(udev);
-
-        *vendor_id = (int) strtol(pci_id, &tmp, 16);
-        *device_id = (int) strtol((tmp+1), NULL, 16);
-        
-	return fd;
-}
-
-int drm_open_any(int *vendor_id, int *device_id)
-{
-        int fd = drm_open_matching("*:*", 0, vendor_id, device_id);
-
-	if (fd < 0) {
-		fprintf(stderr, "failed to open any drm device\n");
-		//abort();
-	}
-
-	return fd;
-}
-
-/**
- * Open the first DRM device we can find where we end up being the master.
- */
-int drm_open_any_master(void)
-{
-        int vendor_id, device_id;
-	int fd = drm_open_matching("*:*", DRM_TEST_MASTER, &vendor_id, &device_id);
-
-	if (fd < 0) {
-		fprintf(stderr, "failed to open any drm device\n");
-		abort();
-	}
-
-	return fd;
-
-}
diff -Nru libva-1.0.4/va/dummy/drmtest.h libva-1.0.1/va/dummy/drmtest.h
--- libva-1.0.4/va/dummy/drmtest.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/dummy/drmtest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2007 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-
-#include "xf86drm.h"
-
-#define DRM_TEST_MASTER 0x01
-
-int drm_open_any(int *vendor_id, int *device_id);
-int drm_open_any_master(void);
-int drm_open_matching(const char *pci_glob, int flags, int *vendor_id, int *device_id);
diff -Nru libva-1.0.4/va/dummy/Makefile.am libva-1.0.1/va/dummy/Makefile.am
--- libva-1.0.4/va/dummy/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/dummy/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# INTEL CONFIDENTIAL
-# Copyright 2007 Intel Corporation. All Rights Reserved.
-#
-# The source code contained or described herein and all documents related to
-# the source code ("Material") are owned by Intel Corporation or its suppliers
-# or licensors. Title to the Material remains with Intel Corporation or its
-# suppliers and licensors. The Material may contain trade secrets and
-# proprietary and confidential information of Intel Corporation and its
-# suppliers and licensors, and is protected by worldwide copyright and trade
-# secret laws and treaty provisions. No part of the Material may be used,
-# copied, reproduced, modified, published, uploaded, posted, transmitted,
-# distributed, or disclosed in any way without Intel's prior express written
-# permission. 
-# 
-# No license under any patent, copyright, trade secret or other intellectual
-# property right is granted to or conferred upon you by disclosure or delivery
-# of the Materials, either expressly, by implication, inducement, estoppel or
-# otherwise. Any license under such intellectual property rights must be
-# express and approved by Intel in writing.
-
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 $(DRM_CFLAGS)
-
-noinst_LTLIBRARIES = libva_dummy.la	
-
-libva_dummy_la_LIBADD = $(LIBVA_LIBS) -ldl -ludev
-
-libva_dummyincludedir = ${includedir}/va
-
-libva_dummy_la_SOURCES = va_dummy.c drmtest.c
-
diff -Nru libva-1.0.4/va/dummy/Makefile.in libva-1.0.1/va/dummy/Makefile.in
--- libva-1.0.4/va/dummy/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/dummy/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,517 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# INTEL CONFIDENTIAL
-# Copyright 2007 Intel Corporation. All Rights Reserved.
-#
-# The source code contained or described herein and all documents related to
-# the source code ("Material") are owned by Intel Corporation or its suppliers
-# or licensors. Title to the Material remains with Intel Corporation or its
-# suppliers and licensors. The Material may contain trade secrets and
-# proprietary and confidential information of Intel Corporation and its
-# suppliers and licensors, and is protected by worldwide copyright and trade
-# secret laws and treaty provisions. No part of the Material may be used,
-# copied, reproduced, modified, published, uploaded, posted, transmitted,
-# distributed, or disclosed in any way without Intel's prior express written
-# permission. 
-# 
-# No license under any patent, copyright, trade secret or other intellectual
-# property right is granted to or conferred upon you by disclosure or delivery
-# of the Materials, either expressly, by implication, inducement, estoppel or
-# otherwise. Any license under such intellectual property rights must be
-# express and approved by Intel in writing.
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = va/dummy
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libva_dummy_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libva_dummy_la_OBJECTS = va_dummy.lo drmtest.lo
-libva_dummy_la_OBJECTS = $(am_libva_dummy_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libva_dummy_la_SOURCES)
-DIST_SOURCES = $(libva_dummy_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
-GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
-LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
-LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
-LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
-LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
-LIBVA_VERSION = @LIBVA_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XFIXES_CFLAGS = @XFIXES_CFLAGS@
-XFIXES_LIBS = @XFIXES_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libvabackendlib = @libvabackendlib@
-libvacorelib = @libvacorelib@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11 $(DRM_CFLAGS)
-noinst_LTLIBRARIES = libva_dummy.la	
-libva_dummy_la_LIBADD = $(LIBVA_LIBS) -ldl -ludev
-libva_dummyincludedir = ${includedir}/va
-libva_dummy_la_SOURCES = va_dummy.c drmtest.c
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/dummy/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu va/dummy/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libva_dummy.la: $(libva_dummy_la_OBJECTS) $(libva_dummy_la_DEPENDENCIES) 
-	$(LINK)  $(libva_dummy_la_OBJECTS) $(libva_dummy_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drmtest.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dummy.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru libva-1.0.4/va/dummy/va_android.cpp libva-1.0.1/va/dummy/va_android.cpp
--- libva-1.0.4/va/dummy/va_android.cpp	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/dummy/va_android.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va.h"
-#include "va_backend.h"
-#include "va_android.h"
-#include "va_dricommon.h" /* needs some helper functions from this file */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <errno.h>
-#ifndef ANDROID
-#include <libudev.h>
-#include "drmtest.h"
-#endif
-
-#define CHECK_SYMBOL(func) { if (!func) printf("func %s not found\n", #func); return VA_STATUS_ERROR_UNKNOWN; }
-#define DEVICE_NAME "/dev/card0"
-
-static VADisplayContextP pDisplayContexts = NULL;
-
-static int open_device (char *dev_name)
-{
-    struct stat st;
-    int fd;
-
-    if (-1 == stat (dev_name, &st))
-    {
-        printf ("Cannot identify '%s': %d, %s\n",
-                dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    if (!S_ISCHR (st.st_mode))
-    {
-        printf ("%s is no device\n", dev_name);
-        return -1;
-    }
-
-    fd = open (dev_name, O_RDWR);
-
-    if (-1 == fd)
-    {
-        fprintf (stderr, "Cannot open '%s': %d, %s\n",
-                 dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    return fd;
-}
-
-static int va_DisplayContextIsValid (
-    VADisplayContextP pDisplayContext
-                                  )
-{
-    VADisplayContextP ctx = pDisplayContexts;
-
-    while (ctx)
-    {
-	if (ctx == pDisplayContext && pDisplayContext->pDriverContext)
-	    return 1;
-	ctx = ctx->pNext;
-    }
-    return 0;
-}
-
-static void va_DisplayContextDestroy (
-    VADisplayContextP pDisplayContext
-)
-{
-    VADisplayContextP *ctx = &pDisplayContexts;
-
-    /* Throw away pDisplayContext */
-    while (*ctx)
-    {
-	if (*ctx == pDisplayContext)
-	{
-	    *ctx = pDisplayContext->pNext;
-	    pDisplayContext->pNext = NULL;
-	    break;
-	}
-	ctx = &((*ctx)->pNext);
-    }
-    free(pDisplayContext->pDriverContext->dri_state);
-    free(pDisplayContext->pDriverContext);
-    free(pDisplayContext);
-}
-
-#ifdef ANDROID
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = open_device(DEVICE_NAME);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-
-    /* TBD: other vendor driver names */
-    vendor_id = devices[0].vendor_id;
-    device_id = devices[0].device_id;
-    *driver_name = strdup(devices[0].driver_name);
-        
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#else
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    int i = 0;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = drm_open_any(&vendor_id, &device_id);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-    
-    /* TBD: other vendor driver names */
-
-    while (devices[i].device_id != 0) {
-        if ((devices[i].vendor_id == vendor_id) &&
-            (devices[i].device_id == device_id))
-            break;
-        i++;
-    }
-
-    if (devices[i].device_id != 0)
-        *driver_name = strdup(devices[i].driver_name);
-    else {
-        fprintf(stderr,"device (0x%04x:0x%04x) is not supported\n",
-                vendor_id, device_id);
-        
-        return VA_STATUS_ERROR_UNKNOWN;
-    }            
-
-    printf("DRM device is opened, loading driver %s for device 0x%04x:0x%04x\n",
-           driver_name, vendor_id, device_id);
-    
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#endif
-
-VADisplay vaGetDisplay (
-    void *native_dpy /* implementation specific */
-)
-{
-    VADisplay dpy = NULL;
-    VADisplayContextP pDisplayContext = pDisplayContexts;
-
-    if (!native_dpy)
-        return NULL;
-
-    while (pDisplayContext)
-    {
-        if (pDisplayContext->pDriverContext &&
-            pDisplayContext->pDriverContext->native_dpy == (void *)native_dpy)
-        {
-            dpy = (VADisplay)pDisplayContext;
-            break;
-        }
-        pDisplayContext = pDisplayContext->pNext;
-    }
-
-
-    if (!dpy)
-    {
-        /* create new entry */
-        VADriverContextP pDriverContext;
-        struct dri_state *dri_state;
-        pDisplayContext = (VADisplayContextP)calloc(1, sizeof(*pDisplayContext));
-        pDriverContext  = (VADriverContextP)calloc(1, sizeof(*pDriverContext));
-        dri_state       = (struct dri_state*)calloc(1, sizeof(*dri_state));
-        if (pDisplayContext && pDriverContext && dri_state)
-        {
-            pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
-
-            pDriverContext->native_dpy       = (void *)native_dpy;
-            pDisplayContext->pNext           = pDisplayContexts;
-            pDisplayContext->pDriverContext  = pDriverContext;
-            pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
-            pDisplayContext->vaDestroy       = va_DisplayContextDestroy;
-            pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
-            pDisplayContexts                 = pDisplayContext;
-            pDriverContext->dri_state 	   = dri_state;
-            dpy                              = (VADisplay)pDisplayContext;
-        }
-        else
-        {
-            if (pDisplayContext)
-                free(pDisplayContext);
-            if (pDriverContext)
-                free(pDriverContext);
-            if (dri_state)
-                free(dri_state);
-        }
-    }
-  
-    return dpy;
-}
-
-#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
-#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-
-
-#ifdef ANDROID
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,
-    sp<ISurface> draw, /* Android Surface/Window */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-)
-{
-    VADriverContextP ctx;
-
-    CHECK_DISPLAY(dpy);
-    ctx = CTX(dpy);
-    return ctx->vtable.vaPutSurface( ctx, surface, static_cast<void*>(&draw), srcx, srcy, srcw, srch, 
-                                     destx, desty, destw, desth,
-                                     cliprects, number_cliprects, flags );
-}
-#endif
diff -Nru libva-1.0.4/va/dummy/va_dummy.c libva-1.0.1/va/dummy/va_dummy.c
--- libva-1.0.4/va/dummy/va_dummy.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/dummy/va_dummy.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,300 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va.h"
-#include "va_backend.h"
-#include "va_android.h"
-#include "va_dricommon.h" /* needs some helper functions from this file */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dlfcn.h>
-#include <errno.h>
-#ifndef ANDROID
-#include <libudev.h>
-#include "drmtest.h"
-#endif
-
-#define CHECK_SYMBOL(func) { if (!func) printf("func %s not found\n", #func); return VA_STATUS_ERROR_UNKNOWN; }
-#define DEVICE_NAME "/dev/card0"
-
-static VADisplayContextP pDisplayContexts = NULL;
-
-static int open_device (char *dev_name)
-{
-    struct stat st;
-    int fd;
-
-    if (-1 == stat (dev_name, &st))
-    {
-        printf ("Cannot identify '%s': %d, %s\n",
-                dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    if (!S_ISCHR (st.st_mode))
-    {
-        printf ("%s is no device\n", dev_name);
-        return -1;
-    }
-
-    fd = open (dev_name, O_RDWR);
-
-    if (-1 == fd)
-    {
-        fprintf (stderr, "Cannot open '%s': %d, %s\n",
-                 dev_name, errno, strerror (errno));
-        return -1;
-    }
-
-    return fd;
-}
-
-static int va_DisplayContextIsValid (
-    VADisplayContextP pDisplayContext
-                                  )
-{
-    VADisplayContextP ctx = pDisplayContexts;
-
-    while (ctx)
-    {
-	if (ctx == pDisplayContext && pDisplayContext->pDriverContext)
-	    return 1;
-	ctx = ctx->pNext;
-    }
-    return 0;
-}
-
-static void va_DisplayContextDestroy (
-    VADisplayContextP pDisplayContext
-)
-{
-    VADisplayContextP *ctx = &pDisplayContexts;
-
-    /* Throw away pDisplayContext */
-    while (*ctx)
-    {
-	if (*ctx == pDisplayContext)
-	{
-	    *ctx = pDisplayContext->pNext;
-	    pDisplayContext->pNext = NULL;
-	    break;
-	}
-	ctx = &((*ctx)->pNext);
-    }
-    free(pDisplayContext->pDriverContext->dri_state);
-    free(pDisplayContext->pDriverContext);
-    free(pDisplayContext);
-}
-
-#ifdef ANDROID
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = open_device(DEVICE_NAME);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-
-    /* TBD: other vendor driver names */
-    vendor_id = devices[0].vendor_id;
-    device_id = devices[0].device_id;
-    *driver_name = strdup(devices[0].driver_name);
-        
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#else
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    char *driver_name_env;
-    int vendor_id, device_id;
-    int i = 0;
-    
-    struct {
-        int vendor_id;
-        int device_id;
-        char driver_name[64];
-    } devices[] = {
-        { 0x8086, 0x4100, "pvr" },
-        { 0x8086, 0x0130, "pvr" },
-        { 0x0,    0x0,    "\0" },
-    };
-
-    memset(dri_state, 0, sizeof(*dri_state));
-    dri_state->fd = drm_open_any(&vendor_id, &device_id);
-    
-    if (dri_state->fd < 0) {
-        fprintf(stderr,"can't open DRM devices\n");
-        return VA_STATUS_ERROR_UNKNOWN;
-    }
-    
-    /* TBD: other vendor driver names */
-
-    while (devices[i].device_id != 0) {
-        if ((devices[i].vendor_id == vendor_id) &&
-            (devices[i].device_id == device_id))
-            break;
-        i++;
-    }
-
-    if (devices[i].device_id != 0)
-        *driver_name = strdup(devices[i].driver_name);
-    else {
-        fprintf(stderr,"device (0x%04x:0x%04x) is not supported\n",
-                vendor_id, device_id);
-        
-        return VA_STATUS_ERROR_UNKNOWN;
-    }            
-
-    printf("DRM device is opened, loading driver %s for device 0x%04x:0x%04x\n",
-           driver_name, vendor_id, device_id);
-    
-    dri_state->driConnectedFlag = VA_DUMMY;
-    
-    return VA_STATUS_SUCCESS;
-}
-#endif
-
-VADisplay vaGetDisplay (
-    void *native_dpy /* implementation specific */
-)
-{
-    VADisplay dpy = NULL;
-    VADisplayContextP pDisplayContext = pDisplayContexts;
-
-    if (!native_dpy)
-        return NULL;
-
-    while (pDisplayContext)
-    {
-        if (pDisplayContext->pDriverContext &&
-            pDisplayContext->pDriverContext->native_dpy == (void *)native_dpy)
-        {
-            dpy = (VADisplay)pDisplayContext;
-            break;
-        }
-        pDisplayContext = pDisplayContext->pNext;
-    }
-
-
-    if (!dpy)
-    {
-        /* create new entry */
-        VADriverContextP pDriverContext;
-        struct dri_state *dri_state;
-        pDisplayContext = (VADisplayContextP)calloc(1, sizeof(*pDisplayContext));
-        pDriverContext  = (VADriverContextP)calloc(1, sizeof(*pDriverContext));
-        dri_state       = (struct dri_state*)calloc(1, sizeof(*dri_state));
-        if (pDisplayContext && pDriverContext && dri_state)
-        {
-            pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
-
-            pDriverContext->native_dpy       = (void *)native_dpy;
-            pDisplayContext->pNext           = pDisplayContexts;
-            pDisplayContext->pDriverContext  = pDriverContext;
-            pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
-            pDisplayContext->vaDestroy       = va_DisplayContextDestroy;
-            pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
-            pDisplayContexts                 = pDisplayContext;
-            pDriverContext->dri_state 	   = dri_state;
-            dpy                              = (VADisplay)pDisplayContext;
-        }
-        else
-        {
-            if (pDisplayContext)
-                free(pDisplayContext);
-            if (pDriverContext)
-                free(pDriverContext);
-            if (dri_state)
-                free(dri_state);
-        }
-    }
-  
-    return dpy;
-}
-
-#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
-#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-
-
-#ifdef ANDROID
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,
-    sp<ISurface> draw, /* Android Surface/Window */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-)
-{
-    VADriverContextP ctx;
-
-    CHECK_DISPLAY(dpy);
-    ctx = CTX(dpy);
-    return ctx->vtable.vaPutSurface( ctx, surface, static_cast<void*>(&draw), srcx, srcy, srcw, srch, 
-                                     destx, desty, destw, desth,
-                                     cliprects, number_cliprects, flags );
-}
-#endif
diff -Nru libva-1.0.4/va/glx/Makefile.am libva-1.0.1/va/glx/Makefile.am
--- libva-1.0.4/va/glx/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-# Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sub license, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice (including the
-# next paragraph) shall be included in all copies or substantial portions
-# of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
-
-source_c = \
-	va_glx.c		\
-	va_glx_impl.c
-
-source_h = \
-	va_glx.h		\
-	va_backend_glx.h
-
-source_h_priv = \
-	va_glx_impl.h		\
-	va_glx_private.h
-
-noinst_LTLIBRARIES	 = libva_glx.la
-libva_glxincludedir	 = ${includedir}/va
-libva_glxinclude_HEADERS = $(source_h)
-libva_glx_la_SOURCES	 = $(source_c)
-noinst_HEADERS		 = $(source_h_priv)
diff -Nru libva-1.0.4/va/glx/Makefile.in libva-1.0.1/va/glx/Makefile.in
--- libva-1.0.4/va/glx/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,581 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sub license, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice (including the
-# next paragraph) shall be included in all copies or substantial portions
-# of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = va/glx
-DIST_COMMON = $(libva_glxinclude_HEADERS) $(noinst_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libva_glx_la_LIBADD =
-am__objects_1 = va_glx.lo va_glx_impl.lo
-am_libva_glx_la_OBJECTS = $(am__objects_1)
-libva_glx_la_OBJECTS = $(am_libva_glx_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libva_glx_la_SOURCES)
-DIST_SOURCES = $(libva_glx_la_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libva_glxincludedir)"
-HEADERS = $(libva_glxinclude_HEADERS) $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
-GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
-LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
-LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
-LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
-LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
-LIBVA_VERSION = @LIBVA_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XFIXES_CFLAGS = @XFIXES_CFLAGS@
-XFIXES_LIBS = @XFIXES_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libvabackendlib = @libvabackendlib@
-libvacorelib = @libvacorelib@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
-source_c = \
-	va_glx.c		\
-	va_glx_impl.c
-
-source_h = \
-	va_glx.h		\
-	va_backend_glx.h
-
-source_h_priv = \
-	va_glx_impl.h		\
-	va_glx_private.h
-
-noinst_LTLIBRARIES = libva_glx.la
-libva_glxincludedir = ${includedir}/va
-libva_glxinclude_HEADERS = $(source_h)
-libva_glx_la_SOURCES = $(source_c)
-noinst_HEADERS = $(source_h_priv)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/glx/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu va/glx/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libva_glx.la: $(libva_glx_la_OBJECTS) $(libva_glx_la_DEPENDENCIES) 
-	$(LINK)  $(libva_glx_la_OBJECTS) $(libva_glx_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_glx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_glx_impl.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-libva_glxincludeHEADERS: $(libva_glxinclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(libva_glxincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libva_glxincludedir)"
-	@list='$(libva_glxinclude_HEADERS)'; test -n "$(libva_glxincludedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libva_glxincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libva_glxincludedir)" || exit $$?; \
-	done
-
-uninstall-libva_glxincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libva_glxinclude_HEADERS)'; test -n "$(libva_glxincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libva_glxincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libva_glxincludedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(libva_glxincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-libva_glxincludeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libva_glxincludeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libva_glxincludeHEADERS install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libva_glxincludeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru libva-1.0.4/va/glx/va_backend_glx.h libva-1.0.1/va/glx/va_backend_glx.h
--- libva-1.0.4/va/glx/va_backend_glx.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/va_backend_glx.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef VA_BACKEND_GLX_H
-#define VA_BACKEND_GLX_H
-
-struct VADriverContext;
-
-struct VADriverVTableGLX {
-    /* Optional: create a surface used for display to OpenGL */
-    VAStatus (*vaCreateSurfaceGLX)(
-        struct VADriverContext *ctx,
-        unsigned int            gl_target,
-        unsigned int            gl_texture,
-        void                  **gl_surface
-    );
-
-    /* Optional: destroy a VA/GLX surface */
-    VAStatus (*vaDestroySurfaceGLX)(
-        struct VADriverContext *ctx,
-        void                   *gl_surface
-    );
-
-    /* Optional: copy a VA surface to a VA/GLX surface */
-    VAStatus (*vaCopySurfaceGLX)(
-        struct VADriverContext *ctx,
-        void                   *gl_surface,
-        VASurfaceID             surface,
-        unsigned int            flags
-    );
-};
-
-#endif /* VA_BACKEND_GLX_H */
diff -Nru libva-1.0.4/va/glx/va_glx.c libva-1.0.1/va/glx/va_glx.c
--- libva-1.0.4/va/glx/va_glx.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/va_glx.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include "va_glx_private.h"
-#include "va_glx_impl.h"
-
-#define INIT_CONTEXT(ctx, dpy) do {                             \
-        if (!vaDisplayIsValid(dpy))                             \
-            return VA_STATUS_ERROR_INVALID_DISPLAY;             \
-                                                                \
-        ctx = ((VADisplayContextP)(dpy))->pDriverContext;       \
-        if (!(ctx))                                             \
-            return VA_STATUS_ERROR_INVALID_DISPLAY;             \
-                                                                \
-        VAStatus status = va_glx_init_context(ctx);             \
-        if (status != VA_STATUS_SUCCESS)                        \
-            return status;                                      \
-    } while (0)
-
-#define INVOKE(ctx, func, args) do {                            \
-        VADriverVTableGLXP vtable;                              \
-        vtable = &VA_DRIVER_CONTEXT_GLX(ctx)->vtable;           \
-        if (!vtable->va##func##GLX)                             \
-            return VA_STATUS_ERROR_UNIMPLEMENTED;               \
-        status = vtable->va##func##GLX args;                    \
-    } while (0)
-
-
-// Destroy VA/GLX display context
-static void va_DisplayContextDestroy(VADisplayContextP pDisplayContext)
-{
-    VADisplayContextGLXP pDisplayContextGLX;
-    VADriverContextP     pDriverContext;
-    VADriverContextGLXP  pDriverContextGLX;
-
-    if (!pDisplayContext)
-        return;
-
-    pDriverContext     = pDisplayContext->pDriverContext;
-    pDriverContextGLX  = pDriverContext->glx;
-    if (pDriverContextGLX) {
-        free(pDriverContextGLX);
-        pDriverContext->glx = NULL;
-    }
-
-    pDisplayContextGLX = pDisplayContext->opaque;
-    if (pDisplayContextGLX) {
-        vaDestroyFunc vaDestroy = pDisplayContextGLX->vaDestroy;
-        free(pDisplayContextGLX);
-        pDisplayContext->opaque = NULL;
-        if (vaDestroy)
-            vaDestroy(pDisplayContext);
-    }
-}
-
-// Return a suitable VADisplay for VA API
-VADisplay vaGetDisplayGLX(Display *native_dpy)
-{
-    VADisplay            dpy                = NULL;
-    VADisplayContextP    pDisplayContext    = NULL;
-    VADisplayContextGLXP pDisplayContextGLX = NULL;
-    VADriverContextP     pDriverContext;
-    VADriverContextGLXP  pDriverContextGLX  = NULL;
-
-    dpy = vaGetDisplay(native_dpy);
-    if (!dpy)
-        return NULL;
-    pDisplayContext = (VADisplayContextP)dpy;
-    pDriverContext  = pDisplayContext->pDriverContext;
-
-    pDisplayContextGLX = calloc(1, sizeof(*pDisplayContextGLX));
-    if (!pDisplayContextGLX)
-        goto error;
-
-    pDriverContextGLX = calloc(1, sizeof(*pDriverContextGLX));
-    if (!pDriverContextGLX)
-        goto error;
-
-    pDisplayContextGLX->vaDestroy = pDisplayContext->vaDestroy;
-    pDisplayContext->vaDestroy    = va_DisplayContextDestroy;
-    pDisplayContext->opaque       = pDisplayContextGLX;
-    pDriverContext->glx           = pDriverContextGLX;
-    return dpy;
-
-error:
-    free(pDriverContextGLX);
-    free(pDisplayContextGLX);
-    pDisplayContext->vaDestroy(pDisplayContext);
-    return NULL;
-}
-
-// Create a surface used for display to OpenGL
-VAStatus vaCreateSurfaceGLX(
-    VADisplay dpy,
-    GLenum    target,
-    GLuint    texture,
-    void    **gl_surface
-)
-{
-    VADriverContextP ctx;
-    VAStatus status;
-
-    /* Make sure it is a valid GL texture object */
-    if (!glIsTexture(texture))
-        return VA_STATUS_ERROR_INVALID_PARAMETER;
-
-    INIT_CONTEXT(ctx, dpy);
-
-    INVOKE(ctx, CreateSurface, (ctx, target, texture, gl_surface));
-    return status;
-}
-
-// Destroy a VA/GLX surface
-VAStatus vaDestroySurfaceGLX(
-    VADisplay dpy,
-    void     *gl_surface
-)
-{
-    VADriverContextP ctx;
-    VAStatus status;
-
-    INIT_CONTEXT(ctx, dpy);
-
-    INVOKE(ctx, DestroySurface, (ctx, gl_surface));
-    return status;
-}
-
-// Copy a VA surface to a VA/GLX surface
-VAStatus vaCopySurfaceGLX(
-    VADisplay    dpy,
-    void        *gl_surface,
-    VASurfaceID  surface,
-    unsigned int flags
-)
-{
-    VADriverContextP ctx;
-    VAStatus status;
-
-    INIT_CONTEXT(ctx, dpy);
-
-    INVOKE(ctx, CopySurface, (ctx, gl_surface, surface, flags));
-    return status;
-}
diff -Nru libva-1.0.4/va/glx/va_glx.h libva-1.0.1/va/glx/va_glx.h
--- libva-1.0.4/va/glx/va_glx.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/va_glx.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef VA_GLX_H
-#define VA_GLX_H
-
-#include <va/va.h>
-#include <GL/glx.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Return a suitable VADisplay for VA API
- *
- * @param[in] dpy the X11 display
- * @return a VADisplay
- */
-VADisplay vaGetDisplayGLX(
-    Display *dpy
-);
-
-/**
- * Create a surface used for display to OpenGL
- *
- * The application shall maintain the live GLX context itself.
- * Implementations are free to use glXGetCurrentContext() and
- * glXGetCurrentDrawable() functions for internal purposes.
- *
- * @param[in]  dpy        the VA display
- * @param[in]  target     the GL target to which the texture needs to be bound
- * @param[in]  texture    the GL texture
- * @param[out] gl_surface the VA/GLX surface
- * @return VA_STATUS_SUCCESS if successful
- */
-VAStatus vaCreateSurfaceGLX(
-    VADisplay dpy,
-    GLenum    target,
-    GLuint    texture,
-    void    **gl_surface
-);
-
-/**
- * Destroy a VA/GLX surface
- *
- * The application shall maintain the live GLX context itself.
- * Implementations are free to use glXGetCurrentContext() and
- * glXGetCurrentDrawable() functions for internal purposes.
- *
- * @param[in]  dpy        the VA display
- * @param[in]  gl_surface the VA surface
- * @return VA_STATUS_SUCCESS if successful
- */
-VAStatus vaDestroySurfaceGLX(
-    VADisplay dpy,
-    void     *gl_surface
-);
-
-/**
- * Copy a VA surface to a VA/GLX surface
- *
- * This function will not return until the copy is completed. At this
- * point, the underlying GL texture will contain the surface pixels
- * in an RGB format defined by the user.
- *
- * The application shall maintain the live GLX context itself.
- * Implementations are free to use glXGetCurrentContext() and
- * glXGetCurrentDrawable() functions for internal purposes.
- *
- * @param[in]  dpy        the VA display
- * @param[in]  gl_surface the VA/GLX destination surface
- * @param[in]  surface    the VA source surface
- * @param[in]  flags      the PutSurface flags
- * @return VA_STATUS_SUCCESS if successful
- */
-VAStatus vaCopySurfaceGLX(
-    VADisplay    dpy,
-    void        *gl_surface,
-    VASurfaceID  surface,
-    unsigned int flags
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* VA_GLX_H */
diff -Nru libva-1.0.4/va/glx/va_glx_impl.c libva-1.0.1/va/glx/va_glx_impl.c
--- libva-1.0.4/va/glx/va_glx_impl.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/va_glx_impl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1083 +0,0 @@
-/*
- * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va_glx_private.h"
-#include "va_glx_impl.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <assert.h>
-#include <dlfcn.h>
-
-static void va_glx_error_message(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    fprintf(stderr, "[%s] ", PACKAGE_NAME);
-    vfprintf(stderr, format, args);
-    va_end(args);
-}
-
-// X error trap
-static int x11_error_code = 0;
-static int (*old_error_handler)(Display *, XErrorEvent *);
-
-static int error_handler(Display *dpy, XErrorEvent *error)
-{
-    x11_error_code = error->error_code;
-    return 0;
-}
-
-static void x11_trap_errors(void)
-{
-    x11_error_code    = 0;
-    old_error_handler = XSetErrorHandler(error_handler);
-}
-
-static int x11_untrap_errors(void)
-{
-    XSetErrorHandler(old_error_handler);
-    return x11_error_code;
-}
-
-// Returns a string representation of an OpenGL error
-static const char *gl_get_error_string(GLenum error)
-{
-    static const struct {
-        GLenum val;
-        const char *str;
-    }
-    gl_errors[] = {
-        { GL_NO_ERROR,          "no error" },
-        { GL_INVALID_ENUM,      "invalid enumerant" },
-        { GL_INVALID_VALUE,     "invalid value" },
-        { GL_INVALID_OPERATION, "invalid operation" },
-        { GL_STACK_OVERFLOW,    "stack overflow" },
-        { GL_STACK_UNDERFLOW,   "stack underflow" },
-        { GL_OUT_OF_MEMORY,     "out of memory" },
-#ifdef GL_INVALID_FRAMEBUFFER_OPERATION_EXT
-        { GL_INVALID_FRAMEBUFFER_OPERATION_EXT, "invalid framebuffer operation" },
-#endif
-        { ~0, NULL }
-    };
-
-    int i;
-    for (i = 0; gl_errors[i].str; i++) {
-        if (gl_errors[i].val == error)
-            return gl_errors[i].str;
-    }
-    return "unknown";
-}
-
-static inline int gl_do_check_error(int report)
-{
-    GLenum error;
-    int is_error = 0;
-    while ((error = glGetError()) != GL_NO_ERROR) {
-        if (report)
-            va_glx_error_message("glError: %s caught\n",
-                                 gl_get_error_string(error));
-        is_error = 1;
-    }
-    return is_error;
-}
-
-static inline void gl_purge_errors(void)
-{
-    gl_do_check_error(0);
-}
-
-static inline int gl_check_error(void)
-{
-    return gl_do_check_error(1);
-}
-
-// glGetTexLevelParameteriv() wrapper
-static int gl_get_texture_param(GLenum param, unsigned int *pval)
-{
-    GLint val;
-
-    gl_purge_errors();
-    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, param, &val);
-    if (gl_check_error())
-        return 0;
-    if (pval)
-        *pval = val;
-    return 1;
-}
-
-// Returns the OpenGL VTable
-static inline VAOpenGLVTableP gl_get_vtable(VADriverContextP ctx)
-{
-    return &VA_DRIVER_CONTEXT_GLX(ctx)->gl_vtable;
-}
-
-// Lookup for a GLX function
-typedef void (*GLFuncPtr)(void);
-typedef GLFuncPtr (*GLXGetProcAddressProc)(const char *);
-
-static GLFuncPtr get_proc_address_default(const char *name)
-{
-    return NULL;
-}
-
-static GLXGetProcAddressProc get_proc_address_func(void)
-{
-    GLXGetProcAddressProc get_proc_func;
-
-    dlerror();
-    get_proc_func = (GLXGetProcAddressProc)
-        dlsym(RTLD_DEFAULT, "glXGetProcAddress");
-    if (!dlerror())
-        return get_proc_func;
-
-    get_proc_func = (GLXGetProcAddressProc)
-        dlsym(RTLD_DEFAULT, "glXGetProcAddressARB");
-    if (!dlerror())
-        return get_proc_func;
-
-    return get_proc_address_default;
-}
-
-static inline GLFuncPtr get_proc_address(const char *name)
-{
-    static GLXGetProcAddressProc get_proc_func = NULL;
-    if (!get_proc_func)
-        get_proc_func = get_proc_address_func();
-    return get_proc_func(name);
-}
-
-// Check for GLX extensions (TFP, FBO)
-static int check_extension(const char *name, const char *ext)
-{
-    const char *end;
-    int name_len, n;
-
-    if (!name || !ext)
-        return 0;
-
-    end = ext + strlen(ext);
-    name_len = strlen(name);
-    while (ext < end) {
-        n = strcspn(ext, " ");
-        if (n == name_len && strncmp(name, ext, n) == 0)
-            return 1;
-        ext += (n + 1);
-    }
-    return 0;
-}
-
-static int check_tfp_extensions(VADriverContextP ctx)
-{
-    const char *gl_extensions;
-    const char *glx_extensions;
-
-    gl_extensions = (const char *)glGetString(GL_EXTENSIONS);
-    if (!check_extension("GL_ARB_texture_non_power_of_two", gl_extensions))
-        return 0;
-
-    glx_extensions = glXQueryExtensionsString((Display *)ctx->native_dpy, ctx->x11_screen);
-    if (!check_extension("GLX_EXT_texture_from_pixmap", glx_extensions))
-        return 0;
-    return 1;
-}
-
-static int check_fbo_extensions(VADriverContextP ctx)
-{
-    const char *gl_extensions;
-
-    gl_extensions = (const char *)glGetString(GL_EXTENSIONS);
-    if (check_extension("GL_ARB_framebuffer_object", gl_extensions))
-        return 1;
-    if (check_extension("GL_EXT_framebuffer_object", gl_extensions))
-        return 1;
-    return 0;
-}
-
-// Load GLX extensions
-static int load_tfp_extensions(VADriverContextP ctx)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-
-    pOpenGLVTable->glx_create_pixmap = (PFNGLXCREATEPIXMAPPROC)
-        get_proc_address("glXCreatePixmap");
-    if (!pOpenGLVTable->glx_create_pixmap)
-        return 0;
-    pOpenGLVTable->glx_destroy_pixmap = (PFNGLXDESTROYPIXMAPPROC)
-        get_proc_address("glXDestroyPixmap");
-    if (!pOpenGLVTable->glx_destroy_pixmap)
-        return 0;
-    pOpenGLVTable->glx_bind_tex_image = (PFNGLXBINDTEXIMAGEEXTPROC)
-        get_proc_address("glXBindTexImageEXT");
-    if (!pOpenGLVTable->glx_bind_tex_image)
-        return 0;
-    pOpenGLVTable->glx_release_tex_image = (PFNGLXRELEASETEXIMAGEEXTPROC)
-        get_proc_address("glXReleaseTexImageEXT");
-    if (!pOpenGLVTable->glx_release_tex_image)
-        return 0;
-    return 1;
-}
-
-static int load_fbo_extensions(VADriverContextP ctx)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-
-    pOpenGLVTable->gl_gen_framebuffers = (PFNGLGENFRAMEBUFFERSEXTPROC)
-        get_proc_address("glGenFramebuffersEXT");
-    if (!pOpenGLVTable->gl_gen_framebuffers)
-        return 0;
-    pOpenGLVTable->gl_delete_framebuffers = (PFNGLDELETEFRAMEBUFFERSEXTPROC)
-        get_proc_address("glDeleteFramebuffersEXT");
-    if (!pOpenGLVTable->gl_delete_framebuffers)
-        return 0;
-    pOpenGLVTable->gl_bind_framebuffer = (PFNGLBINDFRAMEBUFFEREXTPROC)
-        get_proc_address("glBindFramebufferEXT");
-    if (!pOpenGLVTable->gl_bind_framebuffer)
-        return 0;
-    pOpenGLVTable->gl_gen_renderbuffers = (PFNGLGENRENDERBUFFERSEXTPROC)
-        get_proc_address("glGenRenderbuffersEXT");
-    if (!pOpenGLVTable->gl_gen_renderbuffers)
-        return 0;
-    pOpenGLVTable->gl_delete_renderbuffers = (PFNGLDELETERENDERBUFFERSEXTPROC)
-        get_proc_address("glDeleteRenderbuffersEXT");
-    if (!pOpenGLVTable->gl_delete_renderbuffers)
-        return 0;
-    pOpenGLVTable->gl_bind_renderbuffer = (PFNGLBINDRENDERBUFFEREXTPROC)
-        get_proc_address("glBindRenderbufferEXT");
-    if (!pOpenGLVTable->gl_bind_renderbuffer)
-        return 0;
-    pOpenGLVTable->gl_renderbuffer_storage = (PFNGLRENDERBUFFERSTORAGEEXTPROC)
-        get_proc_address("glRenderbufferStorageEXT");
-    if (!pOpenGLVTable->gl_renderbuffer_storage)
-        return 0;
-    pOpenGLVTable->gl_framebuffer_renderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)
-        get_proc_address("glFramebufferRenderbufferEXT");
-    if (!pOpenGLVTable->gl_framebuffer_renderbuffer)
-        return 0;
-    pOpenGLVTable->gl_framebuffer_texture_2d = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)
-        get_proc_address("glFramebufferTexture2DEXT");
-    if (!pOpenGLVTable->gl_framebuffer_texture_2d)
-        return 0;
-    pOpenGLVTable->gl_check_framebuffer_status = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)
-        get_proc_address("glCheckFramebufferStatusEXT");
-    if (!pOpenGLVTable->gl_check_framebuffer_status)
-        return 0;
-    return 1;
-}
-
-
-/* ========================================================================= */
-/* === VA/GLX helpers                                                    === */
-/* ========================================================================= */
-
-// OpenGL context state
-typedef struct OpenGLContextState *OpenGLContextStateP;
-
-struct OpenGLContextState {
-    Display     *display;
-    Window       window;
-    GLXContext   context;
-};
-
-static void
-gl_destroy_context(OpenGLContextStateP cs)
-{
-    if (!cs)
-        return;
-
-    if (cs->display && cs->context) {
-        if (glXGetCurrentContext() == cs->context)
-            glXMakeCurrent(cs->display, None, NULL);
-        glXDestroyContext(cs->display, cs->context);
-        cs->display = NULL;
-        cs->context = NULL;
-    }
-    free(cs);
-}
-
-static OpenGLContextStateP
-gl_create_context(VADriverContextP ctx, OpenGLContextStateP parent)
-{
-    OpenGLContextStateP cs;
-    GLXFBConfig *fbconfigs = NULL;
-    int fbconfig_id, val, n, n_fbconfigs;
-    Status status;
-
-    static GLint fbconfig_attrs[] = {
-        GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
-        GLX_RENDER_TYPE,   GLX_RGBA_BIT,
-        GLX_DOUBLEBUFFER,  True,
-        GLX_RED_SIZE,      8,
-        GLX_GREEN_SIZE,    8, 
-        GLX_BLUE_SIZE,     8,
-        None
-    };
-
-    cs = malloc(sizeof(*cs));
-    if (!cs)
-        goto error;
-
-    cs->display = (Display *)ctx->native_dpy;
-    cs->window  = parent ? parent->window : None;
-    cs->context = NULL;
-
-    if (parent && parent->context) {
-        status = glXQueryContext(
-            parent->display,
-            parent->context,
-            GLX_FBCONFIG_ID, &fbconfig_id
-        );
-        if (status != Success)
-            goto error;
-
-        if (fbconfig_id == GLX_DONT_CARE)
-            goto choose_fbconfig;
-
-        fbconfigs = glXGetFBConfigs(
-            (Display *)ctx->native_dpy,
-            ctx->x11_screen,
-            &n_fbconfigs
-        );
-        if (!fbconfigs)
-            goto error;
-
-        /* Find out a GLXFBConfig compatible with the parent context */
-        for (n = 0; n < n_fbconfigs; n++) {
-            status = glXGetFBConfigAttrib(
-                (Display *)ctx->native_dpy,
-                fbconfigs[n],
-                GLX_FBCONFIG_ID, &val
-            );
-            if (status == Success && val == fbconfig_id)
-                break;
-        }
-        if (n == n_fbconfigs)
-            goto error;
-    }
-    else {
-    choose_fbconfig:
-        fbconfigs = glXChooseFBConfig(
-            (Display *)ctx->native_dpy,
-            ctx->x11_screen,
-            fbconfig_attrs, &n_fbconfigs
-        );
-        if (!fbconfigs)
-            goto error;
-
-        /* Select the first one */
-        n = 0;
-    }
-
-    cs->context = glXCreateNewContext(
-        (Display *)ctx->native_dpy,
-        fbconfigs[n],
-        GLX_RGBA_TYPE,
-        parent ? parent->context : NULL,
-        True
-    );
-    if (cs->context)
-        goto end;
-
-error:
-    gl_destroy_context(cs);
-    cs = NULL;
-end:
-    if (fbconfigs)
-        XFree(fbconfigs);
-    return cs;
-}
-
-static void gl_get_current_context(OpenGLContextStateP cs)
-{
-    cs->display = glXGetCurrentDisplay();
-    cs->window  = glXGetCurrentDrawable();
-    cs->context = glXGetCurrentContext();
-}
-
-static int
-gl_set_current_context(OpenGLContextStateP new_cs, OpenGLContextStateP old_cs)
-{
-    /* If display is NULL, this could be that new_cs was retrieved from
-       gl_get_current_context() with none set previously. If that case,
-       the other fields are also NULL and we don't return an error */
-    if (!new_cs->display)
-        return !new_cs->window && !new_cs->context;
-
-    if (old_cs) {
-        if (old_cs == new_cs)
-            return 1;
-        gl_get_current_context(old_cs);
-        if (old_cs->display == new_cs->display &&
-            old_cs->window  == new_cs->window  &&
-            old_cs->context == new_cs->context)
-            return 1;
-    }
-    return glXMakeCurrent(new_cs->display, new_cs->window, new_cs->context);
-}
-
-/** Unique VASurfaceGLX identifier */
-#define VA_SURFACE_GLX_MAGIC VA_FOURCC('V','A','G','L')
-
-struct VASurfaceGLX {
-    uint32_t            magic;      ///< Magic number identifying a VASurfaceGLX
-    GLenum              target;     ///< GL target to which the texture is bound
-    GLuint              texture;    ///< GL texture
-    VASurfaceID         surface;    ///< Associated VA surface
-    unsigned int        width;
-    unsigned int        height;
-    OpenGLContextStateP gl_context;
-    int                 is_bound;
-    Pixmap              pixmap;
-    GLuint              pix_texture;
-    GLXPixmap           glx_pixmap;
-    GLuint              fbo;
-};
-
-// Create Pixmaps for GLX texture-from-pixmap extension
-static int create_tfp_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAOpenGLVTableP const pOpenGLVTable = gl_get_vtable(ctx);
-    const unsigned int    width         = pSurfaceGLX->width;
-    const unsigned int    height        = pSurfaceGLX->height;
-    Pixmap                pixmap        = None;
-    GLXFBConfig          *fbconfig      = NULL;
-    GLXPixmap             glx_pixmap    = None;
-    Window                root_window;
-    XWindowAttributes     wattr;
-    int                  *attrib;
-    int                   n_fbconfig_attrs;
-
-    root_window = RootWindow((Display *)ctx->native_dpy, ctx->x11_screen);
-    XGetWindowAttributes((Display *)ctx->native_dpy, root_window, &wattr);
-    if (wattr.depth != 24 && wattr.depth != 32)
-        return 0;
-    pixmap = XCreatePixmap(
-        (Display *)ctx->native_dpy,
-        root_window,
-        width,
-        height,
-        wattr.depth
-    );
-    if (!pixmap)
-        return 0;
-    pSurfaceGLX->pixmap = pixmap;
-
-    int fbconfig_attrs[32] = {
-        GLX_DRAWABLE_TYPE,      GLX_PIXMAP_BIT,
-        GLX_DOUBLEBUFFER,       GL_TRUE,
-        GLX_RENDER_TYPE,        GLX_RGBA_BIT,
-        GLX_X_RENDERABLE,       GL_TRUE,
-        GLX_Y_INVERTED_EXT,     GL_TRUE,
-        GLX_RED_SIZE,           8,
-        GLX_GREEN_SIZE,         8,
-        GLX_BLUE_SIZE,          8,
-        GL_NONE,
-    };
-    for (attrib = fbconfig_attrs; *attrib != GL_NONE; attrib += 2)
-        ;
-    *attrib++ = GLX_DEPTH_SIZE;                 *attrib++ = wattr.depth;
-    if (wattr.depth == 32) {
-    *attrib++ = GLX_ALPHA_SIZE;                 *attrib++ = 8;
-    *attrib++ = GLX_BIND_TO_TEXTURE_RGBA_EXT;   *attrib++ = GL_TRUE;
-    }
-    else {
-    *attrib++ = GLX_BIND_TO_TEXTURE_RGB_EXT;    *attrib++ = GL_TRUE;
-    }
-    *attrib++ = GL_NONE;
-
-    fbconfig = glXChooseFBConfig(
-        (Display *)ctx->native_dpy,
-        ctx->x11_screen,
-        fbconfig_attrs,
-        &n_fbconfig_attrs
-    );
-    if (!fbconfig)
-        return 0;
-
-    int pixmap_attrs[10] = {
-        GLX_TEXTURE_TARGET_EXT, GLX_TEXTURE_2D_EXT,
-        GLX_MIPMAP_TEXTURE_EXT, GL_FALSE,
-        GL_NONE,
-    };
-    for (attrib = pixmap_attrs; *attrib != GL_NONE; attrib += 2)
-        ;
-    *attrib++ = GLX_TEXTURE_FORMAT_EXT;
-    if (wattr.depth == 32)
-    *attrib++ = GLX_TEXTURE_FORMAT_RGBA_EXT;
-    else
-    *attrib++ = GLX_TEXTURE_FORMAT_RGB_EXT;
-    *attrib++ = GL_NONE;
-
-    x11_trap_errors();
-    glx_pixmap = pOpenGLVTable->glx_create_pixmap(
-        (Display *)ctx->native_dpy,
-        fbconfig[0],
-        pixmap,
-        pixmap_attrs
-    );
-    free(fbconfig);
-    if (x11_untrap_errors() != 0)
-        return 0;
-    pSurfaceGLX->glx_pixmap = glx_pixmap;
-
-    glGenTextures(1, &pSurfaceGLX->pix_texture);
-    glBindTexture(GL_TEXTURE_2D, pSurfaceGLX->pix_texture);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    return 1;
-}
-
-// Destroy Pixmaps used for TFP
-static void destroy_tfp_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAOpenGLVTableP const pOpenGLVTable = gl_get_vtable(ctx);
-
-    if (pSurfaceGLX->pix_texture) {
-        glDeleteTextures(1, &pSurfaceGLX->pix_texture);
-        pSurfaceGLX->pix_texture = 0;
-    }
-
-    if (pSurfaceGLX->glx_pixmap) {
-        pOpenGLVTable->glx_destroy_pixmap((Display *)ctx->native_dpy, pSurfaceGLX->glx_pixmap);
-        pSurfaceGLX->glx_pixmap = None;
-    }
-
-    if (pSurfaceGLX->pixmap) {
-        XFreePixmap((Display *)ctx->native_dpy, pSurfaceGLX->pixmap);
-        pSurfaceGLX->pixmap = None;
-    }
-}
-
-// Bind GLX Pixmap to texture
-static int bind_pixmap(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-
-    if (pSurfaceGLX->is_bound)
-        return 1;
-
-    glBindTexture(GL_TEXTURE_2D, pSurfaceGLX->pix_texture);
-
-    x11_trap_errors();
-    pOpenGLVTable->glx_bind_tex_image(
-        (Display *)ctx->native_dpy,
-        pSurfaceGLX->glx_pixmap,
-        GLX_FRONT_LEFT_EXT,
-        NULL
-    );
-    XSync((Display *)ctx->native_dpy, False);
-    if (x11_untrap_errors() != 0) {
-        va_glx_error_message("failed to bind pixmap\n");
-        return 0;
-    }
-
-    pSurfaceGLX->is_bound = 1;
-    return 1;
-}
-
-// Release GLX Pixmap from texture
-static int unbind_pixmap(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-
-    if (!pSurfaceGLX->is_bound)
-        return 1;
-
-    x11_trap_errors();
-    pOpenGLVTable->glx_release_tex_image(
-        (Display *)ctx->native_dpy,
-        pSurfaceGLX->glx_pixmap,
-        GLX_FRONT_LEFT_EXT
-    );
-    XSync((Display *)ctx->native_dpy, False);
-    if (x11_untrap_errors() != 0) {
-        va_glx_error_message("failed to release pixmap\n");
-        return 0;
-    }
-
-    glBindTexture(GL_TEXTURE_2D, 0);
-
-    pSurfaceGLX->is_bound = 0;
-    return 1;
-}
-
-// Render GLX Pixmap to texture
-static void render_pixmap(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    const unsigned int w = pSurfaceGLX->width;
-    const unsigned int h = pSurfaceGLX->height;
-
-    glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-    glBegin(GL_QUADS);
-    {
-        glTexCoord2f(0.0f, 0.0f); glVertex2i(0, 0);
-        glTexCoord2f(0.0f, 1.0f); glVertex2i(0, h);
-        glTexCoord2f(1.0f, 1.0f); glVertex2i(w, h);
-        glTexCoord2f(1.0f, 0.0f); glVertex2i(w, 0);
-    }
-    glEnd();
-}
-
-// Create offscreen surface
-static int create_fbo_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-    GLuint fbo;
-    GLenum status;
-
-    pOpenGLVTable->gl_gen_framebuffers(1, &fbo);
-    pOpenGLVTable->gl_bind_framebuffer(GL_FRAMEBUFFER_EXT, fbo);
-    pOpenGLVTable->gl_framebuffer_texture_2d(
-        GL_FRAMEBUFFER_EXT,
-        GL_COLOR_ATTACHMENT0_EXT,
-        GL_TEXTURE_2D,
-        pSurfaceGLX->texture,
-        0
-    );
-
-    status = pOpenGLVTable->gl_check_framebuffer_status(GL_DRAW_FRAMEBUFFER_EXT);
-    pOpenGLVTable->gl_bind_framebuffer(GL_FRAMEBUFFER_EXT, 0);
-    if (status != GL_FRAMEBUFFER_COMPLETE_EXT)
-        return 0;
-
-    pSurfaceGLX->fbo = fbo;
-    return 1;
-}
-
-// Destroy offscreen surface
-static void destroy_fbo_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-
-    if (pSurfaceGLX->fbo) {
-        pOpenGLVTable->gl_delete_framebuffers(1, &pSurfaceGLX->fbo);
-        pSurfaceGLX->fbo = 0;
-    }
-}
-
-// Setup matrices to match the FBO texture dimensions
-static void fbo_enter(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-    const unsigned int width  = pSurfaceGLX->width;
-    const unsigned int height = pSurfaceGLX->height;
-
-    pOpenGLVTable->gl_bind_framebuffer(GL_FRAMEBUFFER_EXT, pSurfaceGLX->fbo);
-    glPushAttrib(GL_VIEWPORT_BIT);
-    glMatrixMode(GL_PROJECTION);
-    glPushMatrix();
-    glLoadIdentity();
-    glMatrixMode(GL_MODELVIEW);
-    glPushMatrix();
-    glLoadIdentity();
-    glViewport(0, 0, width, height);
-    glTranslatef(-1.0f, -1.0f, 0.0f);
-    glScalef(2.0f / width, 2.0f / height, 1.0f);
-}
-
-// Restore original OpenGL matrices
-static void fbo_leave(VADriverContextP ctx)
-{
-    VAOpenGLVTableP pOpenGLVTable = gl_get_vtable(ctx);
-
-    glPopAttrib();
-    glMatrixMode(GL_PROJECTION);
-    glPopMatrix();
-    glMatrixMode(GL_MODELVIEW);
-    glPopMatrix();
-    pOpenGLVTable->gl_bind_framebuffer(GL_FRAMEBUFFER_EXT, 0);
-}
-
-// Check internal texture format is supported
-static int is_supported_internal_format(GLenum format)
-{
-    /* XXX: we don't support other textures than RGBA */
-    switch (format) {
-    case 4:
-    case GL_RGBA:
-    case GL_RGBA8:
-        return 1;
-    }
-    return 0;
-}
-
-// Destroy VA/GLX surface
-static void
-destroy_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    unbind_pixmap(ctx, pSurfaceGLX);
-    destroy_fbo_surface(ctx, pSurfaceGLX);
-    destroy_tfp_surface(ctx, pSurfaceGLX);
-    free(pSurfaceGLX);
-}
-
-// Create VA/GLX surface
-static VASurfaceGLXP
-create_surface(VADriverContextP ctx, GLenum target, GLuint texture)
-{
-    VASurfaceGLXP pSurfaceGLX = NULL;
-    unsigned int internal_format, border_width, width, height;
-    int is_error = 1;
-
-    pSurfaceGLX = malloc(sizeof(*pSurfaceGLX));
-    if (!pSurfaceGLX)
-        goto end;
-
-    pSurfaceGLX->magic          = VA_SURFACE_GLX_MAGIC;
-    pSurfaceGLX->target         = target;
-    pSurfaceGLX->texture        = texture;
-    pSurfaceGLX->surface        = VA_INVALID_SURFACE;
-    pSurfaceGLX->gl_context     = NULL;
-    pSurfaceGLX->is_bound       = 0;
-    pSurfaceGLX->pixmap         = None;
-    pSurfaceGLX->pix_texture    = 0;
-    pSurfaceGLX->glx_pixmap     = None;
-    pSurfaceGLX->fbo            = 0;
-
-    glEnable(target);
-    glBindTexture(target, texture);
-    if (!gl_get_texture_param(GL_TEXTURE_INTERNAL_FORMAT, &internal_format))
-        goto end;
-    if (!is_supported_internal_format(internal_format))
-        goto end;
-
-    /* Check texture dimensions */
-    if (!gl_get_texture_param(GL_TEXTURE_BORDER, &border_width))
-        goto end;
-    if (!gl_get_texture_param(GL_TEXTURE_WIDTH, &width))
-        goto end;
-    if (!gl_get_texture_param(GL_TEXTURE_HEIGHT, &height))
-        goto end;
-
-    width  -= 2 * border_width;
-    height -= 2 * border_width;
-    if (width == 0 || height == 0)
-        goto end;
-
-    pSurfaceGLX->width  = width;
-    pSurfaceGLX->height = height;
-
-    /* Create TFP objects */
-    if (!create_tfp_surface(ctx, pSurfaceGLX))
-        goto end;
-
-    /* Create FBO objects */
-    if (!create_fbo_surface(ctx, pSurfaceGLX))
-        goto end;
-
-    is_error = 0;
-end:
-    if (is_error && pSurfaceGLX) {
-        destroy_surface(ctx, pSurfaceGLX);
-        pSurfaceGLX = NULL;
-    }
-    return pSurfaceGLX;
-}
-
-
-/* ========================================================================= */
-/* === VA/GLX implementation from the driver (fordward calls)            === */
-/* ========================================================================= */
-
-#define INVOKE(ctx, func, args) do {                    \
-        VADriverVTableGLXP vtable = (ctx)->vtable.glx;  \
-        if (!vtable->va##func##GLX)                     \
-            return VA_STATUS_ERROR_UNIMPLEMENTED;       \
-                                                        \
-        VAStatus status = vtable->va##func##GLX args;   \
-        if (status != VA_STATUS_SUCCESS)                \
-            return status;                              \
-    } while (0)
-
-static VAStatus
-vaCreateSurfaceGLX_impl_driver(
-    VADriverContextP    ctx,
-    GLenum              target,
-    GLuint              texture,
-    void              **gl_surface
-)
-{
-    INVOKE(ctx, CreateSurface, (ctx, target, texture, gl_surface));
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus
-vaDestroySurfaceGLX_impl_driver(VADriverContextP ctx, void *gl_surface)
-{
-    INVOKE(ctx, DestroySurface, (ctx, gl_surface));
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus
-vaCopySurfaceGLX_impl_driver(
-    VADriverContextP    ctx,
-    void               *gl_surface,
-    VASurfaceID         surface,
-    unsigned int        flags
-)
-{
-    INVOKE(ctx, CopySurface, (ctx, gl_surface, surface, flags));
-    return VA_STATUS_SUCCESS;
-}
-
-#undef INVOKE
-
-
-/* ========================================================================= */
-/* === VA/GLX implementation from libVA (generic and suboptimal path)    === */
-/* ========================================================================= */
-
-#define INIT_SURFACE(surface, surface_arg) do {         \
-        surface = (VASurfaceGLXP)(surface_arg);         \
-        if (!check_surface(surface))                    \
-            return VA_STATUS_ERROR_INVALID_SURFACE;     \
-    } while (0)
-
-// Check VASurfaceGLX is valid
-static inline int check_surface(VASurfaceGLXP pSurfaceGLX)
-{
-    return pSurfaceGLX && pSurfaceGLX->magic == VA_SURFACE_GLX_MAGIC;
-}
-
-static VAStatus
-vaCreateSurfaceGLX_impl_libva(
-    VADriverContextP    ctx,
-    GLenum              target,
-    GLuint              texture,
-    void              **gl_surface
-)
-{
-    VASurfaceGLXP pSurfaceGLX;
-    struct OpenGLContextState old_cs, *new_cs;
-
-    gl_get_current_context(&old_cs);
-    new_cs = gl_create_context(ctx, &old_cs);
-    if (!new_cs)
-        return VA_STATUS_ERROR_ALLOCATION_FAILED;
-    if (!gl_set_current_context(new_cs, NULL))
-        return VA_STATUS_ERROR_OPERATION_FAILED;
-
-    pSurfaceGLX = create_surface(ctx, target, texture);
-    if (!pSurfaceGLX)
-        return VA_STATUS_ERROR_ALLOCATION_FAILED;
-
-    pSurfaceGLX->gl_context = new_cs;
-    *gl_surface = pSurfaceGLX;
-
-    gl_set_current_context(&old_cs, NULL);
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus
-vaDestroySurfaceGLX_impl_libva(VADriverContextP ctx, void *gl_surface)
-{
-    VASurfaceGLXP pSurfaceGLX;
-    struct OpenGLContextState old_cs, *new_cs;
-
-    INIT_SURFACE(pSurfaceGLX, gl_surface);
-
-    new_cs = pSurfaceGLX->gl_context;
-    if (!gl_set_current_context(new_cs, &old_cs))
-        return VA_STATUS_ERROR_OPERATION_FAILED;
-
-    destroy_surface(ctx, pSurfaceGLX);
-
-    gl_destroy_context(new_cs);
-    gl_set_current_context(&old_cs, NULL);
-    return VA_STATUS_SUCCESS;
-}
-
-static inline VAStatus
-deassociate_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    if (!unbind_pixmap(ctx, pSurfaceGLX))
-        return VA_STATUS_ERROR_OPERATION_FAILED;
-
-    pSurfaceGLX->surface = VA_INVALID_SURFACE;
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus
-associate_surface(
-    VADriverContextP    ctx,
-    VASurfaceGLXP       pSurfaceGLX,
-    VASurfaceID         surface,
-    unsigned int        flags
-)
-{
-    VAStatus status;
-
-    /* XXX: optimise case where we are associating the same VA surface
-       as before an no changed occurred to it */
-    status = deassociate_surface(ctx, pSurfaceGLX);
-    if (status != VA_STATUS_SUCCESS)
-        return status;
-
-    x11_trap_errors();
-    status = ctx->vtable.vaPutSurface(
-        ctx,
-        surface,
-        (void *)pSurfaceGLX->pixmap,
-        0, 0, pSurfaceGLX->width, pSurfaceGLX->height,
-        0, 0, pSurfaceGLX->width, pSurfaceGLX->height,
-        NULL, 0,
-        flags
-    );
-    XSync((Display *)ctx->native_dpy, False);
-    if (x11_untrap_errors() != 0)
-        return VA_STATUS_ERROR_OPERATION_FAILED;
-    if (status != VA_STATUS_SUCCESS)
-        return status;
-
-    pSurfaceGLX->surface = surface;
-    return VA_STATUS_SUCCESS;
-}
-
-static inline VAStatus
-sync_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    if (pSurfaceGLX->surface == VA_INVALID_SURFACE)
-        return VA_STATUS_ERROR_INVALID_SURFACE;
-
-    return ctx->vtable.vaSyncSurface(ctx, pSurfaceGLX->surface);
-}
-
-static inline VAStatus
-begin_render_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    VAStatus status;
-
-    status = sync_surface(ctx, pSurfaceGLX);
-    if (status != VA_STATUS_SUCCESS)
-        return status;
-
-    if (!bind_pixmap(ctx, pSurfaceGLX))
-        return VA_STATUS_ERROR_OPERATION_FAILED;
-
-    return VA_STATUS_SUCCESS;
-}
-
-static inline VAStatus
-end_render_surface(VADriverContextP ctx, VASurfaceGLXP pSurfaceGLX)
-{
-    if (!unbind_pixmap(ctx, pSurfaceGLX))
-        return VA_STATUS_ERROR_OPERATION_FAILED;
-
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus
-copy_surface(
-    VADriverContextP    ctx,
-    VASurfaceGLXP       pSurfaceGLX,
-    VASurfaceID         surface,
-    unsigned int        flags
-)
-{
-    VAStatus status;
-
-    /* Associate VA surface */
-    status = associate_surface(ctx, pSurfaceGLX, surface, flags);
-    if (status != VA_STATUS_SUCCESS)
-        return status;
-
-    /* Render to FBO */
-    fbo_enter(ctx, pSurfaceGLX);
-    status = begin_render_surface(ctx, pSurfaceGLX);
-    if (status == VA_STATUS_SUCCESS) {
-        render_pixmap(ctx, pSurfaceGLX);
-        status = end_render_surface(ctx, pSurfaceGLX);
-    }
-    fbo_leave(ctx);
-    if (status != VA_STATUS_SUCCESS)
-        return status;
-
-    return deassociate_surface(ctx, pSurfaceGLX);
-}
-
-static VAStatus
-vaCopySurfaceGLX_impl_libva(
-    VADriverContextP    ctx,
-    void               *gl_surface,
-    VASurfaceID         surface,
-    unsigned int        flags
-)
-{
-    VASurfaceGLXP pSurfaceGLX;
-    VAStatus status;
-    struct OpenGLContextState old_cs;
-
-    INIT_SURFACE(pSurfaceGLX, gl_surface);
-
-    if (!gl_set_current_context(pSurfaceGLX->gl_context, &old_cs))
-        return VA_STATUS_ERROR_OPERATION_FAILED;
-
-    status = copy_surface(ctx, pSurfaceGLX, surface, flags);
-
-    gl_set_current_context(&old_cs, NULL);
-    return status;
-}
-
-#undef INIT_SURFACE
-
-
-/* ========================================================================= */
-/* === Private VA/GLX vtable initialization                              === */
-/* ========================================================================= */
-
-// Initialize GLX driver context
-VAStatus va_glx_init_context(VADriverContextP ctx)
-{
-    VADriverContextGLXP glx_ctx = VA_DRIVER_CONTEXT_GLX(ctx);
-    VADriverVTableGLXP  vtable  = &glx_ctx->vtable;
-    int glx_major, glx_minor;
-
-    if (glx_ctx->is_initialized)
-        return VA_STATUS_SUCCESS;
-
-    if (ctx->vtable.glx && ctx->vtable.glx->vaCopySurfaceGLX) {
-        vtable->vaCreateSurfaceGLX      = vaCreateSurfaceGLX_impl_driver;
-        vtable->vaDestroySurfaceGLX     = vaDestroySurfaceGLX_impl_driver;
-        vtable->vaCopySurfaceGLX        = vaCopySurfaceGLX_impl_driver;
-    }
-    else {
-        vtable->vaCreateSurfaceGLX      = vaCreateSurfaceGLX_impl_libva;
-        vtable->vaDestroySurfaceGLX     = vaDestroySurfaceGLX_impl_libva;
-        vtable->vaCopySurfaceGLX        = vaCopySurfaceGLX_impl_libva;
-
-        if (!glXQueryVersion((Display *)ctx->native_dpy, &glx_major, &glx_minor))
-            return VA_STATUS_ERROR_UNIMPLEMENTED;
-
-        if (!check_tfp_extensions(ctx) || !load_tfp_extensions(ctx))
-            return VA_STATUS_ERROR_UNIMPLEMENTED;
-
-        if (!check_fbo_extensions(ctx) || !load_fbo_extensions(ctx))
-            return VA_STATUS_ERROR_UNIMPLEMENTED;
-    }
-
-    glx_ctx->is_initialized = 1;
-    return VA_STATUS_SUCCESS;
-}
diff -Nru libva-1.0.4/va/glx/va_glx_impl.h libva-1.0.1/va/glx/va_glx_impl.h
--- libva-1.0.4/va/glx/va_glx_impl.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/va_glx_impl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef VA_GLX_IMPL_H
-#define VA_GLX_IMPL_H
-
-/**
- * Initialize GLX driver context
- *
- * @param[in]  ctx        the VA driver context
- * @return VA_STATUS_SUCCESS if successful
- */
-VAStatus va_glx_init_context(VADriverContextP ctx);
-    /* ATTRIBUTE_HIDDEN; */
-
-#endif /* VA_GLX_IMPL_H */
diff -Nru libva-1.0.4/va/glx/va_glx_private.h libva-1.0.1/va/glx/va_glx_private.h
--- libva-1.0.4/va/glx/va_glx_private.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/glx/va_glx_private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef VA_GLX_PRIVATE_H
-#define VA_GLX_PRIVATE_H
-
-#include "config.h"
-#include "va.h"
-#include "va_backend.h"
-#include "va_x11.h"
-#include "va_glx.h"
-#include "va_backend_glx.h"
-#include <GL/glxext.h>
-
-#if GLX_GLXEXT_VERSION < 18
-typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *);
-typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
-#endif
-
-#if GLX_GLXEXT_VERSION < 27
-/* XXX: this is not exactly that version but this is the only means to
-   make sure we have the correct <GL/glx.h> with those signatures */
-typedef GLXPixmap (*PFNGLXCREATEPIXMAPPROC)(Display *, GLXFBConfig, Pixmap, const int *);
-typedef void (*PFNGLXDESTROYPIXMAPPROC)(Display *, GLXPixmap);
-#endif
-
-typedef struct VAOpenGLVTable *VAOpenGLVTableP;
-
-struct VAOpenGLVTable {
-    PFNGLXCREATEPIXMAPPROC              glx_create_pixmap;
-    PFNGLXDESTROYPIXMAPPROC             glx_destroy_pixmap;
-    PFNGLXBINDTEXIMAGEEXTPROC           glx_bind_tex_image;
-    PFNGLXRELEASETEXIMAGEEXTPROC        glx_release_tex_image;
-    PFNGLGENFRAMEBUFFERSEXTPROC         gl_gen_framebuffers;
-    PFNGLDELETEFRAMEBUFFERSEXTPROC      gl_delete_framebuffers;
-    PFNGLBINDFRAMEBUFFEREXTPROC         gl_bind_framebuffer;
-    PFNGLGENRENDERBUFFERSEXTPROC        gl_gen_renderbuffers;
-    PFNGLDELETERENDERBUFFERSEXTPROC     gl_delete_renderbuffers;
-    PFNGLBINDRENDERBUFFEREXTPROC        gl_bind_renderbuffer;
-    PFNGLRENDERBUFFERSTORAGEEXTPROC     gl_renderbuffer_storage;
-    PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC gl_framebuffer_renderbuffer;
-    PFNGLFRAMEBUFFERTEXTURE2DEXTPROC    gl_framebuffer_texture_2d;
-    PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC  gl_check_framebuffer_status;
-};
-
-typedef struct VADisplayContextGLX *VADisplayContextGLXP;
-typedef struct VADriverContextGLX  *VADriverContextGLXP;
-typedef struct VASurfaceGLX        *VASurfaceGLXP;
-typedef struct VADriverVTableGLX   *VADriverVTableGLXP;
-
-typedef void (*vaDestroyFunc)(VADisplayContextP);
-
-struct VADisplayContextGLX {
-    vaDestroyFunc vaDestroy;
-};
-
-#define VA_DRIVER_CONTEXT_GLX(ctx) ((VADriverContextGLXP)((ctx)->glx))
-
-struct VADriverContextGLX {
-    struct VADriverVTableGLX    vtable;
-    struct VAOpenGLVTable       gl_vtable;
-    unsigned int                is_initialized  : 1;
-};
-
-#endif /* VA_GLX_PRIVATE_H */
diff -Nru libva-1.0.4/va/Makefile.am libva-1.0.1/va/Makefile.am
--- libva-1.0.4/va/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-# Copyright (c) 2007 Intel Corporation. All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sub license, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice (including the
-# next paragraph) shall be included in all copies or substantial portions
-# of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-INCLUDES = \
-	$(LIBVA_CFLAGS) -I$(top_srcdir)/va/x11 \
-	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
-
-LDADD = \
-	$(LIBVA_LT_LDFLAGS)
-
-libva_la_SOURCES = va.c va_trace.c
-libva_ladir = $(libdir)
-libva_la_LDFLAGS = $(LDADD) -no-undefined
-libva_la_LIBADD = $(LIBVA_LIBS) -ldl
-
-libva_tpi_la_SOURCES = va_tpi.c
-libva_tpi_ladir = $(libdir)
-libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined
-libva_tpi_la_LIBADD = $(libvacorelib) -ldl
-libva_tpi_la_DEPENDENCIES = $(libvacorelib) 
-
-
-libva_x11_backend      = libva-x11.la
-libva_x11_backenddir   = x11
-
-libva_x11_la_SOURCES = 
-libva_x11_la_LIBADD  = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
-libva_x11_la_LDFLAGS = $(LDADD)
-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
-
-if BUILD_DUMMY_BACKEND
-libva_dummy_backend = libva-dummy.la
-libva_dummy_backenddir = dummy
-
-libva_dummy_la_SOURCES = 
-libva_dummy_la_LIBADD  = $(libvacorelib) dummy/libva_dummy.la $(LIBVA_LIBS) $(DRM_LIBS)
-libva_dummy_la_LDFLAGS = $(LDADD)
-libva_dummy_la_DEPENDENCIES = $(libvacorelib) dummy/libva_dummy.la
-else
-libva_dummy_backend =
-libva_dummy_backenddir =
-endif
-
-if USE_GLX
-libva_glx_backend      = libva-glx.la
-libva_glx_backenddir   = glx
-
-libva_glx_la_SOURCES =
-libva_glx_la_LIBADD  = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS) -ldl
-libva_glx_la_LDFLAGS = $(LDADD)
-libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la
-
-else
-libva_glx_backend      =
-libva_glx_backenddir   =
-endif
-
-lib_LTLIBRARIES = libva.la libva-tpi.la $(libva_x11_backend) $(libva_dummy_backend) $(libva_glx_backend)
-
-DIST_SUBDIRS = x11 glx dummy
-
-SUBDIRS = $(libva_x11_backenddir) $(libva_dummy_backenddir) $(libva_glx_backenddir)
-
-libvaincludedir = ${includedir}/va
-libvainclude_HEADERS = va.h va_tpi.h va_x11.h va_backend.h va_backend_tpi.h va_dummy.h va_version.h
-
-DISTCLEANFILES = \
-	va_version.h
-
-EXTRA_DIST = \
-	va_version.h.in
diff -Nru libva-1.0.4/va/Makefile.in libva-1.0.1/va/Makefile.in
--- libva-1.0.4/va/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,828 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Copyright (c) 2007 Intel Corporation. All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sub license, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice (including the
-# next paragraph) shall be included in all copies or substantial portions
-# of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = va
-DIST_COMMON = $(libvainclude_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/va_version.h.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = va_version.h
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libvaincludedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-am_libva_dummy_la_OBJECTS =
-libva_dummy_la_OBJECTS = $(am_libva_dummy_la_OBJECTS)
-libva_dummy_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libva_dummy_la_LDFLAGS) $(LDFLAGS) -o $@
-@BUILD_DUMMY_BACKEND_TRUE@am_libva_dummy_la_rpath = -rpath $(libdir)
-am_libva_glx_la_OBJECTS =
-libva_glx_la_OBJECTS = $(am_libva_glx_la_OBJECTS)
-libva_glx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libva_glx_la_LDFLAGS) $(LDFLAGS) -o $@
-@USE_GLX_TRUE@am_libva_glx_la_rpath = -rpath $(libdir)
-am_libva_tpi_la_OBJECTS = va_tpi.lo
-libva_tpi_la_OBJECTS = $(am_libva_tpi_la_OBJECTS)
-libva_tpi_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libva_tpi_la_LDFLAGS) $(LDFLAGS) -o $@
-am_libva_x11_la_OBJECTS =
-libva_x11_la_OBJECTS = $(am_libva_x11_la_OBJECTS)
-libva_x11_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libva_x11_la_LDFLAGS) $(LDFLAGS) -o $@
-libva_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libva_la_OBJECTS = va.lo va_trace.lo
-libva_la_OBJECTS = $(am_libva_la_OBJECTS)
-libva_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libva_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libva_dummy_la_SOURCES) $(libva_glx_la_SOURCES) \
-	$(libva_tpi_la_SOURCES) $(libva_x11_la_SOURCES) \
-	$(libva_la_SOURCES)
-DIST_SOURCES = $(libva_dummy_la_SOURCES) $(libva_glx_la_SOURCES) \
-	$(libva_tpi_la_SOURCES) $(libva_x11_la_SOURCES) \
-	$(libva_la_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-HEADERS = $(libvainclude_HEADERS)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
-GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
-LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
-LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
-LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
-LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
-LIBVA_VERSION = @LIBVA_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XFIXES_CFLAGS = @XFIXES_CFLAGS@
-XFIXES_LIBS = @XFIXES_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libvabackendlib = @libvabackendlib@
-libvacorelib = @libvacorelib@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = \
-	$(LIBVA_CFLAGS) -I$(top_srcdir)/va/x11 \
-	-DVA_DRIVERS_PATH="\"$(LIBVA_DRIVERS_PATH)\""
-
-LDADD = \
-	$(LIBVA_LT_LDFLAGS)
-
-libva_la_SOURCES = va.c va_trace.c
-libva_ladir = $(libdir)
-libva_la_LDFLAGS = $(LDADD) -no-undefined
-libva_la_LIBADD = $(LIBVA_LIBS) -ldl
-libva_tpi_la_SOURCES = va_tpi.c
-libva_tpi_ladir = $(libdir)
-libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined
-libva_tpi_la_LIBADD = $(libvacorelib) -ldl
-libva_tpi_la_DEPENDENCIES = $(libvacorelib) 
-libva_x11_backend = libva-x11.la
-libva_x11_backenddir = x11
-libva_x11_la_SOURCES = 
-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
-libva_x11_la_LDFLAGS = $(LDADD)
-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
-@BUILD_DUMMY_BACKEND_FALSE@libva_dummy_backend = 
-@BUILD_DUMMY_BACKEND_TRUE@libva_dummy_backend = libva-dummy.la
-@BUILD_DUMMY_BACKEND_FALSE@libva_dummy_backenddir = 
-@BUILD_DUMMY_BACKEND_TRUE@libva_dummy_backenddir = dummy
-@BUILD_DUMMY_BACKEND_TRUE@libva_dummy_la_SOURCES = 
-@BUILD_DUMMY_BACKEND_TRUE@libva_dummy_la_LIBADD = $(libvacorelib) dummy/libva_dummy.la $(LIBVA_LIBS) $(DRM_LIBS)
-@BUILD_DUMMY_BACKEND_TRUE@libva_dummy_la_LDFLAGS = $(LDADD)
-@BUILD_DUMMY_BACKEND_TRUE@libva_dummy_la_DEPENDENCIES = $(libvacorelib) dummy/libva_dummy.la
-@USE_GLX_FALSE@libva_glx_backend = 
-@USE_GLX_TRUE@libva_glx_backend = libva-glx.la
-@USE_GLX_FALSE@libva_glx_backenddir = 
-@USE_GLX_TRUE@libva_glx_backenddir = glx
-@USE_GLX_TRUE@libva_glx_la_SOURCES = 
-@USE_GLX_TRUE@libva_glx_la_LIBADD = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS) -ldl
-@USE_GLX_TRUE@libva_glx_la_LDFLAGS = $(LDADD)
-@USE_GLX_TRUE@libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la
-lib_LTLIBRARIES = libva.la libva-tpi.la $(libva_x11_backend) $(libva_dummy_backend) $(libva_glx_backend)
-DIST_SUBDIRS = x11 glx dummy
-SUBDIRS = $(libva_x11_backenddir) $(libva_dummy_backenddir) $(libva_glx_backenddir)
-libvaincludedir = ${includedir}/va
-libvainclude_HEADERS = va.h va_tpi.h va_x11.h va_backend.h va_backend_tpi.h va_dummy.h va_version.h
-DISTCLEANFILES = \
-	va_version.h
-
-EXTRA_DIST = \
-	va_version.h.in
-
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu va/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-va_version.h: $(top_builddir)/config.status $(srcdir)/va_version.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libva-dummy.la: $(libva_dummy_la_OBJECTS) $(libva_dummy_la_DEPENDENCIES) 
-	$(libva_dummy_la_LINK) $(am_libva_dummy_la_rpath) $(libva_dummy_la_OBJECTS) $(libva_dummy_la_LIBADD) $(LIBS)
-libva-glx.la: $(libva_glx_la_OBJECTS) $(libva_glx_la_DEPENDENCIES) 
-	$(libva_glx_la_LINK) $(am_libva_glx_la_rpath) $(libva_glx_la_OBJECTS) $(libva_glx_la_LIBADD) $(LIBS)
-libva-tpi.la: $(libva_tpi_la_OBJECTS) $(libva_tpi_la_DEPENDENCIES) 
-	$(libva_tpi_la_LINK) -rpath $(libdir) $(libva_tpi_la_OBJECTS) $(libva_tpi_la_LIBADD) $(LIBS)
-libva-x11.la: $(libva_x11_la_OBJECTS) $(libva_x11_la_DEPENDENCIES) 
-	$(libva_x11_la_LINK) -rpath $(libdir) $(libva_x11_la_OBJECTS) $(libva_x11_la_LIBADD) $(LIBS)
-libva.la: $(libva_la_OBJECTS) $(libva_la_DEPENDENCIES) 
-	$(libva_la_LINK) -rpath $(libdir) $(libva_la_OBJECTS) $(libva_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_tpi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_trace.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-libvaincludeHEADERS: $(libvainclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(libvaincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libvaincludedir)"
-	@list='$(libvainclude_HEADERS)'; test -n "$(libvaincludedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libvaincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libvaincludedir)" || exit $$?; \
-	done
-
-uninstall-libvaincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libvainclude_HEADERS)'; test -n "$(libvaincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libvaincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libvaincludedir)" && rm -f $$files
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libvaincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-libvaincludeHEADERS
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES uninstall-libvaincludeHEADERS
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-libLTLIBRARIES \
-	install-libvaincludeHEADERS install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-libLTLIBRARIES uninstall-libvaincludeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru libva-1.0.4/va/va_android.h libva-1.0.1/va/va_android.h
--- libva-1.0.4/va/va_android.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_android.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-#ifndef _VA_ANDROID_H_
-#define _VA_ANDROID_H_
-
-#include <va/va.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Returns a suitable VADisplay for VA API
- */
-VADisplay vaGetDisplay (
-    void *android_dpy
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-#ifdef ANDROID    
-#include <ui/ISurface.h>
-using namespace android;
-
-/*
- * Output rendering
- * Following is the rendering interface for Android system, 
- * to get the decode output surface to an ISurface object.
- * It basically performs a de-interlacing (if needed), 
- * color space conversion and scaling to the destination
- * rectangle
- */
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,	
-    sp<ISurface> draw, /* Android Window/Surface */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied destination clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* PutSurface flags */
-);
-
-#endif /* ANDROID */
-#endif /* __cplusplus */
-
-#endif /* _VA_ANDROID_H_ */
diff -Nru libva-1.0.4/va/va_backend.h libva-1.0.1/va/va_backend.h
--- libva-1.0.4/va/va_backend.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_backend.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,431 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * Video Decode Acceleration -Backend API
- */
-
-#ifndef _VA_BACKEND_H_
-#define _VA_BACKEND_H_
-
-#include <va/va.h>
-#ifndef ANDROID
-#include <X11/Xlib.h>
-#endif
-#include <linux/videodev2.h>
-
-typedef struct VADriverContext *VADriverContextP;
-typedef struct VADisplayContext *VADisplayContextP;
-
-struct VADriverVTable
-{
-	VAStatus (*vaTerminate) ( VADriverContextP ctx );
-
-	VAStatus (*vaQueryConfigProfiles) (
-		VADriverContextP ctx,
-		VAProfile *profile_list,	/* out */
-		int *num_profiles			/* out */
-	);
-
-	VAStatus (*vaQueryConfigEntrypoints) (
-		VADriverContextP ctx,
-		VAProfile profile,
-		VAEntrypoint  *entrypoint_list,	/* out */
-		int *num_entrypoints			/* out */
-	);
-
-	VAStatus (*vaGetConfigAttributes) (
-		VADriverContextP ctx,
-		VAProfile profile,
-		VAEntrypoint entrypoint,
-		VAConfigAttrib *attrib_list,	/* in/out */
-		int num_attribs
-	);
-
-	VAStatus (*vaCreateConfig) (
-		VADriverContextP ctx,
-		VAProfile profile, 
-		VAEntrypoint entrypoint, 
-		VAConfigAttrib *attrib_list,
-		int num_attribs,
-		VAConfigID *config_id		/* out */
-	);
-
-	VAStatus (*vaDestroyConfig) (
-		VADriverContextP ctx,
-		VAConfigID config_id
-	);
-
-	VAStatus (*vaQueryConfigAttributes) (
-		VADriverContextP ctx,
-		VAConfigID config_id, 
-		VAProfile *profile,		/* out */
-		VAEntrypoint *entrypoint, 	/* out */
-		VAConfigAttrib *attrib_list,	/* out */
-		int *num_attribs		/* out */
-	);
-
-	VAStatus (*vaCreateSurfaces) (
-		VADriverContextP ctx,
-		int width,
-		int height,
-		int format,
-		int num_surfaces,
-		VASurfaceID *surfaces		/* out */
-	);
-
-	VAStatus (*vaDestroySurfaces) (
-		VADriverContextP ctx,
-		VASurfaceID *surface_list,
-		int num_surfaces
-	);
-
-	VAStatus (*vaCreateContext) (
-		VADriverContextP ctx,
-		VAConfigID config_id,
-		int picture_width,
-		int picture_height,
-		int flag,
-		VASurfaceID *render_targets,
-		int num_render_targets,
-		VAContextID *context		/* out */
-	);
-
-	VAStatus (*vaDestroyContext) (
-		VADriverContextP ctx,
-		VAContextID context
-	);
-
-	VAStatus (*vaCreateBuffer) (
-		VADriverContextP ctx,
-		VAContextID context,		/* in */
-		VABufferType type,		/* in */
-		unsigned int size,		/* in */
-		unsigned int num_elements,	/* in */
-		void *data,			/* in */
-		VABufferID *buf_id		/* out */
-	);
-
-	VAStatus (*vaBufferSetNumElements) (
-		VADriverContextP ctx,
-		VABufferID buf_id,	/* in */
-		unsigned int num_elements	/* in */
-	);
-
-	VAStatus (*vaMapBuffer) (
-		VADriverContextP ctx,
-		VABufferID buf_id,	/* in */
-		void **pbuf         /* out */
-	);
-
-	VAStatus (*vaUnmapBuffer) (
-		VADriverContextP ctx,
-		VABufferID buf_id	/* in */
-	);
-
-	VAStatus (*vaDestroyBuffer) (
-		VADriverContextP ctx,
-		VABufferID buffer_id
-	);
-
-	VAStatus (*vaBeginPicture) (
-		VADriverContextP ctx,
-		VAContextID context,
-		VASurfaceID render_target
-	);
-
-	VAStatus (*vaRenderPicture) (
-		VADriverContextP ctx,
-		VAContextID context,
-		VABufferID *buffers,
-		int num_buffers
-	);
-
-	VAStatus (*vaEndPicture) (
-		VADriverContextP ctx,
-		VAContextID context
-	);
-
-	VAStatus (*vaSyncSurface) (
-		VADriverContextP ctx,
-		VASurfaceID render_target
-	);
-
-	VAStatus (*vaQuerySurfaceStatus) (
-		VADriverContextP ctx,
-		VASurfaceID render_target,
-		VASurfaceStatus *status	/* out */
-	);
-
-	VAStatus (*vaPutSurface) (
-    		VADriverContextP ctx,
-		VASurfaceID surface,
-		void* draw, /* Drawable of window system */
-		short srcx,
-		short srcy,
-		unsigned short srcw,
-		unsigned short srch,
-		short destx,
-		short desty,
-		unsigned short destw,
-		unsigned short desth,
-		VARectangle *cliprects, /* client supplied clip list */
-		unsigned int number_cliprects, /* number of clip rects in the clip list */
-		unsigned int flags /* de-interlacing flags */
-	);
-
-	VAStatus (*vaQueryImageFormats) (
-		VADriverContextP ctx,
-		VAImageFormat *format_list,        /* out */
-		int *num_formats           /* out */
-	);
-
-	VAStatus (*vaCreateImage) (
-		VADriverContextP ctx,
-		VAImageFormat *format,
-		int width,
-		int height,
-		VAImage *image     /* out */
-	);
-
-	VAStatus (*vaDeriveImage) (
-		VADriverContextP ctx,
-		VASurfaceID surface,
-		VAImage *image     /* out */
-	);
-
-	VAStatus (*vaDestroyImage) (
-		VADriverContextP ctx,
-		VAImageID image
-	);
-	
-	VAStatus (*vaSetImagePalette) (
-	        VADriverContextP ctx,
-	        VAImageID image,
-	        /*
-                 * pointer to an array holding the palette data.  The size of the array is
-                 * num_palette_entries * entry_bytes in size.  The order of the components
-                 * in the palette is described by the component_order in VAImage struct
-                 */
-                unsigned char *palette
-	);
-	
-	VAStatus (*vaGetImage) (
-		VADriverContextP ctx,
-		VASurfaceID surface,
-		int x,     /* coordinates of the upper left source pixel */
-		int y,
-		unsigned int width, /* width and height of the region */
-		unsigned int height,
-		VAImageID image
-	);
-
-	VAStatus (*vaPutImage) (
-		VADriverContextP ctx,
-		VASurfaceID surface,
-		VAImageID image,
-		int src_x,
-		int src_y,
-		unsigned int src_width,
-		unsigned int src_height,
-		int dest_x,
-		int dest_y,
-		unsigned int dest_width,
-		unsigned int dest_height
-	);
-
-	VAStatus (*vaQuerySubpictureFormats) (
-		VADriverContextP ctx,
-		VAImageFormat *format_list,        /* out */
-		unsigned int *flags,       /* out */
-		unsigned int *num_formats  /* out */
-	);
-
-	VAStatus (*vaCreateSubpicture) (
-		VADriverContextP ctx,
-		VAImageID image,
-		VASubpictureID *subpicture   /* out */
-	);
-
-	VAStatus (*vaDestroySubpicture) (
-		VADriverContextP ctx,
-		VASubpictureID subpicture
-	);
-
-        VAStatus (*vaSetSubpictureImage) (
-                VADriverContextP ctx,
-                VASubpictureID subpicture,
-                VAImageID image
-        );
-
-	VAStatus (*vaSetSubpictureChromakey) (
-		VADriverContextP ctx,
-		VASubpictureID subpicture,
-		unsigned int chromakey_min,
-		unsigned int chromakey_max,
-		unsigned int chromakey_mask
-	);
-
-	VAStatus (*vaSetSubpictureGlobalAlpha) (
-		VADriverContextP ctx,
-		VASubpictureID subpicture,
-		float global_alpha 
-	);
-
-	VAStatus (*vaAssociateSubpicture) (
-		VADriverContextP ctx,
-		VASubpictureID subpicture,
-		VASurfaceID *target_surfaces,
-		int num_surfaces,
-		short src_x, /* upper left offset in subpicture */
-		short src_y,
-		unsigned short src_width,
-		unsigned short src_height,
-		short dest_x, /* upper left offset in surface */
-		short dest_y,
-		unsigned short dest_width,
-		unsigned short dest_height,
-		/*
-		 * whether to enable chroma-keying or global-alpha
-		 * see VA_SUBPICTURE_XXX values
-		 */
-		unsigned int flags
-	);
-
-	VAStatus (*vaDeassociateSubpicture) (
-		VADriverContextP ctx,
-		VASubpictureID subpicture,
-		VASurfaceID *target_surfaces,
-		int num_surfaces
-	);
-
-	VAStatus (*vaQueryDisplayAttributes) (
-		VADriverContextP ctx,
-		VADisplayAttribute *attr_list,	/* out */
-		int *num_attributes		/* out */
-        );
-
-	VAStatus (*vaGetDisplayAttributes) (
-		VADriverContextP ctx,
-		VADisplayAttribute *attr_list,	/* in/out */
-		int num_attributes
-        );
-        
-        VAStatus (*vaSetDisplayAttributes) (
-		VADriverContextP ctx,
-                VADisplayAttribute *attr_list,
-                int num_attributes
-        );
-
-        /* used by va trace */        
-        VAStatus (*vaBufferInfo) (
-                   VADriverContextP ctx,
-                   VAContextID context, /* in */
-                   VABufferID buf_id, /* in */
-                   VABufferType *type,    /* out */
-                   unsigned int *size,    /* out */
-                   unsigned int *num_elements /* out */
-        );
-
-        /* lock/unlock surface for external access */    
-        VAStatus (*vaLockSurface) (
-		VADriverContextP ctx,
-                VASurfaceID surface,
-                unsigned int *fourcc, /* out  for follow argument */
-                unsigned int *luma_stride,
-                unsigned int *chroma_u_stride,
-                unsigned int *chroma_v_stride,
-                unsigned int *luma_offset,
-                unsigned int *chroma_u_offset,
-                unsigned int *chroma_v_offset,
-                unsigned int *buffer_name, /* if it is not NULL, assign the low lever
-                                            * surface buffer name
-                                            */
-                void **buffer /* if it is not NULL, map the surface buffer for
-                                * CPU access
-                                */
-        );
-    
-        VAStatus (*vaUnlockSurface) (
-		VADriverContextP ctx,
-                VASurfaceID surface
-        );
-
-        /* Optional: GLX support hooks */
-        struct VADriverVTableGLX *glx;
-};
-
-struct VADriverContext
-{
-    void *pDriverData;
-    struct VADriverVTable vtable;
-    void *vtable_tpi; /* the structure is malloc-ed */
-
-    void *native_dpy;
-    int x11_screen;
-    int version_major;
-    int version_minor;
-    int max_profiles;
-    int max_entrypoints;
-    int max_attributes;
-    int max_image_formats;
-    int max_subpic_formats;
-    int max_display_attributes;
-    const char *str_vendor;
-
-    void *handle;			/* dlopen handle */
-    
-    void *dri_state;
-    void *glx;				/* opaque for GLX code */
-};
-
-#define VA_DISPLAY_MAGIC 0x56414430 /* VAD0 */
-struct VADisplayContext
-{
-    int vadpy_magic;
-    
-    VADisplayContextP pNext;
-    VADriverContextP pDriverContext;
-
-    int (*vaIsValid) (
-	VADisplayContextP ctx
-    );
-
-    void (*vaDestroy) (
-	VADisplayContextP ctx
-    );
-
-    VAStatus (*vaGetDriverName) (
-	VADisplayContextP ctx,
-	char **driver_name
-    );
-
-    void *opaque; /* opaque for display extensions (e.g. GLX) */
-};
-
-typedef VAStatus (*VADriverInit) (
-    VADriverContextP driver_context
-);
-
-#endif /* _VA_BACKEND_H_ */
diff -Nru libva-1.0.4/va/va_backend_tpi.h libva-1.0.1/va/va_backend_tpi.h
--- libva-1.0.4/va/va_backend_tpi.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_backend_tpi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/*
- * Video Decode Acceleration -Backend API
- */
-
-#ifndef _VA_BACKEND_TPI_H_
-#define _VA_BACKEND_TPI_H_
-
-#include <va/va.h>
-#include <va/va_backend.h>
-
-#include <linux/videodev2.h>
-
-struct VADriverVTableTPI
-{
-        /* device specific */
-	VAStatus (*vaCreateSurfaceFromCIFrame) (
-		VADriverContextP ctx,
-		unsigned long frame_id,
-		VASurfaceID *surface		/* out */
-	);
-    
-        VAStatus (*vaCreateSurfaceFromV4L2Buf) (
-		VADriverContextP ctx,
-                int v4l2_fd,         /* file descriptor of V4L2 device */
-                struct v4l2_format *v4l2_fmt,       /* format of V4L2 */
-                struct v4l2_buffer *v4l2_buf,       /* V4L2 buffer */
-                VASurfaceID *surface	           /* out */
-        );
-
-	VAStatus (*vaPutSurfaceBuf) (
-		VADisplay dpy,
-		VASurfaceID surface,
-		unsigned char* data,
-		int* data_len,
-		short srcx,
-		short srcy,
-		unsigned short srcw,
-		unsigned short srch,
-		short destx,
-		short desty,
-		unsigned short destw,
-		unsigned short desth,
-		VARectangle *cliprects, /* client supplied clip list */
-		unsigned int number_cliprects, /* number of clip rects in the clip list */
-		unsigned int flags /* de-interlacing flags */
-	);
-};
-
-
-#endif /* _VA_BACKEND_TPI_H_ */
diff -Nru libva-1.0.4/va/va.c libva-1.0.1/va/va.c
--- libva-1.0.4/va/va.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1192 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va.h"
-#include "va_backend.h"
-#include "va_trace.h"
-#include "config.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <unistd.h>
-
-#ifdef ANDROID
-#define Bool int
-#define True 1
-#define False 0
-#endif
-
-#define DRIVER_INIT_FUNC	"__vaDriverInit_0_31"
-
-#define DRIVER_EXTENSION	"_drv_video.so"
-
-#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
-#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-
-#define ASSERT		assert
-#define CHECK_VTABLE(s, ctx, func) if (!va_checkVtable(ctx->vtable.va##func, #func)) s = VA_STATUS_ERROR_UNKNOWN;
-#define CHECK_MAXIMUM(s, ctx, var) if (!va_checkMaximum(ctx->max_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
-#define CHECK_STRING(s, ctx, var) if (!va_checkString(ctx->str_##var, #var)) s = VA_STATUS_ERROR_UNKNOWN;
-
-extern int trace_flag;
-#define VA_TRACE(trace_func,...)                \
-    if (trace_flag) {                           \
-        va_TraceMsg("========%s========\n", __func__);   \
-        trace_func(__VA_ARGS__);                \
-    }
-
-int vaDisplayIsValid(VADisplay dpy)
-{
-    VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
-    return pDisplayContext && (pDisplayContext->vadpy_magic == VA_DISPLAY_MAGIC) && pDisplayContext->vaIsValid(pDisplayContext);
-}
-
-static void va_errorMessage(const char *msg, ...)
-{
-    va_list args;
-
-    fprintf(stderr, "libva error: ");
-    va_start(args, msg);
-    vfprintf(stderr, msg, args);
-    va_end(args);
-}
-
-static void va_infoMessage(const char *msg, ...)
-{
-    va_list args;
-
-    fprintf(stderr, "libva: ");
-    va_start(args, msg);
-    vfprintf(stderr, msg, args);
-    va_end(args);
-}
-
-static Bool va_checkVtable(void *ptr, char *function)
-{
-    if (!ptr)
-    {
-        va_errorMessage("No valid vtable entry for va%s\n", function);
-        return False;
-    }
-    return True;
-}
-
-static Bool va_checkMaximum(int value, char *variable)
-{
-    if (!value)
-    {
-        va_errorMessage("Failed to define max_%s in init\n", variable);
-        return False;
-    }
-    return True;
-}
-
-static Bool va_checkString(const char* value, char *variable)
-{
-    if (!value)
-    {
-        va_errorMessage("Failed to define str_%s in init\n", variable);
-        return False;
-    }
-    return True;
-}
-
-static VAStatus va_getDriverName(VADisplay dpy, char **driver_name)
-{
-    VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
-
-    return pDisplayContext->vaGetDriverName(pDisplayContext, driver_name);
-}
-
-static VAStatus va_openDriver(VADisplay dpy, char *driver_name)
-{
-    VADriverContextP ctx = CTX(dpy);
-    VAStatus vaStatus = VA_STATUS_ERROR_UNKNOWN;
-    char *search_path = NULL;
-    char *saveptr;
-    char *driver_dir;
-    
-    if (geteuid() == getuid())
-    {
-        /* don't allow setuid apps to use LIBVA_DRIVERS_PATH */
-        search_path = getenv("LIBVA_DRIVERS_PATH");
-    }
-    if (!search_path)
-    {
-        search_path = VA_DRIVERS_PATH;
-    }
-
-    search_path = strdup((const char *)search_path);
-    driver_dir = strtok_r((const char *)search_path, ":", &saveptr);
-    while(driver_dir)
-    {
-        void *handle = NULL;
-        char *driver_path = (char *) malloc( strlen(driver_dir) +
-                                             strlen(driver_name) +
-                                             strlen(DRIVER_EXTENSION) + 2 );
-        strncpy( driver_path, driver_dir, strlen(driver_dir) + 1);
-        strncat( driver_path, "/", strlen("/") );
-        strncat( driver_path, driver_name, strlen(driver_name) );
-        strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) );
-        
-        va_infoMessage("Trying to open %s\n", driver_path);
-#ifndef ANDROID
-        handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
-#else
-        handle = dlopen( driver_path, RTLD_NOW| RTLD_GLOBAL);
-#endif
-        if (!handle)
-        {
-            /* Don't give errors for non-existing files */
-            if (0 == access( driver_path, F_OK))
-            {	
-                va_errorMessage("dlopen of %s failed: %s\n", driver_path, dlerror());
-            }
-        }
-        else
-        {
-            VADriverInit init_func;
-            init_func = (VADriverInit) dlsym(handle, DRIVER_INIT_FUNC);
-            if (!init_func)
-            {
-                va_errorMessage("%s has no function %s\n", driver_path, DRIVER_INIT_FUNC);
-                dlclose(handle);
-            }
-            else
-            {
-                vaStatus = (*init_func)(ctx);
-
-                if (VA_STATUS_SUCCESS == vaStatus)
-                {
-                    CHECK_MAXIMUM(vaStatus, ctx, profiles);
-                    CHECK_MAXIMUM(vaStatus, ctx, entrypoints);
-                    CHECK_MAXIMUM(vaStatus, ctx, attributes);
-                    CHECK_MAXIMUM(vaStatus, ctx, image_formats);
-                    CHECK_MAXIMUM(vaStatus, ctx, subpic_formats);
-                    CHECK_MAXIMUM(vaStatus, ctx, display_attributes);
-                    CHECK_STRING(vaStatus, ctx, vendor);
-                    CHECK_VTABLE(vaStatus, ctx, Terminate);
-                    CHECK_VTABLE(vaStatus, ctx, QueryConfigProfiles);
-                    CHECK_VTABLE(vaStatus, ctx, QueryConfigEntrypoints);
-                    CHECK_VTABLE(vaStatus, ctx, QueryConfigAttributes);
-                    CHECK_VTABLE(vaStatus, ctx, CreateConfig);
-                    CHECK_VTABLE(vaStatus, ctx, DestroyConfig);
-                    CHECK_VTABLE(vaStatus, ctx, GetConfigAttributes);
-                    CHECK_VTABLE(vaStatus, ctx, CreateSurfaces);
-                    CHECK_VTABLE(vaStatus, ctx, DestroySurfaces);
-                    CHECK_VTABLE(vaStatus, ctx, CreateContext);
-                    CHECK_VTABLE(vaStatus, ctx, DestroyContext);
-                    CHECK_VTABLE(vaStatus, ctx, CreateBuffer);
-                    CHECK_VTABLE(vaStatus, ctx, BufferSetNumElements);
-                    CHECK_VTABLE(vaStatus, ctx, MapBuffer);
-                    CHECK_VTABLE(vaStatus, ctx, UnmapBuffer);
-                    CHECK_VTABLE(vaStatus, ctx, DestroyBuffer);
-                    CHECK_VTABLE(vaStatus, ctx, BeginPicture);
-                    CHECK_VTABLE(vaStatus, ctx, RenderPicture);
-                    CHECK_VTABLE(vaStatus, ctx, EndPicture);
-                    CHECK_VTABLE(vaStatus, ctx, SyncSurface);
-                    CHECK_VTABLE(vaStatus, ctx, QuerySurfaceStatus);
-                    CHECK_VTABLE(vaStatus, ctx, PutSurface);
-                    CHECK_VTABLE(vaStatus, ctx, QueryImageFormats);
-                    CHECK_VTABLE(vaStatus, ctx, CreateImage);
-                    CHECK_VTABLE(vaStatus, ctx, DeriveImage);
-                    CHECK_VTABLE(vaStatus, ctx, DestroyImage);
-                    CHECK_VTABLE(vaStatus, ctx, SetImagePalette);
-                    CHECK_VTABLE(vaStatus, ctx, GetImage);
-                    CHECK_VTABLE(vaStatus, ctx, PutImage);
-                    CHECK_VTABLE(vaStatus, ctx, QuerySubpictureFormats);
-                    CHECK_VTABLE(vaStatus, ctx, CreateSubpicture);
-                    CHECK_VTABLE(vaStatus, ctx, DestroySubpicture);
-                    CHECK_VTABLE(vaStatus, ctx, SetSubpictureImage);
-                    CHECK_VTABLE(vaStatus, ctx, SetSubpictureChromakey);
-                    CHECK_VTABLE(vaStatus, ctx, SetSubpictureGlobalAlpha);
-                    CHECK_VTABLE(vaStatus, ctx, AssociateSubpicture);
-                    CHECK_VTABLE(vaStatus, ctx, DeassociateSubpicture);
-                    CHECK_VTABLE(vaStatus, ctx, QueryDisplayAttributes);
-                    CHECK_VTABLE(vaStatus, ctx, GetDisplayAttributes);
-                    CHECK_VTABLE(vaStatus, ctx, SetDisplayAttributes);
-                }
-                if (VA_STATUS_SUCCESS != vaStatus)
-                {
-                    va_errorMessage("%s init failed\n", driver_path);
-                    dlclose(handle);
-                }
-                if (VA_STATUS_SUCCESS == vaStatus)
-                {
-                    ctx->handle = handle;
-                }
-                free(driver_path);
-                break;
-            }
-        }
-        free(driver_path);
-        
-        driver_dir = strtok_r(NULL, ":", &saveptr);
-    }
-    
-    free(search_path);    
-    
-    return vaStatus;
-}
-
-VAPrivFunc vaGetLibFunc(VADisplay dpy, const char *func)
-{
-    VADriverContextP ctx;
-    if( !vaDisplayIsValid(dpy) )
-        return NULL;
-    ctx = CTX(dpy);
-
-    if (NULL == ctx->handle)
-        return NULL;
-        
-    return (VAPrivFunc) dlsym(ctx->handle, func);
-}
-
-
-/*
- * Returns a short english description of error_status
- */
-const char *vaErrorStr(VAStatus error_status)
-{
-    switch(error_status)
-    {
-        case VA_STATUS_SUCCESS:
-            return "success (no error)";
-        case VA_STATUS_ERROR_OPERATION_FAILED:
-            return "operation failed";
-        case VA_STATUS_ERROR_ALLOCATION_FAILED:
-            return "resource allocation failed";
-        case VA_STATUS_ERROR_INVALID_DISPLAY:
-            return "invalid VADisplay";
-        case VA_STATUS_ERROR_INVALID_CONFIG:
-            return "invalid VAConfigID";
-        case VA_STATUS_ERROR_INVALID_CONTEXT:
-            return "invalid VAContextID";
-        case VA_STATUS_ERROR_INVALID_SURFACE:
-            return "invalid VASurfaceID";
-        case VA_STATUS_ERROR_INVALID_BUFFER:
-            return "invalid VABufferID";
-        case VA_STATUS_ERROR_INVALID_IMAGE:
-            return "invalid VAImageID";
-        case VA_STATUS_ERROR_INVALID_SUBPICTURE:
-            return "invalid VASubpictureID";
-        case VA_STATUS_ERROR_ATTR_NOT_SUPPORTED:
-            return "attribute not supported";
-        case VA_STATUS_ERROR_MAX_NUM_EXCEEDED:
-            return "list argument exceeds maximum number";
-        case VA_STATUS_ERROR_UNSUPPORTED_PROFILE:
-            return "the requested VAProfile is not supported";
-        case VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT:
-            return "the requested VAEntryPoint is not supported";
-        case VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT:
-            return "the requested RT Format is not supported";
-        case VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE:
-            return "the requested VABufferType is not supported";
-        case VA_STATUS_ERROR_SURFACE_BUSY:
-            return "surface is in use";
-        case VA_STATUS_ERROR_FLAG_NOT_SUPPORTED:
-            return "flag not supported";
-        case VA_STATUS_ERROR_INVALID_PARAMETER:
-            return "invalid parameter";
-        case VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED:
-            return "resolution not supported";
-        case VA_STATUS_ERROR_UNIMPLEMENTED:
-            return "the requested function is not implemented";
-        case VA_STATUS_ERROR_SURFACE_IN_DISPLAYING:
-            return "surface is in displaying (may by overlay)" ;
-        case VA_STATUS_ERROR_INVALID_IMAGE_FORMAT:
-            return "invalid VAImageFormat";
-        case VA_STATUS_ERROR_UNKNOWN:
-            return "unknown libva error";
-    }
-    return "unknown libva error / description missing";
-}
-      
-VAStatus vaInitialize (
-    VADisplay dpy,
-    int *major_version,	 /* out */
-    int *minor_version 	 /* out */
-)
-{
-    const char *driver_name_env = NULL;
-    char *driver_name = NULL;
-    VAStatus vaStatus;
-
-    CHECK_DISPLAY(dpy);
-
-    va_TraceInit();
-
-    va_infoMessage("libva version %s\n", VA_VERSION_S);
-
-    driver_name_env = getenv("LIBVA_DRIVER_NAME");
-    if (driver_name_env && geteuid() == getuid())
-    {
-        /* Don't allow setuid apps to use LIBVA_DRIVER_NAME */
-        driver_name = strdup(driver_name_env);
-        vaStatus = VA_STATUS_SUCCESS;
-        va_infoMessage("User requested driver '%s'\n", driver_name);
-    }
-    else
-    {
-        vaStatus = va_getDriverName(dpy, &driver_name);
-        va_infoMessage("va_getDriverName() returns %d\n", vaStatus);
-    }
-
-    if (VA_STATUS_SUCCESS == vaStatus)
-    {
-        vaStatus = va_openDriver(dpy, driver_name);
-        va_infoMessage("va_openDriver() returns %d\n", vaStatus);
-
-        *major_version = VA_MAJOR_VERSION;
-        *minor_version = VA_MINOR_VERSION;
-    }
-
-    if (driver_name)
-        free(driver_name);
-    return vaStatus;
-}
-
-
-/*
- * After this call, all library internal resources will be cleaned up
- */ 
-VAStatus vaTerminate (
-    VADisplay dpy
-)
-{
-  VAStatus vaStatus = VA_STATUS_SUCCESS;
-  VADisplayContextP pDisplayContext = (VADisplayContextP)dpy;
-  VADriverContextP old_ctx;
-
-  CHECK_DISPLAY(dpy);
-  old_ctx = CTX(dpy);
-
-  if (old_ctx->handle)
-  {
-      vaStatus = old_ctx->vtable.vaTerminate(old_ctx);
-      dlclose(old_ctx->handle);
-      old_ctx->handle = NULL;
-  }
-
-  if (VA_STATUS_SUCCESS == vaStatus)
-      pDisplayContext->vaDestroy(pDisplayContext);
-
-  va_TraceEnd();
-
-  return vaStatus;
-}
-
-/*
- * vaQueryVendorString returns a pointer to a zero-terminated string
- * describing some aspects of the VA implemenation on a specific
- * hardware accelerator. The format of the returned string is:
- * <vendorname>-<major_version>-<minor_version>-<addtional_info>
- * e.g. for the Intel GMA500 implementation, an example would be:
- * "IntelGMA500-1.0-0.2-patch3
- */
-const char *vaQueryVendorString (
-    VADisplay dpy
-)
-{
-  if( !vaDisplayIsValid(dpy) )
-      return NULL;
-  
-  return CTX(dpy)->str_vendor;
-}
-
-
-/* Get maximum number of profiles supported by the implementation */
-int vaMaxNumProfiles (
-    VADisplay dpy
-)
-{
-  if( !vaDisplayIsValid(dpy) )
-      return 0;
-  
-  return CTX(dpy)->max_profiles;
-}
-
-/* Get maximum number of entrypoints supported by the implementation */
-int vaMaxNumEntrypoints (
-    VADisplay dpy
-)
-{
-  if( !vaDisplayIsValid(dpy) )
-      return 0;
-  
-  return CTX(dpy)->max_entrypoints;
-}
-
-
-/* Get maximum number of attributs supported by the implementation */
-int vaMaxNumConfigAttributes (
-    VADisplay dpy
-)
-{
-  if( !vaDisplayIsValid(dpy) )
-      return 0;
-  
-  return CTX(dpy)->max_attributes;
-}
-
-VAStatus vaQueryConfigEntrypoints (
-    VADisplay dpy,
-    VAProfile profile,
-    VAEntrypoint *entrypoints,	/* out */
-    int *num_entrypoints	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaQueryConfigEntrypoints ( ctx, profile, entrypoints, num_entrypoints);
-}
-
-VAStatus vaGetConfigAttributes (
-    VADisplay dpy,
-    VAProfile profile,
-    VAEntrypoint entrypoint,
-    VAConfigAttrib *attrib_list, /* in/out */
-    int num_attribs
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaGetConfigAttributes ( ctx, profile, entrypoint, attrib_list, num_attribs );
-}
-
-VAStatus vaQueryConfigProfiles (
-    VADisplay dpy,
-    VAProfile *profile_list,	/* out */
-    int *num_profiles		/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaQueryConfigProfiles ( ctx, profile_list, num_profiles );
-}
-
-VAStatus vaCreateConfig (
-    VADisplay dpy,
-    VAProfile profile, 
-    VAEntrypoint entrypoint, 
-    VAConfigAttrib *attrib_list,
-    int num_attribs,
-    VAConfigID *config_id /* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  VA_TRACE(va_TraceCreateConfig, dpy, profile, entrypoint, attrib_list, num_attribs, config_id);
-  return ctx->vtable.vaCreateConfig ( ctx, profile, entrypoint, attrib_list, num_attribs, config_id );
-}
-
-VAStatus vaDestroyConfig (
-    VADisplay dpy,
-    VAConfigID config_id
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDestroyConfig ( ctx, config_id );
-}
-
-VAStatus vaQueryConfigAttributes (
-    VADisplay dpy,
-    VAConfigID config_id, 
-    VAProfile *profile, 	/* out */
-    VAEntrypoint *entrypoint, 	/* out */
-    VAConfigAttrib *attrib_list,/* out */
-    int *num_attribs		/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaQueryConfigAttributes( ctx, config_id, profile, entrypoint, attrib_list, num_attribs);
-}
-
-VAStatus vaCreateSurfaces (
-    VADisplay dpy,
-    int width,
-    int height,
-    int format,
-    int num_surfaces,
-    VASurfaceID *surfaces	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  VA_TRACE(va_TraceCreateSurface, dpy, width, height, format, num_surfaces, surfaces);
-  return ctx->vtable.vaCreateSurfaces( ctx, width, height, format, num_surfaces, surfaces );
-}
-
-
-VAStatus vaDestroySurfaces (
-    VADisplay dpy,
-    VASurfaceID *surface_list,
-    int num_surfaces
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDestroySurfaces( ctx, surface_list, num_surfaces );
-}
-
-VAStatus vaCreateContext (
-    VADisplay dpy,
-    VAConfigID config_id,
-    int picture_width,
-    int picture_height,
-    int flag,
-    VASurfaceID *render_targets,
-    int num_render_targets,
-    VAContextID *context		/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  VA_TRACE(va_TraceCreateContext, dpy, config_id, picture_width, picture_height, flag, render_targets, num_render_targets, context);
-  return ctx->vtable.vaCreateContext( ctx, config_id, picture_width, picture_height,
-                                      flag, render_targets, num_render_targets, context );
-}
-
-VAStatus vaDestroyContext (
-    VADisplay dpy,
-    VAContextID context
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDestroyContext( ctx, context );
-}
-
-VAStatus vaCreateBuffer (
-    VADisplay dpy,
-    VAContextID context,	/* in */
-    VABufferType type,		/* in */
-    unsigned int size,		/* in */
-    unsigned int num_elements,	/* in */
-    void *data,			/* in */
-    VABufferID *buf_id		/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaCreateBuffer( ctx, context, type, size, num_elements, data, buf_id);
-}
-
-VAStatus vaBufferSetNumElements (
-    VADisplay dpy,
-    VABufferID buf_id,	/* in */
-    unsigned int num_elements /* in */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaBufferSetNumElements( ctx, buf_id, num_elements );
-}
-
-
-VAStatus vaMapBuffer (
-    VADisplay dpy,
-    VABufferID buf_id,	/* in */
-    void **pbuf 	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaMapBuffer( ctx, buf_id, pbuf );
-}
-
-VAStatus vaUnmapBuffer (
-    VADisplay dpy,
-    VABufferID buf_id	/* in */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaUnmapBuffer( ctx, buf_id );
-}
-
-VAStatus vaDestroyBuffer (
-    VADisplay dpy,
-    VABufferID buffer_id
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDestroyBuffer( ctx, buffer_id );
-}
-
-VAStatus vaBufferInfo (
-    VADisplay dpy,
-    VAContextID context,	/* in */
-    VABufferID buf_id,		/* in */
-    VABufferType *type,		/* out */
-    unsigned int *size,		/* out */
-    unsigned int *num_elements	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaBufferInfo( ctx, context, buf_id, type, size, num_elements );
-}
-
-VAStatus vaBeginPicture (
-    VADisplay dpy,
-    VAContextID context,
-    VASurfaceID render_target
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  VA_TRACE(va_TraceBeginPicture, ctx, context, render_target);
-  return ctx->vtable.vaBeginPicture( ctx, context, render_target );
-}
-
-VAStatus vaRenderPicture (
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID *buffers,
-    int num_buffers
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  VA_TRACE(va_TraceRenderPicture, dpy, context, buffers, num_buffers);
-  return ctx->vtable.vaRenderPicture( ctx, context, buffers, num_buffers );
-}
-
-VAStatus vaEndPicture (
-    VADisplay dpy,
-    VAContextID context
-)
-{
-  VAStatus va_status;
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  va_status = ctx->vtable.vaEndPicture( ctx, context );
-  VA_TRACE(va_TraceEndPicture, dpy, context);
-  return va_status;
-}
-
-VAStatus vaSyncSurface (
-    VADisplay dpy,
-    VASurfaceID render_target
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaSyncSurface( ctx, render_target );
-}
-
-VAStatus vaQuerySurfaceStatus (
-    VADisplay dpy,
-    VASurfaceID render_target,
-    VASurfaceStatus *status	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaQuerySurfaceStatus( ctx, render_target, status );
-}
-
-/* Get maximum number of image formats supported by the implementation */
-int vaMaxNumImageFormats (
-    VADisplay dpy
-)
-{
-  if( !vaDisplayIsValid(dpy) )
-      return 0;
-  
-  return CTX(dpy)->max_image_formats;
-}
-
-VAStatus vaQueryImageFormats (
-    VADisplay dpy,
-    VAImageFormat *format_list,	/* out */
-    int *num_formats		/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaQueryImageFormats ( ctx, format_list, num_formats);
-}
-
-/* 
- * The width and height fields returned in the VAImage structure may get 
- * enlarged for some YUV formats. The size of the data buffer that needs
- * to be allocated will be given in the "data_size" field in VAImage.
- * Image data is not allocated by this function.  The client should
- * allocate the memory and fill in the VAImage structure's data field
- * after looking at "data_size" returned from the library.
- */
-VAStatus vaCreateImage (
-    VADisplay dpy,
-    VAImageFormat *format,
-    int width,
-    int height,
-    VAImage *image	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaCreateImage ( ctx, format, width, height, image);
-}
-
-/*
- * Should call DestroyImage before destroying the surface it is bound to
- */
-VAStatus vaDestroyImage (
-    VADisplay dpy,
-    VAImageID image
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDestroyImage ( ctx, image);
-}
-
-VAStatus vaSetImagePalette (
-    VADisplay dpy,
-    VAImageID image,
-    unsigned char *palette
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaSetImagePalette ( ctx, image, palette);
-}
-
-/*
- * Retrieve surface data into a VAImage
- * Image must be in a format supported by the implementation
- */
-VAStatus vaGetImage (
-    VADisplay dpy,
-    VASurfaceID surface,
-    int x,	/* coordinates of the upper left source pixel */
-    int y,
-    unsigned int width, /* width and height of the region */
-    unsigned int height,
-    VAImageID image
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaGetImage ( ctx, surface, x, y, width, height, image);
-}
-
-/*
- * Copy data from a VAImage to a surface
- * Image must be in a format supported by the implementation
- */
-VAStatus vaPutImage (
-    VADisplay dpy,
-    VASurfaceID surface,
-    VAImageID image,
-    int src_x,
-    int src_y,
-    unsigned int src_width,
-    unsigned int src_height,
-    int dest_x,
-    int dest_y,
-    unsigned int dest_width,
-    unsigned int dest_height
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaPutImage ( ctx, surface, image, src_x, src_y, src_width, src_height, dest_x, dest_y, dest_width, dest_height );
-}
-
-/*
- * Derive an VAImage from an existing surface.
- * This interface will derive a VAImage and corresponding image buffer from
- * an existing VA Surface. The image buffer can then be mapped/unmapped for
- * direct CPU access. This operation is only possible on implementations with
- * direct rendering capabilities and internal surface formats that can be
- * represented with a VAImage. When the operation is not possible this interface
- * will return VA_STATUS_ERROR_OPERATION_FAILED. Clients should then fall back
- * to using vaCreateImage + vaPutImage to accomplish the same task in an
- * indirect manner.
- *
- * Implementations should only return success when the resulting image buffer
- * would be useable with vaMap/Unmap.
- *
- * When directly accessing a surface special care must be taken to insure
- * proper synchronization with the graphics hardware. Clients should call
- * vaQuerySurfaceStatus to insure that a surface is not the target of concurrent
- * rendering or currently being displayed by an overlay.
- *
- * Additionally nothing about the contents of a surface should be assumed
- * following a vaPutSurface. Implementations are free to modify the surface for
- * scaling or subpicture blending within a call to vaPutImage.
- *
- * Calls to vaPutImage or vaGetImage using the same surface from which the image
- * has been derived will return VA_STATUS_ERROR_SURFACE_BUSY. vaPutImage or
- * vaGetImage with other surfaces is supported.
- *
- * An image created with vaDeriveImage should be freed with vaDestroyImage. The
- * image and image buffer structures will be destroyed; however, the underlying
- * surface will remain unchanged until freed with vaDestroySurfaces.
- */
-VAStatus vaDeriveImage (
-    VADisplay dpy,
-    VASurfaceID surface,
-    VAImage *image	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDeriveImage ( ctx, surface, image );
-}
-
-
-/* Get maximum number of subpicture formats supported by the implementation */
-int vaMaxNumSubpictureFormats (
-    VADisplay dpy
-)
-{
-  if( !vaDisplayIsValid(dpy) )
-      return 0;
-  
-  return CTX(dpy)->max_subpic_formats;
-}
-
-/* 
- * Query supported subpicture formats 
- * The caller must provide a "format_list" array that can hold at
- * least vaMaxNumSubpictureFormats() entries. The flags arrary holds the flag 
- * for each format to indicate additional capabilities for that format. The actual 
- * number of formats returned in "format_list" is returned in "num_formats".
- */
-VAStatus vaQuerySubpictureFormats (
-    VADisplay dpy,
-    VAImageFormat *format_list,	/* out */
-    unsigned int *flags,	/* out */
-    unsigned int *num_formats	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaQuerySubpictureFormats ( ctx, format_list, flags, num_formats);
-}
-
-/* 
- * Subpictures are created with an image associated. 
- */
-VAStatus vaCreateSubpicture (
-    VADisplay dpy,
-    VAImageID image,
-    VASubpictureID *subpicture	/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaCreateSubpicture ( ctx, image, subpicture );
-}
-
-/*
- * Destroy the subpicture before destroying the image it is assocated to
- */
-VAStatus vaDestroySubpicture (
-    VADisplay dpy,
-    VASubpictureID subpicture
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDestroySubpicture ( ctx, subpicture);
-}
-
-VAStatus vaSetSubpictureImage (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    VAImageID image
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaSetSubpictureImage ( ctx, subpicture, image);
-}
-
-
-/*
- * If chromakey is enabled, then the area where the source value falls within
- * the chromakey [min, max] range is transparent
- */
-VAStatus vaSetSubpictureChromakey (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    unsigned int chromakey_min,
-    unsigned int chromakey_max,
-    unsigned int chromakey_mask
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaSetSubpictureChromakey ( ctx, subpicture, chromakey_min, chromakey_max, chromakey_mask );
-}
-
-
-/*
- * Global alpha value is between 0 and 1. A value of 1 means fully opaque and 
- * a value of 0 means fully transparent. If per-pixel alpha is also specified then
- * the overall alpha is per-pixel alpha multiplied by the global alpha
- */
-VAStatus vaSetSubpictureGlobalAlpha (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    float global_alpha 
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaSetSubpictureGlobalAlpha ( ctx, subpicture, global_alpha );
-}
-
-/*
-  vaAssociateSubpicture associates the subpicture with the target_surface.
-  It defines the region mapping between the subpicture and the target 
-  surface through source and destination rectangles (with the same width and height).
-  Both will be displayed at the next call to vaPutSurface.  Additional
-  associations before the call to vaPutSurface simply overrides the association.
-*/
-VAStatus vaAssociateSubpicture (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    VASurfaceID *target_surfaces,
-    int num_surfaces,
-    short src_x, /* upper left offset in subpicture */
-    short src_y,
-    unsigned short src_width,
-    unsigned short src_height,
-    short dest_x, /* upper left offset in surface */
-    short dest_y,
-    unsigned short dest_width,
-    unsigned short dest_height,
-    /*
-     * whether to enable chroma-keying or global-alpha
-     * see VA_SUBPICTURE_XXX values
-     */
-    unsigned int flags
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaAssociateSubpicture ( ctx, subpicture, target_surfaces, num_surfaces, src_x, src_y, src_width, src_height, dest_x, dest_y, dest_width, dest_height, flags );
-}
-
-/*
- * vaDeassociateSubpicture removes the association of the subpicture with target_surfaces.
- */
-VAStatus vaDeassociateSubpicture (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    VASurfaceID *target_surfaces,
-    int num_surfaces
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaDeassociateSubpicture ( ctx, subpicture, target_surfaces, num_surfaces );
-}
-
-
-/* Get maximum number of display attributes supported by the implementation */
-int vaMaxNumDisplayAttributes (
-    VADisplay dpy
-)
-{
-  if( !vaDisplayIsValid(dpy) )
-      return 0;
-  
-  return CTX(dpy)->max_display_attributes;
-}
-
-/* 
- * Query display attributes 
- * The caller must provide a "attr_list" array that can hold at
- * least vaMaxNumDisplayAttributes() entries. The actual number of attributes
- * returned in "attr_list" is returned in "num_attributes".
- */
-VAStatus vaQueryDisplayAttributes (
-    VADisplay dpy,
-    VADisplayAttribute *attr_list,	/* out */
-    int *num_attributes			/* out */
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaQueryDisplayAttributes ( ctx, attr_list, num_attributes );
-}
-
-/* 
- * Get display attributes 
- * This function returns the current attribute values in "attr_list".
- * Only attributes returned with VA_DISPLAY_ATTRIB_GETTABLE set in the "flags" field
- * from vaQueryDisplayAttributes() can have their values retrieved.  
- */
-VAStatus vaGetDisplayAttributes (
-    VADisplay dpy,
-    VADisplayAttribute *attr_list,	/* in/out */
-    int num_attributes
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaGetDisplayAttributes ( ctx, attr_list, num_attributes );
-}
-
-/* 
- * Set display attributes 
- * Only attributes returned with VA_DISPLAY_ATTRIB_SETTABLE set in the "flags" field
- * from vaQueryDisplayAttributes() can be set.  If the attribute is not settable or 
- * the value is out of range, the function returns VA_STATUS_ERROR_ATTR_NOT_SUPPORTED
- */
-VAStatus vaSetDisplayAttributes (
-    VADisplay dpy,
-    VADisplayAttribute *attr_list,
-    int num_attributes
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaSetDisplayAttributes ( ctx, attr_list, num_attributes );
-}
-
-VAStatus vaLockSurface(VADisplay dpy,
-    VASurfaceID surface,
-    unsigned int *fourcc, /* following are output argument */
-    unsigned int *luma_stride,
-    unsigned int *chroma_u_stride,
-    unsigned int *chroma_v_stride,
-    unsigned int *luma_offset,
-    unsigned int *chroma_u_offset,
-    unsigned int *chroma_v_offset,
-    unsigned int *buffer_name,
-    void **buffer 
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaLockSurface( ctx, surface, fourcc, luma_stride, chroma_u_stride, chroma_v_stride, luma_offset, chroma_u_offset, chroma_v_offset, buffer_name, buffer);
-}
-
-
-VAStatus vaUnlockSurface(VADisplay dpy,
-    VASurfaceID surface
-)
-{
-  VADriverContextP ctx;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaUnlockSurface( ctx, surface );
-}
diff -Nru libva-1.0.4/va/va_dummy.h libva-1.0.1/va/va_dummy.h
--- libva-1.0.4/va/va_dummy.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_dummy.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-#ifndef _VA_ANDROID_H_
-#define _VA_ANDROID_H_
-
-#include <va/va.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Returns a suitable VADisplay for VA API
- */
-VADisplay vaGetDisplay (
-    void *android_dpy
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef __cplusplus
-#ifdef ANDROID    
-#include <ui/ISurface.h>
-using namespace android;
-
-/*
- * Output rendering
- * Following is the rendering interface for Android system, 
- * to get the decode output surface to an ISurface object.
- * It basically performs a de-interlacing (if needed), 
- * color space conversion and scaling to the destination
- * rectangle
- */
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,	
-    sp<ISurface> draw, /* Android Window/Surface */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied destination clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* PutSurface flags */
-);
-
-#endif /* ANDROID */
-#endif /* __cplusplus */
-
-#endif /* _VA_ANDROID_H_ */
diff -Nru libva-1.0.4/va/va.h libva-1.0.1/va/va.h
--- libva-1.0.4/va/va.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,1804 +0,0 @@
-/*
- * Copyright (c) 2007-2009 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-/*
- * Video Acceleration (VA) API Specification
- *
- * Rev. 0.30
- * <jonathan.bian@intel.com>
- *
- * Revision History:
- * rev 0.10 (12/10/2006 Jonathan Bian) - Initial draft
- * rev 0.11 (12/15/2006 Jonathan Bian) - Fixed some errors
- * rev 0.12 (02/05/2007 Jonathan Bian) - Added VC-1 data structures for slice level decode
- * rev 0.13 (02/28/2007 Jonathan Bian) - Added GetDisplay()
- * rev 0.14 (04/13/2007 Jonathan Bian) - Fixed MPEG-2 PictureParameter structure, cleaned up a few funcs.
- * rev 0.15 (04/20/2007 Jonathan Bian) - Overhauled buffer management
- * rev 0.16 (05/02/2007 Jonathan Bian) - Added error codes and fixed some issues with configuration
- * rev 0.17 (05/07/2007 Jonathan Bian) - Added H.264/AVC data structures for slice level decode.
- * rev 0.18 (05/14/2007 Jonathan Bian) - Added data structures for MPEG-4 slice level decode 
- *                                       and MPEG-2 motion compensation.
- * rev 0.19 (08/06/2007 Jonathan Bian) - Removed extra type for bitplane data.
- * rev 0.20 (08/08/2007 Jonathan Bian) - Added missing fields to VC-1 PictureParameter structure.
- * rev 0.21 (08/20/2007 Jonathan Bian) - Added image and subpicture support.
- * rev 0.22 (08/27/2007 Jonathan Bian) - Added support for chroma-keying and global alpha.
- * rev 0.23 (09/11/2007 Jonathan Bian) - Fixed some issues with images and subpictures.
- * rev 0.24 (09/18/2007 Jonathan Bian) - Added display attributes.
- * rev 0.25 (10/18/2007 Jonathan Bian) - Changed to use IDs only for some types.
- * rev 0.26 (11/07/2007 Waldo Bastian) - Change vaCreateBuffer semantics
- * rev 0.27 (11/19/2007 Matt Sottek)   - Added DeriveImage
- * rev 0.28 (12/06/2007 Jonathan Bian) - Added new versions of PutImage and AssociateSubpicture 
- *                                       to enable scaling
- * rev 0.29 (02/07/2008 Jonathan Bian) - VC1 parameter fixes,
- *                                       added VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED
- * rev 0.30 (03/01/2009 Jonathan Bian) - Added encoding support for H.264 BP and MPEG-4 SP and fixes
- *                                       for ISO C conformance.
- * rev 0.31 (09/02/2009 Gwenole Beauchesne) - VC-1/H264 fields change for VDPAU and XvBA backend
- *                                       Application needs to relink with the new library.
- *
- * rev 0.31.1 (03/29/2009) - Data structure for JPEG encode
- *                                      
- * Acknowledgements:
- *  Some concepts borrowed from XvMC and XvImage.
- *  Waldo Bastian (Intel), Matt Sottek (Intel),  Austin Yuan (Intel), and Gwenole Beauchesne (SDS)
- *  contributed to various aspects of the API.
- */
-
-#ifndef _VA_H_
-#define _VA_H_
-
-#include <va/va_version.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* 
-Overview 
-
-The VA API is intended to provide an interface between a video decode/encode/display
-application (client) and a hardware accelerator (server), to off-load 
-video decode/encode/display operations from the host to the hardware accelerator at various 
-entry-points.
-
-The basic operation steps are:
-
-- Negotiate a mutually acceptable configuration with the server to lock
-  down profile, entrypoints, and other attributes that will not change on 
-  a frame-by-frame basis.
-- Create a decode context which represents a "virtualized" hardware decode 
-  device
-- Get and fill decode buffers with picture level, slice level and macroblock 
-  level data (depending on entrypoints)
-- Pass the decode buffers to the server to decode the current frame
-
-Initialization & Configuration Management 
-
-- Find out supported profiles
-- Find out entrypoints for a given profile
-- Find out configuration attributes for a given profile/entrypoint pair
-- Create a configuration for use by the decoder
-
-*/
-
-typedef void* VADisplay;	/* window system dependent */
-
-typedef int VAStatus;	/* Return status type from functions */
-/* Values for the return status */
-#define VA_STATUS_SUCCESS			0x00000000
-#define VA_STATUS_ERROR_OPERATION_FAILED	0x00000001
-#define VA_STATUS_ERROR_ALLOCATION_FAILED	0x00000002
-#define VA_STATUS_ERROR_INVALID_DISPLAY		0x00000003
-#define VA_STATUS_ERROR_INVALID_CONFIG		0x00000004
-#define VA_STATUS_ERROR_INVALID_CONTEXT		0x00000005
-#define VA_STATUS_ERROR_INVALID_SURFACE		0x00000006
-#define VA_STATUS_ERROR_INVALID_BUFFER		0x00000007
-#define VA_STATUS_ERROR_INVALID_IMAGE		0x00000008
-#define VA_STATUS_ERROR_INVALID_SUBPICTURE	0x00000009
-#define VA_STATUS_ERROR_ATTR_NOT_SUPPORTED	0x0000000a
-#define VA_STATUS_ERROR_MAX_NUM_EXCEEDED	0x0000000b
-#define VA_STATUS_ERROR_UNSUPPORTED_PROFILE	0x0000000c
-#define VA_STATUS_ERROR_UNSUPPORTED_ENTRYPOINT	0x0000000d
-#define VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT	0x0000000e
-#define VA_STATUS_ERROR_UNSUPPORTED_BUFFERTYPE	0x0000000f
-#define VA_STATUS_ERROR_SURFACE_BUSY		0x00000010
-#define VA_STATUS_ERROR_FLAG_NOT_SUPPORTED      0x00000011
-#define VA_STATUS_ERROR_INVALID_PARAMETER	0x00000012
-#define VA_STATUS_ERROR_RESOLUTION_NOT_SUPPORTED 0x00000013
-#define VA_STATUS_ERROR_UNIMPLEMENTED           0x00000014
-#define VA_STATUS_ERROR_SURFACE_IN_DISPLAYING   0x00000015
-#define VA_STATUS_ERROR_INVALID_IMAGE_FORMAT    0x00000016
-#define VA_STATUS_ERROR_UNKNOWN			0xFFFFFFFF
-
-/* De-interlacing flags for vaPutSurface() */
-#define VA_FRAME_PICTURE        0x00000000 
-#define VA_TOP_FIELD            0x00000001
-#define VA_BOTTOM_FIELD         0x00000002
-
-/*
- * Clears the drawable with background color.
- * for hardware overlay based implementation this flag
- * can be used to turn off the overlay
- */
-#define VA_CLEAR_DRAWABLE       0x00000008 
-
-/* Color space conversion flags for vaPutSurface() */
-#define VA_SRC_BT601            0x00000010
-#define VA_SRC_BT709            0x00000020
-
-/*
- * Returns a short english description of error_status
- */
-const char *vaErrorStr(VAStatus error_status);
-
-/*
- * Initialization:
- * A display must be obtained by calling vaGetDisplay() before calling
- * vaInitialize() and other functions. This connects the API to the 
- * native window system.
- * For X Windows, native_dpy would be from XOpenDisplay()
- */
-typedef void* NativeDisplay;	/* window system dependent */
-
-int vaDisplayIsValid(VADisplay dpy);
-    
-/*
- * Initialize the library 
- */
-VAStatus vaInitialize (
-    VADisplay dpy,
-    int *major_version,	 /* out */
-    int *minor_version 	 /* out */
-);
-
-/*
- * After this call, all library internal resources will be cleaned up
- */ 
-VAStatus vaTerminate (
-    VADisplay dpy
-);
-
-/*
- * vaQueryVendorString returns a pointer to a zero-terminated string
- * describing some aspects of the VA implemenation on a specific    
- * hardware accelerator. The format of the returned string is vendor
- * specific and at the discretion of the implementer.
- * e.g. for the Intel GMA500 implementation, an example would be:
- * "Intel GMA500 - 2.0.0.32L.0005"
- */
-const char *vaQueryVendorString (
-    VADisplay dpy
-);
-
-typedef int (*VAPrivFunc)();
-
-/*
- * Return a function pointer given a function name in the library.
- * This allows private interfaces into the library
- */ 
-VAPrivFunc vaGetLibFunc (
-    VADisplay dpy,
-    const char *func
-);
-
-/* Currently defined profiles */
-typedef enum
-{
-    VAProfileMPEG2Simple		= 0,
-    VAProfileMPEG2Main			= 1,
-    VAProfileMPEG4Simple		= 2,
-    VAProfileMPEG4AdvancedSimple	= 3,
-    VAProfileMPEG4Main			= 4,
-    VAProfileH264Baseline		= 5,
-    VAProfileH264Main			= 6,
-    VAProfileH264High			= 7,
-    VAProfileVC1Simple			= 8,
-    VAProfileVC1Main			= 9,
-    VAProfileVC1Advanced		= 10,
-    VAProfileH263Baseline		= 11,
-    VAProfileJPEGBaseline               = 12
-} VAProfile;
-
-/* 
- *  Currently defined entrypoints 
- */
-typedef enum
-{
-    VAEntrypointVLD		= 1,
-    VAEntrypointIZZ		= 2,
-    VAEntrypointIDCT		= 3,
-    VAEntrypointMoComp		= 4,
-    VAEntrypointDeblocking	= 5,
-    VAEntrypointEncSlice	= 6,	/* slice level encode */
-    VAEntrypointEncPicture 	= 7	/* pictuer encode, JPEG, etc */
-} VAEntrypoint;
-
-/* Currently defined configuration attribute types */
-typedef enum
-{
-    VAConfigAttribRTFormat		= 0,
-    VAConfigAttribSpatialResidual	= 1,
-    VAConfigAttribSpatialClipping	= 2,
-    VAConfigAttribIntraResidual		= 3,
-    VAConfigAttribEncryption		= 4,
-    VAConfigAttribRateControl		= 5
-} VAConfigAttribType;
-
-/*
- * Configuration attributes
- * If there is more than one value for an attribute, a default
- * value will be assigned to the attribute if the client does not
- * specify the attribute when creating a configuration
- */
-typedef struct _VAConfigAttrib {
-    VAConfigAttribType type;
-    unsigned int value; /* OR'd flags (bits) for this attribute */
-} VAConfigAttrib;
-
-/* attribute value for VAConfigAttribRTFormat */
-#define VA_RT_FORMAT_YUV420	0x00000001	
-#define VA_RT_FORMAT_YUV422	0x00000002
-#define VA_RT_FORMAT_YUV444	0x00000004
-#define VA_RT_FORMAT_PROTECTED	0x80000000
-
-/* attribute value for VAConfigAttribRateControl */
-#define VA_RC_NONE	0x00000001	
-#define VA_RC_CBR	0x00000002	
-#define VA_RC_VBR	0x00000004	
-
-/*
- * if an attribute is not applicable for a given
- * profile/entrypoint pair, then set the value to the following 
- */
-#define VA_ATTRIB_NOT_SUPPORTED 0x80000000
-
-/* Get maximum number of profiles supported by the implementation */
-int vaMaxNumProfiles (
-    VADisplay dpy
-);
-
-/* Get maximum number of entrypoints supported by the implementation */
-int vaMaxNumEntrypoints (
-    VADisplay dpy
-);
-
-/* Get maximum number of attributs supported by the implementation */
-int vaMaxNumConfigAttributes (
-    VADisplay dpy
-);
-
-/* 
- * Query supported profiles 
- * The caller must provide a "profile_list" array that can hold at
- * least vaMaxNumProfile() entries. The actual number of profiles
- * returned in "profile_list" is returned in "num_profile".
- */
-VAStatus vaQueryConfigProfiles (
-    VADisplay dpy,
-    VAProfile *profile_list,	/* out */
-    int *num_profiles		/* out */
-);
-
-/* 
- * Query supported entrypoints for a given profile 
- * The caller must provide an "entrypoint_list" array that can hold at
- * least vaMaxNumEntrypoints() entries. The actual number of entrypoints 
- * returned in "entrypoint_list" is returned in "num_entrypoints".
- */
-VAStatus vaQueryConfigEntrypoints (
-    VADisplay dpy,
-    VAProfile profile,
-    VAEntrypoint *entrypoint_list,	/* out */
-    int *num_entrypoints		/* out */
-);
-
-/* 
- * Get attributes for a given profile/entrypoint pair 
- * The caller must provide an "attrib_list" with all attributes to be 
- * retrieved.  Upon return, the attributes in "attrib_list" have been 
- * updated with their value.  Unknown attributes or attributes that are 
- * not supported for the given profile/entrypoint pair will have their 
- * value set to VA_ATTRIB_NOT_SUPPORTED
- */
-VAStatus vaGetConfigAttributes (
-    VADisplay dpy,
-    VAProfile profile,
-    VAEntrypoint entrypoint,
-    VAConfigAttrib *attrib_list, /* in/out */
-    int num_attribs
-);
-
-/* Generic ID type, can be re-typed for specific implementation */
-typedef unsigned int VAGenericID;
-
-typedef VAGenericID VAConfigID;
-
-/* 
- * Create a configuration for the decode pipeline 
- * it passes in the attribute list that specifies the attributes it cares 
- * about, with the rest taking default values.  
- */
-VAStatus vaCreateConfig (
-    VADisplay dpy,
-    VAProfile profile, 
-    VAEntrypoint entrypoint, 
-    VAConfigAttrib *attrib_list,
-    int num_attribs,
-    VAConfigID *config_id /* out */
-);
-
-/* 
- * Free resources associdated with a given config 
- */
-VAStatus vaDestroyConfig (
-    VADisplay dpy,
-    VAConfigID config_id
-);
-
-/* 
- * Query all attributes for a given configuration 
- * The profile of the configuration is returned in "profile"
- * The entrypoint of the configuration is returned in "entrypoint"
- * The caller must provide an "attrib_list" array that can hold at least 
- * vaMaxNumConfigAttributes() entries. The actual number of attributes 
- * returned in "attrib_list" is returned in "num_attribs"
- */
-VAStatus vaQueryConfigAttributes (
-    VADisplay dpy,
-    VAConfigID config_id, 
-    VAProfile *profile, 	/* out */
-    VAEntrypoint *entrypoint, 	/* out */
-    VAConfigAttrib *attrib_list,/* out */
-    int *num_attribs 		/* out */
-);
-
-
-/*
- * Contexts and Surfaces
- *
- * Context represents a "virtual" video decode pipeline. Surfaces are render 
- * targets for a given context. The data in the surfaces are not accessible  
- * to the client and the internal data format of the surface is implementatin 
- * specific. 
- *
- * Surfaces will be bound to a context when the context is created. Once
- * a surface is bound to a given context, it can not be used to create  
- * another context. The association is removed when the context is destroyed
- * 
- * Both contexts and surfaces are identified by unique IDs and its
- * implementation specific internals are kept opaque to the clients
- */
-
-typedef VAGenericID VAContextID;
-
-typedef VAGenericID VASurfaceID;
-
-#define VA_INVALID_ID		0xffffffff
-#define VA_INVALID_SURFACE	VA_INVALID_ID
-
-/* 
- * vaCreateSurfaces - Create an array of surfaces used for decode and display  
- *  dpy: display
- *  width: surface width
- *  height: surface height
- *  format: VA_RT_FORMAT_YUV420, VA_RT_FORMAT_YUV422 or VA_RT_FORMAT_YUV444
- *  num_surfaces: number of surfaces to be created
- *  surfaces: array of surfaces created upon return
- */
-VAStatus vaCreateSurfaces (
-    VADisplay dpy,
-    int width,
-    int height,
-    int format,
-    int num_surfaces,
-    VASurfaceID *surfaces	/* out */
-);
-
-    
-/*
- * vaDestroySurfaces - Destroy resources associated with surfaces. 
- *  Surfaces can only be destroyed after the context associated has been 
- *  destroyed.  
- *  dpy: display
- *  surfaces: array of surfaces to destroy
- *  num_surfaces: number of surfaces in the array to be destroyed.
- */
-VAStatus vaDestroySurfaces (
-    VADisplay dpy,
-    VASurfaceID *surfaces,
-    int num_surfaces
-);
-
-#define VA_PROGRESSIVE 0x1
-/*
- * vaCreateContext - Create a context
- *  dpy: display
- *  config_id: configuration for the context
- *  picture_width: coded picture width
- *  picture_height: coded picture height
- *  flag: any combination of the following:
- *    VA_PROGRESSIVE (only progressive frame pictures in the sequence when set)
- *  render_targets: render targets (surfaces) tied to the context
- *  num_render_targets: number of render targets in the above array
- *  context: created context id upon return
- */
-VAStatus vaCreateContext (
-    VADisplay dpy,
-    VAConfigID config_id,
-    int picture_width,
-    int picture_height,
-    int flag,
-    VASurfaceID *render_targets,
-    int num_render_targets,
-    VAContextID *context		/* out */
-);
-
-/*
- * vaDestroyContext - Destroy a context 
- *  dpy: display
- *  context: context to be destroyed
- */
-VAStatus vaDestroyContext (
-    VADisplay dpy,
-    VAContextID context
-);
-
-/*
- * Buffers 
- * Buffers are used to pass various types of data from the
- * client to the server. The server maintains a data store
- * for each buffer created, and the client idenfies a buffer
- * through a unique buffer id assigned by the server.
- */
-
-typedef VAGenericID VABufferID;
-
-typedef enum
-{
-    VAPictureParameterBufferType	= 0,
-    VAIQMatrixBufferType		= 1,
-    VABitPlaneBufferType		= 2,
-    VASliceGroupMapBufferType		= 3,
-    VASliceParameterBufferType		= 4,
-    VASliceDataBufferType		= 5,
-    VAMacroblockParameterBufferType	= 6,
-    VAResidualDataBufferType		= 7,
-    VADeblockingParameterBufferType	= 8,
-    VAImageBufferType			= 9,
-    VAProtectedSliceDataBufferType	= 10,
-    VAQMatrixBufferType                 = 11,
-/* Following are encode buffer types */
-    VAEncCodedBufferType		= 21,
-    VAEncSequenceParameterBufferType	= 22,
-    VAEncPictureParameterBufferType	= 23,
-    VAEncSliceParameterBufferType	= 24,
-    VAEncH264VUIBufferType		= 25,
-    VAEncH264SEIBufferType		= 26,
-} VABufferType;
-
-
-/* 
- * There will be cases where the bitstream buffer will not have enough room to hold
- * the data for the entire slice, and the following flags will be used in the slice
- * parameter to signal to the server for the possible cases.
- * If a slice parameter buffer and slice data buffer pair is sent to the server with 
- * the slice data partially in the slice data buffer (BEGIN and MIDDLE cases below), 
- * then a slice parameter and data buffer needs to be sent again to complete this slice. 
- */
-#define VA_SLICE_DATA_FLAG_ALL		0x00	/* whole slice is in the buffer */
-#define VA_SLICE_DATA_FLAG_BEGIN	0x01	/* The beginning of the slice is in the buffer but the end if not */
-#define VA_SLICE_DATA_FLAG_MIDDLE	0x02	/* Neither beginning nor end of the slice is in the buffer */
-#define VA_SLICE_DATA_FLAG_END		0x04	/* end of the slice is in the buffer */
-
-/* Codec-independent Slice Parameter Buffer base */
-typedef struct _VASliceParameterBufferBase
-{
-    unsigned int slice_data_size;	/* number of bytes in the slice data buffer for this slice */
-    unsigned int slice_data_offset;	/* the offset to the first byte of slice data */
-    unsigned int slice_data_flag;	/* see VA_SLICE_DATA_FLAG_XXX definitions */
-} VASliceParameterBufferBase;
-
-
-/****************************
- * JEPG data structure
- ***************************/
-typedef struct _VAQMatrixBufferJPEG
-{
-    int load_lum_quantiser_matrix;
-    int load_chroma_quantiser_matrix;
-    unsigned char lum_quantiser_matrix[64];
-    unsigned char chroma_quantiser_matrix[64];
-} VAQMatrixBufferJPEG;
-
-typedef struct _VAEncPictureParameterBufferJPEG
-{
-    VASurfaceID reconstructed_picture;
-    unsigned short picture_width;
-    unsigned short picture_height;
-    VABufferID coded_buf;
-} VAEncPictureParameterBufferJPEG;
-
-
-/****************************
- * MPEG-2 data structures
- ****************************/
- 
-/* MPEG-2 Picture Parameter Buffer */
-/* 
- * For each frame or field, and before any slice data, a single
- * picture parameter buffer must be send.
- */
-typedef struct _VAPictureParameterBufferMPEG2
-{
-    unsigned short horizontal_size;
-    unsigned short vertical_size;
-    VASurfaceID forward_reference_picture;
-    VASurfaceID backward_reference_picture;
-    /* meanings of the following fields are the same as in the standard */
-    int picture_coding_type;
-    int f_code; /* pack all four fcode into this */
-    union {
-        struct {
-            unsigned int intra_dc_precision		: 2; 
-            unsigned int picture_structure		: 2; 
-            unsigned int top_field_first		: 1; 
-            unsigned int frame_pred_frame_dct		: 1; 
-            unsigned int concealment_motion_vectors	: 1;
-            unsigned int q_scale_type			: 1;
-            unsigned int intra_vlc_format		: 1;
-            unsigned int alternate_scan			: 1;
-            unsigned int repeat_first_field		: 1;
-            unsigned int progressive_frame		: 1;
-            unsigned int is_first_field			: 1; /* indicate whether the current field
-                                                              * is the first field for field picture
-                                                              */
-        } bits;
-        unsigned int value;
-    } picture_coding_extension;
-} VAPictureParameterBufferMPEG2;
-
-/* MPEG-2 Inverse Quantization Matrix Buffer */
-typedef struct _VAIQMatrixBufferMPEG2
-{
-    int load_intra_quantiser_matrix;
-    int load_non_intra_quantiser_matrix;
-    int load_chroma_intra_quantiser_matrix;
-    int load_chroma_non_intra_quantiser_matrix;
-    unsigned char intra_quantiser_matrix[64];
-    unsigned char non_intra_quantiser_matrix[64];
-    unsigned char chroma_intra_quantiser_matrix[64];
-    unsigned char chroma_non_intra_quantiser_matrix[64];
-} VAIQMatrixBufferMPEG2;
-
-/* MPEG-2 Slice Parameter Buffer */
-typedef struct _VASliceParameterBufferMPEG2
-{
-    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
-    unsigned int slice_data_offset;/* the offset to the first byte of slice data */
-    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
-    unsigned int macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
-    unsigned int slice_horizontal_position;
-    unsigned int slice_vertical_position;
-    int quantiser_scale_code;
-    int intra_slice_flag;
-} VASliceParameterBufferMPEG2;
-
-/* MPEG-2 Macroblock Parameter Buffer */
-typedef struct _VAMacroblockParameterBufferMPEG2
-{
-    unsigned short macroblock_address;
-    /* 
-     * macroblock_address (in raster scan order)
-     * top-left: 0
-     * bottom-right: picture-height-in-mb*picture-width-in-mb - 1
-     */
-    unsigned char macroblock_type;  /* see definition below */
-    union {
-        struct {
-            unsigned int frame_motion_type		: 2; 
-            unsigned int field_motion_type		: 2; 
-            unsigned int dct_type			: 1; 
-        } bits;
-        unsigned int value;
-    } macroblock_modes;
-    unsigned char motion_vertical_field_select; 
-    /* 
-     * motion_vertical_field_select:
-     * see section 6.3.17.2 in the spec
-     * only the lower 4 bits are used
-     * bit 0: first vector forward
-     * bit 1: first vector backward
-     * bit 2: second vector forward
-     * bit 3: second vector backward
-     */
-    short PMV[2][2][2]; /* see Table 7-7 in the spec */
-    unsigned short coded_block_pattern;
-    /* 
-     * The bitplanes for coded_block_pattern are described 
-     * in Figure 6.10-12 in the spec
-     */
-     
-    /* Number of skipped macroblocks after this macroblock */
-    unsigned short num_skipped_macroblocks;
-} VAMacroblockParameterBufferMPEG2;
-
-/* 
- * OR'd flags for macroblock_type (section 6.3.17.1 in the spec)
- */
-#define VA_MB_TYPE_MOTION_FORWARD	0x02
-#define VA_MB_TYPE_MOTION_BACKWARD	0x04
-#define VA_MB_TYPE_MOTION_PATTERN	0x08
-#define VA_MB_TYPE_MOTION_INTRA		0x10
-
-/* 
- * MPEG-2 Residual Data Buffer 
- * For each macroblock, there wil be 64 shorts (16-bit) in the 
- * residual data buffer
- */
-
-/****************************
- * MPEG-4 Part 2 data structures
- ****************************/
- 
-/* MPEG-4 Picture Parameter Buffer */
-/* 
- * For each frame or field, and before any slice data, a single
- * picture parameter buffer must be send.
- */
-typedef struct _VAPictureParameterBufferMPEG4
-{
-    unsigned short vop_width;
-    unsigned short vop_height;
-    VASurfaceID forward_reference_picture;
-    VASurfaceID backward_reference_picture;
-    union {
-        struct {
-            unsigned int short_video_header		: 1; 
-            unsigned int chroma_format			: 2; 
-            unsigned int interlaced			: 1; 
-            unsigned int obmc_disable			: 1; 
-            unsigned int sprite_enable			: 2; 
-            unsigned int sprite_warping_accuracy	: 2; 
-            unsigned int quant_type			: 1; 
-            unsigned int quarter_sample			: 1; 
-            unsigned int data_partitioned		: 1; 
-            unsigned int reversible_vlc			: 1; 
-            unsigned int resync_marker_disable		: 1; 
-        } bits;
-        unsigned int value;
-    } vol_fields;
-    unsigned char no_of_sprite_warping_points;
-    short sprite_trajectory_du[3];
-    short sprite_trajectory_dv[3];
-    unsigned char quant_precision;
-    union {
-        struct {
-            unsigned int vop_coding_type		: 2; 
-            unsigned int backward_reference_vop_coding_type	: 2; 
-            unsigned int vop_rounding_type		: 1; 
-            unsigned int intra_dc_vlc_thr		: 3; 
-            unsigned int top_field_first		: 1; 
-            unsigned int alternate_vertical_scan_flag	: 1; 
-        } bits;
-        unsigned int value;
-    } vop_fields;
-    unsigned char vop_fcode_forward;
-    unsigned char vop_fcode_backward;
-    unsigned short vop_time_increment_resolution;
-    /* short header related */
-    unsigned char num_gobs_in_vop;
-    unsigned char num_macroblocks_in_gob;
-    /* for direct mode prediction */
-    short TRB;
-    short TRD;
-} VAPictureParameterBufferMPEG4;
-
-/* MPEG-4 Inverse Quantization Matrix Buffer */
-typedef struct _VAIQMatrixBufferMPEG4
-{
-    int load_intra_quant_mat;
-    int load_non_intra_quant_mat;
-    unsigned char intra_quant_mat[64];
-    unsigned char non_intra_quant_mat[64];
-} VAIQMatrixBufferMPEG4;
-
-/* MPEG-4 Slice Parameter Buffer */
-typedef struct _VASliceParameterBufferMPEG4
-{
-    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
-    unsigned int slice_data_offset;/* the offset to the first byte of slice data */
-    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
-    unsigned int macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
-    unsigned int macroblock_number;
-    int quant_scale;
-} VASliceParameterBufferMPEG4;
-
-/*
- VC-1 data structures
-*/
-
-typedef enum   /* see 7.1.1.32 */
-{
-    VAMvMode1Mv                        = 0,
-    VAMvMode1MvHalfPel                 = 1,
-    VAMvMode1MvHalfPelBilinear         = 2,
-    VAMvModeMixedMv                    = 3,
-    VAMvModeIntensityCompensation      = 4 
-} VAMvModeVC1;
-
-/* VC-1 Picture Parameter Buffer */
-/* 
- * For each picture, and before any slice data, a picture parameter
- * buffer must be send. Multiple picture parameter buffers may be
- * sent for a single picture. In that case picture parameters will
- * apply to all slice data that follow it until a new picture
- * parameter buffer is sent.
- *
- * Notes:
- *   pic_quantizer_type should be set to the applicable quantizer
- *   type as defined by QUANTIZER (J.1.19) and either
- *   PQUANTIZER (7.1.1.8) or PQINDEX (7.1.1.6)
- */
-typedef struct _VAPictureParameterBufferVC1
-{
-    VASurfaceID forward_reference_picture;
-    VASurfaceID backward_reference_picture;
-    /* if out-of-loop post-processing is done on the render
-       target, then we need to keep the in-loop decoded 
-       picture as a reference picture */
-    VASurfaceID inloop_decoded_picture;
-
-    /* sequence layer for AP or meta data for SP and MP */
-    union {
-        struct {
-            unsigned int pulldown	: 1; /* SEQUENCE_LAYER::PULLDOWN */
-            unsigned int interlace	: 1; /* SEQUENCE_LAYER::INTERLACE */
-            unsigned int tfcntrflag	: 1; /* SEQUENCE_LAYER::TFCNTRFLAG */
-            unsigned int finterpflag	: 1; /* SEQUENCE_LAYER::FINTERPFLAG */
-            unsigned int psf		: 1; /* SEQUENCE_LAYER::PSF */
-            unsigned int multires	: 1; /* METADATA::MULTIRES */
-            unsigned int overlap	: 1; /* METADATA::OVERLAP */
-            unsigned int syncmarker	: 1; /* METADATA::SYNCMARKER */
-            unsigned int rangered	: 1; /* METADATA::RANGERED */
-            unsigned int max_b_frames	: 3; /* METADATA::MAXBFRAMES */
-        } bits;
-        unsigned int value;
-    } sequence_fields;
-
-    unsigned short coded_width;		/* ENTRY_POINT_LAYER::CODED_WIDTH */
-    unsigned short coded_height;	/* ENTRY_POINT_LAYER::CODED_HEIGHT */
-    union {
-	struct {
-            unsigned int broken_link	: 1; /* ENTRY_POINT_LAYER::BROKEN_LINK */
-            unsigned int closed_entry	: 1; /* ENTRY_POINT_LAYER::CLOSED_ENTRY */
-            unsigned int panscan_flag	: 1; /* ENTRY_POINT_LAYER::PANSCAN_FLAG */
-            unsigned int loopfilter	: 1; /* ENTRY_POINT_LAYER::LOOPFILTER */
-	} bits;
-	unsigned int value;
-    } entrypoint_fields;
-    unsigned char conditional_overlap_flag; /* ENTRY_POINT_LAYER::CONDOVER */
-    unsigned char fast_uvmc_flag;	/* ENTRY_POINT_LAYER::FASTUVMC */
-    union {
-        struct {
-            unsigned int luma_flag	: 1; /* ENTRY_POINT_LAYER::RANGE_MAPY_FLAG */
-            unsigned int luma		: 3; /* ENTRY_POINT_LAYER::RANGE_MAPY */
-            unsigned int chroma_flag	: 1; /* ENTRY_POINT_LAYER::RANGE_MAPUV_FLAG */
-            unsigned int chroma		: 3; /* ENTRY_POINT_LAYER::RANGE_MAPUV */
-        } bits;
-        unsigned int value;
-    } range_mapping_fields;
-
-    unsigned char b_picture_fraction;	/* PICTURE_LAYER::BFRACTION */
-    unsigned char cbp_table;		/* PICTURE_LAYER::CBPTAB/ICBPTAB */
-    unsigned char mb_mode_table;	/* PICTURE_LAYER::MBMODETAB */
-    unsigned char range_reduction_frame;/* PICTURE_LAYER::RANGEREDFRM */
-    unsigned char rounding_control;	/* PICTURE_LAYER::RNDCTRL */
-    unsigned char post_processing;	/* PICTURE_LAYER::POSTPROC */
-    unsigned char picture_resolution_index;	/* PICTURE_LAYER::RESPIC */
-    unsigned char luma_scale;		/* PICTURE_LAYER::LUMSCALE */
-    unsigned char luma_shift;		/* PICTURE_LAYER::LUMSHIFT */
-    union {
-        struct {
-            unsigned int picture_type		: 3; /* PICTURE_LAYER::PTYPE */
-            unsigned int frame_coding_mode	: 3; /* PICTURE_LAYER::FCM */
-            unsigned int top_field_first	: 1; /* PICTURE_LAYER::TFF */
-            unsigned int is_first_field		: 1; /* set to 1 if it is the first field */
-            unsigned int intensity_compensation	: 1; /* PICTURE_LAYER::INTCOMP */
-        } bits;
-        unsigned int value;
-    } picture_fields;
-    union {
-        struct {
-            unsigned int mv_type_mb	: 1; 	/* PICTURE::MVTYPEMB */
-            unsigned int direct_mb	: 1; 	/* PICTURE::DIRECTMB */
-            unsigned int skip_mb	: 1; 	/* PICTURE::SKIPMB */
-            unsigned int field_tx	: 1; 	/* PICTURE::FIELDTX */
-            unsigned int forward_mb	: 1;	/* PICTURE::FORWARDMB */
-            unsigned int ac_pred	: 1;	/* PICTURE::ACPRED */
-            unsigned int overflags	: 1;	/* PICTURE::OVERFLAGS */
-        } flags;
-        unsigned int value;
-    } raw_coding;
-    union {
-        struct {
-            unsigned int bp_mv_type_mb   : 1;    /* PICTURE::MVTYPEMB */
-            unsigned int bp_direct_mb    : 1;    /* PICTURE::DIRECTMB */
-            unsigned int bp_skip_mb      : 1;    /* PICTURE::SKIPMB */  
-            unsigned int bp_field_tx     : 1;    /* PICTURE::FIELDTX */ 
-            unsigned int bp_forward_mb   : 1;    /* PICTURE::FORWARDMB */
-            unsigned int bp_ac_pred      : 1;    /* PICTURE::ACPRED */   
-            unsigned int bp_overflags    : 1;    /* PICTURE::OVERFLAGS */
-        } flags;
-        unsigned int value;
-    } bitplane_present; /* signal what bitplane is being passed via the bitplane buffer */
-    union {
-        struct {
-            unsigned int reference_distance_flag : 1;/* PICTURE_LAYER::REFDIST_FLAG */
-            unsigned int reference_distance	: 5;/* PICTURE_LAYER::REFDIST */
-            unsigned int num_reference_pictures: 1;/* PICTURE_LAYER::NUMREF */
-            unsigned int reference_field_pic_indicator	: 1;/* PICTURE_LAYER::REFFIELD */
-        } bits;
-        unsigned int value;
-    } reference_fields;
-    union {
-        struct {
-            unsigned int mv_mode		: 3; /* PICTURE_LAYER::MVMODE */
-            unsigned int mv_mode2		: 3; /* PICTURE_LAYER::MVMODE2 */
-            unsigned int mv_table		: 3; /* PICTURE_LAYER::MVTAB/IMVTAB */
-            unsigned int two_mv_block_pattern_table: 2; /* PICTURE_LAYER::2MVBPTAB */
-            unsigned int four_mv_switch		: 1; /* PICTURE_LAYER::4MVSWITCH */
-            unsigned int four_mv_block_pattern_table : 2; /* PICTURE_LAYER::4MVBPTAB */
-            unsigned int extended_mv_flag	: 1; /* ENTRY_POINT_LAYER::EXTENDED_MV */
-            unsigned int extended_mv_range	: 2; /* PICTURE_LAYER::MVRANGE */
-            unsigned int extended_dmv_flag	: 1; /* ENTRY_POINT_LAYER::EXTENDED_DMV */
-            unsigned int extended_dmv_range	: 2; /* PICTURE_LAYER::DMVRANGE */
-        } bits;
-        unsigned int value;
-    } mv_fields;
-    union {
-        struct {
-            unsigned int dquant	: 2; 	/* ENTRY_POINT_LAYER::DQUANT */
-            unsigned int quantizer     : 2; 	/* ENTRY_POINT_LAYER::QUANTIZER */
-            unsigned int half_qp	: 1; 	/* PICTURE_LAYER::HALFQP */
-            unsigned int pic_quantizer_scale : 5;/* PICTURE_LAYER::PQUANT */
-            unsigned int pic_quantizer_type : 1;/* PICTURE_LAYER::PQUANTIZER */
-            unsigned int dq_frame	: 1; 	/* VOPDQUANT::DQUANTFRM */
-            unsigned int dq_profile	: 2; 	/* VOPDQUANT::DQPROFILE */
-            unsigned int dq_sb_edge	: 2; 	/* VOPDQUANT::DQSBEDGE */
-            unsigned int dq_db_edge 	: 2; 	/* VOPDQUANT::DQDBEDGE */
-            unsigned int dq_binary_level : 1; 	/* VOPDQUANT::DQBILEVEL */
-            unsigned int alt_pic_quantizer : 5;/* VOPDQUANT::ALTPQUANT */
-        } bits;
-        unsigned int value;
-    } pic_quantizer_fields;
-    union {
-        struct {
-            unsigned int variable_sized_transform_flag	: 1;/* ENTRY_POINT_LAYER::VSTRANSFORM */
-            unsigned int mb_level_transform_type_flag	: 1;/* PICTURE_LAYER::TTMBF */
-            unsigned int frame_level_transform_type	: 2;/* PICTURE_LAYER::TTFRM */
-            unsigned int transform_ac_codingset_idx1	: 2;/* PICTURE_LAYER::TRANSACFRM */
-            unsigned int transform_ac_codingset_idx2	: 2;/* PICTURE_LAYER::TRANSACFRM2 */
-            unsigned int intra_transform_dc_table	: 1;/* PICTURE_LAYER::TRANSDCTAB */
-        } bits;
-        unsigned int value;
-    } transform_fields;
-} VAPictureParameterBufferVC1;
-
-/* VC-1 Bitplane Buffer 
-There will be at most three bitplanes coded in any picture header. To send 
-the bitplane data more efficiently, each byte is divided in two nibbles, with
-each nibble carrying three bitplanes for one macroblock.  The following table
-shows the bitplane data arrangement within each nibble based on the picture
-type.
-
-Picture Type	Bit3		Bit2		Bit1		Bit0
-I or BI				OVERFLAGS	ACPRED		FIELDTX
-P				MYTYPEMB	SKIPMB		DIRECTMB
-B				FORWARDMB	SKIPMB		DIRECTMB
-
-Within each byte, the lower nibble is for the first MB and the upper nibble is 
-for the second MB.  E.g. the lower nibble of the first byte in the bitplane
-buffer is for Macroblock #1 and the upper nibble of the first byte is for 
-Macroblock #2 in the first row.
-*/
-
-/* VC-1 Slice Parameter Buffer */
-typedef struct _VASliceParameterBufferVC1
-{
-    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
-    unsigned int slice_data_offset;/* the offset to the first byte of slice data */
-    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
-    unsigned int macroblock_offset;/* the offset to the first bit of MB from the first byte of slice data */
-    unsigned int slice_vertical_position;
-} VASliceParameterBufferVC1;
-
-/* VC-1 Slice Data Buffer */
-/* 
-This is simplely a buffer containing raw bit-stream bytes 
-*/
-
-/****************************
- * H.264/AVC data structures
- ****************************/
-
-typedef struct _VAPictureH264
-{
-    VASurfaceID picture_id;
-    unsigned int frame_idx;
-    unsigned int flags;
-    unsigned int TopFieldOrderCnt;
-    unsigned int BottomFieldOrderCnt;
-} VAPictureH264;
-/* flags in VAPictureH264 could be OR of the following */
-#define VA_PICTURE_H264_INVALID			0x00000001
-#define VA_PICTURE_H264_TOP_FIELD		0x00000002
-#define VA_PICTURE_H264_BOTTOM_FIELD		0x00000004
-#define VA_PICTURE_H264_SHORT_TERM_REFERENCE	0x00000008
-#define VA_PICTURE_H264_LONG_TERM_REFERENCE	0x00000010
-
-/* H.264 Picture Parameter Buffer */
-/* 
- * For each picture, and before any slice data, a single
- * picture parameter buffer must be send.
- */
-typedef struct _VAPictureParameterBufferH264
-{
-    VAPictureH264 CurrPic;
-    VAPictureH264 ReferenceFrames[16];	/* in DPB */
-    unsigned short picture_width_in_mbs_minus1;
-    unsigned short picture_height_in_mbs_minus1;
-    unsigned char bit_depth_luma_minus8;
-    unsigned char bit_depth_chroma_minus8;
-    unsigned char num_ref_frames;
-    union {
-        struct {
-            unsigned int chroma_format_idc			: 2; 
-            unsigned int residual_colour_transform_flag		: 1; 
-            unsigned int gaps_in_frame_num_value_allowed_flag	: 1; 
-            unsigned int frame_mbs_only_flag			: 1; 
-            unsigned int mb_adaptive_frame_field_flag		: 1; 
-            unsigned int direct_8x8_inference_flag		: 1; 
-            unsigned int MinLumaBiPredSize8x8			: 1; /* see A.3.3.2 */
-            unsigned int log2_max_frame_num_minus4		: 4;
-            unsigned int pic_order_cnt_type			: 2;
-            unsigned int log2_max_pic_order_cnt_lsb_minus4	: 4;
-            unsigned int delta_pic_order_always_zero_flag	: 1;
-        } bits;
-        unsigned int value;
-    } seq_fields;
-    unsigned char num_slice_groups_minus1;
-    unsigned char slice_group_map_type;
-    unsigned short slice_group_change_rate_minus1;
-    signed char pic_init_qp_minus26;
-    signed char pic_init_qs_minus26;
-    signed char chroma_qp_index_offset;
-    signed char second_chroma_qp_index_offset;
-    union {
-        struct {
-            unsigned int entropy_coding_mode_flag	: 1;
-            unsigned int weighted_pred_flag		: 1;
-            unsigned int weighted_bipred_idc		: 2;
-            unsigned int transform_8x8_mode_flag	: 1;
-            unsigned int field_pic_flag			: 1;
-            unsigned int constrained_intra_pred_flag	: 1;
-            unsigned int pic_order_present_flag			: 1;
-            unsigned int deblocking_filter_control_present_flag : 1;
-            unsigned int redundant_pic_cnt_present_flag		: 1;
-            unsigned int reference_pic_flag			: 1; /* nal_ref_idc != 0 */
-        } bits;
-        unsigned int value;
-    } pic_fields;
-    unsigned short frame_num;
-} VAPictureParameterBufferH264;
-
-/* H.264 Inverse Quantization Matrix Buffer */
-typedef struct _VAIQMatrixBufferH264
-{
-    unsigned char ScalingList4x4[6][16];
-    unsigned char ScalingList8x8[2][64];
-} VAIQMatrixBufferH264;
-
-/* 
- * H.264 Slice Group Map Buffer 
- * When VAPictureParameterBufferH264::num_slice_group_minus1 is not equal to 0,
- * A slice group map buffer should be sent for each picture if required. The buffer
- * is sent only when there is a change in the mapping values.
- * The slice group map buffer map "map units" to slice groups as specified in 
- * section 8.2.2 of the H.264 spec. The buffer will contain one byte for each macroblock 
- * in raster scan order
- */ 
-
-/* H.264 Slice Parameter Buffer */
-typedef struct _VASliceParameterBufferH264
-{
-    unsigned int slice_data_size;/* number of bytes in the slice data buffer for this slice */
-    unsigned int slice_data_offset;/* the offset to the NAL start code for this slice */
-    unsigned int slice_data_flag; /* see VA_SLICE_DATA_FLAG_XXX defintions */
-    unsigned short slice_data_bit_offset; /* bit offset from NAL start code to the beginning of slice data */
-    unsigned short first_mb_in_slice;
-    unsigned char slice_type;
-    unsigned char direct_spatial_mv_pred_flag;
-    unsigned char num_ref_idx_l0_active_minus1;
-    unsigned char num_ref_idx_l1_active_minus1;
-    unsigned char cabac_init_idc;
-    char slice_qp_delta;
-    unsigned char disable_deblocking_filter_idc;
-    char slice_alpha_c0_offset_div2;
-    char slice_beta_offset_div2;
-    VAPictureH264 RefPicList0[32];	/* See 8.2.4.2 */
-    VAPictureH264 RefPicList1[32];	/* See 8.2.4.2 */
-    unsigned char luma_log2_weight_denom;
-    unsigned char chroma_log2_weight_denom;
-    unsigned char luma_weight_l0_flag;
-    short luma_weight_l0[32];
-    short luma_offset_l0[32];
-    unsigned char chroma_weight_l0_flag;
-    short chroma_weight_l0[32][2];
-    short chroma_offset_l0[32][2];
-    unsigned char luma_weight_l1_flag;
-    short luma_weight_l1[32];
-    short luma_offset_l1[32];
-    unsigned char chroma_weight_l1_flag;
-    short chroma_weight_l1[32][2];
-    short chroma_offset_l1[32][2];
-} VASliceParameterBufferH264;
-
-/****************************
- * Common encode data structures 
- ****************************/
-typedef enum
-{
-    VAEncPictureTypeIntra		= 0,
-    VAEncPictureTypePredictive		= 1,
-    VAEncPictureTypeBidirectional	= 2,
-} VAEncPictureType;
-
-/* Encode Slice Parameter Buffer */
-typedef struct _VAEncSliceParameterBuffer
-{
-    unsigned int start_row_number;	/* starting MB row number for this slice */
-    unsigned int slice_height;	/* slice height measured in MB */
-    union {
-        struct {
-            unsigned int is_intra	: 1;
-            unsigned int disable_deblocking_filter_idc : 2;
-        } bits;
-        unsigned int value;
-    } slice_flags;
-} VAEncSliceParameterBuffer;
-
-/****************************
- * H.264 specific encode data structures
- ****************************/
-
-typedef struct _VAEncSequenceParameterBufferH264
-{
-    unsigned char seq_parameter_set_id;
-    unsigned char level_idc;
-    unsigned int intra_period;
-    unsigned int intra_idr_period;
-    unsigned int picture_width_in_mbs;
-    unsigned int picture_height_in_mbs;
-    unsigned int bits_per_second;
-    unsigned int frame_rate;
-    unsigned int initial_qp;
-    unsigned int min_qp;
-    unsigned int basic_unit_size;
-    unsigned char vui_flag;
-} VAEncSequenceParameterBufferH264;
-
-typedef struct _VAEncPictureParameterBufferH264
-{
-    VASurfaceID reference_picture;
-    VASurfaceID reconstructed_picture;
-    VABufferID coded_buf;
-    unsigned short picture_width;
-    unsigned short picture_height;
-    unsigned char last_picture; /* if set to 1 it indicates the last picture in the sequence */
-} VAEncPictureParameterBufferH264;
-
-/****************************
- * H.263 specific encode data structures
- ****************************/
-
-typedef struct _VAEncSequenceParameterBufferH263
-{
-    unsigned int intra_period;
-    unsigned int bits_per_second;
-    unsigned int frame_rate;
-    unsigned int initial_qp;
-    unsigned int min_qp;
-} VAEncSequenceParameterBufferH263;
-
-typedef struct _VAEncPictureParameterBufferH263
-{
-    VASurfaceID reference_picture;
-    VASurfaceID reconstructed_picture;
-    VABufferID coded_buf;
-    unsigned short picture_width;
-    unsigned short picture_height;
-    VAEncPictureType picture_type;
-} VAEncPictureParameterBufferH263;
-
-/****************************
- * MPEG-4 specific encode data structures
- ****************************/
-
-typedef struct _VAEncSequenceParameterBufferMPEG4
-{
-    unsigned char profile_and_level_indication;
-    unsigned int intra_period;
-    unsigned int video_object_layer_width;
-    unsigned int video_object_layer_height;
-    unsigned int vop_time_increment_resolution;
-    unsigned int fixed_vop_rate;
-    unsigned int fixed_vop_time_increment;
-    unsigned int bits_per_second;
-    unsigned int frame_rate;
-    unsigned int initial_qp;
-    unsigned int min_qp;
-} VAEncSequenceParameterBufferMPEG4;
-
-typedef struct _VAEncPictureParameterBufferMPEG4
-{
-    VASurfaceID reference_picture;
-    VASurfaceID reconstructed_picture;
-    VABufferID coded_buf;
-    unsigned short picture_width;
-    unsigned short picture_height;
-    unsigned int modulo_time_base; /* number of 1s */
-    unsigned int vop_time_increment;
-    VAEncPictureType picture_type;
-} VAEncPictureParameterBufferMPEG4;
-
-
-
-/* Buffer functions */
-
-/*
- * Creates a buffer for "num_elements" elements of "size" bytes and 
- * initalize with "data".
- * if "data" is null, then the contents of the buffer data store
- * are undefined.
- * Basically there are two ways to get buffer data to the server side. One is 
- * to call vaCreateBuffer() with a non-null "data", which results the data being
- * copied to the data store on the server side.  A different method that 
- * eliminates this copy is to pass null as "data" when calling vaCreateBuffer(),
- * and then use vaMapBuffer() to map the data store from the server side to the
- * client address space for access.
- *  Note: image buffers are created by the library, not the client. Please see 
- *        vaCreateImage on how image buffers are managed.
- */
-VAStatus vaCreateBuffer (
-    VADisplay dpy,
-    VAContextID context,
-    VABufferType type,	/* in */
-    unsigned int size,	/* in */
-    unsigned int num_elements, /* in */
-    void *data,		/* in */
-    VABufferID *buf_id	/* out */
-);
-
-/*
- * Convey to the server how many valid elements are in the buffer. 
- * e.g. if multiple slice parameters are being held in a single buffer,
- * this will communicate to the server the number of slice parameters
- * that are valid in the buffer.
- */
-VAStatus vaBufferSetNumElements (
-    VADisplay dpy,
-    VABufferID buf_id,	/* in */
-    unsigned int num_elements /* in */
-);
-
-
-/*
- * device independent data structure for codedbuffer
- */
-typedef  struct _VACodedBufferSegment {
-    unsigned int size; /* size of the data buffer in the coded buffer segment, in bytes */
-    unsigned int bit_offset;/* bit offset into the data buffer where valid bitstream data begins */
-    void *buf; /* pointer to the beginning of the data buffer in the coded buffer segment */
-    void *next; /* pointer to the next VACodedBufferSegment */
-} VACodedBufferSegment;
-     
-/*
- * Map data store of the buffer into the client's address space
- * vaCreateBuffer() needs to be called with "data" set to NULL before
- * calling vaMapBuffer()
- *
- * if buffer type is VAEncCodedBufferType, pbuf points to link-list of
- * VACodedBufferSegment, and the list is terminated if "next" is NULL
- */
-VAStatus vaMapBuffer (
-    VADisplay dpy,
-    VABufferID buf_id,	/* in */
-    void **pbuf 	/* out */
-);
-
-/*
- * After client making changes to a mapped data store, it needs to
- * "Unmap" it to let the server know that the data is ready to be
- * consumed by the server
- */
-VAStatus vaUnmapBuffer (
-    VADisplay dpy,
-    VABufferID buf_id	/* in */
-);
-
-/*
- * After this call, the buffer is deleted and this buffer_id is no longer valid
- * Only call this if the buffer is not going to be passed to vaRenderBuffer
- */
-VAStatus vaDestroyBuffer (
-    VADisplay dpy,
-    VABufferID buffer_id
-);
-
-/*
-Render (Decode) Pictures
-
-A picture represents either a frame or a field.
-
-The Begin/Render/End sequence sends the decode buffers to the server
-*/
-
-/*
- * Get ready to decode a picture to a target surface
- */
-VAStatus vaBeginPicture (
-    VADisplay dpy,
-    VAContextID context,
-    VASurfaceID render_target
-);
-
-/* 
- * Send decode buffers to the server.
- * Buffers are automatically destroyed afterwards
- */
-VAStatus vaRenderPicture (
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID *buffers,
-    int num_buffers
-);
-
-/* 
- * Make the end of rendering for a picture. 
- * The server should start processing all pending operations for this 
- * surface. This call is non-blocking. The client can start another 
- * Begin/Render/End sequence on a different render target.
- */
-VAStatus vaEndPicture (
-    VADisplay dpy,
-    VAContextID context
-);
-
-/*
-
-Synchronization 
-
-*/
-
-/* 
- * This function blocks until all pending operations on the render target
- * have been completed.  Upon return it is safe to use the render target for a 
- * different picture. 
- */
-VAStatus vaSyncSurface (
-    VADisplay dpy,
-    VASurfaceID render_target
-);
-
-typedef enum
-{
-    VASurfaceRendering	= 1, /* Rendering in progress */ 
-    VASurfaceDisplaying	= 2, /* Displaying in progress (not safe to render into it) */ 
-                             /* this status is useful if surface is used as the source */
-                             /* of an overlay */
-    VASurfaceReady	= 4, /* not being rendered or displayed */
-    VASurfaceSkipped	= 8  /* Indicate a skipped frame during encode */
-} VASurfaceStatus;
-
-/*
- * Find out any pending ops on the render target 
- */
-VAStatus vaQuerySurfaceStatus (
-    VADisplay dpy,
-    VASurfaceID render_target,
-    VASurfaceStatus *status	/* out */
-);
-
-/*
- * Images and Subpictures
- * VAImage is used to either get the surface data to client memory, or 
- * to copy image data in client memory to a surface. 
- * Both images, subpictures and surfaces follow the same 2D coordinate system where origin 
- * is at the upper left corner with positive X to the right and positive Y down
- */
-#define VA_FOURCC(ch0, ch1, ch2, ch3) \
-    ((unsigned long)(unsigned char) (ch0) | ((unsigned long)(unsigned char) (ch1) << 8) | \
-    ((unsigned long)(unsigned char) (ch2) << 16) | ((unsigned long)(unsigned char) (ch3) << 24 ))
-
-/* a few common FourCCs */
-#define VA_FOURCC_NV12		0x3231564E
-#define VA_FOURCC_AI44		0x34344149
-#define VA_FOURCC_RGBA		0x41424752
-#define VA_FOURCC_UYVY          0x59565955
-#define VA_FOURCC_YUY2          0x32595559
-#define VA_FOURCC_AYUV          0x56555941
-#define VA_FOURCC_NV11          0x3131564e
-#define VA_FOURCC_YV12          0x32315659
-#define VA_FOURCC_P208          0x38303250
-#define VA_FOURCC_IYUV          0x56555949
-
-/* byte order */
-#define VA_LSB_FIRST		1
-#define VA_MSB_FIRST		2
-
-typedef struct _VAImageFormat
-{
-    unsigned int	fourcc;
-    unsigned int	byte_order; /* VA_LSB_FIRST, VA_MSB_FIRST */
-    unsigned int	bits_per_pixel;
-    /* for RGB formats */
-    unsigned int	depth; /* significant bits per pixel */
-    unsigned int	red_mask;
-    unsigned int	green_mask;
-    unsigned int	blue_mask;
-    unsigned int	alpha_mask;
-} VAImageFormat;
-
-typedef VAGenericID VAImageID;
-
-typedef struct _VAImage
-{
-    VAImageID		image_id; /* uniquely identify this image */
-    VAImageFormat	format;
-    VABufferID		buf;	/* image data buffer */
-    /*
-     * Image data will be stored in a buffer of type VAImageBufferType to facilitate
-     * data store on the server side for optimal performance. The buffer will be 
-     * created by the CreateImage function, and proper storage allocated based on the image
-     * size and format. This buffer is managed by the library implementation, and 
-     * accessed by the client through the buffer Map/Unmap functions.
-     */
-    unsigned short	width; 
-    unsigned short	height;
-    unsigned int	data_size;
-    unsigned int	num_planes;	/* can not be greater than 3 */
-    /* 
-     * An array indicating the scanline pitch in bytes for each plane.
-     * Each plane may have a different pitch. Maximum 3 planes for planar formats
-     */
-    unsigned int	pitches[3];
-    /* 
-     * An array indicating the byte offset from the beginning of the image data 
-     * to the start of each plane.
-     */
-    unsigned int	offsets[3];
-
-    /* The following fields are only needed for paletted formats */
-    int num_palette_entries;   /* set to zero for non-palette images */
-    /* 
-     * Each component is one byte and entry_bytes indicates the number of components in 
-     * each entry (eg. 3 for YUV palette entries). set to zero for non-palette images   
-     */
-    int entry_bytes; 
-    /*
-     * An array of ascii characters describing the order of the components within the bytes.
-     * Only entry_bytes characters of the string are used.
-     */
-    char component_order[4];
-} VAImage;
-
-/* Get maximum number of image formats supported by the implementation */
-int vaMaxNumImageFormats (
-    VADisplay dpy
-);
-
-/* 
- * Query supported image formats 
- * The caller must provide a "format_list" array that can hold at
- * least vaMaxNumImageFormats() entries. The actual number of formats
- * returned in "format_list" is returned in "num_formats".
- */
-VAStatus vaQueryImageFormats (
-    VADisplay dpy,
-    VAImageFormat *format_list,	/* out */
-    int *num_formats		/* out */
-);
-
-/* 
- * Create a VAImage structure
- * The width and height fields returned in the VAImage structure may get 
- * enlarged for some YUV formats. Upon return from this function, 
- * image->buf has been created and proper storage allocated by the library. 
- * The client can access the image through the Map/Unmap calls.
- */
-VAStatus vaCreateImage (
-    VADisplay dpy,
-    VAImageFormat *format,
-    int width,
-    int height,
-    VAImage *image	/* out */
-);
-
-/*
- * Should call DestroyImage before destroying the surface it is bound to
- */
-VAStatus vaDestroyImage (
-    VADisplay dpy,
-    VAImageID image
-);
-
-VAStatus vaSetImagePalette (
-    VADisplay dpy,
-    VAImageID image,
-    /* 
-     * pointer to an array holding the palette data.  The size of the array is 
-     * num_palette_entries * entry_bytes in size.  The order of the components 
-     * in the palette is described by the component_order in VAImage struct    
-     */
-    unsigned char *palette 
-);
-
-/*
- * Retrive surface data into a VAImage
- * Image must be in a format supported by the implementation
- */
-VAStatus vaGetImage (
-    VADisplay dpy,
-    VASurfaceID surface,
-    int x,	/* coordinates of the upper left source pixel */
-    int y,
-    unsigned int width, /* width and height of the region */
-    unsigned int height,
-    VAImageID image
-);
-
-/*
- * Copy data from a VAImage to a surface
- * Image must be in a format supported by the implementation
- * Returns a VA_STATUS_ERROR_SURFACE_BUSY if the surface
- * shouldn't be rendered into when this is called
- */
-VAStatus vaPutImage (
-    VADisplay dpy,
-    VASurfaceID surface,
-    VAImageID image,
-    int src_x,
-    int src_y,
-    unsigned int src_width,
-    unsigned int src_height,
-    int dest_x,
-    int dest_y,
-    unsigned int dest_width,
-    unsigned int dest_height
-);
-
-/*
- * Derive an VAImage from an existing surface.
- * This interface will derive a VAImage and corresponding image buffer from
- * an existing VA Surface. The image buffer can then be mapped/unmapped for
- * direct CPU access. This operation is only possible on implementations with
- * direct rendering capabilities and internal surface formats that can be
- * represented with a VAImage. When the operation is not possible this interface
- * will return VA_STATUS_ERROR_OPERATION_FAILED. Clients should then fall back
- * to using vaCreateImage + vaPutImage to accomplish the same task in an
- * indirect manner.
- *
- * Implementations should only return success when the resulting image buffer
- * would be useable with vaMap/Unmap.
- *
- * When directly accessing a surface special care must be taken to insure
- * proper synchronization with the graphics hardware. Clients should call
- * vaQuerySurfaceStatus to insure that a surface is not the target of concurrent
- * rendering or currently being displayed by an overlay.
- *
- * Additionally nothing about the contents of a surface should be assumed
- * following a vaPutSurface. Implementations are free to modify the surface for
- * scaling or subpicture blending within a call to vaPutImage.
- *
- * Calls to vaPutImage or vaGetImage using the same surface from which the image
- * has been derived will return VA_STATUS_ERROR_SURFACE_BUSY. vaPutImage or
- * vaGetImage with other surfaces is supported.
- *
- * An image created with vaDeriveImage should be freed with vaDestroyImage. The
- * image and image buffer structures will be destroyed; however, the underlying
- * surface will remain unchanged until freed with vaDestroySurfaces.
- */
-VAStatus vaDeriveImage (
-    VADisplay dpy,
-    VASurfaceID surface,
-    VAImage *image	/* out */
-);
-
-/*
- * Subpictures 
- * Subpicture is a special type of image that can be blended 
- * with a surface during vaPutSurface(). Subpicture can be used to render
- * DVD sub-titles or closed captioning text etc.  
- */
-
-typedef VAGenericID VASubpictureID;
-
-/* Get maximum number of subpicture formats supported by the implementation */
-int vaMaxNumSubpictureFormats (
-    VADisplay dpy
-);
-
-/* flags for subpictures */
-#define VA_SUBPICTURE_CHROMA_KEYING	0x0001
-#define VA_SUBPICTURE_GLOBAL_ALPHA	0x0002
-/* 
- * Query supported subpicture formats 
- * The caller must provide a "format_list" array that can hold at
- * least vaMaxNumSubpictureFormats() entries. The flags arrary holds the flag 
- * for each format to indicate additional capabilities for that format. The actual 
- * number of formats returned in "format_list" is returned in "num_formats".
- *  flags: returned value to indicate addtional capabilities
- *         VA_SUBPICTURE_CHROMA_KEYING - supports chroma-keying
- *         VA_SUBPICTURE_GLOBAL_ALPHA - supports global alpha  
- */
-VAStatus vaQuerySubpictureFormats (
-    VADisplay dpy,
-    VAImageFormat *format_list,	/* out */
-    unsigned int *flags,	/* out */
-    unsigned int *num_formats	/* out */
-);
-
-/* 
- * Subpictures are created with an image associated. 
- */
-VAStatus vaCreateSubpicture (
-    VADisplay dpy,
-    VAImageID image,
-    VASubpictureID *subpicture	/* out */
-);
-
-/*
- * Destroy the subpicture before destroying the image it is assocated to
- */
-VAStatus vaDestroySubpicture (
-    VADisplay dpy,
-    VASubpictureID subpicture
-);
-
-/* 
- * Bind an image to the subpicture. This image will now be associated with 
- * the subpicture instead of the one at creation.
- */
-VAStatus vaSetSubpictureImage (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    VAImageID image
-);
-
-/*
- * If chromakey is enabled, then the area where the source value falls within
- * the chromakey [min, max] range is transparent
- * The chromakey component format is the following:
- *  For RGB: [0:7] Red [8:15] Blue [16:23] Green   
- *  For YUV: [0:7] V [8:15] U [16:23] Y
- * The chromakey mask can be used to mask out certain components for chromakey
- * comparision
- */
-VAStatus vaSetSubpictureChromakey (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    unsigned int chromakey_min,
-    unsigned int chromakey_max,
-    unsigned int chromakey_mask
-);
-
-/*
- * Global alpha value is between 0 and 1. A value of 1 means fully opaque and 
- * a value of 0 means fully transparent. If per-pixel alpha is also specified then
- * the overall alpha is per-pixel alpha multiplied by the global alpha
- */
-VAStatus vaSetSubpictureGlobalAlpha (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    float global_alpha 
-);
-
-/*
- * vaAssociateSubpicture associates the subpicture with target_surfaces.
- * It defines the region mapping between the subpicture and the target  
- * surfaces through source and destination rectangles (with the same width and height).
- * Both will be displayed at the next call to vaPutSurface.  Additional
- * associations before the call to vaPutSurface simply overrides the association.
- */
-VAStatus vaAssociateSubpicture (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    VASurfaceID *target_surfaces,
-    int num_surfaces,
-    short src_x, /* upper left offset in subpicture */
-    short src_y,
-    unsigned short src_width,
-    unsigned short src_height,
-    short dest_x, /* upper left offset in surface */
-    short dest_y,
-    unsigned short dest_width,
-    unsigned short dest_height,
-    /*
-     * whether to enable chroma-keying or global-alpha
-     * see VA_SUBPICTURE_XXX values
-     */
-    unsigned int flags
-);
-
-/*
- * vaDeassociateSubpicture removes the association of the subpicture with target_surfaces.
- */
-VAStatus vaDeassociateSubpicture (
-    VADisplay dpy,
-    VASubpictureID subpicture,
-    VASurfaceID *target_surfaces,
-    int num_surfaces
-);
-
-typedef struct _VARectangle
-{
-    short x;
-    short y;
-    unsigned short width;
-    unsigned short height;
-} VARectangle;
-
-/*
- * Display attributes
- * Display attributes are used to control things such as contrast, hue, saturation,
- * brightness etc. in the rendering process.  The application can query what
- * attributes are supported by the driver, and then set the appropriate attributes
- * before calling vaPutSurface()
- */
-/* PowerVR IEP Lite attributes */
-typedef enum
-{
-    VADISPLAYATTRIB_BLE_OFF              = 0x00,
-    VADISPLAYATTRIB_BLE_LOW,
-    VADISPLAYATTRIB_BLE_MEDIUM,
-    VADISPLAYATTRIB_BLE_HIGH,
-    VADISPLAYATTRIB_BLE_NONE,
-} VADisplayAttribBLEMode;
-
-typedef enum
-{ 
-    VADISPLAYATTRIB_CSC_FORMAT_YCC_BT601 = 0x00,
-    VADISPLAYATTRIB_CSC_FORMAT_YCC_BT709,
-    VADISPLAYATTRIB_CSC_FORMAT_YCC_SMPTE_240,
-    VADISPLAYATTRIB_CSC_FORMAT_RGB,
-    VADISPLAYATTRIB_CSC_FORMAT_NONE,
-} VADisplayAttribCSCFormat;
-
-/* attribute value for VADisplayAttribRotation   */
-#define VA_ROTATION_NONE        0x00000000
-#define VA_ROTATION_90          0x00000001
-#define VA_ROTATION_180         0x00000002
-#define VA_ROTATION_270         0x00000004
-
-/* attribute value for VADisplayAttribOutOfLoopDeblock */
-#define VA_OOL_DEBLOCKING_FALSE 0x00000000
-#define VA_OOL_DEBLOCKING_TRUE  0x00000001
-
-
-/* Currently defined display attribute types */
-typedef enum
-{
-    VADisplayAttribBrightness		= 0,
-    VADisplayAttribContrast		= 1,
-    VADisplayAttribHue			= 2,
-    VADisplayAttribSaturation		= 3,
-    /* client can specifiy a background color for the target window */
-    VADisplayAttribBackgroundColor      = 4,
-    /*
-     * this is a gettable only attribute. For some implementations that use the
-     * hardware overlay, after PutSurface is called, the surface can not be    
-     * re-used until after the subsequent PutSurface call. If this is the case 
-     * then the value for this attribute will be set to 1 so that the client   
-     * will not attempt to re-use the surface right after returning from a call
-     * to PutSurface.
-     *
-     * Don't use it, use flag VASurfaceDisplaying of vaQuerySurfaceStatus since
-     * driver may use overlay or GPU alternatively
-     */
-    VADisplayAttribDirectSurface       = 5,
-    VADisplayAttribRotation            = 6,	
-    VADisplayAttribOutofLoopDeblock    = 7,
-
-    /* PowerVR IEP Lite specific attributes */
-    VADisplayAttribBLEBlackMode        = 8,
-    VADisplayAttribBLEWhiteMode        = 9,
-    VADisplayAttribBlueStretch         = 10,
-    VADisplayAttribSkinColorCorrection = 11,
-    /*
-     * For type VADisplayAttribCSCMatrix, "value" field is a pointer to the color
-     * conversion matrix. Each element in the matrix is float-point
-     */
-    VADisplayAttribCSCMatrix           = 12
-} VADisplayAttribType;
-
-/* flags for VADisplayAttribute */
-#define VA_DISPLAY_ATTRIB_NOT_SUPPORTED	0x0000
-#define VA_DISPLAY_ATTRIB_GETTABLE	0x0001
-#define VA_DISPLAY_ATTRIB_SETTABLE	0x0002
-
-typedef struct _VADisplayAttribute
-{
-    VADisplayAttribType type;
-    int min_value;
-    int max_value;
-    int value;	/* used by the set/get attribute functions */
-/* flags can be VA_DISPLAY_ATTRIB_GETTABLE or VA_DISPLAY_ATTRIB_SETTABLE or OR'd together */
-    unsigned int flags;
-} VADisplayAttribute;
-
-/* Get maximum number of display attributs supported by the implementation */
-int vaMaxNumDisplayAttributes (
-    VADisplay dpy
-);
-
-/* 
- * Query display attributes 
- * The caller must provide a "attr_list" array that can hold at
- * least vaMaxNumDisplayAttributes() entries. The actual number of attributes
- * returned in "attr_list" is returned in "num_attributes".
- */
-VAStatus vaQueryDisplayAttributes (
-    VADisplay dpy,
-    VADisplayAttribute *attr_list,	/* out */
-    int *num_attributes			/* out */
-);
-
-/* 
- * Get display attributes 
- * This function returns the current attribute values in "attr_list".
- * Only attributes returned with VA_DISPLAY_ATTRIB_GETTABLE set in the "flags" field
- * from vaQueryDisplayAttributes() can have their values retrieved.  
- */
-VAStatus vaGetDisplayAttributes (
-    VADisplay dpy,
-    VADisplayAttribute *attr_list,	/* in/out */
-    int num_attributes
-);
-
-/* 
- * Set display attributes 
- * Only attributes returned with VA_DISPLAY_ATTRIB_SETTABLE set in the "flags" field
- * from vaQueryDisplayAttributes() can be set.  If the attribute is not settable or 
- * the value is out of range, the function returns VA_STATUS_ERROR_ATTR_NOT_SUPPORTED
- */
-VAStatus vaSetDisplayAttributes (
-    VADisplay dpy,
-    VADisplayAttribute *attr_list,
-    int num_attributes
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _VA_H_ */
diff -Nru libva-1.0.4/va/va_tpi.c libva-1.0.1/va/va_tpi.c
--- libva-1.0.4/va/va_tpi.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_tpi.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va.h"
-#include "va_backend.h"
-#include "va_backend_tpi.h"
-#include "config.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <unistd.h>
-
-#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
-#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-
-/* Wrap a CI (camera imaging) frame as a VA surface to share captured video between camear
- * and VA encode. With frame_id, VA driver need to call CI interfaces to get the information
- * of the frame, and to determine if the frame can be wrapped as a VA surface
- *
- * Application should make sure the frame is idle before the frame is passed into VA stack
- * and also a vaSyncSurface should be called before application tries to access the frame
- * from CI stack
- */
-VAStatus vaCreateSurfaceFromCIFrame (
-    VADisplay dpy,
-    unsigned long frame_id,
-    VASurfaceID *surface	/* out */
-)
-{
-  VADriverContextP ctx;
-  struct VADriverVTableTPI *tpi;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-  
-  tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
-  if (tpi && tpi->vaCreateSurfaceFromCIFrame) {
-      return tpi->vaCreateSurfaceFromCIFrame( ctx, frame_id, surface );
-  } else
-      return VA_STATUS_ERROR_UNIMPLEMENTED;
-  
-}
-
-/* Wrap a V4L2 buffer as a VA surface, so that V4L2 camera, VA encode
- * can share the data without copy
- * The VA driver should query the camera device from v4l2_fd to see
- * if camera device memory/buffer can be wrapped into a VA surface
- * Buffer information is passed in by v4l2_fmt and v4l2_buf structure,
- * VA driver also needs do further check if the buffer can meet encode
- * hardware requirement, such as dimension, fourcc, stride, etc
- *
- * Application should make sure the buffer is idle before the frame into VA stack
- * and also a vaSyncSurface should be called before application tries to access the frame
- * from V4L2 stack
- */
-VAStatus vaCreateSurfaceFromV4L2Buf(
-    VADisplay dpy,
-    int v4l2_fd,         /* file descriptor of V4L2 device */
-    struct v4l2_format *v4l2_fmt,       /* format of V4L2 */
-    struct v4l2_buffer *v4l2_buf,       /* V4L2 buffer */
-    VASurfaceID *surface	       /* out */
-)
-{
-  VADriverContextP ctx;
-  struct VADriverVTableTPI *tpi;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-  
-  tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
-  if (tpi && tpi->vaCreateSurfaceFromV4L2Buf) {
-      return tpi->vaCreateSurfaceFromV4L2Buf( ctx, v4l2_fd, v4l2_fmt, v4l2_buf, surface );
-  } else
-      return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
-
-VAStatus vaPutSurfaceBuf (
-    VADisplay dpy,
-    VASurfaceID surface,
-    unsigned char* data,
-    int* data_len,
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-)
-{
-  VADriverContextP ctx;
-  struct VADriverVTableTPI *tpi;
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-  
-  tpi = ( struct VADriverVTableTPI *)ctx->vtable_tpi;
-  if (tpi && tpi->vaPutSurfaceBuf) {
-      return tpi->vaPutSurfaceBuf( ctx, surface, data, data_len, srcx, srcy, srcw, srch,
-                                      destx, desty, destw, desth, cliprects, number_cliprects, flags );
-  } else
-      return VA_STATUS_ERROR_UNIMPLEMENTED;
-}
diff -Nru libva-1.0.4/va/va_tpi.h libva-1.0.1/va/va_tpi.h
--- libva-1.0.4/va/va_tpi.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_tpi.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2007-2009 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Wrap a CI (camera imaging) frame as a VA surface to share captured video between camear
- * and VA encode. With frame_id, VA driver need to call CI interfaces to get the information
- * of the frame, and to determine if the frame can be wrapped as a VA surface
- *
- * Application should make sure the frame is idle before the frame is passed into VA stack
- * and also a vaSyncSurface should be called before application tries to access the frame
- * from CI stack
- */
-#include <va/va.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-VAStatus vaCreateSurfaceFromCIFrame (
-    VADisplay dpy,
-    unsigned long frame_id,
-    VASurfaceID *surface	/* out */
-);
-
-VAStatus vaCreateSurfaceFromV4L2Buf(
-    VADisplay dpy,
-    int v4l2_fd,         /* file descriptor of V4L2 device */
-    struct v4l2_format *v4l2_fmt,       /* format of V4L2 */
-    struct v4l2_buffer *v4l2_buf,       /* V4L2 buffer */
-    VASurfaceID *surface	/* out */
-);
-
-VAStatus vaPutSurfaceBuf (
-    VADisplay dpy,
-    VASurfaceID surface,
-    unsigned char* data,
-    int* data_len,
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-);
-
-#ifdef __cplusplus
-}
-#endif
diff -Nru libva-1.0.4/va/va_trace.c libva-1.0.1/va/va_trace.c
--- libva-1.0.4/va/va_trace.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_trace.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1127 +0,0 @@
-/*
- * Copyright (c) 2009 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "va.h"
-#include "va_backend.h"
-#include "va_trace.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <unistd.h>
-
-unsigned int trace_flag = 0;
-
-static const char *trace_file = 0;
-static FILE *trace_fp = 0;
-
-static VASurfaceID  trace_rendertarget; /* current render target */
-static VAProfile trace_profile; /* current entrypoint for buffers */
-
-static unsigned int trace_frame;
-static unsigned int trace_slice;
-
-static unsigned int trace_width;
-static unsigned int trace_height;
-
-/* Prototypes (functions defined in va.c) */
-VAStatus vaBufferInfo (
-    VADisplay dpy,
-    VAContextID context,	/* in */
-    VABufferID buf_id,		/* in */
-    VABufferType *type,		/* out */
-    unsigned int *size,		/* out */
-    unsigned int *num_elements	/* out */
-);
-
-VAStatus vaLockSurface(VADisplay dpy,
-    VASurfaceID surface,
-    unsigned int *fourcc, /* following are output argument */
-    unsigned int *luma_stride,
-    unsigned int *chroma_u_stride,
-    unsigned int *chroma_v_stride,
-    unsigned int *luma_offset,
-    unsigned int *chroma_u_offset,
-    unsigned int *chroma_v_offset,
-    unsigned int *buffer_name,
-    void **buffer 
-);
-
-VAStatus vaUnlockSurface(VADisplay dpy,
-    VASurfaceID surface
-);
-
-void va_TraceInit(void)
-{
-    trace_file = (const char *)getenv("LIBVA_TRACE");
-    if (trace_file) {
-	trace_fp = fopen(trace_file, "w");
-        if (trace_fp)
-            trace_flag = 1;
-    }
-}
-
-void va_TraceEnd(void)
-{
-    if (trace_file && trace_fp) {
-        fclose(trace_fp);
-
-        trace_file = NULL;
-        trace_fp = NULL;
-
-        trace_flag = 0;
-
-        trace_width = 0;
-        trace_height = 0;
-    }
-}
-
-void va_TraceMsg(const char *msg, ...)
-{
-    va_list args;
-    
-    if (msg)  {
-        va_start(args, msg);
-        vfprintf(trace_fp, msg, args);
-        va_end(args);
-    } else  {
-        fflush(trace_fp);
-    }
-}
-
-
-void va_TraceCreateConfig(
-    VADisplay dpy,
-    VAProfile profile, 
-    VAEntrypoint entrypoint, 
-    VAConfigAttrib *attrib_list,
-    int num_attribs,
-    VAConfigID *config_id /* out */
-                         )
-{
-    int i;
-    
-    va_TraceMsg("\tprofile = %d\n", profile);
-    va_TraceMsg("\tentrypoint = %d\n", entrypoint);
-    va_TraceMsg("\tnum_attribs = %d\n", num_attribs);
-    for (i = 0; i < num_attribs; i++) {
-	va_TraceMsg("\t\tattrib_list[%d].type = 0x%08x\n", i, attrib_list[i].type);
-        va_TraceMsg("\t\tattrib_list[%d].value = 0x%08x\n", i, attrib_list[i].value);
-    }
-
-    trace_profile = profile;
-}
-
-
-void va_TraceCreateSurface(
-    VADisplay dpy,
-    int width,
-    int height,
-    int format,
-    int num_surfaces,
-    VASurfaceID *surfaces	/* out */
-                          )
-{
-    int i;
-    
-    va_TraceMsg("\twidth = %d\n", width);
-    va_TraceMsg("\theight = %d\n", height);
-    va_TraceMsg("\tformat = %d\n", format);
-    va_TraceMsg("\tnum_surfaces = %d\n", num_surfaces);
-
-    for (i = 0; i < num_surfaces; i++)
-        va_TraceMsg("\t\tsurfaces[%d] = 0x%08x\n", i, surfaces[i]);
-}
-
-
-void va_TraceCreateContext(
-    VADisplay dpy,
-    VAConfigID config_id,
-    int picture_width,
-    int picture_height,
-    int flag,
-    VASurfaceID *render_targets,
-    int num_render_targets,
-    VAContextID *context		/* out */
-                          )
-{
-    int i;
-
-    va_TraceMsg("\twidth = %d\n", picture_width);
-    va_TraceMsg("\theight = %d\n", picture_height);
-    va_TraceMsg("\tflag = 0x%08x\n", flag);
-    va_TraceMsg("\tnum_render_targets = %d\n", num_render_targets);
-    for (i=0; i<num_render_targets; i++)
-        va_TraceMsg("\t\trender_targets[%d] = 0x%08x\n", i, render_targets[i]);
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-
-
-    trace_frame = 0;
-    trace_slice = 0;
-
-    trace_width = picture_width;
-    trace_height = picture_height;
-}
-
-
-static char * buffer_type_to_string(int type)
-{
-    switch (type) {
-    case VAPictureParameterBufferType: return "VAPictureParameterBufferType";
-    case VAIQMatrixBufferType: return "VAIQMatrixBufferType";
-    case VABitPlaneBufferType: return "VABitPlaneBufferType";
-    case VASliceGroupMapBufferType: return "VASliceGroupMapBufferType";
-    case VASliceParameterBufferType: return "VASliceParameterBufferType";
-    case VASliceDataBufferType: return "VASliceDataBufferType";
-    case VAProtectedSliceDataBufferType: return "VAProtectedSliceDataBufferType";
-    case VAMacroblockParameterBufferType: return "VAMacroblockParameterBufferType";
-    case VAResidualDataBufferType: return "VAResidualDataBufferType";
-    case VADeblockingParameterBufferType: return "VADeblockingParameterBufferType";
-    case VAImageBufferType: return "VAImageBufferType";
-    case VAEncCodedBufferType: return "VAEncCodedBufferType";
-    case VAEncSequenceParameterBufferType: return "VAEncSequenceParameterBufferType";
-    case VAEncPictureParameterBufferType: return "VAEncPictureParameterBufferType";
-    case VAEncSliceParameterBufferType: return "VAEncSliceParameterBufferType";
-    default: return "UnknowBuffer";
-    }
-}
-
-
-static int va_TraceVABuffers(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *pbuf
-                             )
-{
-    int i;
-    unsigned char *p = pbuf;
-    unsigned int *pi = (unsigned int *)pbuf;
-
-    va_TraceMsg("***Buffer Data***");
-    for (i=0; i<size; i++) {
-        if ((i%16) == 0)
-            va_TraceMsg("\n0x%08x:", i);
-        va_TraceMsg(" %02x", p[i]);
-    }
-
-    va_TraceMsg("\n");
-    return 0;
-}
-
-
-static void va_TraceVAPictureParameterBufferMPEG2(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
-}
-
-
-static void va_TraceVAIQMatrixBufferMPEG2(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
-}
-
-
-static void va_TraceVASliceParameterBufferMPEG2(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
-}
-
-
-
-static void va_TraceVAPictureParameterBufferMPEG4(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
-}
-
-
-static void va_TraceVAIQMatrixBufferMPEG4(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
-}
-
-
-static void va_TraceVASliceParameterBufferMPEG4(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, data);
-    
-    return;
-}
-
-
-static void va_TraceVAPictureParameterBufferH264(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    int i;
-
-    VAPictureParameterBufferH264 *p = (VAPictureParameterBufferH264*)data;
-
-    va_TraceMsg  ("==========H264PicParameterBuffer============\n");
-
-#if 0    
-    if (p->num_ref_frames > 4)
-    {
-        int num = 0;
-        for (i = 15; i >= 0; i--)
-        {
-            if (p->ReferenceFrames[i].flags != VA_PICTURE_H264_INVALID)
-            {
-                num++;
-            }
-            if (num > 4)
-            {
-                p->ReferenceFrames[i].flags = VA_PICTURE_H264_INVALID;
-            }
-        }  	
-        p->num_ref_frames  = 4;
-    }
-#endif
-    
-#if 1
-    va_TraceMsg("picture id: %d\n", p->CurrPic.picture_id);
-    va_TraceMsg("frame idx: %d\n", p->CurrPic.frame_idx);
-    va_TraceMsg("picture flags: %d\n", p->CurrPic.flags);
-    va_TraceMsg("top field order count: %d\n", p->CurrPic.TopFieldOrderCnt);
-    va_TraceMsg("bottom field order count: %d\n", p->CurrPic.BottomFieldOrderCnt);
-
-
-    va_TraceMsg("Reference frames: \n");
-    for (i = 0; i < 16; i++)
-    {
-        if (p->ReferenceFrames[i].flags != VA_PICTURE_H264_INVALID)
-        {
-            //va_TraceMsg("%d-%d; ", p->ReferenceFrames[i].TopFieldOrderCnt, p->ReferenceFrames[i].BottomFieldOrderCnt);
-            va_TraceMsg("%d-%d-%d-%d; ", p->ReferenceFrames[i].TopFieldOrderCnt, p->ReferenceFrames[i].BottomFieldOrderCnt, p->ReferenceFrames[i].picture_id, p->ReferenceFrames[i].frame_idx);
-        }
-    }
-    va_TraceMsg("\n");
-#endif
-    va_TraceMsg("picture_width_in_mbs_minus1: %d\n", p->picture_width_in_mbs_minus1);
-    va_TraceMsg("picture_height_in_mbs_minus1: %d\n", p->picture_height_in_mbs_minus1);
-    va_TraceMsg("bit_depth_luma_minus8: %d\n", p->bit_depth_luma_minus8);
-    va_TraceMsg("bit_depth_chroma_minus8: %d\n", p->bit_depth_chroma_minus8);
-    va_TraceMsg("num_ref_frames: %d\n", p->num_ref_frames);
-    va_TraceMsg("seq fields: %d\n", p->seq_fields.value);
-    va_TraceMsg("\t chroma_format_idc: %d\n", p->seq_fields.bits.chroma_format_idc);
-    va_TraceMsg("\t residual_colour_transform_flag: %d\n", p->seq_fields.bits.residual_colour_transform_flag);
-    va_TraceMsg("\t frame_mbs_only_flag: %d\n", p->seq_fields.bits.frame_mbs_only_flag);
-    va_TraceMsg("\t mb_adaptive_frame_field_flag: %d\n", p->seq_fields.bits.mb_adaptive_frame_field_flag);
-    va_TraceMsg("\t direct_8x8_inference_flag: %d\n", p->seq_fields.bits.direct_8x8_inference_flag);
-    va_TraceMsg("\t MinLumaBiPredSize8x8: %d\n", p->seq_fields.bits.MinLumaBiPredSize8x8);
-    va_TraceMsg("num_slice_groups_minus1: %d\n", p->num_slice_groups_minus1);
-    va_TraceMsg("slice_group_map_type: %d\n", p->slice_group_map_type);
-    va_TraceMsg("slice_group_change_rate_minus1: %d\n", p->slice_group_change_rate_minus1);
-    va_TraceMsg("pic_init_qp_minus26: %d\n", p->pic_init_qp_minus26);
-    va_TraceMsg("pic_init_qs_minus26: %d\n", p->pic_init_qs_minus26);
-    va_TraceMsg("chroma_qp_index_offset: %d\n", p->chroma_qp_index_offset);
-    va_TraceMsg("second_chroma_qp_index_offset: %d\n", p->second_chroma_qp_index_offset);
-    va_TraceMsg("pic_fields: %d\n", p->pic_fields.value);
-    va_TraceMsg("\t entropy_coding_mode_flag: %d\n", p->pic_fields.bits.entropy_coding_mode_flag);
-    va_TraceMsg("\t weighted_pred_flag: %d\n", p->pic_fields.bits.weighted_pred_flag);
-    va_TraceMsg("\t weighted_bipred_idc: %d\n", p->pic_fields.bits.weighted_bipred_idc);
-    va_TraceMsg("\t transform_8x8_mode_flag: %d\n", p->pic_fields.bits.transform_8x8_mode_flag);
-    va_TraceMsg("\t field_pic_flag: %d\n", p->pic_fields.bits.field_pic_flag);
-    va_TraceMsg("\t constrained_intra_pred_flag: %d\n", p->pic_fields.bits.constrained_intra_pred_flag);
-    va_TraceMsg("frame_num: %d\n", p->frame_num);
-
-    return;
-}
-
-static void va_TraceVASliceParameterBufferH264(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data)
-{
-    int i;
-    VASliceParameterBufferH264* p = (VASliceParameterBufferH264*)data;
-
-    va_TraceMsg  ("========== SLICE HEADER ============.\n");
-    va_TraceMsg("slice_data_size: %d\n", p->slice_data_size);
-    va_TraceMsg("slice_data_offset: %d\n", p->slice_data_offset);
-    va_TraceMsg("slice_data_flag: %d\n", p->slice_data_flag);
-    va_TraceMsg("slice_data_bit_offset: %d\n", p->slice_data_bit_offset);
-    va_TraceMsg("first_mb_in_slice: %d\n", p->first_mb_in_slice);
-    va_TraceMsg("slice_type: %d\n", p->slice_type);
-    va_TraceMsg("direct_spatial_mv_pred_flag: %d\n", p->direct_spatial_mv_pred_flag);
-    va_TraceMsg("num_ref_idx_l0_active_minus1: %d\n", p->num_ref_idx_l0_active_minus1);
-    va_TraceMsg("num_ref_idx_l1_active_minus1: %d\n", p->num_ref_idx_l1_active_minus1);
-    va_TraceMsg("cabac_init_idc: %d\n", p->cabac_init_idc);
-    va_TraceMsg("slice_qp_delta: %d\n", p->slice_qp_delta);
-    va_TraceMsg("disable_deblocking_filter_idc: %d\n", p->disable_deblocking_filter_idc);
-    va_TraceMsg("slice_alpha_c0_offset_div2: %d\n", p->slice_alpha_c0_offset_div2);
-    va_TraceMsg("slice_beta_offset_div2: %d\n", p->slice_beta_offset_div2);	
-
-#if 1
-    if (p->slice_type == 0 || p->slice_type == 1)
-    {
-        va_TraceMsg("RefPicList0:\n");
-        for (i = 0; i < p->num_ref_idx_l0_active_minus1 + 1; i++)
-        {
-            //va_TraceMsg("%d-%d; ", p->RefPicList0[i].TopFieldOrderCnt, p->RefPicList0[i].BottomFieldOrderCnt);
-            va_TraceMsg("%d-%d-%d-%d; ", p->RefPicList0[i].TopFieldOrderCnt, p->RefPicList0[i].BottomFieldOrderCnt, p->RefPicList0[i].picture_id, p->RefPicList0[i].frame_idx);
-        }
-        va_TraceMsg("\n");
-        if (p->slice_type == 1)
-        {
-            va_TraceMsg("RefPicList1:\n");
-            for (i = 0; i < p->num_ref_idx_l1_active_minus1 + 1; i++)
-            {
-                //va_TraceMsg("%d-%d; ", p->RefPicList1[i].TopFieldOrderCnt, p->RefPicList1[i].BottomFieldOrderCnt);
-                va_TraceMsg("%d-%d-%d-%d; ", p->RefPicList1[i].TopFieldOrderCnt, p->RefPicList1[i].BottomFieldOrderCnt, p->RefPicList1[i].picture_id, p->RefPicList1[i].frame_idx);
-            }
-        }
-        va_TraceMsg("\n");
-    }
-#endif
-
-    va_TraceMsg("luma_log2_weight_denom: %d\n", p->luma_log2_weight_denom);
-    va_TraceMsg("chroma_log2_weight_denom: %d\n", p->chroma_log2_weight_denom);
-    va_TraceMsg("luma_weight_l0_flag: %d\n", p->luma_weight_l0_flag);
-    if (p->luma_weight_l0_flag)
-    {
-        for (i = 0; i <=  p->num_ref_idx_l0_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->luma_weight_l0[i]);
-            va_TraceMsg("%d ", p->luma_offset_l0[i]);
-        }
-        va_TraceMsg("\n");
-    }
-	
-		
-    va_TraceMsg("chroma_weight_l0_flag: %d\n", p->chroma_weight_l0_flag);
-    if (p->chroma_weight_l0_flag)
-    {
-        for (i = 0; i <= p->num_ref_idx_l0_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->chroma_weight_l0[i][0]);
-            va_TraceMsg("%d ", p->chroma_offset_l0[i][0]);
-            va_TraceMsg("%d ", p->chroma_weight_l0[i][1]);
-            va_TraceMsg("%d ", p->chroma_offset_l0[i][1]);
-        }
-        va_TraceMsg("\n");			
-    }
-    va_TraceMsg("luma_weight_l1_flag: %d\n", p->luma_weight_l1_flag);
-    if (p->luma_weight_l1_flag)
-    {
-        for (i = 0; i <=  p->num_ref_idx_l1_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->luma_weight_l1[i]);
-            va_TraceMsg("%d ", p->luma_offset_l1[i]);
-        }
-        va_TraceMsg("\n");
-    }
-    va_TraceMsg("chroma_weight_l1_flag: %d\n", p->chroma_weight_l1_flag);
-    if (p->chroma_weight_l1_flag)
-    {
-        for (i = 0; i <= p->num_ref_idx_l1_active_minus1; i++)
-        {
-            va_TraceMsg("%d ", p->chroma_weight_l1[i][0]);
-            va_TraceMsg("%d ", p->chroma_offset_l1[i][0]);
-            va_TraceMsg("%d ", p->chroma_weight_l1[i][1]);
-            va_TraceMsg("%d ", p->chroma_offset_l1[i][1]);
-        }
-        va_TraceMsg("\n");			
-    }	
-}
-
-static void va_TraceVAIQMatrixBufferH264(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data
-)
-{
-    va_TraceMsg("========== IQMatrix ============.\n");
-    VAIQMatrixBufferH264* p = (VAIQMatrixBufferH264* )data;
-    int i, j;
-    for (i = 0; i < 6; i++)
-    {
-        for (j = 0; j < 16; j++)
-        {
-            va_TraceMsg("%d\t", p->ScalingList4x4[i][j]);
-            if ((j + 1) % 8 == 0)
-                va_TraceMsg("\n");
-        }
-    }
-
-    for (i = 0; i < 2; i++)
-    {
-        for (j = 0; j < 64; j++)
-        {
-            va_TraceMsg("%d\t", p->ScalingList8x8[i][j]);
-            if ((j + 1) % 8 == 0)
-                va_TraceMsg("\n");
-        }		
-    }
-}
-
-static void va_TraceVAPictureParameterBufferVC1(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *data
-)
-{
-    VAPictureParameterBufferVC1* p = (VAPictureParameterBufferVC1*)data;
-
-    va_TraceMsg("\tforward_reference_picture = 0x%08x\n", p->forward_reference_picture);
-    va_TraceMsg("\tbackward_reference_picture = 0x%08x\n", p->backward_reference_picture);
-    va_TraceMsg("\tinloop_decoded_picture = 0x%08x\n", p->inloop_decoded_picture);
-    
-    va_TraceMsg("\tpulldown = %d\n", p->sequence_fields.bits.pulldown);
-    va_TraceMsg("\tinterlace = %d\n", p->sequence_fields.bits.interlace);
-    va_TraceMsg("\ttfcntrflag = %d\n", p->sequence_fields.bits.tfcntrflag);
-    va_TraceMsg("\tfinterpflag = %d\n", p->sequence_fields.bits.finterpflag);
-    va_TraceMsg("\tpsf                           = %d.\n",
-                p->sequence_fields.bits.psf);
-    va_TraceMsg("\tmultires                      = %d.\n",
-                p->sequence_fields.bits.multires);
-    va_TraceMsg("\toverlap                       = %d.\n",
-                p->sequence_fields.bits.overlap);
-    va_TraceMsg("\tsyncmarker                    = %d.\n",
-                p->sequence_fields.bits.syncmarker);
-    va_TraceMsg("\trangered                      = %d.\n",
-                p->sequence_fields.bits.rangered);
-    va_TraceMsg("\tmax_b_frames                  = %d.\n",
-                p->sequence_fields.bits.max_b_frames);
-    va_TraceMsg("\tcoded_width                   = %d.\n",
-                p->coded_width);
-    va_TraceMsg("\tcoded_height                  = %d.\n",
-                p->coded_height);
-    va_TraceMsg("\tclosed_entry                  = %d.\n",
-                p->entrypoint_fields.bits.closed_entry);
-    va_TraceMsg("\tbroken_link                   = %d.\n",
-                p->entrypoint_fields.bits.broken_link);
-    va_TraceMsg("\tclosed_entry                  = %d.\n",
-                p->entrypoint_fields.bits.closed_entry);
-    va_TraceMsg("\tpanscan_flag                  = %d.\n",
-                p->entrypoint_fields.bits.panscan_flag);
-    va_TraceMsg("\tloopfilter                    = %d.\n",
-                p->entrypoint_fields.bits.loopfilter);
-    va_TraceMsg("\tconditional_overlap_flag      = %d.\n",
-                p->conditional_overlap_flag);
-    va_TraceMsg("\tfast_uvmc_flag                = %d.\n",
-                p->fast_uvmc_flag);
-    va_TraceMsg("\trange_mapping_luma_flag       = %d.\n",
-                p->range_mapping_fields.bits.luma_flag);
-    va_TraceMsg("\trange_mapping_luma            = %d.\n",
-                p->range_mapping_fields.bits.luma);
-    va_TraceMsg("\trange_mapping_chroma_flag     = %d.\n",
-                p->range_mapping_fields.bits.chroma_flag);
-    va_TraceMsg("\trange_mapping_chroma          = %d.\n",
-                p->range_mapping_fields.bits.chroma);
-    va_TraceMsg("\tb_picture_fraction            = %d.\n",
-                p->b_picture_fraction);
-    va_TraceMsg("\tcbp_table                     = %d.\n",
-                p->cbp_table);
-    va_TraceMsg("\tmb_mode_table                 = %d.\n",
-                p->mb_mode_table);
-    va_TraceMsg("\trange_reduction_frame         = %d.\n",
-                p->range_reduction_frame);
-    va_TraceMsg("\trounding_control              = %d.\n",
-                p->rounding_control);
-    va_TraceMsg("\tpost_processing               = %d.\n",
-                p->post_processing);
-    va_TraceMsg("\tpicture_resolution_index      = %d.\n",
-                p->picture_resolution_index);
-    va_TraceMsg("\tluma_scale                    = %d.\n",
-                p->luma_scale);
-    va_TraceMsg("\tluma_shift                    = %d.\n",
-                p->luma_shift);
-    va_TraceMsg("\tpicture_type                  = %d.\n",
-                p->picture_fields.bits.picture_type);
-    va_TraceMsg("\tframe_coding_mode             = %d.\n",
-                p->picture_fields.bits.frame_coding_mode);
-    va_TraceMsg("\ttop_field_first               = %d.\n",
-                p->picture_fields.bits.top_field_first);
-    va_TraceMsg("\tis_first_field                = %d.\n",
-                p->picture_fields.bits.is_first_field);
-    va_TraceMsg("\tintensity_compensation        = %d.\n",
-                p->picture_fields.bits.intensity_compensation);
-    va_TraceMsg("  ---------------------------------\n");
-    va_TraceMsg("\tmv_type_mb                    = %d.\n",
-                p->raw_coding.flags.mv_type_mb);
-    va_TraceMsg("\tdirect_mb                     = %d.\n",
-                p->raw_coding.flags.direct_mb);
-    va_TraceMsg("\tskip_mb                       = %d.\n",
-                p->raw_coding.flags.skip_mb);
-    va_TraceMsg("\tfield_tx                      = %d.\n",
-                p->raw_coding.flags.field_tx);
-    va_TraceMsg("\tforward_mb                    = %d.\n",
-                p->raw_coding.flags.forward_mb);
-    va_TraceMsg("\tac_pred                       = %d.\n",
-                p->raw_coding.flags.ac_pred);
-    va_TraceMsg("\toverflags                     = %d.\n",
-                p->raw_coding.flags.overflags);
-    va_TraceMsg("  ---------------------------------\n");
-    va_TraceMsg("\tbp_mv_type_mb                 = %d.\n",
-                p->bitplane_present.flags.bp_mv_type_mb);
-    va_TraceMsg("\tbp_direct_mb                  = %d.\n",
-                p->bitplane_present.flags.bp_direct_mb);
-    va_TraceMsg("\tbp_skip_mb                    = %d.\n",
-                p->bitplane_present.flags.bp_skip_mb);
-    va_TraceMsg("\tbp_field_tx                   = %d.\n",
-                p->bitplane_present.flags.bp_field_tx);
-    va_TraceMsg("\tbp_forward_mb                 = %d.\n",
-                p->bitplane_present.flags.bp_forward_mb);
-    va_TraceMsg("\tbp_ac_pred                    = %d.\n",
-                p->bitplane_present.flags.bp_ac_pred);
-    va_TraceMsg("\tbp_overflags                  = %d.\n",
-                p->bitplane_present.flags.bp_overflags);
-    va_TraceMsg("  ---------------------------------\n");
-    va_TraceMsg("\treference_distance_flag       = %d.\n",
-                p->reference_fields.bits.reference_distance_flag);
-    va_TraceMsg("\treference_distance            = %d.\n",
-                p->reference_fields.bits.reference_distance);
-    va_TraceMsg("\tnum_reference_pictures        = %d.\n",
-                p->reference_fields.bits.num_reference_pictures);
-    va_TraceMsg("\treference_field_pic_indicator = %d.\n",
-                p->reference_fields.bits.reference_field_pic_indicator);
-    va_TraceMsg("\tmv_mode                       = %d.\n",
-                p->mv_fields.bits.mv_mode);
-    va_TraceMsg("\tmv_mode2                      = %d.\n",
-                p->mv_fields.bits.mv_mode2);
-    va_TraceMsg("\tmv_table                      = %d.\n",
-                p->mv_fields.bits.mv_table);
-    va_TraceMsg("\ttwo_mv_block_pattern_table    = %d.\n",
-                p->mv_fields.bits.two_mv_block_pattern_table);
-    va_TraceMsg("\tfour_mv_switch                = %d.\n",
-                p->mv_fields.bits.four_mv_switch);
-    va_TraceMsg("\tfour_mv_block_pattern_table   = %d.\n",
-                p->mv_fields.bits.four_mv_block_pattern_table);
-    va_TraceMsg("\textended_mv_flag              = %d.\n",
-                p->mv_fields.bits.extended_mv_flag);
-    va_TraceMsg("\textended_mv_range             = %d.\n",
-                p->mv_fields.bits.extended_mv_range);
-    va_TraceMsg("\textended_dmv_flag             = %d.\n",
-                p->mv_fields.bits.extended_dmv_flag);
-    va_TraceMsg("\textended_dmv_range            = %d.\n",
-                p->mv_fields.bits.extended_dmv_range);
-    va_TraceMsg("\tdquant                        = %d.\n",
-                p->pic_quantizer_fields.bits.dquant);
-    va_TraceMsg("\tquantizer                     = %d.\n",
-                p->pic_quantizer_fields.bits.quantizer);
-    va_TraceMsg("\thalf_qp                       = %d.\n",
-                p->pic_quantizer_fields.bits.half_qp);
-    va_TraceMsg("\tpic_quantizer_scale           = %d.\n",
-                p->pic_quantizer_fields.bits.pic_quantizer_scale);
-    va_TraceMsg("\tpic_quantizer_type            = %d.\n",
-                p->pic_quantizer_fields.bits.pic_quantizer_type);
-    va_TraceMsg("\tdq_frame                      = %d.\n",
-                p->pic_quantizer_fields.bits.dq_frame);
-    va_TraceMsg("\tdq_profile                    = %d.\n",
-                p->pic_quantizer_fields.bits.dq_profile);
-    va_TraceMsg("\tdq_sb_edge                    = %d.\n",
-                p->pic_quantizer_fields.bits.dq_sb_edge);
-    va_TraceMsg("\tdq_db_edge                    = %d.\n",
-                p->pic_quantizer_fields.bits.dq_db_edge);
-    va_TraceMsg("\tdq_binary_level               = %d.\n",
-                p->pic_quantizer_fields.bits.dq_binary_level);
-    va_TraceMsg("\talt_pic_quantizer             = %d.\n",
-                p->pic_quantizer_fields.bits.alt_pic_quantizer);
-    va_TraceMsg("\tvariable_sized_transform_flag = %d.\n",
-                p->transform_fields.bits.variable_sized_transform_flag);
-    va_TraceMsg("\tmb_level_transform_type_flag  = %d.\n",
-                p->transform_fields.bits.mb_level_transform_type_flag);
-    va_TraceMsg("\tframe_level_transform_type    = %d.\n",
-                p->transform_fields.bits.frame_level_transform_type);
-    va_TraceMsg("\ttransform_ac_codingset_idx1   = %d.\n",
-                p->transform_fields.bits.transform_ac_codingset_idx1);
-    va_TraceMsg("\ttransform_ac_codingset_idx2   = %d.\n",
-                p->transform_fields.bits.transform_ac_codingset_idx2);
-    va_TraceMsg("\tintra_transform_dc_table      = %d.\n",
-                p->transform_fields.bits.intra_transform_dc_table);
-}
-
-static void va_TraceVASliceParameterBufferVC1(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void* data
-)
-{
-    VASliceParameterBufferVC1 *p = (VASliceParameterBufferVC1*)data;
-
-    va_TraceMsg ("========== SLICE NUMBER ==========\n");
-    va_TraceMsg ("    slice_data_size               = %d\n", p->slice_data_size);
-    va_TraceMsg ("    slice_data_offset             = %d\n", p->slice_data_offset);
-    va_TraceMsg ("    slice_data_flag               = %d\n", p->slice_data_flag);
-    va_TraceMsg ("    macroblock_offset             = %d\n", p->macroblock_offset);
-    va_TraceMsg ("    slice_vertical_position       = %d\n", p->slice_vertical_position);
-}
-
-void va_TraceBeginPicture(
-    VADisplay dpy,
-    VAContextID context,
-    VASurfaceID render_target
-)
-{
-    int i;
-
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-    va_TraceMsg("\t\trender_targets = 0x%08x\n", render_target);
-
-    trace_rendertarget = render_target; /* for surface data dump after vaEndPicture */
-
-    trace_frame++;
-    trace_slice = 0;
-}
-
-static void va_TraceMPEG2Buf(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *pbuf
-)
-{
-    switch (type) {
-    case VAPictureParameterBufferType:
-        va_TraceVAPictureParameterBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAIQMatrixBufferType:
-        va_TraceVAIQMatrixBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VABitPlaneBufferType:
-        break;
-    case VASliceGroupMapBufferType:
-        break;
-    case VASliceParameterBufferType:
-        trace_slice++;
-        va_TraceVASliceParameterBufferMPEG2(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VASliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAMacroblockParameterBufferType:
-        break;
-    case VAResidualDataBufferType:
-        break;
-    case VADeblockingParameterBufferType:
-        break;
-    case VAImageBufferType:
-        break;
-    case VAProtectedSliceDataBufferType:
-        break;
-    case VAEncCodedBufferType:
-        break;
-    case VAEncSequenceParameterBufferType:
-        break;
-    case VAEncPictureParameterBufferType:
-        break;
-    case VAEncSliceParameterBufferType:
-        break;
-    case VAEncH264VUIBufferType:
-        break;
-    case VAEncH264SEIBufferType:
-        break;
-    }
-}
-
-static void va_TraceMPEG4Buf(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *pbuf
-)
-{
-    switch (type) {
-    case VAPictureParameterBufferType:
-        va_TraceVAPictureParameterBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAIQMatrixBufferType:
-        va_TraceVAIQMatrixBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VABitPlaneBufferType:
-        break;
-    case VASliceGroupMapBufferType:
-        break;
-    case VASliceParameterBufferType:
-        va_TraceVASliceParameterBufferMPEG4(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VASliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAMacroblockParameterBufferType:
-        break;
-    case VAResidualDataBufferType:
-        break;
-    case VADeblockingParameterBufferType:
-        break;
-    case VAImageBufferType:
-        break;
-    case VAProtectedSliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAEncCodedBufferType:
-        break;
-    case VAEncSequenceParameterBufferType:
-        break;
-    case VAEncPictureParameterBufferType:
-        break;
-    case VAEncSliceParameterBufferType:
-        break;
-    case VAEncH264VUIBufferType:
-        break;
-    case VAEncH264SEIBufferType:
-        break;
-    default:
-        break;
-    }
-}
-
-
-static void va_TraceH264Buf(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *pbuf
-)
-{
-    switch (type) {
-    case VAPictureParameterBufferType:
-        va_TraceVAPictureParameterBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAIQMatrixBufferType:
-        va_TraceVAIQMatrixBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VABitPlaneBufferType:
-        break;
-    case VASliceGroupMapBufferType:
-        break;
-    case VASliceParameterBufferType:
-        va_TraceVASliceParameterBufferH264(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VASliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAMacroblockParameterBufferType:
-        break;
-    case VAResidualDataBufferType:
-        break;
-    case VADeblockingParameterBufferType:
-        break;
-    case VAImageBufferType:
-        break;
-    case VAProtectedSliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAEncCodedBufferType:
-        break;
-    case VAEncSequenceParameterBufferType:
-        break;
-    case VAEncPictureParameterBufferType:
-        break;
-    case VAEncSliceParameterBufferType:
-        break;
-    case VAEncH264VUIBufferType:
-        break;
-    case VAEncH264SEIBufferType:
-        break;
-    default:
-        break;
-    }
-}
-
-
-static void va_TraceVC1Buf(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID buffer,
-    VABufferType type,
-    unsigned int size,
-    unsigned int num_elements,
-    void *pbuf
-)
-{
-    switch (type) {
-    case VAPictureParameterBufferType:
-        va_TraceVAPictureParameterBufferVC1(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAIQMatrixBufferType:
-        break;
-    case VABitPlaneBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VASliceGroupMapBufferType:
-        break;
-    case VASliceParameterBufferType:
-        va_TraceVASliceParameterBufferVC1(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VASliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAMacroblockParameterBufferType:
-        break;
-    case VAResidualDataBufferType:
-        break;
-    case VADeblockingParameterBufferType:
-        break;
-    case VAImageBufferType:
-        break;
-    case VAProtectedSliceDataBufferType:
-        va_TraceVABuffers(dpy, context, buffer, type, size, num_elements, pbuf);
-        break;
-    case VAEncCodedBufferType:
-        break;
-    case VAEncSequenceParameterBufferType:
-        break;
-    case VAEncPictureParameterBufferType:
-        break;
-    case VAEncSliceParameterBufferType:
-        break;
-    case VAEncH264VUIBufferType:
-        break;
-    case VAEncH264SEIBufferType:
-        break;
-    default:
-        break;
-    }
-}
-
-void va_TraceRenderPicture(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID *buffers,
-    int num_buffers
-)
-{
-    VABufferType type;
-    unsigned int size;
-    unsigned int num_elements;
-    int i;
-
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-    va_TraceMsg("\tnum_buffers = %d\n", num_buffers);
-    for (i = 0; i < num_buffers; i++) {
-        void *pbuf;
-
-        /* get buffer type information */
-        vaBufferInfo(dpy, context, buffers[i], &type, &size, &num_elements);
-        
-        va_TraceMsg("\t\tbuffers[%d] = 0x%08x\n", i, buffers[i]);
-        va_TraceMsg("\t\t\ttype = %s\n", buffer_type_to_string(type));
-        va_TraceMsg("\t\t\tsize = %d\n", size);
-        va_TraceMsg("\t\t\tnum_elements = %d\n", num_elements);
-
-
-        vaMapBuffer(dpy, buffers[i], &pbuf);
-
-        switch (trace_profile) {
-        case VAProfileMPEG2Simple:
-        case VAProfileMPEG2Main:
-            va_TraceMPEG2Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
-            break;
-        case VAProfileMPEG4Simple:
-        case VAProfileMPEG4AdvancedSimple:
-        case VAProfileMPEG4Main:
-            va_TraceMPEG4Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
-            break;
-        case VAProfileH264Baseline:
-        case VAProfileH264Main:
-        case VAProfileH264High:
-            va_TraceH264Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
-            break;
-        case VAProfileVC1Simple:
-        case VAProfileVC1Main:
-        case VAProfileVC1Advanced:
-            va_TraceVC1Buf(dpy, context, buffers[i], type, size, num_elements, pbuf);
-            break;
-        case VAProfileH263Baseline:
-            break;
-        }
-
-        vaUnmapBuffer(dpy, buffers[i]);
-    }
-}
-
-
-void va_TraceEndPicture(
-    VADisplay dpy,
-    VAContextID context
-)
-{
-    int i, j;
-    unsigned int fourcc; /* following are output argument */
-    unsigned int luma_stride;
-    unsigned int chroma_u_stride;
-    unsigned int chroma_v_stride;
-    unsigned int luma_offset;
-    unsigned int chroma_u_offset;
-    unsigned int chroma_v_offset;
-    unsigned int buffer_name;
-    void *buffer;
-    char *Y_data, *UV_data, *tmp;
-    
-    VAStatus va_status;
-    
-    va_TraceMsg("\tcontext = 0x%08x\n", context);
-    va_TraceMsg("\t\trender_targets = 0x%08x\n", trace_rendertarget);
-    
-    /* force the pipleline finish rendering */
-    vaSyncSurface(dpy, trace_rendertarget);
-
-    va_TraceMsg("***dump surface data***\n", trace_rendertarget);
-
-    va_status = vaLockSurface(dpy, trace_rendertarget, &fourcc, &luma_stride, &chroma_u_stride, &chroma_v_stride,
-                                      &luma_offset, &chroma_u_offset, &chroma_v_offset, &buffer_name, &buffer);
-
-    if (va_status != VA_STATUS_SUCCESS)
-        return;
-    
-    va_TraceMsg("\tfourcc=0x%08x\n", fourcc);
-    va_TraceMsg("\twidth=%d\n", trace_width);
-    va_TraceMsg("\theight=%d\n", trace_height);
-    va_TraceMsg("\tluma_stride=%d\n", luma_stride);
-    va_TraceMsg("\tchroma_u_stride=%d\n", chroma_u_stride);
-    va_TraceMsg("\tchroma_v_stride=%d\n", chroma_v_stride);
-    va_TraceMsg("\tluma_offset=%d\n", luma_offset);
-    va_TraceMsg("\tchroma_u_offset=%d\n", chroma_u_offset);
-    va_TraceMsg("\tchroma_v_offset=%d\n", chroma_v_offset);
-
-    if (!buffer) {
-        vaUnlockSurface(dpy, trace_rendertarget);
-        return;
-    }
-
-    Y_data = buffer;
-    UV_data = buffer + luma_offset;
-
-    tmp = Y_data;
-    va_TraceMsg("**Y data**\n");
-    for (i=0; i<trace_height; i++) {
-        for (j=0; j<trace_width; j++) {
-            if ((j%16) == 0)
-                va_TraceMsg("\n0x%08x:", j + i*trace_width);
-            va_TraceMsg(" %02x", tmp[j]);
-        }
-
-        va_TraceMsg("\n");
-        tmp = Y_data + i * luma_stride;
-    }
-
-    tmp = UV_data;
-    if (fourcc == VA_FOURCC_NV12) {
-        va_TraceMsg("**UV data**\n");
-        
-        for (i=0; i<trace_height/2; i++) {
-            for (j=0; j<trace_width; j++) {
-                if ((j%16) == 0)
-                    va_TraceMsg("\n0x%08x:", j + i*trace_width);
-                va_TraceMsg(" %02x", tmp[j]);
-            }
-
-            va_TraceMsg("\n");
-            tmp = UV_data + i * chroma_u_stride;
-        }
-    }
-
-    vaUnlockSurface(dpy, trace_rendertarget);
-}
diff -Nru libva-1.0.4/va/va_trace.h libva-1.0.1/va/va_trace.h
--- libva-1.0.4/va/va_trace.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_trace.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2009 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef VA_TRACE_H
-#define VA_TRACE_H
-
-void va_TraceInit(void);
-void va_TraceEnd(void);
-
-void va_TraceMsg(const char *msg, ...);
-
-void va_TraceCreateConfig(
-    VADisplay dpy,
-    VAProfile profile, 
-    VAEntrypoint entrypoint, 
-    VAConfigAttrib *attrib_list,
-    int num_attribs,
-    VAConfigID *config_id /* out */
-);
-
-void va_TraceCreateSurface(
-    VADisplay dpy,
-    int width,
-    int height,
-    int format,
-    int num_surfaces,
-    VASurfaceID *surfaces	/* out */
-);
-
-void va_TraceCreateContext(
-    VADisplay dpy,
-    VAConfigID config_id,
-    int picture_width,
-    int picture_height,
-    int flag,
-    VASurfaceID *render_targets,
-    int num_render_targets,
-    VAContextID *context		/* out */
-);
-
-void va_TraceBeginPicture(
-    VADisplay dpy,
-    VAContextID context,
-    VASurfaceID render_target
-);
-
-void va_TraceRenderPicture(
-    VADisplay dpy,
-    VAContextID context,
-    VABufferID *buffers,
-    int num_buffers
-);
-
-void va_TraceEndPicture(
-    VADisplay dpy,
-    VAContextID context
-);
-
-#endif /* VA_TRACE_H */
diff -Nru libva-1.0.4/va/va_version.h.in libva-1.0.1/va/va_version.h.in
--- libva-1.0.4/va/va_version.h.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_version.h.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2009 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef VA_VERSION_H
-#define VA_VERSION_H
-
-/**
- * VA_MAJOR_VERSION:
- *
- * The major version of the VA library (1, if %VA_VERSION is 1.2.3)
- */
-#define VA_MAJOR_VERSION   (@LIBVA_MAJOR_VERSION@)
-
-/**
- * VA_MINOR_VERSION:
- *
- * The minor version of the VA library (2, if %VA_VERSION is 1.2.3)
- */
-#define VA_MINOR_VERSION   (@LIBVA_MINOR_VERSION@)
-
-/**
- * VA_MICRO_VERSION:
- *
- * The micro version of the VA library (3, if %VA_VERSION is 1.2.3)
- */
-#define VA_MICRO_VERSION   (@LIBVA_MICRO_VERSION@)
-
-/**
- * VA_VERSION:
- *
- * The full version of the VA library, like 1.2.3
- */
-#define VA_VERSION         @LIBVA_VERSION@
-
-/**
- * VA_VERSION_S:
- *
- * The full version of the VA library, in string form (suited for
- * string concatenation)
- */
-#define VA_VERSION_S       "@LIBVA_VERSION@"
-
-/**
- * VA_VERSION_HEX:
- *
- * Numerically encoded version of the VA library, like 0x010203
- */
-#define VA_VERSION_HEX     ((VA_MAJOR_VERSION << 24) | \
-                            (VA_MINOR_VERSION << 16) | \
-                            (VA_MICRO_VERSION << 8))
-
-/**
- * VA_CHECK_VERSION:
- * @major: major version, like 1 in 1.2.3
- * @minor: minor version, like 2 in 1.2.3
- * @micro: micro version, like 3 in 1.2.3
- *
- * Evaluates to %TRUE if the version of the VA library is greater
- * than @major, @minor and @micro
- */
-#define VA_CHECK_VERSION(major,minor,micro) \
-        (VA_MAJOR_VERSION > (major) || \
-         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION > (minor)) || \
-         (VA_MAJOR_VERSION == (major) && VA_MINOR_VERSION == (minor) && VA_MICRO_VERSION >= (micro)))
-
-#endif /* VA_VERSION_H */
diff -Nru libva-1.0.4/va/va_x11.h libva-1.0.1/va/va_x11.h
--- libva-1.0.4/va/va_x11.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/va_x11.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-#ifndef _VA_X11_H_
-#define _VA_X11_H_
-
-#include <va/va.h>
-#include <X11/Xlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Returns a suitable VADisplay for VA API
- */
-VADisplay vaGetDisplay (
-    Display *dpy
-);
-
-/*
- * Output rendering
- * Following is the rendering interface for X windows, 
- * to get the decode output surface to a X drawable
- * It basically performs a de-interlacing (if needed), 
- * color space conversion and scaling to the destination
- * rectangle
- */
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,	
-    Drawable draw, /* X Drawable */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied destination clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* PutSurface flags */
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _VA_X11_H_ */
diff -Nru libva-1.0.4/va/x11/dri1_util.c libva-1.0.1/va/x11/dri1_util.c
--- libva-1.0.4/va/x11/dri1_util.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/dri1_util.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <assert.h>
-
-#include <xf86drm.h>
-
-#include "X11/Xlib.h"
-#include "va.h"
-#include "va_backend.h"
-
-#include "va_dri.h"
-#include "va_dricommon.h"
-
-struct dri1_drawable 
-{
-    struct dri_drawable base;
-    union dri_buffer buffer;
-    int width;
-    int height;
-};
-
-static struct dri_drawable * 
-dri1CreateDrawable(VADriverContextP ctx, XID x_drawable)
-{
-    struct dri1_drawable *dri1_drawable;
-
-    dri1_drawable = calloc(1, sizeof(*dri1_drawable));
-
-    if (!dri1_drawable)
-        return NULL;
-
-    dri1_drawable->base.x_drawable = x_drawable;
-
-    return &dri1_drawable->base;
-}
-
-static void 
-dri1DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-    free(dri_drawable);
-}
-
-static void 
-dri1SwapBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-
-}
-
-static union dri_buffer *
-dri1GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-    struct dri1_drawable *dri1_drawable = (struct dri1_drawable *)dri_drawable;
-
-    return &dri1_drawable->buffer;
-}
-
-static void
-dri1Close(VADriverContextP ctx)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-
-    free_drawable_hashtable(ctx);
-    VA_DRIDestroyContext((Display *)ctx->native_dpy, ctx->x11_screen, dri_state->hwContextID);
-    assert(dri_state->pSAREA != MAP_FAILED);
-    drmUnmap(dri_state->pSAREA, SAREA_MAX);
-    assert(dri_state->fd >= 0);
-    drmCloseOnce(dri_state->fd);
-    VA_DRICloseConnection((Display *)ctx->native_dpy, ctx->x11_screen);
-}
-
-Bool 
-isDRI1Connected(VADriverContextP ctx, char **driver_name)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    int direct_capable;
-    int driver_major;
-    int driver_minor;
-    int driver_patch;
-    int newlyopened;
-    char *BusID;
-    drm_magic_t magic;        
-
-    *driver_name = NULL;
-    dri_state->fd = -1;
-    dri_state->pSAREA = MAP_FAILED;
-    dri_state->driConnectedFlag = VA_NONE;
-
-    if (!VA_DRIQueryDirectRenderingCapable((Display *)ctx->native_dpy, 
-                                           ctx->x11_screen, 
-                                           &direct_capable))
-        goto err_out0;
-
-    if (!direct_capable)
-        goto err_out0;
-
-    if (!VA_DRIGetClientDriverName((Display *)ctx->native_dpy, ctx->x11_screen, 
-                                   &driver_major, &driver_minor,
-                                   &driver_patch, driver_name))
-        goto err_out0;
-
-    if (!VA_DRIOpenConnection((Display *)ctx->native_dpy, ctx->x11_screen, 
-                              &dri_state->hSAREA, &BusID))
-        goto err_out0;
-
-    
-    dri_state->fd = drmOpenOnce(NULL, BusID, &newlyopened);
-    XFree(BusID);
-
-    if (dri_state->fd < 0)
-        goto err_out1;
-
-
-    if (drmGetMagic(dri_state->fd, &magic))
-        goto err_out1;
-
-    if (newlyopened && !VA_DRIAuthConnection((Display *)ctx->native_dpy, ctx->x11_screen, magic))
-        goto err_out1;
-
-    if (drmMap(dri_state->fd, dri_state->hSAREA, SAREA_MAX, &dri_state->pSAREA))
-        goto err_out1;
-
-    if (!VA_DRICreateContext((Display *)ctx->native_dpy, ctx->x11_screen,
-                             DefaultVisual((Display *)ctx->native_dpy, ctx->x11_screen),
-                             &dri_state->hwContextID, &dri_state->hwContext))
-        goto err_out1;
-
-    dri_state->driConnectedFlag = VA_DRI1;
-    dri_state->createDrawable = dri1CreateDrawable;
-    dri_state->destroyDrawable = dri1DestroyDrawable;
-    dri_state->swapBuffer = dri1SwapBuffer;
-    dri_state->getRenderingBuffer = dri1GetRenderingBuffer;
-    dri_state->close = dri1Close;
-
-    return True;
-
-err_out1:
-    if (dri_state->pSAREA != MAP_FAILED)
-        drmUnmap(dri_state->pSAREA, SAREA_MAX);
-
-    if (dri_state->fd >= 0)
-        drmCloseOnce(dri_state->fd);
-
-    VA_DRICloseConnection((Display *)ctx->native_dpy, ctx->x11_screen);
-
-err_out0:
-    if (*driver_name)
-        XFree(*driver_name);
-
-    dri_state->pSAREA = MAP_FAILED;
-    dri_state->fd = -1;
-    *driver_name = NULL;
-    
-    return False;
-}
-
diff -Nru libva-1.0.4/va/x11/dri2_util.c libva-1.0.1/va/x11/dri2_util.c
--- libva-1.0.4/va/x11/dri2_util.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/dri2_util.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,212 +0,0 @@
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <xf86drm.h>
-
-#include <X11/Xlibint.h>
-#include <X11/Xlib.h>
-#include "va.h"
-#include "va_backend.h"
-
-#include "va_dri2.h"
-#include "va_dri2tokens.h"
-#include "va_dricommon.h"
-
-#define __DRI_BUFFER_FRONT_LEFT         0
-#define __DRI_BUFFER_BACK_LEFT          1
-#define __DRI_BUFFER_FRONT_RIGHT        2
-#define __DRI_BUFFER_BACK_RIGHT         3
-#define __DRI_BUFFER_DEPTH              4
-#define __DRI_BUFFER_STENCIL            5
-#define __DRI_BUFFER_ACCUM              6
-#define __DRI_BUFFER_FAKE_FRONT_LEFT    7
-#define __DRI_BUFFER_FAKE_FRONT_RIGHT   8
-
-struct dri2_drawable 
-{
-    struct dri_drawable base;
-    union dri_buffer buffers[5];
-    int width;
-    int height;
-    int has_backbuffer;
-    int back_index;
-    int front_index;
-};
-
-static int gsDRI2SwapAvailable;
-
-static struct dri_drawable * 
-dri2CreateDrawable(VADriverContextP ctx, XID x_drawable)
-{
-    struct dri2_drawable *dri2_drawable;
-
-    dri2_drawable = calloc(1, sizeof(*dri2_drawable));
-
-    if (!dri2_drawable)
-        return NULL;
-
-    dri2_drawable->base.x_drawable = x_drawable;
-    dri2_drawable->base.x = 0;
-    dri2_drawable->base.y = 0;
-    VA_DRI2CreateDrawable((Display *)ctx->native_dpy, x_drawable);
-
-    return &dri2_drawable->base;
-}
-
-static void 
-dri2DestroyDrawable(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-    VA_DRI2DestroyDrawable((Display *)ctx->native_dpy, dri_drawable->x_drawable);
-    free(dri_drawable);
-}
-
-static void 
-dri2SwapBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-    struct dri2_drawable *dri2_drawable = (struct dri2_drawable *)dri_drawable;
-    XRectangle xrect;
-    XserverRegion region;
-
-    if (dri2_drawable->has_backbuffer) {
-        if (gsDRI2SwapAvailable) {
-            CARD64 ret;
-            VA_DRI2SwapBuffers(ctx->native_dpy, dri_drawable->x_drawable, 0, 0,
-                               0, &ret);
-        } else {
-            xrect.x = 0;
-            xrect.y = 0;
-            xrect.width = dri2_drawable->width;
-            xrect.height = dri2_drawable->height;
-
-            region = XFixesCreateRegion(ctx->native_dpy, &xrect, 1);
-            VA_DRI2CopyRegion(ctx->native_dpy, dri_drawable->x_drawable, region,
-                              DRI2BufferFrontLeft, DRI2BufferBackLeft);
-            XFixesDestroyRegion(ctx->native_dpy, region);
-        }
-    }
-}
-
-static union dri_buffer *
-dri2GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-    struct dri2_drawable *dri2_drawable = (struct dri2_drawable *)dri_drawable;
-    int i;
-    int count;
-    unsigned int attachments[5];
-    VA_DRI2Buffer *buffers;
-    
-    i = 0;
-    if (dri_drawable->is_window)
-        attachments[i++] = __DRI_BUFFER_BACK_LEFT;
-    else
-        attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
-
-    buffers = VA_DRI2GetBuffers(ctx->native_dpy, dri_drawable->x_drawable,
-			     &dri2_drawable->width, &dri2_drawable->height, 
-                             attachments, i, &count);
-    assert(buffers);
-    if (buffers == NULL)
-        return NULL;
-
-    dri2_drawable->has_backbuffer = 0;
-
-    for (i = 0; i < count; i++) {
-        dri2_drawable->buffers[i].dri2.attachment = buffers[i].attachment;
-        dri2_drawable->buffers[i].dri2.name = buffers[i].name;
-        dri2_drawable->buffers[i].dri2.pitch = buffers[i].pitch;
-        dri2_drawable->buffers[i].dri2.cpp = buffers[i].cpp;
-        dri2_drawable->buffers[i].dri2.flags = buffers[i].flags;
-        
-        if (buffers[i].attachment == __DRI_BUFFER_BACK_LEFT) {
-            dri2_drawable->has_backbuffer = 1;
-            dri2_drawable->back_index = i;
-        }
-
-        if (buffers[i].attachment == __DRI_BUFFER_FRONT_LEFT)
-            dri2_drawable->front_index = i;
-    }
-    
-    dri_drawable->width = dri2_drawable->width;
-    dri_drawable->height = dri2_drawable->height;
-    Xfree(buffers);
-
-    if (dri2_drawable->has_backbuffer)
-        return &dri2_drawable->buffers[dri2_drawable->back_index];
-
-    return &dri2_drawable->buffers[dri2_drawable->front_index];
-}
-
-static void
-dri2Close(VADriverContextP ctx)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-
-    free_drawable_hashtable(ctx);
-    assert(dri_state->fd >= 0);
-    close(dri_state->fd);
-}
-
-Bool 
-isDRI2Connected(VADriverContextP ctx, char **driver_name)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    int major, minor;
-    int error_base;
-    int event_base;
-    char *device_name = NULL;
-    drm_magic_t magic;        
-    *driver_name = NULL;
-    dri_state->fd = -1;
-    dri_state->driConnectedFlag = VA_NONE;
-    if (!VA_DRI2QueryExtension((Display *)ctx->native_dpy, &event_base, &error_base))
-        goto err_out;
-
-    if (!VA_DRI2QueryVersion((Display *)ctx->native_dpy, &major, &minor))
-        goto err_out;
-
-
-    if (!VA_DRI2Connect((Display *)ctx->native_dpy, RootWindow((Display *)ctx->native_dpy, ctx->x11_screen),
-                     driver_name, &device_name))
-        goto err_out;
-
-    dri_state->fd = open(device_name, O_RDWR);
-    assert(dri_state->fd >= 0);
-
-    if (dri_state->fd < 0)
-        goto err_out;
-
-    if (drmGetMagic(dri_state->fd, &magic))
-        goto err_out;
-
-    if (!VA_DRI2Authenticate((Display *)ctx->native_dpy, RootWindow((Display *)ctx->native_dpy, ctx->x11_screen),
-                          magic))
-        goto err_out;
-
-    dri_state->driConnectedFlag = VA_DRI2;
-    dri_state->createDrawable = dri2CreateDrawable;
-    dri_state->destroyDrawable = dri2DestroyDrawable;
-    dri_state->swapBuffer = dri2SwapBuffer;
-    dri_state->getRenderingBuffer = dri2GetRenderingBuffer;
-    dri_state->close = dri2Close;
-    gsDRI2SwapAvailable = (minor >= 2);
-
-    return True;
-
-err_out:
-    if (device_name)
-        Xfree(device_name);
-
-    if (*driver_name)
-        Xfree(*driver_name);
-
-    if (dri_state->fd >= 0)
-        close(dri_state->fd);
-
-    *driver_name = NULL;
-    dri_state->fd = -1;
-    
-    return False;
-}
-
diff -Nru libva-1.0.4/va/x11/Makefile.am libva-1.0.1/va/x11/Makefile.am
--- libva-1.0.4/va/x11/Makefile.am	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/Makefile.am	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-# INTEL CONFIDENTIAL
-# Copyright 2007 Intel Corporation. All Rights Reserved.
-#
-# The source code contained or described herein and all documents related to
-# the source code ("Material") are owned by Intel Corporation or its suppliers
-# or licensors. Title to the Material remains with Intel Corporation or its
-# suppliers and licensors. The Material may contain trade secrets and
-# proprietary and confidential information of Intel Corporation and its
-# suppliers and licensors, and is protected by worldwide copyright and trade
-# secret laws and treaty provisions. No part of the Material may be used,
-# copied, reproduced, modified, published, uploaded, posted, transmitted,
-# distributed, or disclosed in any way without Intel's prior express written
-# permission. 
-# 
-# No license under any patent, copyright, trade secret or other intellectual
-# property right is granted to or conferred upon you by disclosure or delivery
-# of the Materials, either expressly, by implication, inducement, estoppel or
-# otherwise. Any license under such intellectual property rights must be
-# express and approved by Intel in writing.
-
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va $(DRM_CFLAGS)
-
-noinst_LTLIBRARIES = libva_x11.la	
-
-libva_x11includedir = ${includedir}/va
-libva_x11include_HEADERS = va_dri.h va_dri2.h va_dricommon.h
-
-libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c va_fglrx.c
-
-EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h va_fglrx.h
diff -Nru libva-1.0.4/va/x11/Makefile.in libva-1.0.1/va/x11/Makefile.in
--- libva-1.0.4/va/x11/Makefile.in	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/Makefile.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,574 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# INTEL CONFIDENTIAL
-# Copyright 2007 Intel Corporation. All Rights Reserved.
-#
-# The source code contained or described herein and all documents related to
-# the source code ("Material") are owned by Intel Corporation or its suppliers
-# or licensors. Title to the Material remains with Intel Corporation or its
-# suppliers and licensors. The Material may contain trade secrets and
-# proprietary and confidential information of Intel Corporation and its
-# suppliers and licensors, and is protected by worldwide copyright and trade
-# secret laws and treaty provisions. No part of the Material may be used,
-# copied, reproduced, modified, published, uploaded, posted, transmitted,
-# distributed, or disclosed in any way without Intel's prior express written
-# permission. 
-# 
-# No license under any patent, copyright, trade secret or other intellectual
-# property right is granted to or conferred upon you by disclosure or delivery
-# of the Materials, either expressly, by implication, inducement, estoppel or
-# otherwise. Any license under such intellectual property rights must be
-# express and approved by Intel in writing.
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = va/x11
-DIST_COMMON = $(libva_x11include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-libva_x11_la_LIBADD =
-am_libva_x11_la_OBJECTS = va_x11.lo va_dri.lo va_dri2.lo \
-	va_dricommon.lo dri2_util.lo dri1_util.lo va_nvctrl.lo \
-	va_fglrx.lo
-libva_x11_la_OBJECTS = $(am_libva_x11_la_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(libva_x11_la_SOURCES)
-DIST_SOURCES = $(libva_x11_la_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libva_x11includedir)"
-HEADERS = $(libva_x11include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRM_CFLAGS = @DRM_CFLAGS@
-DRM_LIBS = @DRM_LIBS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GEN4ASM_CFLAGS = @GEN4ASM_CFLAGS@
-GEN4ASM_LIBS = @GEN4ASM_LIBS@
-GL_DEPS_CFLAGS = @GL_DEPS_CFLAGS@
-GL_DEPS_LIBS = @GL_DEPS_LIBS@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBVA_CFLAGS = @LIBVA_CFLAGS@
-LIBVA_DRIVERS_PATH = @LIBVA_DRIVERS_PATH@
-LIBVA_LIBS = @LIBVA_LIBS@
-LIBVA_LT_LDFLAGS = @LIBVA_LT_LDFLAGS@
-LIBVA_LT_VERSION = @LIBVA_LT_VERSION@
-LIBVA_MAJOR_VERSION = @LIBVA_MAJOR_VERSION@
-LIBVA_MICRO_VERSION = @LIBVA_MICRO_VERSION@
-LIBVA_MINOR_VERSION = @LIBVA_MINOR_VERSION@
-LIBVA_VERSION = @LIBVA_VERSION@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-UDEV_CFLAGS = @UDEV_CFLAGS@
-UDEV_LIBS = @UDEV_LIBS@
-VERSION = @VERSION@
-X11_CFLAGS = @X11_CFLAGS@
-X11_LIBS = @X11_LIBS@
-XEXT_CFLAGS = @XEXT_CFLAGS@
-XEXT_LIBS = @XEXT_LIBS@
-XFIXES_CFLAGS = @XFIXES_CFLAGS@
-XFIXES_LIBS = @XFIXES_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-libvabackendlib = @libvabackendlib@
-libvacorelib = @libvacorelib@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CFLAGS = -DLINUX -I$(top_srcdir)/va $(DRM_CFLAGS)
-noinst_LTLIBRARIES = libva_x11.la	
-libva_x11includedir = ${includedir}/va
-libva_x11include_HEADERS = va_dri.h va_dri2.h va_dricommon.h
-libva_x11_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c va_nvctrl.c va_fglrx.c
-EXTRA_DIST = va_dristr.h va_dri2str.h va_dri2tokens.h va_nvctrl.h va_fglrx.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu va/x11/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu va/x11/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libva_x11.la: $(libva_x11_la_OBJECTS) $(libva_x11_la_DEPENDENCIES) 
-	$(LINK)  $(libva_x11_la_OBJECTS) $(libva_x11_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dri1_util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dri2_util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dri.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dri2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_dricommon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_fglrx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_nvctrl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/va_x11.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-install-libva_x11includeHEADERS: $(libva_x11include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(libva_x11includedir)" || $(MKDIR_P) "$(DESTDIR)$(libva_x11includedir)"
-	@list='$(libva_x11include_HEADERS)'; test -n "$(libva_x11includedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libva_x11includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libva_x11includedir)" || exit $$?; \
-	done
-
-uninstall-libva_x11includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libva_x11include_HEADERS)'; test -n "$(libva_x11includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libva_x11includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libva_x11includedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(libva_x11includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-libva_x11includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libva_x11includeHEADERS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am \
-	install-libva_x11includeHEADERS install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libva_x11includeHEADERS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff -Nru libva-1.0.4/va/x11/va_dri2.c libva-1.0.1/va/x11/va_dri2.c
--- libva-1.0.4/va/x11/va_dri2.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dri2.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,349 +0,0 @@
-/*
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Authors:
- *   Kristian Høgsberg (krh@redhat.com)
- */
-
-
-#define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include "xf86drm.h"
-#include "va_dri2.h"
-#include "va_dri2str.h"
-#include "va_dri2tokens.h"
-
-#ifndef DRI2DriverDRI
-#define DRI2DriverDRI 0
-#endif
-
-static char va_dri2ExtensionName[] = DRI2_NAME;
-static XExtensionInfo _va_dri2_info_data;
-static XExtensionInfo *va_dri2Info = &_va_dri2_info_data;
-static XEXT_GENERATE_CLOSE_DISPLAY (VA_DRI2CloseDisplay, va_dri2Info)
-static /* const */ XExtensionHooks va_dri2ExtensionHooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    VA_DRI2CloseDisplay,		/* close_display */
-    NULL,				/* wire_to_event */
-    NULL,				/* event_to_wire */
-    NULL,				/* error */
-    NULL,				/* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (DRI2FindDisplay, va_dri2Info, 
-				   va_dri2ExtensionName, 
-				   &va_dri2ExtensionHooks, 
-				   0, NULL)
-
-Bool VA_DRI2QueryExtension(Display *dpy, int *eventBase, int *errorBase)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-
-    if (XextHasExtension(info)) {
-	*eventBase = info->codes->first_event;
-	*errorBase = info->codes->first_error;
-	return True;
-    }
-
-    return False;
-}
-
-Bool VA_DRI2QueryVersion(Display *dpy, int *major, int *minor)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay (dpy);
-    xDRI2QueryVersionReply rep;
-    xDRI2QueryVersionReq *req;
-
-    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
-
-    LockDisplay(dpy);
-    GetReq(DRI2QueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2QueryVersion;
-    req->majorVersion = DRI2_MAJOR;
-    req->minorVersion = DRI2_MINOR;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    *major = rep.majorVersion;
-    *minor = rep.minorVersion;
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    return True;
-}
-
-Bool VA_DRI2Connect(Display *dpy, XID window,
-		 char **driverName, char **deviceName)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-    xDRI2ConnectReply rep;
-    xDRI2ConnectReq *req;
-
-    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
-
-    LockDisplay(dpy);
-    GetReq(DRI2Connect, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2Connect;
-    req->window = window;
-    req->driverType = DRI2DriverDRI;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-
-    if (rep.driverNameLength == 0 && rep.deviceNameLength == 0) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-
-    *driverName = Xmalloc(rep.driverNameLength + 1);
-    if (*driverName == NULL) {
-	_XEatData(dpy, 
-		  ((rep.driverNameLength + 3) & ~3) +
-		  ((rep.deviceNameLength + 3) & ~3));
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    _XReadPad(dpy, *driverName, rep.driverNameLength);
-    (*driverName)[rep.driverNameLength] = '\0';
-
-    *deviceName = Xmalloc(rep.deviceNameLength + 1);
-    if (*deviceName == NULL) {
-	Xfree(*driverName);
-	_XEatData(dpy, ((rep.deviceNameLength + 3) & ~3));
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-    _XReadPad(dpy, *deviceName, rep.deviceNameLength);
-    (*deviceName)[rep.deviceNameLength] = '\0';
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    return True;
-}
-
-Bool VA_DRI2Authenticate(Display *dpy, XID window, drm_magic_t magic)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-    xDRI2AuthenticateReq *req;
-    xDRI2AuthenticateReply rep;
-
-    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
-
-    LockDisplay(dpy);
-    GetReq(DRI2Authenticate, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2Authenticate;
-    req->window = window;
-    req->magic = magic;
-
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return False;
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    return rep.authenticated;
-}
-
-void VA_DRI2CreateDrawable(Display *dpy, XID drawable)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-    xDRI2CreateDrawableReq *req;
-
-    XextSimpleCheckExtension (dpy, info, va_dri2ExtensionName);
-
-    LockDisplay(dpy);
-    GetReq(DRI2CreateDrawable, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2CreateDrawable;
-    req->drawable = drawable;
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-void VA_DRI2DestroyDrawable(Display *dpy, XID drawable)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-    xDRI2DestroyDrawableReq *req;
-
-    XextSimpleCheckExtension (dpy, info, va_dri2ExtensionName);
-
-    XSync(dpy, False);
-
-    LockDisplay(dpy);
-    GetReq(DRI2DestroyDrawable, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2DestroyDrawable;
-    req->drawable = drawable;
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-VA_DRI2Buffer *VA_DRI2GetBuffers(Display *dpy, XID drawable,
-			   int *width, int *height,
-			   unsigned int *attachments, int count,
-			   int *outCount)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-    xDRI2GetBuffersReply rep;
-    xDRI2GetBuffersReq *req;
-    VA_DRI2Buffer *buffers;
-    xDRI2Buffer repBuffer;
-    CARD32 *p;
-    int i;
-
-    XextCheckExtension (dpy, info, va_dri2ExtensionName, False);
-
-    LockDisplay(dpy);
-    GetReqExtra(DRI2GetBuffers, count * 4, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2GetBuffers;
-    req->drawable = drawable;
-    req->count = count;
-    p = (CARD32 *) &req[1];
-    for (i = 0; i < count; i++)
-	p[i] = attachments[i];
-
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return NULL;
-    }
-
-    *width = rep.width;
-    *height = rep.height;
-    *outCount = rep.count;
-
-    buffers = Xmalloc(rep.count * sizeof buffers[0]);
-    if (buffers == NULL) {
-	_XEatData(dpy, rep.count * sizeof repBuffer);
-	UnlockDisplay(dpy);
-	SyncHandle();
-	return NULL;
-    }
-
-    for (i = 0; i < rep.count; i++) {
-	_XReadPad(dpy, (char *) &repBuffer, sizeof repBuffer);
-	buffers[i].attachment = repBuffer.attachment;
-	buffers[i].name = repBuffer.name;
-	buffers[i].pitch = repBuffer.pitch;
-	buffers[i].cpp = repBuffer.cpp;
-	buffers[i].flags = repBuffer.flags;
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-
-    return buffers;
-}
-
-void VA_DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region,
-		    CARD32 dest, CARD32 src)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-    xDRI2CopyRegionReq *req;
-    xDRI2CopyRegionReply rep;
-
-    XextSimpleCheckExtension (dpy, info, va_dri2ExtensionName);
-
-    LockDisplay(dpy);
-    GetReq(DRI2CopyRegion, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2CopyRegion;
-    req->drawable = drawable;
-    req->region = region;
-    req->dest = dest;
-    req->src = src;
-
-    _XReply(dpy, (xReply *)&rep, 0, xFalse);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
-
-static void
-load_swap_req(xDRI2SwapBuffersReq *req, CARD64 target, CARD64 divisor,
-              CARD64 remainder)
-{
-    req->target_msc_hi = target >> 32;
-    req->target_msc_lo = target & 0xffffffff;
-    req->divisor_hi = divisor >> 32;
-    req->divisor_lo = divisor & 0xffffffff;
-    req->remainder_hi = remainder >> 32;
-    req->remainder_lo = remainder & 0xffffffff;
-}
-
-static CARD64
-vals_to_card64(CARD32 lo, CARD32 hi)
-{
-    return (CARD64)hi << 32 | lo;
-}
-
-void VA_DRI2SwapBuffers(Display *dpy, XID drawable, CARD64 target_msc,
-                        CARD64 divisor, CARD64 remainder, CARD64 *count)
-{
-    XExtDisplayInfo *info = DRI2FindDisplay(dpy);
-    xDRI2SwapBuffersReq *req;
-    xDRI2SwapBuffersReply rep;
-
-    XextSimpleCheckExtension (dpy, info, va_dri2ExtensionName);
-
-    LockDisplay(dpy);
-    GetReq(DRI2SwapBuffers, req);
-    req->reqType = info->codes->major_opcode;
-    req->dri2ReqType = X_DRI2SwapBuffers;
-    req->drawable = drawable;
-    load_swap_req(req, target_msc, divisor, remainder);
-
-    _XReply(dpy, (xReply *)&rep, 0, xFalse);
-
-    *count = vals_to_card64(rep.swap_lo, rep.swap_hi);
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-}
diff -Nru libva-1.0.4/va/x11/va_dri2.h libva-1.0.1/va/x11/va_dri2.h
--- libva-1.0.4/va/x11/va_dri2.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dri2.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-/*
- * Copyright © 2007,2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Authors:
- *   Kristian Høgsberg (krh@redhat.com)
- */
-
-#ifndef _VA_DRI2_H_
-#define _VA_DRI2_H_
-
-#include <X11/Xproto.h>
-#include <X11/extensions/Xfixes.h>
-#include <X11/Xfuncproto.h>
-#include <xf86drm.h>
-
-typedef struct {
-    unsigned int attachment;
-    unsigned int name;
-    unsigned int pitch;
-    unsigned int cpp;
-    unsigned int flags;
-} VA_DRI2Buffer;
-
-extern Bool
-VA_DRI2QueryExtension(Display *display, int *eventBase, int *errorBase);
-extern Bool
-VA_DRI2QueryVersion(Display *display, int *major, int *minor);
-extern Bool
-VA_DRI2Connect(Display *display, XID window,
-	    char **driverName, char **deviceName);
-extern Bool
-VA_DRI2Authenticate(Display *display, XID window, drm_magic_t magic);
-extern void
-VA_DRI2CreateDrawable(Display *display, XID drawable);
-extern void
-VA_DRI2DestroyDrawable(Display *display, XID handle);
-extern VA_DRI2Buffer *
-VA_DRI2GetBuffers(Display *dpy, XID drawable,
-	       int *width, int *height,
-	       unsigned int *attachments, int count,
-	       int *outCount);
-extern void
-VA_DRI2CopyRegion(Display *dpy, XID drawable, XserverRegion region,
-                  CARD32 dest, CARD32 src);
-extern void
-VA_DRI2SwapBuffers(Display *dpy, XID drawable, CARD64 target_msc, CARD64 divisor,
-                   CARD64 remainder, CARD64 *count);
-#endif
diff -Nru libva-1.0.4/va/x11/va_dri2str.h libva-1.0.1/va/x11/va_dri2str.h
--- libva-1.0.4/va/x11/va_dri2str.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dri2str.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,227 +0,0 @@
-/*
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Authors:
- *   Kristian Høgsberg (krh@redhat.com)
- */
-
-#ifndef _DRI2_PROTO_H_
-#define _DRI2_PROTO_H_
-
-#define DRI2_NAME			"DRI2"
-#define DRI2_MAJOR			1
-#define DRI2_MINOR			2
-
-#define DRI2NumberErrors		0
-#define DRI2NumberEvents		2
-#define DRI2NumberRequests		13
-
-#define X_DRI2QueryVersion		0
-#define X_DRI2Connect			1
-#define X_DRI2Authenticate		2
-#define X_DRI2CreateDrawable		3
-#define X_DRI2DestroyDrawable		4
-#define X_DRI2GetBuffers		5
-#define X_DRI2CopyRegion		6
-#define X_DRI2GetBuffersWithFormat	7
-#define X_DRI2SwapBuffers		8
-#define X_DRI2GetMSC			9
-#define X_DRI2WaitMSC			10
-#define X_DRI2WaitSBC			11
-#define X_DRI2SwapInterval		12
-
-typedef struct {
-    CARD32  attachment B32;
-    CARD32  name B32;
-    CARD32  pitch B32;
-    CARD32  cpp B32;
-    CARD32  flags B32;
-} xDRI2Buffer;
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-} xDRI2QueryVersionReq;
-#define sz_xDRI2QueryVersionReq   12
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  majorVersion B32;
-    CARD32  minorVersion B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xDRI2QueryVersionReply;
-#define sz_xDRI2QueryVersionReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  window B32;
-    CARD32  driverType B32;
-} xDRI2ConnectReq;
-#define sz_xDRI2ConnectReq	12
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  driverNameLength B32;
-    CARD32  deviceNameLength B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xDRI2ConnectReply;
-#define sz_xDRI2ConnectReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  window B32;
-    CARD32  magic B32;
-} xDRI2AuthenticateReq;
-#define sz_xDRI2AuthenticateReq   12
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  authenticated B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-} xDRI2AuthenticateReply;
-#define sz_xDRI2AuthenticateReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-} xDRI2CreateDrawableReq;
-#define sz_xDRI2CreateDrawableReq   8
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-} xDRI2DestroyDrawableReq;
-#define sz_xDRI2DestroyDrawableReq   8
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-    CARD32  count B32;
-} xDRI2GetBuffersReq;
-#define sz_xDRI2GetBuffersReq   12
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  width B32;
-    CARD32  height B32;
-    CARD32  count B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-} xDRI2GetBuffersReply;
-#define sz_xDRI2GetBuffersReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-    CARD32  region B32;
-    CARD32  dest B32;
-    CARD32  src B32;
-} xDRI2CopyRegionReq;
-#define sz_xDRI2CopyRegionReq   20
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-    CARD32  pad6 B32;
-    CARD32  pad7 B32;
-} xDRI2CopyRegionReply;
-#define sz_xDRI2CopyRegionReply	32
-
-typedef struct {
-    CARD8   reqType;
-    CARD8   dri2ReqType;
-    CARD16  length B16;
-    CARD32  drawable B32;
-    CARD32  target_msc_hi B32;
-    CARD32  target_msc_lo B32;
-    CARD32  divisor_hi B32;
-    CARD32  divisor_lo B32;
-    CARD32  remainder_hi B32;
-    CARD32  remainder_lo B32;
-} xDRI2SwapBuffersReq;
-#define sz_xDRI2SwapBuffersReq  32
-
-typedef struct {
-    BYTE    type;   /* X_Reply */
-    BYTE    pad1;
-    CARD16  sequenceNumber B16;
-    CARD32  length B32;
-    CARD32  swap_hi B32;
-    CARD32  swap_lo B32;
-    CARD32  pad2 B32;
-    CARD32  pad3 B32;
-    CARD32  pad4 B32;
-    CARD32  pad5 B32;
-} xDRI2SwapBuffersReply;
-#define sz_xDRI2SwapBuffersReply 32
-
-#endif
diff -Nru libva-1.0.4/va/x11/va_dri2tokens.h libva-1.0.1/va/x11/va_dri2tokens.h
--- libva-1.0.4/va/x11/va_dri2tokens.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dri2tokens.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/*
- * Copyright © 2008 Red Hat, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Authors:
- *   Kristian Høgsberg (krh@redhat.com)
- */
-
-#ifndef _DRI2_TOKENS_H_
-#define _DRI2_TOKENS_H_
-
-#define DRI2BufferFrontLeft		0
-#define DRI2BufferBackLeft		1
-#define DRI2BufferFrontRight		2
-#define DRI2BufferBackRight		3
-#define DRI2BufferDepth			4
-#define DRI2BufferStencil		5
-#define DRI2BufferAccum			6
-#define DRI2BufferFakeFrontLeft		7
-#define DRI2BufferFakeFrontRight	8
-
-#define DRI2DriverDRI			0
-
-#endif
diff -Nru libva-1.0.4/va/x11/va_dri.c libva-1.0.1/va/x11/va_dri.c
--- libva-1.0.4/va/x11/va_dri.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dri.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,624 +0,0 @@
-/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.13 2002/10/30 12:51:25 alanh Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright 2007 Intel Corporation
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Kevin E. Martin <martin@valinux.com>
- *   Jens Owen <jens@tungstengraphics.com>
- *   Rickard E. (Rik) Faith <faith@valinux.com>
- *
- */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include "va_dristr.h"
-
-#define PUBLIC
-
-static XExtensionInfo _va_dri_info_data;
-static XExtensionInfo *va_dri_info = &_va_dri_info_data;
-static char va_dri_extension_name[] = VA_DRINAME;
-
-#define VA_DRICheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, va_dri_extension_name, val)
-
-/*****************************************************************************
- *                                                                           *
- *			   private utility routines                          *
- *                                                                           *
- *****************************************************************************/
-
-static int close_display(Display *dpy, XExtCodes *extCodes);
-static /* const */ XExtensionHooks va_dri_extension_hooks = {
-    NULL,				/* create_gc */
-    NULL,				/* copy_gc */
-    NULL,				/* flush_gc */
-    NULL,				/* free_gc */
-    NULL,				/* create_font */
-    NULL,				/* free_font */
-    close_display,			/* close_display */
-    NULL,				/* wire_to_event */
-    NULL,				/* event_to_wire */
-    NULL,				/* error */
-    NULL,				/* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, va_dri_info, 
-				   va_dri_extension_name, 
-				   &va_dri_extension_hooks, 
-				   0, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, va_dri_info)
-
-
-/*****************************************************************************
- *                                                                           *
- *		    public XFree86-DRI Extension routines                    *
- *                                                                           *
- *****************************************************************************/
-
-#if 0
-#include <stdio.h>
-#define TRACE(msg)  fprintf(stderr,"XF86DRI%s\n", msg);
-#else
-#define TRACE(msg)
-#endif
-
-
-PUBLIC Bool VA_DRIQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-
-    TRACE("QueryExtension...");
-    if (XextHasExtension(info)) {
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
-        TRACE("QueryExtension... return True");
-	return True;
-    } else {
-        TRACE("QueryExtension... return False");
-	return False;
-    }
-}
-
-PUBLIC Bool VA_DRIQueryVersion(dpy, majorVersion, minorVersion, patchVersion)
-    Display* dpy;
-    int* majorVersion; 
-    int* minorVersion;
-    int* patchVersion;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIQueryVersionReply rep;
-    xVA_DRIQueryVersionReq *req;
-
-    TRACE("QueryVersion...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIQueryVersion, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIQueryVersion;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("QueryVersion... return False");
-	return False;
-    }
-    *majorVersion = rep.majorVersion;
-    *minorVersion = rep.minorVersion;
-    *patchVersion = rep.patchVersion;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("QueryVersion... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIQueryDirectRenderingCapable(dpy, screen, isCapable)
-    Display* dpy;
-    int screen;
-    Bool* isCapable;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIQueryDirectRenderingCapableReply rep;
-    xVA_DRIQueryDirectRenderingCapableReq *req;
-
-    TRACE("QueryDirectRenderingCapable...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIQueryDirectRenderingCapable, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIQueryDirectRenderingCapable;
-    req->screen = screen;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("QueryDirectRenderingCapable... return False");
-	return False;
-    }
-    *isCapable = rep.isCapable;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("QueryDirectRenderingCapable... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIOpenConnection(dpy, screen, hSAREA, busIdString)
-    Display* dpy;
-    int screen;
-    drm_handle_t * hSAREA;
-    char **busIdString;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIOpenConnectionReply rep;
-    xVA_DRIOpenConnectionReq *req;
-
-    TRACE("OpenConnection...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIOpenConnection, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIOpenConnection;
-    req->screen = screen;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("OpenConnection... return False");
-	return False;
-    }
-
-    *hSAREA = rep.hSAREALow;
-    if (sizeof(drm_handle_t) == 8) {
-       int shift = 32; /* var to prevent warning on next line */
-       *hSAREA |= ((drm_handle_t) rep.hSAREAHigh) << shift;
-    }
-
-    if (rep.length) {
-        if (!(*busIdString = (char *)Xcalloc(rep.busIdStringLength + 1, 1))) {
-            _XEatData(dpy, ((rep.busIdStringLength+3) & ~3));
-            UnlockDisplay(dpy);
-            SyncHandle();
-            TRACE("OpenConnection... return False");
-            return False;
-        }
-	_XReadPad(dpy, *busIdString, rep.busIdStringLength);
-    } else {
-        *busIdString = NULL;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("OpenConnection... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIAuthConnection(dpy, screen, magic)
-    Display* dpy;
-    int screen;
-    drm_magic_t magic;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIAuthConnectionReq *req;
-    xVA_DRIAuthConnectionReply rep;
-
-    TRACE("AuthConnection...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIAuthConnection, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIAuthConnection;
-    req->screen = screen;
-    req->magic = magic;
-    rep.authenticated = 0;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse) || !rep.authenticated) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("AuthConnection... return False");
-	return False;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("AuthConnection... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRICloseConnection(dpy, screen)
-    Display* dpy;
-    int screen;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRICloseConnectionReq *req;
-
-    TRACE("CloseConnection...");
-
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRICloseConnection, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRICloseConnection;
-    req->screen = screen;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("CloseConnection... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIGetClientDriverName(dpy, screen, ddxDriverMajorVersion, 
-	ddxDriverMinorVersion, ddxDriverPatchVersion, clientDriverName)
-    Display* dpy;
-    int screen;
-    int* ddxDriverMajorVersion;
-    int* ddxDriverMinorVersion;
-    int* ddxDriverPatchVersion;
-    char** clientDriverName;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIGetClientDriverNameReply rep;
-    xVA_DRIGetClientDriverNameReq *req;
-
-    TRACE("GetClientDriverName...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIGetClientDriverName, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIGetClientDriverName;
-    req->screen = screen;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("GetClientDriverName... return False");
-	return False;
-    }
-
-    *ddxDriverMajorVersion = rep.ddxDriverMajorVersion;
-    *ddxDriverMinorVersion = rep.ddxDriverMinorVersion;
-    *ddxDriverPatchVersion = rep.ddxDriverPatchVersion;
-
-    if (rep.length) {
-        if (!(*clientDriverName = (char *)Xcalloc(rep.clientDriverNameLength + 1, 1))) {
-            _XEatData(dpy, ((rep.clientDriverNameLength+3) & ~3));
-            UnlockDisplay(dpy);
-            SyncHandle();
-            TRACE("GetClientDriverName... return False");
-            return False;
-        }
-	_XReadPad(dpy, *clientDriverName, rep.clientDriverNameLength);
-    } else {
-        *clientDriverName = NULL;
-    }
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("GetClientDriverName... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRICreateContextWithConfig(dpy, screen, configID, context,
-	hHWContext)
-    Display* dpy;
-    int screen;
-    int configID;
-    XID* context;
-    drm_context_t * hHWContext;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRICreateContextReply rep;
-    xVA_DRICreateContextReq *req;
-
-    TRACE("CreateContext...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRICreateContext, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRICreateContext;
-    req->visual = configID;
-    req->screen = screen;
-    *context = XAllocID(dpy);
-    req->context = *context;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("CreateContext... return False");
-	return False;
-    }
-    *hHWContext = rep.hHWContext;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("CreateContext... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRICreateContext(dpy, screen, visual, context, hHWContext)
-    Display* dpy;
-    int screen;
-    Visual* visual;
-    XID* context;
-    drm_context_t * hHWContext;
-{
-    return VA_DRICreateContextWithConfig( dpy, screen, visual->visualid,
-					   context, hHWContext );
-}
-
-PUBLIC Bool VA_DRIDestroyContext( __DRInativeDisplay * ndpy, int screen, 
-    __DRIid context )
-{
-    Display * const dpy = (Display *) ndpy;
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIDestroyContextReq *req;
-
-    TRACE("DestroyContext...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIDestroyContext, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIDestroyContext;
-    req->screen = screen;
-    req->context = context;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("DestroyContext... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRICreateDrawable( __DRInativeDisplay * ndpy, int screen, 
-    __DRIid drawable, drm_drawable_t * hHWDrawable )
-{
-    Display * const dpy = (Display *) ndpy;
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRICreateDrawableReply rep;
-    xVA_DRICreateDrawableReq *req;
-
-    TRACE("CreateDrawable...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRICreateDrawable, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRICreateDrawable;
-    req->screen = screen;
-    req->drawable = drawable;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("CreateDrawable... return False");
-	return False;
-    }
-    *hHWDrawable = rep.hHWDrawable;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("CreateDrawable... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIDestroyDrawable( __DRInativeDisplay * ndpy, int screen,
-    __DRIid drawable )
-{
-    Display * const dpy = (Display *) ndpy;
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIDestroyDrawableReq *req;
-
-    TRACE("DestroyDrawable...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIDestroyDrawable, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIDestroyDrawable;
-    req->screen = screen;
-    req->drawable = drawable;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("DestroyDrawable... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIGetDrawableInfo(Display* dpy, int screen, Drawable drawable,
-    unsigned int* index, unsigned int* stamp,
-    int* X, int* Y, int* W, int* H,
-    int* numClipRects, drm_clip_rect_t ** pClipRects,
-    int* backX, int* backY,
-    int* numBackClipRects, drm_clip_rect_t ** pBackClipRects )
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIGetDrawableInfoReply rep;
-    xVA_DRIGetDrawableInfoReq *req;
-    int total_rects;
-
-    TRACE("GetDrawableInfo...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIGetDrawableInfo, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIGetDrawableInfo;
-    req->screen = screen;
-    req->drawable = drawable;
-
-    if (!_XReply(dpy, (xReply *)&rep, 1, xFalse)) 
-    {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("GetDrawableInfo... return False");
-	return False;
-    }
-    *index = rep.drawableTableIndex;
-    *stamp = rep.drawableTableStamp;
-    *X = (int)rep.drawableX;
-    *Y = (int)rep.drawableY;
-    *W = (int)rep.drawableWidth;
-    *H = (int)rep.drawableHeight;
-    *numClipRects = rep.numClipRects;
-    total_rects = *numClipRects;
-
-    *backX = rep.backX;
-    *backY = rep.backY;
-    *numBackClipRects = rep.numBackClipRects;
-    total_rects += *numBackClipRects;
-
-#if 0
-    /* Because of the fix in Xserver/GL/dri/xf86dri.c, this check breaks
-     * backwards compatibility (Because of the >> 2 shift) but the fix
-     * enables multi-threaded apps to work.
-     */
-    if (rep.length !=  ((((SIZEOF(xVA_DRIGetDrawableInfoReply) - 
-		       SIZEOF(xGenericReply) + 
-		       total_rects * sizeof(drm_clip_rect_t)) + 3) & ~3) >> 2)) {
-        _XEatData(dpy, rep.length);
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("GetDrawableInfo... return False");
-        return False;
-    }
-#endif
-
-    if (*numClipRects) {
-       int len = sizeof(drm_clip_rect_t) * (*numClipRects);
-
-       *pClipRects = (drm_clip_rect_t *)Xcalloc(len, 1);
-       if (*pClipRects) 
-	  _XRead(dpy, (char*)*pClipRects, len);
-    } else {
-        *pClipRects = NULL;
-    }
-
-    if (*numBackClipRects) {
-       int len = sizeof(drm_clip_rect_t) * (*numBackClipRects);
-
-       *pBackClipRects = (drm_clip_rect_t *)Xcalloc(len, 1);
-       if (*pBackClipRects) 
-	  _XRead(dpy, (char*)*pBackClipRects, len);
-    } else {
-        *pBackClipRects = NULL;
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("GetDrawableInfo... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIGetDeviceInfo(dpy, screen, hFrameBuffer, 
-	fbOrigin, fbSize, fbStride, devPrivateSize, pDevPrivate)
-    Display* dpy;
-    int screen;
-    drm_handle_t * hFrameBuffer;
-    int* fbOrigin;
-    int* fbSize;
-    int* fbStride;
-    int* devPrivateSize;
-    void** pDevPrivate;
-{
-    XExtDisplayInfo *info = find_display (dpy);
-    xVA_DRIGetDeviceInfoReply rep;
-    xVA_DRIGetDeviceInfoReq *req;
-
-    TRACE("GetDeviceInfo...");
-    VA_DRICheckExtension (dpy, info, False);
-
-    LockDisplay(dpy);
-    GetReq(VA_DRIGetDeviceInfo, req);
-    req->reqType = info->codes->major_opcode;
-    req->driReqType = X_VA_DRIGetDeviceInfo;
-    req->screen = screen;
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
-        TRACE("GetDeviceInfo... return False");
-	return False;
-    }
-
-    *hFrameBuffer = rep.hFrameBufferLow;
-    if (sizeof(drm_handle_t) == 8) {
-       int shift = 32; /* var to prevent warning on next line */
-       *hFrameBuffer |= ((drm_handle_t) rep.hFrameBufferHigh) << shift;
-    }
-
-    *fbOrigin = rep.framebufferOrigin;
-    *fbSize = rep.framebufferSize;
-    *fbStride = rep.framebufferStride;
-    *devPrivateSize = rep.devPrivateSize;
-
-    if (rep.length) {
-        if (!(*pDevPrivate = (void *)Xcalloc(rep.devPrivateSize, 1))) {
-            _XEatData(dpy, ((rep.devPrivateSize+3) & ~3));
-            UnlockDisplay(dpy);
-            SyncHandle();
-            TRACE("GetDeviceInfo... return False");
-            return False;
-        }
-	_XRead(dpy, (char*)*pDevPrivate, rep.devPrivateSize);
-    } else {
-        *pDevPrivate = NULL;
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    TRACE("GetDeviceInfo... return True");
-    return True;
-}
-
-PUBLIC Bool VA_DRIOpenFullScreen(dpy, screen, drawable)
-    Display* dpy;
-    int screen;
-    Drawable drawable;
-{
-    /* This function and the underlying X protocol are deprecated.
-     */
-    (void) dpy;
-    (void) screen;
-    (void) drawable;
-    return False;
-}
-
-PUBLIC Bool VA_DRICloseFullScreen(dpy, screen, drawable)
-    Display* dpy;
-    int screen;
-    Drawable drawable;
-{
-    /* This function and the underlying X protocol are deprecated.
-     */
-    (void) dpy;
-    (void) screen;
-    (void) drawable;
-    return True;
-}
-
-#undef TRACE
-
diff -Nru libva-1.0.4/va/x11/va_dricommon.c libva-1.0.1/va/x11/va_dricommon.c
--- libva-1.0.4/va/x11/va_dricommon.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dricommon.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-#include "va_dricommon.h"
-
-// X error trap
-static int x11_error_code = 0;
-static int (*old_error_handler)(Display *, XErrorEvent *);
-
-static int 
-error_handler(Display *dpy, XErrorEvent *error)
-{
-    x11_error_code = error->error_code;
-    return 0;
-}
-
-static void 
-x11_trap_errors(void)
-{
-    x11_error_code    = 0;
-    old_error_handler = XSetErrorHandler(error_handler);
-}
-
-static int 
-x11_untrap_errors(void)
-{
-    XSetErrorHandler(old_error_handler);
-    return x11_error_code;
-}
-
-static int 
-is_window(Display *dpy, Drawable drawable)
-{
-    XWindowAttributes wattr;
-
-    x11_trap_errors();
-    XGetWindowAttributes(dpy, drawable, &wattr);
-    return x11_untrap_errors() == 0;
-}
-
-static struct dri_drawable *
-do_drawable_hash(VADriverContextP ctx, XID drawable)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    int index = drawable % DRAWABLE_HASH_SZ;
-    struct dri_drawable *dri_drawable = dri_state->drawable_hash[index];
-
-    while (dri_drawable) {
-        if (dri_drawable->x_drawable == drawable)
-            return dri_drawable;
-        dri_drawable = dri_drawable->next;
-    }
-
-    dri_drawable = dri_state->createDrawable(ctx, drawable);
-    dri_drawable->x_drawable = drawable;
-    dri_drawable->is_window = is_window((Display *)ctx->native_dpy, drawable);
-    dri_drawable->next = dri_state->drawable_hash[index];
-    dri_state->drawable_hash[index] = dri_drawable;
-
-    return dri_drawable;
-}
-
-void
-free_drawable_hashtable(VADriverContextP ctx)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    int i;
-    struct dri_drawable *dri_drawable, *prev;
-
-    for (i = 0; i < DRAWABLE_HASH_SZ; i++) {
-        dri_drawable = dri_state->drawable_hash[i];
-
-        while (dri_drawable) {
-            prev = dri_drawable;
-            dri_drawable = prev->next;
-            dri_state->destroyDrawable(ctx, prev);
-        }
-    }
-}
-
-struct dri_drawable *
-dri_get_drawable(VADriverContextP ctx, XID drawable)
-{
-    return do_drawable_hash(ctx, drawable);
-}
-
-void 
-dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-
-    dri_state->swapBuffer(ctx, dri_drawable);
-}
-
-union dri_buffer *
-dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
-{
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-    
-    return dri_state->getRenderingBuffer(ctx, dri_drawable);
-}
diff -Nru libva-1.0.4/va/x11/va_dricommon.h libva-1.0.1/va/x11/va_dricommon.h
--- libva-1.0.4/va/x11/va_dricommon.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dricommon.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-#ifndef _VA_DRICOMMON_H_
-#define _VA_DRICOMMON_H_
-
-#ifndef ANDROID
-#include <X11/Xlib.h>
-#include <xf86drm.h>
-#include <drm.h>
-#include <drm_sarea.h>
-#endif
-
-#include <va/va_backend.h>
-
-#ifdef ANDROID
-#define XID unsigned int
-#define Bool int
-#endif
-
-enum
-{
-    VA_NONE = 0,
-    VA_DRI1 = 1,
-    VA_DRI2 = 2,
-    VA_DUMMY = 3
-};
-
-union dri_buffer 
-{
-    struct {
-        unsigned int attachment;
-        unsigned int name;
-        unsigned int pitch;
-        unsigned int cpp;
-        unsigned int flags;
-    } dri2;
-
-    struct {
-    } dri1;
-};
-
-struct dri_drawable 
-{
-    XID x_drawable;
-    int is_window;
-    int x;
-    int y;
-    unsigned int width;
-    unsigned int height;
-    struct dri_drawable *next;
-};
-
-#define DRAWABLE_HASH_SZ 32
-struct dri_state 
-{
-    int fd;
-    int driConnectedFlag; /* 0: disconnected, 1: DRI, 2: DRI2 */
-#ifndef ANDROID
-    drm_handle_t hSAREA;
-    drm_context_t hwContext;
-    drmAddress pSAREA;
-    XID hwContextID;
-    struct dri_drawable *drawable_hash[DRAWABLE_HASH_SZ];
-
-    struct dri_drawable *(*createDrawable)(VADriverContextP ctx, XID x_drawable);
-    void (*destroyDrawable)(VADriverContextP ctx, struct dri_drawable *dri_drawable);
-    void (*swapBuffer)(VADriverContextP ctx, struct dri_drawable *dri_drawable);
-    union dri_buffer *(*getRenderingBuffer)(VADriverContextP ctx, struct dri_drawable *dri_drawable);
-    void (*close)(VADriverContextP ctx);
-#endif
-};
-
-Bool isDRI2Connected(VADriverContextP ctx, char **driver_name);
-Bool isDRI1Connected(VADriverContextP ctx, char **driver_name);
-void free_drawable_hashtable(VADriverContextP ctx);
-struct dri_drawable *dri_get_drawable(VADriverContextP ctx, XID drawable);
-void dri_swap_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
-union dri_buffer *dri_get_rendering_buffer(VADriverContextP ctx, struct dri_drawable *dri_drawable);
-
-#endif /* _VA_DRICOMMON_H_ */
diff -Nru libva-1.0.4/va/x11/va_dri.h libva-1.0.1/va/x11/va_dri.h
--- libva-1.0.4/va/x11/va_dri.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dri.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,120 +0,0 @@
-/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.8 2002/10/30 12:51:25 alanh Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright 2007 Intel Corporation
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/**
- * \file xf86dri.h
- * Protocol numbers and function prototypes for DRI X protocol.
- *
- * \author Kevin E. Martin <martin@valinux.com>
- * \author Jens Owen <jens@tungstengraphics.com>
- * \author Rickard E. (Rik) Faith <faith@valinux.com>
- */
-
-#ifndef _VA_DRI_H_
-#define _VA_DRI_H_
-
-#include <X11/Xfuncproto.h>
-#include <xf86drm.h>
-
-#define X_VA_DRIQueryVersion			0
-#define X_VA_DRIQueryDirectRenderingCapable	1
-#define X_VA_DRIOpenConnection			2
-#define X_VA_DRICloseConnection		3
-#define X_VA_DRIGetClientDriverName		4
-#define X_VA_DRICreateContext			5
-#define X_VA_DRIDestroyContext			6
-#define X_VA_DRICreateDrawable			7
-#define X_VA_DRIDestroyDrawable		8
-#define X_VA_DRIGetDrawableInfo		9
-#define X_VA_DRIGetDeviceInfo			10
-#define X_VA_DRIAuthConnection                 11
-#define X_VA_DRIOpenFullScreen                 12   /* Deprecated */
-#define X_VA_DRICloseFullScreen                13   /* Deprecated */
-
-#define VA_DRINumberEvents		0
-
-#define VA_DRIClientNotLocal		0
-#define VA_DRIOperationNotSupported	1
-#define VA_DRINumberErrors		(VA_DRIOperationNotSupported + 1)
-
-typedef unsigned long __DRIid;
-typedef void __DRInativeDisplay;
-
-_XFUNCPROTOBEGIN
-
-Bool VA_DRIQueryExtension( Display *dpy, int *event_base, int *error_base );
-
-Bool VA_DRIQueryVersion( Display *dpy, int *majorVersion, int *minorVersion,
-    int *patchVersion );
-
-Bool VA_DRIQueryDirectRenderingCapable( Display *dpy, int screen,
-    Bool *isCapable );
-
-Bool VA_DRIOpenConnection( Display *dpy, int screen, drm_handle_t *hSAREA,
-    char **busIDString );
-
-Bool VA_DRIAuthConnection( Display *dpy, int screen, drm_magic_t magic );
-
-Bool VA_DRICloseConnection( Display *dpy, int screen );
-
-Bool VA_DRIGetClientDriverName( Display *dpy, int screen,
-    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
-    int *ddxDriverPatchVersion, char **clientDriverName );
-
-Bool VA_DRICreateContext( Display *dpy, int screen, Visual *visual,
-    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
-
-Bool VA_DRICreateContextWithConfig( Display *dpy, int screen, int configID,
-    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
-
-Bool VA_DRIDestroyContext( __DRInativeDisplay *dpy, int screen,
-    __DRIid context_id );
-
-Bool VA_DRICreateDrawable( __DRInativeDisplay *dpy, int screen,
-    __DRIid drawable, drm_drawable_t *hHWDrawable );
-
-Bool VA_DRIDestroyDrawable( __DRInativeDisplay *dpy, int screen, 
-    __DRIid drawable);
-
-Bool VA_DRIGetDrawableInfo( Display *dpy, int screen, Drawable drawable,
-    unsigned int *index, unsigned int *stamp, 
-    int *X, int *Y, int *W, int *H,
-    int *numClipRects, drm_clip_rect_t ** pClipRects,
-    int *backX, int *backY,
-    int *numBackClipRects, drm_clip_rect_t **pBackClipRects );
-
-Bool VA_DRIGetDeviceInfo( Display *dpy, int screen,
-    drm_handle_t *hFrameBuffer, int *fbOrigin, int *fbSize,
-    int *fbStride, int *devPrivateSize, void **pDevPrivate );
-
-_XFUNCPROTOEND
-
-#endif /* _VA_DRI_H_ */
-
diff -Nru libva-1.0.4/va/x11/va_dristr.h libva-1.0.1/va/x11/va_dristr.h
--- libva-1.0.4/va/x11/va_dristr.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_dristr.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,344 +0,0 @@
-/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.10 2002/10/30 12:51:25 alanh Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright 2007 Intel Corporation
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Kevin E. Martin <martin@valinux.com>
- *   Jens Owen <jens@tungstengraphics.com>
- *   Rickard E. (Rik) Fiath <faith@valinux.com>
- *
- */
-
-#ifndef _VA_DRISTR_H_
-#define _VA_DRISTR_H_
-
-#include "va_dri.h"
-
-#define VA_DRINAME "XFree86-DRI"
-
-/* The DRI version number.  This was originally set to be the same of the
- * XFree86 version number.  However, this version is really indepedent of
- * the XFree86 version.
- *
- * Version History:
- *    4.0.0: Original
- *    4.0.1: Patch to bump clipstamp when windows are destroyed, 28 May 02
- *    4.1.0: Add transition from single to multi in DRMInfo rec, 24 Jun 02
- */
-#define VA_DRI_MAJOR_VERSION	4
-#define VA_DRI_MINOR_VERSION	1
-#define VA_DRI_PATCH_VERSION	0
-
-typedef struct _VA_DRIQueryVersion {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRIQueryVersion */
-    CARD16	length B16;
-} xVA_DRIQueryVersionReq;
-#define sz_xVA_DRIQueryVersionReq	4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of DRI protocol */
-    CARD16	minorVersion B16;	/* minor version of DRI protocol */
-    CARD32	patchVersion B32;       /* patch version of DRI protocol */
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xVA_DRIQueryVersionReply;
-#define sz_xVA_DRIQueryVersionReply	32
-
-typedef struct _VA_DRIQueryDirectRenderingCapable {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* X_DRIQueryDirectRenderingCapable */
-    CARD16	length B16;
-    CARD32	screen B32;
-} xVA_DRIQueryDirectRenderingCapableReq;
-#define sz_xVA_DRIQueryDirectRenderingCapableReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    BOOL	isCapable;
-    BOOL	pad2;
-    BOOL	pad3;
-    BOOL	pad4;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-    CARD32	pad8 B32;
-    CARD32	pad9 B32;
-} xVA_DRIQueryDirectRenderingCapableReply;
-#define sz_xVA_DRIQueryDirectRenderingCapableReply	32
-
-typedef struct _VA_DRIOpenConnection {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRIOpenConnection */
-    CARD16	length B16;
-    CARD32	screen B32;
-} xVA_DRIOpenConnectionReq;
-#define sz_xVA_DRIOpenConnectionReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hSAREALow B32;
-    CARD32	hSAREAHigh B32;
-    CARD32	busIdStringLength B32;
-    CARD32	pad6 B32;
-    CARD32	pad7 B32;
-    CARD32	pad8 B32;
-} xVA_DRIOpenConnectionReply;
-#define sz_xVA_DRIOpenConnectionReply	32
-
-typedef struct _VA_DRIAuthConnection {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRICloseConnection */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32      magic B32;
-} xVA_DRIAuthConnectionReq;
-#define sz_xVA_DRIAuthConnectionReq	12
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad1;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      authenticated B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xVA_DRIAuthConnectionReply;
-#define zx_xVA_DRIAuthConnectionReply  32
-
-typedef struct _VA_DRICloseConnection {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRICloseConnection */
-    CARD16	length B16;
-    CARD32	screen B32;
-} xVA_DRICloseConnectionReq;
-#define sz_xVA_DRICloseConnectionReq	8
-
-typedef struct _VA_DRIGetClientDriverName {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRIGetClientDriverName */
-    CARD16	length B16;
-    CARD32	screen B32;
-} xVA_DRIGetClientDriverNameReq;
-#define sz_xVA_DRIGetClientDriverNameReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	ddxDriverMajorVersion B32;
-    CARD32	ddxDriverMinorVersion B32;
-    CARD32	ddxDriverPatchVersion B32;
-    CARD32	clientDriverNameLength B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xVA_DRIGetClientDriverNameReply;
-#define sz_xVA_DRIGetClientDriverNameReply	32
-
-typedef struct _VA_DRICreateContext {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRICreateContext */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	visual B32;
-    CARD32	context B32;
-} xVA_DRICreateContextReq;
-#define sz_xVA_DRICreateContextReq	16
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hHWContext B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xVA_DRICreateContextReply;
-#define sz_xVA_DRICreateContextReply	32
-
-typedef struct _VA_DRIDestroyContext {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRIDestroyContext */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	context B32;
-} xVA_DRIDestroyContextReq;
-#define sz_xVA_DRIDestroyContextReq	12
-
-typedef struct _VA_DRICreateDrawable {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRICreateDrawable */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	drawable B32;
-} xVA_DRICreateDrawableReq;
-#define sz_xVA_DRICreateDrawableReq	12
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hHWDrawable B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xVA_DRICreateDrawableReply;
-#define sz_xVA_DRICreateDrawableReply	32
-
-typedef struct _VA_DRIDestroyDrawable {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRIDestroyDrawable */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	drawable B32;
-} xVA_DRIDestroyDrawableReq;
-#define sz_xVA_DRIDestroyDrawableReq	12
-
-typedef struct _VA_DRIGetDrawableInfo {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRIGetDrawableInfo */
-    CARD16	length B16;
-    CARD32	screen B32;
-    CARD32	drawable B32;
-} xVA_DRIGetDrawableInfoReq;
-#define sz_xVA_DRIGetDrawableInfoReq	12
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	drawableTableIndex B32;
-    CARD32	drawableTableStamp B32;
-    INT16	drawableX B16;
-    INT16	drawableY B16;
-    INT16	drawableWidth B16;
-    INT16	drawableHeight B16;
-    CARD32	numClipRects B32;
-    INT16       backX B16;
-    INT16       backY B16;
-    CARD32      numBackClipRects B32;
-} xVA_DRIGetDrawableInfoReply;
-
-#define sz_xVA_DRIGetDrawableInfoReply	36
-
-
-typedef struct _VA_DRIGetDeviceInfo {
-    CARD8	reqType;		/* always DRIReqCode */
-    CARD8	driReqType;		/* always X_DRIGetDeviceInfo */
-    CARD16	length B16;
-    CARD32	screen B32;
-} xVA_DRIGetDeviceInfoReq;
-#define sz_xVA_DRIGetDeviceInfoReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	hFrameBufferLow B32;
-    CARD32	hFrameBufferHigh B32;
-    CARD32	framebufferOrigin B32;
-    CARD32	framebufferSize B32;
-    CARD32	framebufferStride B32;
-    CARD32	devPrivateSize B32;
-} xVA_DRIGetDeviceInfoReply;
-#define sz_xVA_DRIGetDeviceInfoReply	32
-
-typedef struct _VA_DRIOpenFullScreen {
-    CARD8       reqType;	/* always DRIReqCode */
-    CARD8       driReqType;	/* always X_DRIOpenFullScreen */
-    CARD16      length B16;
-    CARD32      screen B32;
-    CARD32      drawable B32;
-} xVA_DRIOpenFullScreenReq;
-#define sz_xVA_DRIOpenFullScreenReq    12
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad1;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      isFullScreen B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-} xVA_DRIOpenFullScreenReply;
-#define sz_xVA_DRIOpenFullScreenReply  32
-
-typedef struct _VA_DRICloseFullScreen {
-    CARD8       reqType;	/* always DRIReqCode */
-    CARD8       driReqType;	/* always X_DRICloseFullScreen */
-    CARD16      length B16;
-    CARD32      screen B32;
-    CARD32      drawable B32;
-} xVA_DRICloseFullScreenReq;
-#define sz_xVA_DRICloseFullScreenReq   12
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad1;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-    CARD32      pad6 B32;
-    CARD32      pad7 B32;
-} xVA_DRICloseFullScreenReply;
-#define sz_xVA_DRICloseFullScreenReply  32
-
-
-#endif /* _VA_DRISTR_H_ */
diff -Nru libva-1.0.4/va/x11/va_fglrx.c libva-1.0.1/va/x11/va_fglrx.c
--- libva-1.0.4/va/x11/va_fglrx.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_fglrx.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-/*
- * Copyright (C) 2010 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-#include <X11/Xlib.h>
-
-#define ADL_OK 0
-#define ADL_MAX_PATH 256
-
-/*
- * Based on public AMD Display Library (ADL) SDK:
- * <http://developer.amd.com/gpu/adlsdk/Pages/default.aspx>
- */
-typedef struct AdapterInfo {
-    int iSize;
-    int iAdapterIndex;
-    char strUDID[ADL_MAX_PATH]; 
-    int iBusNumber;
-    int iDeviceNumber;
-    int iFunctionNumber;
-    int iVendorID;
-    char strAdapterName[ADL_MAX_PATH];
-    char strDisplayName[ADL_MAX_PATH];
-    int iPresent;
-    int iXScreenNum;
-    int iDrvIndex;
-    char strXScreenConfigName[ADL_MAX_PATH];
-} AdapterInfo, *LPAdapterInfo;
-
-typedef struct XScreenInfo {
-    int iXScreenNum;
-    char strXScreenConfigName[ADL_MAX_PATH];
-} XScreenInfo, *LPXScreenInfo;
-
-typedef void *(*ADL_MAIN_MALLOC_CALLBACK)(int);
-typedef int (*ADL_MAIN_CONTROL_CREATE)(ADL_MAIN_MALLOC_CALLBACK, int);
-typedef int (*ADL_MAIN_CONTROL_DESTROY)(void);
-typedef int (*ADL_ADAPTER_NUMBEROFADAPTERS_GET)(int *);
-typedef int (*ADL_ADAPTER_ADAPTERINFO_GET)(LPAdapterInfo, int);
-typedef int (*ADL_ADAPTER_XSCREENINFO_GET)(LPXScreenInfo, int);
-
-static void *ADL_Main_Memory_Alloc(int iSize)
-{
-    return malloc(iSize);
-}
-
-static void ADL_Main_Memory_Free(void *arg)
-{
-    void ** const lpBuffer = arg;
-
-    if (lpBuffer && *lpBuffer) {
-        free(*lpBuffer);
-        *lpBuffer = NULL;
-    }
-}
-
-static int match_display(Display *x11_dpy, const char *display_name)
-{
-    Display *test_dpy;
-    char *test_dpy_name, *x11_dpy_name;
-    int m;
-
-    test_dpy = XOpenDisplay(display_name);
-    if (!test_dpy)
-        return 0;
-
-    test_dpy_name = XDisplayString(test_dpy);
-    x11_dpy_name  = XDisplayString(x11_dpy);
-
-    if (x11_dpy_name && test_dpy_name)
-        m = strcmp(x11_dpy_name, test_dpy_name) == 0;
-    else
-        m = !x11_dpy_name && !test_dpy_name;
-
-    XCloseDisplay(test_dpy);
-    return m;
-}
-
-Bool VA_FGLRXGetClientDriverName( Display *dpy, int screen,
-    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
-    int *ddxDriverPatchVersion, char **clientDriverName )
-{
-    ADL_MAIN_CONTROL_CREATE          ADL_Main_Control_Create;
-    ADL_MAIN_CONTROL_DESTROY         ADL_Main_Control_Destroy;
-    ADL_ADAPTER_NUMBEROFADAPTERS_GET ADL_Adapter_NumberOfAdapters_Get;
-    ADL_ADAPTER_ADAPTERINFO_GET      ADL_Adapter_AdapterInfo_Get;
-    ADL_ADAPTER_XSCREENINFO_GET      ADL_Adapter_XScreenInfo_Get;
-
-    LPAdapterInfo lpAdapterInfo = NULL;
-    LPXScreenInfo lpXScreenInfo = NULL;
-    void *libadl_handle = NULL;
-    Bool success = False;
-    int is_adl_initialized = 0;
-    int i, num_adapters, lpAdapterInfo_size, lpXScreenInfo_size;
-
-    if (ddxDriverMajorVersion)
-        *ddxDriverMajorVersion = 0;
-    if (ddxDriverMinorVersion)
-        *ddxDriverMinorVersion = 0;
-    if (ddxDriverPatchVersion)
-        *ddxDriverPatchVersion = 0;
-    if (clientDriverName)
-        *clientDriverName = NULL;
-
-    libadl_handle = dlopen("libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL);
-    if (!libadl_handle)
-        goto end;
-
-    dlerror();
-    ADL_Main_Control_Create = (ADL_MAIN_CONTROL_CREATE)
-        dlsym(libadl_handle,"ADL_Main_Control_Create");
-    if (dlerror())
-        goto end;
-
-    ADL_Main_Control_Destroy = (ADL_MAIN_CONTROL_DESTROY)
-        dlsym(libadl_handle,"ADL_Main_Control_Destroy");
-    if (dlerror())
-        goto end;
-
-    ADL_Adapter_NumberOfAdapters_Get = (ADL_ADAPTER_NUMBEROFADAPTERS_GET)
-        dlsym(libadl_handle,"ADL_Adapter_NumberOfAdapters_Get");
-    if (dlerror())
-        goto end;
-
-    ADL_Adapter_AdapterInfo_Get = (ADL_ADAPTER_ADAPTERINFO_GET)
-        dlsym(libadl_handle,"ADL_Adapter_AdapterInfo_Get");
-    if (dlerror())
-        goto end;
-
-    ADL_Adapter_XScreenInfo_Get = (ADL_ADAPTER_XSCREENINFO_GET)
-        dlsym(libadl_handle,"ADL_Adapter_XScreenInfo_Get");
-    if (dlerror())
-        goto end;
-
-    if (ADL_Main_Control_Create(ADL_Main_Memory_Alloc, 1) != ADL_OK)
-        goto end;
-    is_adl_initialized = 1;
-
-    if (ADL_Adapter_NumberOfAdapters_Get(&num_adapters) != ADL_OK)
-        goto end;
-    if (num_adapters <= 0)
-        goto end;
-
-    lpAdapterInfo_size = num_adapters * sizeof(*lpAdapterInfo);
-    lpAdapterInfo = ADL_Main_Memory_Alloc(lpAdapterInfo_size);
-    if (!lpAdapterInfo)
-        goto end;
-    memset(lpAdapterInfo, 0, lpAdapterInfo_size);
-
-    for (i = 0; i < num_adapters; i++)
-        lpAdapterInfo[i].iSize = sizeof(lpAdapterInfo[i]);
-
-    lpXScreenInfo_size = num_adapters * sizeof(*lpXScreenInfo);
-    lpXScreenInfo = ADL_Main_Memory_Alloc(lpXScreenInfo_size);
-    if (!lpXScreenInfo)
-        goto end;
-    memset(lpXScreenInfo, 0, lpXScreenInfo_size);
-
-    if (ADL_Adapter_AdapterInfo_Get(lpAdapterInfo, lpAdapterInfo_size) != ADL_OK)
-        goto end;
-
-    if (ADL_Adapter_XScreenInfo_Get(lpXScreenInfo, lpXScreenInfo_size) != ADL_OK)
-        goto end;
-
-    for (i = 0; i < num_adapters; i++) {
-        LPXScreenInfo const lpCurrXScreenInfo = &lpXScreenInfo[i];
-        LPAdapterInfo const lpCurrAdapterInfo = &lpAdapterInfo[i];
-        if (!lpCurrAdapterInfo->iPresent)
-            continue;
-#if 0
-        printf("Adapter %d:\n", i);
-        printf("  iAdapterIndex: %d\n",    lpCurrAdapterInfo->iAdapterIndex);
-        printf("  strUDID: '%s'\n",        lpCurrAdapterInfo->strUDID);
-        printf("  iBusNumber: %d\n",       lpCurrAdapterInfo->iBusNumber);
-        printf("  iDeviceNumber: %d\n",    lpCurrAdapterInfo->iDeviceNumber);
-        printf("  iFunctionNumber: %d\n",  lpCurrAdapterInfo->iFunctionNumber);
-        printf("  iVendorID: 0x%04x\n",    lpCurrAdapterInfo->iVendorID);
-        printf("  strAdapterName: '%s'\n", lpCurrAdapterInfo->strAdapterName);
-        printf("  strDisplayName: '%s'\n", lpCurrAdapterInfo->strDisplayName);
-        printf("  iPresent: %d\n",         lpCurrAdapterInfo->iPresent);
-        printf("  iXScreenNum: %d\n",      lpCurrXScreenInfo->iXScreenNum);
-#endif
-        if (match_display(dpy, lpCurrAdapterInfo->strDisplayName) &&
-            screen == lpCurrXScreenInfo->iXScreenNum) {
-            *clientDriverName = strdup("fglrx");
-            break;
-        }
-    }
-
-    success = True;
-end:
-    if (lpXScreenInfo)
-        ADL_Main_Memory_Free(&lpXScreenInfo);
-    if (lpAdapterInfo)
-        ADL_Main_Memory_Free(&lpAdapterInfo);
-    if (is_adl_initialized)
-        ADL_Main_Control_Destroy();
-    if (libadl_handle)
-        dlclose(libadl_handle);
-    return success;
-}
diff -Nru libva-1.0.4/va/x11/va_fglrx.h libva-1.0.1/va/x11/va_fglrx.h
--- libva-1.0.4/va/x11/va_fglrx.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_fglrx.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2010 Splitted-Desktop Systems. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef VA_FGLRX_H
-#define VA_FGLRX_H
-
-#include <X11/Xlib.h>
-
-Bool VA_FGLRXGetClientDriverName( Display *dpy, int screen,
-    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
-    int *ddxDriverPatchVersion, char **clientDriverName );
-
-#endif /* VA_FGLRX_H */
diff -Nru libva-1.0.4/va/x11/va_nvctrl.c libva-1.0.1/va/x11/va_nvctrl.c
--- libva-1.0.4/va/x11/va_nvctrl.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_nvctrl.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,399 +0,0 @@
-/*
- * Copyright (c) 2008 NVIDIA, Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include <string.h>
-
-#define NEED_REPLIES
-#include <stdlib.h>
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xext.h>
-#include <X11/extensions/extutil.h>
-#include "va_nvctrl.h"
-
-#define NV_CONTROL_ERRORS 0
-#define NV_CONTROL_EVENTS 5
-#define NV_CONTROL_NAME "NV-CONTROL"
-
-#define NV_CTRL_TARGET_TYPE_X_SCREEN   0
-#define NV_CTRL_TARGET_TYPE_GPU        1
-#define NV_CTRL_TARGET_TYPE_FRAMELOCK  2
-#define NV_CTRL_TARGET_TYPE_VCSC       3 /* Visual Computing System */
-
-#define NV_CTRL_STRING_NVIDIA_DRIVER_VERSION                    3  /* R--G */
-
-#define X_nvCtrlQueryExtension                      0
-#define X_nvCtrlIsNv                                1
-#define X_nvCtrlQueryStringAttribute                4
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 nvReqType;
-    CARD16 length B16;
-} xnvCtrlQueryExtensionReq;
-#define sz_xnvCtrlQueryExtensionReq 4
-
-typedef struct {
-    BYTE type;   /* X_Reply */
-    CARD8 padb1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD16 major B16;
-    CARD16 minor B16;
-    CARD32 padl4 B32;
-    CARD32 padl5 B32;
-    CARD32 padl6 B32;
-    CARD32 padl7 B32;
-    CARD32 padl8 B32;
-} xnvCtrlQueryExtensionReply;
-#define sz_xnvCtrlQueryExtensionReply 32
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 nvReqType;
-    CARD16 length B16;
-    CARD32 screen B32;
-} xnvCtrlIsNvReq;
-#define sz_xnvCtrlIsNvReq 8
-
-typedef struct {
-    BYTE type;   /* X_Reply */
-    CARD8 padb1;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 isnv B32;
-    CARD32 padl4 B32;
-    CARD32 padl5 B32;
-    CARD32 padl6 B32;
-    CARD32 padl7 B32;
-    CARD32 padl8 B32;
-} xnvCtrlIsNvReply;
-#define sz_xnvCtrlIsNvReply 32
-
-typedef struct {
-    CARD8 reqType;
-    CARD8 nvReqType;
-    CARD16 length B16;
-    CARD16 target_id B16;    /* X screen number or GPU number */
-    CARD16 target_type B16;  /* X screen or GPU */
-    CARD32 display_mask B32;
-    CARD32 attribute B32;
-} xnvCtrlQueryStringAttributeReq;
-#define sz_xnvCtrlQueryStringAttributeReq 16
-
-typedef struct {
-    BYTE type;
-    BYTE pad0;
-    CARD16 sequenceNumber B16;
-    CARD32 length B32;
-    CARD32 flags B32;
-    CARD32 n B32;    /* Length of string */
-    CARD32 pad4 B32;
-    CARD32 pad5 B32;
-    CARD32 pad6 B32;
-    CARD32 pad7 B32;
-} xnvCtrlQueryStringAttributeReply;
-#define sz_xnvCtrlQueryStringAttributeReply 32
-
-#define NVCTRL_EXT_NEED_CHECK          (XPointer)(~0)
-#define NVCTRL_EXT_NEED_NOTHING        (XPointer)(0)
-#define NVCTRL_EXT_NEED_TARGET_SWAP    (XPointer)(1)
-
-static XExtensionInfo _nvctrl_ext_info_data;
-static XExtensionInfo *nvctrl_ext_info = &_nvctrl_ext_info_data;
-static /* const */ char *nvctrl_extension_name = NV_CONTROL_NAME;
-
-#define XNVCTRLCheckExtension(dpy,i,val) \
-  XextCheckExtension (dpy, i, nvctrl_extension_name, val)
-#define XNVCTRLSimpleCheckExtension(dpy,i) \
-  XextSimpleCheckExtension (dpy, i, nvctrl_extension_name)
-
-static int close_display();
-static /* const */ XExtensionHooks nvctrl_extension_hooks = {
-    NULL,                               /* create_gc */
-    NULL,                               /* copy_gc */
-    NULL,                               /* flush_gc */
-    NULL,                               /* free_gc */
-    NULL,                               /* create_font */
-    NULL,                               /* free_font */
-    close_display,                      /* close_display */
-    NULL,                               /* wire_to_event */
-    NULL,                               /* event_to_wire */
-    NULL,                               /* error */
-    NULL,                               /* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, nvctrl_ext_info,
-                                   nvctrl_extension_name, 
-                                   &nvctrl_extension_hooks,
-                                   NV_CONTROL_EVENTS, NVCTRL_EXT_NEED_CHECK)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, nvctrl_ext_info)
-
-static Bool XNVCTRLQueryVersion (Display *dpy, int *major, int *minor);
-
-/*
- * NV-CONTROL versions 1.8 and 1.9 pack the target_type and target_id
- * fields in reversed order.  In order to talk to one of these servers,
- * we need to swap these fields.
- */
-static void XNVCTRLCheckTargetData(Display *dpy, XExtDisplayInfo *info,
-                                   int *target_type, int *target_id)
-{
-    /* Find out what the server's NV-CONTROL version is and
-     * setup for swapping if we need to.
-     */
-    if (info->data == NVCTRL_EXT_NEED_CHECK) {
-        int major, minor;
-
-        if (XNVCTRLQueryVersion(dpy, &major, &minor)) {
-            if (major == 1 &&
-                (minor == 8 || minor == 9)) {
-                info->data = NVCTRL_EXT_NEED_TARGET_SWAP;
-            } else {
-                info->data = NVCTRL_EXT_NEED_NOTHING;
-            }
-        } else {
-            info->data = NVCTRL_EXT_NEED_NOTHING;
-        }
-    }
-
-    /* We need to swap the target_type and target_id */
-    if (info->data == NVCTRL_EXT_NEED_TARGET_SWAP) {
-        int tmp;
-        tmp = *target_type;
-        *target_type = *target_id;
-        *target_id = tmp;
-    }
-}
-
-
-static Bool XNVCTRLQueryExtension (
-    Display *dpy,
-    int *event_basep,
-    int *error_basep
-){
-    XExtDisplayInfo *info = find_display (dpy);
-
-    if (XextHasExtension(info)) {
-        if (event_basep) *event_basep = info->codes->first_event;
-        if (error_basep) *error_basep = info->codes->first_error;
-        return True;
-    } else {
-        return False;
-    }
-}
-
-
-static Bool XNVCTRLQueryVersion (
-    Display *dpy,
-    int *major,
-    int *minor
-){
-    XExtDisplayInfo *info = find_display (dpy);
-    xnvCtrlQueryExtensionReply rep;
-    xnvCtrlQueryExtensionReq   *req;
-
-    if(!XextHasExtension(info))
-        return False;
-
-    XNVCTRLCheckExtension (dpy, info, False);
-
-    LockDisplay (dpy);
-    GetReq (nvCtrlQueryExtension, req);
-    req->reqType = info->codes->major_opcode;
-    req->nvReqType = X_nvCtrlQueryExtension;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        return False;
-    }
-    if (major) *major = rep.major;
-    if (minor) *minor = rep.minor;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return True;
-}
-
-
-static Bool XNVCTRLIsNvScreen (
-    Display *dpy,
-    int screen
-){
-    XExtDisplayInfo *info = find_display (dpy);
-    xnvCtrlIsNvReply rep;
-    xnvCtrlIsNvReq   *req;
-    Bool isnv;
-
-    if(!XextHasExtension(info))
-        return False;
-
-    XNVCTRLCheckExtension (dpy, info, False);
-
-    LockDisplay (dpy);
-    GetReq (nvCtrlIsNv, req);
-    req->reqType = info->codes->major_opcode;
-    req->nvReqType = X_nvCtrlIsNv;
-    req->screen = screen;
-    if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) {
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        return False;
-    }
-    isnv = rep.isnv;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return isnv;
-}
-
-
-static Bool XNVCTRLQueryTargetStringAttribute (
-    Display *dpy,
-    int target_type,
-    int target_id,
-    unsigned int display_mask,
-    unsigned int attribute,
-    char **ptr
-){
-    XExtDisplayInfo *info = find_display (dpy);
-    xnvCtrlQueryStringAttributeReply rep;
-    xnvCtrlQueryStringAttributeReq   *req;
-    Bool exists;
-    int length, numbytes, slop;
-
-    if (!ptr) return False;
-
-    if(!XextHasExtension(info))
-        return False;
-
-    XNVCTRLCheckExtension (dpy, info, False);
-    XNVCTRLCheckTargetData(dpy, info, &target_type, &target_id);
-
-    LockDisplay (dpy);
-    GetReq (nvCtrlQueryStringAttribute, req);
-    req->reqType = info->codes->major_opcode;
-    req->nvReqType = X_nvCtrlQueryStringAttribute;
-    req->target_type = target_type;
-    req->target_id = target_id;
-    req->display_mask = display_mask;
-    req->attribute = attribute;
-    if (!_XReply (dpy, (xReply *) &rep, 0, False)) {
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        return False;
-    }
-    length = rep.length;
-    numbytes = rep.n;
-    slop = numbytes & 3;
-    *ptr = (char *) Xmalloc(numbytes);
-    if (! *ptr) {
-        _XEatData(dpy, length);
-        UnlockDisplay (dpy);
-        SyncHandle ();
-        return False;
-    } else {
-        _XRead(dpy, (char *) *ptr, numbytes);
-        if (slop) _XEatData(dpy, 4-slop);
-    }
-    exists = rep.flags;
-    UnlockDisplay (dpy);
-    SyncHandle ();
-    return exists;
-}
-
-static Bool XNVCTRLQueryStringAttribute (
-    Display *dpy,
-    int screen,
-    unsigned int display_mask,
-    unsigned int attribute,
-    char **ptr
-){
-    return XNVCTRLQueryTargetStringAttribute(dpy, NV_CTRL_TARGET_TYPE_X_SCREEN,
-                                             screen, display_mask,
-                                             attribute, ptr);
-}
-
-
-Bool VA_NVCTRLQueryDirectRenderingCapable( Display *dpy, int screen,
-    Bool *isCapable )
-{
-    int event_base;
-    int error_base;
-
-    if (isCapable)
-        *isCapable = False;
-
-    if (!XNVCTRLQueryExtension(dpy, &event_base, &error_base))
-        return False;
-
-    if (isCapable && XNVCTRLIsNvScreen(dpy, screen))
-        *isCapable = True;
-
-    return True;
-}
-
-Bool VA_NVCTRLGetClientDriverName( Display *dpy, int screen,
-    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
-    int *ddxDriverPatchVersion, char **clientDriverName )
-{
-    if (ddxDriverMajorVersion)
-        *ddxDriverMajorVersion = 0;
-    if (ddxDriverMinorVersion)
-        *ddxDriverMinorVersion = 0;
-    if (ddxDriverPatchVersion)
-        *ddxDriverPatchVersion = 0;
-    if (clientDriverName)
-        *clientDriverName = NULL;
-
-    char *nvidia_driver_version = NULL;
-    if (!XNVCTRLQueryStringAttribute(dpy, screen, 0, NV_CTRL_STRING_NVIDIA_DRIVER_VERSION, &nvidia_driver_version))
-        return False;
-
-    char *end, *str = nvidia_driver_version;
-    unsigned long v = strtoul(str, &end, 10);
-    if (end && end != str) {
-        if (ddxDriverMajorVersion)
-            *ddxDriverMajorVersion = v;
-        if (*(str = end) == '.') {
-            v = strtoul(str + 1, &end, 10);
-            if (end && end != str && (*end == '.' || *end == '\0')) {
-                if (ddxDriverMinorVersion)
-                    *ddxDriverMinorVersion = v;
-                if (*(str = end) == '.') {
-                    v = strtoul(str + 1, &end, 10);
-                    if (end && end != str && *end == '\0') {
-                        if (ddxDriverPatchVersion)
-                            *ddxDriverPatchVersion = v;
-                    }
-                }
-            }
-        }
-    }
-    Xfree(nvidia_driver_version);
-
-    if (clientDriverName)
-        *clientDriverName = strdup("nvidia");
-
-    return True;
-}
diff -Nru libva-1.0.4/va/x11/va_nvctrl.h libva-1.0.1/va/x11/va_nvctrl.h
--- libva-1.0.4/va/x11/va_nvctrl.h	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_nvctrl.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2008 NVIDIA, Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#ifndef VA_NVCTRLLIB_H
-#define VA_NVCTRLLIB_H
-
-#include <X11/Xlib.h>
-
-Bool VA_NVCTRLQueryDirectRenderingCapable( Display *dpy, int screen,
-    Bool *isCapable );
-
-Bool VA_NVCTRLGetClientDriverName( Display *dpy, int screen,
-    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
-    int *ddxDriverPatchVersion, char **clientDriverName );
-
-#endif /* VA_NVCTRLLIB_H */
diff -Nru libva-1.0.4/va/x11/va_x11.c libva-1.0.1/va/x11/va_x11.c
--- libva-1.0.4/va/x11/va_x11.c	2010-09-10 17:16:46.000000000 +0000
+++ libva-1.0.1/va/x11/va_x11.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,259 +0,0 @@
-/*
- * Copyright (c) 2007 Intel Corporation. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define _GNU_SOURCE 1
-#include "config.h"
-#include "va.h"
-#include "va_backend.h"
-#include "va_x11.h"
-#include "va_dri.h"
-#include "va_dri2.h"
-#include "va_dricommon.h"
-#include "va_nvctrl.h"
-#include "va_fglrx.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-
-static VADisplayContextP pDisplayContexts = NULL;
-
-static int va_DisplayContextIsValid (
-    VADisplayContextP pDisplayContext
-)
-{
-    VADisplayContextP ctx = pDisplayContexts;
-
-    while (ctx)
-    {
-	if (ctx == pDisplayContext && pDisplayContext->pDriverContext)
-	    return 1;
-	ctx = ctx->pNext;
-    }
-    return 0;
-}
-
-static void va_DisplayContextDestroy (
-    VADisplayContextP pDisplayContext
-)
-{
-    VADisplayContextP *ctx = &pDisplayContexts;
-
-    /* Throw away pDisplayContext */
-    while (*ctx)
-    {
-	if (*ctx == pDisplayContext)
-	{
-	    *ctx = pDisplayContext->pNext;
-	    pDisplayContext->pNext = NULL;
-	    break;
-	}
-	ctx = &((*ctx)->pNext);
-    }
-    free(pDisplayContext->pDriverContext->dri_state);
-    free(pDisplayContext->pDriverContext);
-    free(pDisplayContext);
-}
-
-
-static VAStatus va_DRI2GetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-
-    if (!isDRI2Connected(ctx, driver_name))
-        return VA_STATUS_ERROR_UNKNOWN;
-
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus va_DRIGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-
-    if (!isDRI1Connected(ctx, driver_name))
-        return VA_STATUS_ERROR_UNKNOWN;
-
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus va_NVCTRL_GetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    int direct_capable, driver_major, driver_minor, driver_patch;
-    Bool result;
-
-    result = VA_NVCTRLQueryDirectRenderingCapable((Display *)ctx->native_dpy, ctx->x11_screen,
-                                                  &direct_capable);
-    if (!result || !direct_capable)
-        return VA_STATUS_ERROR_UNKNOWN;
-
-    result = VA_NVCTRLGetClientDriverName((Display *)ctx->native_dpy, ctx->x11_screen,
-                                          &driver_major, &driver_minor,
-                                          &driver_patch, driver_name);
-    if (!result)
-        return VA_STATUS_ERROR_UNKNOWN;
-
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus va_FGLRX_GetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VADriverContextP ctx = pDisplayContext->pDriverContext;
-    int driver_major, driver_minor, driver_patch;
-    Bool result;
-
-    result = VA_FGLRXGetClientDriverName(ctx->native_dpy, ctx->x11_screen,
-                                         &driver_major, &driver_minor,
-                                         &driver_patch, driver_name);
-    if (!result)
-        return VA_STATUS_ERROR_UNKNOWN;
-
-    return VA_STATUS_SUCCESS;
-}
-
-static VAStatus va_DisplayContextGetDriverName (
-    VADisplayContextP pDisplayContext,
-    char **driver_name
-)
-{
-    VAStatus vaStatus;
-
-    if (driver_name)
-	*driver_name = NULL;
-
-    vaStatus = va_DRI2GetDriverName(pDisplayContext, driver_name);
-    if (vaStatus != VA_STATUS_SUCCESS)
-        vaStatus = va_DRIGetDriverName(pDisplayContext, driver_name);
-    if (vaStatus != VA_STATUS_SUCCESS)
-        vaStatus = va_NVCTRL_GetDriverName(pDisplayContext, driver_name);
-    if (vaStatus != VA_STATUS_SUCCESS)
-        vaStatus = va_FGLRX_GetDriverName(pDisplayContext, driver_name);
-    return vaStatus;
-}
-
-
-VADisplay vaGetDisplay (
-    Display *native_dpy /* implementation specific */
-)
-{
-  VADisplay dpy = NULL;
-  VADisplayContextP pDisplayContext = pDisplayContexts;
-
-  if (!native_dpy)
-      return NULL;
-
-  while (pDisplayContext)
-  {
-      if (pDisplayContext->pDriverContext &&
-	  pDisplayContext->pDriverContext->native_dpy == (void *)native_dpy)
-      {
-          dpy = (VADisplay)pDisplayContext;
-          break;
-      }
-      pDisplayContext = pDisplayContext->pNext;
-  }
-
-  if (!dpy)
-  {
-      /* create new entry */
-      VADriverContextP pDriverContext;
-      struct dri_state *dri_state;
-      pDisplayContext = calloc(1, sizeof(*pDisplayContext));
-      pDriverContext  = calloc(1, sizeof(*pDriverContext));
-      dri_state       = calloc(1, sizeof(*dri_state));
-      if (pDisplayContext && pDriverContext && dri_state)
-      {
-	  pDisplayContext->vadpy_magic = VA_DISPLAY_MAGIC;          
-
-	  pDriverContext->native_dpy       = (void *)native_dpy;
-	  pDisplayContext->pNext           = pDisplayContexts;
-	  pDisplayContext->pDriverContext  = pDriverContext;
-	  pDisplayContext->vaIsValid       = va_DisplayContextIsValid;
-	  pDisplayContext->vaDestroy       = va_DisplayContextDestroy;
-	  pDisplayContext->vaGetDriverName = va_DisplayContextGetDriverName;
-          pDisplayContext->opaque          = NULL;
-	  pDisplayContexts                 = pDisplayContext;
-	  pDriverContext->dri_state 	   = dri_state;
-	  dpy                              = (VADisplay)pDisplayContext;
-      }
-      else
-      {
-	  if (pDisplayContext)
-	      free(pDisplayContext);
-	  if (pDriverContext)
-	      free(pDriverContext);
-          if (dri_state)
-              free(dri_state);
-      }
-  }
-  
-  return dpy;
-}
-
-#define CTX(dpy) (((VADisplayContextP)dpy)->pDriverContext)
-#define CHECK_DISPLAY(dpy) if( !vaDisplayIsValid(dpy) ) { return VA_STATUS_ERROR_INVALID_DISPLAY; }
-
-VAStatus vaPutSurface (
-    VADisplay dpy,
-    VASurfaceID surface,
-    Drawable draw, /* X Drawable */
-    short srcx,
-    short srcy,
-    unsigned short srcw,
-    unsigned short srch,
-    short destx,
-    short desty,
-    unsigned short destw,
-    unsigned short desth,
-    VARectangle *cliprects, /* client supplied clip list */
-    unsigned int number_cliprects, /* number of clip rects in the clip list */
-    unsigned int flags /* de-interlacing flags */
-)
-{
-  VADriverContextP ctx;
-
-  CHECK_DISPLAY(dpy);
-  ctx = CTX(dpy);
-
-  return ctx->vtable.vaPutSurface( ctx, surface, (void *)draw, srcx, srcy, srcw, srch,
-                                   destx, desty, destw, desth,
-                                   cliprects, number_cliprects, flags );
-}