Refine the directory, move src/X11 to dri/

Signed-off-by: Austin Yuan <shengquan.yuan@intel.com>

.gitignore

+*~
+*.o
+*.lo
+*.la
+*.orig
+*.rej
+*.loT
+*.bin
+.deps
+.libs
+install-sh
+libtool
+ltmain.sh
+missing
+Makefile
+Makefile.in
+config.h
+config.h.in
+stamp-h1
+aclocal.m4
+autom4te.cache
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+fw/msvdx_bin
+fw/msvdx_fw.bin

Makefile.am

@@ -21,7 +21,7 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src dummy_drv_video test i965_drv_video
+SUBDIRS = dri src dummy_drv_video i965_drv_video test
 
 pkgconfigdir = @pkgconfigdir@
 pkgconfig_DATA = libva.pc

configure.ac

@@ -53,14 +53,14 @@ AC_SUBST(pkgconfigdir)
 AC_OUTPUT([
 	Makefile
 	src/Makefile
-	src/X11/Makefile
+	dri/Makefile
 	dummy_drv_video/Makefile
-	test/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
 	libva.pc
 ])
 

src/X11/Makefile.am → dri/Makefile.am

@@ -20,10 +20,10 @@
 
 AM_CFLAGS = -DLINUX -DIN_LIBVA -I$(top_srcdir)/src $(DRM_CFLAGS)
 
-noinst_LTLIBRARIES = libva_X11.la	
+noinst_LTLIBRARIES = libva_dri.la	
 
-libva_X11includedir =  ${includedir}/va
-libva_X11include_HEADERS = va_x11.h va_dri.h va_dri2.h
+libva_driincludedir =  ${includedir}/src
+libva_driinclude_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
+libva_dri_la_SOURCES = va_x11.c va_dri.c va_dri2.c va_dricommon.c dri2_util.c dri1_util.c
 CFLAGS = -ansi -O2 

src/dri2_util.c → dri/dri2_util.c

@@ -10,6 +10,7 @@
 #include "va_backend.h"
 
 #include "va_dri2.h"
+#include "va_dri2tokens.h"
 #include "va_dricommon.h"
 
 #define __DRI_BUFFER_FRONT_LEFT         0
@@ -85,7 +86,7 @@ dri2GetRenderingBuffer(VADriverContextP ctx, struct dri_drawable *dri_drawable)
     int i;
     int count;
     unsigned int attachments[5];
-    DRI2Buffer *buffers;
+    VA_DRI2Buffer *buffers;
     
     i = 0;
     attachments[i++] = __DRI_BUFFER_BACK_LEFT;

i965_drv_video/Makefile.am

@@ -22,7 +22,7 @@
 
 SUBDIRS = shaders
 
-AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/common -I$(top_srcdir)/intel @DRM_CFLAGS@ -DIN_LIBVA
+AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/dri @DRM_CFLAGS@ -DIN_LIBVA
 
 i965_drv_video_la_LTLIBRARIES = i965_drv_video.la
 i965_drv_video_ladir = $(libdir)/dri

i965_drv_video/i965_drv_video.la

-# i965_drv_video.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.2 Debian-2.2.2-1
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='i965_drv_video.so'
-
-# Names of this library.
-library_names='i965_drv_video.so i965_drv_video.so i965_drv_video.so'
-
-# The name of the static archive.
-old_library=''
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/opt/X11R7/lib /opt/X11R7/lib/libdrm_intel.la /opt/X11R7/lib/libdrm.la -lrt /home/znh/libva.old/src/libva.la -lX11 -lXext /opt/X11R7/lib/libXext.la /opt/X11R7/lib/libX11.la /opt/X11R7/lib/libXdmcp.la -ldl /opt/X11R7/lib/libXau.la -lpthread'
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for i965_drv_video.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=no
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/opt/X11R7/lib/dri'
-relink_command="(cd /home/znh/libva.old/i965_drv_video; /bin/sh /home/znh/libva.old/libtool  --tag CC --mode=relink gcc -Wall -I../src -I../common -I../intel -I/opt/X11R7/include -I/opt/X11R7/include/drm -DIN_LIBVA -g -O2 -module -avoid-version -no-undefined -Wl,--no-undefined -L/opt/X11R7/lib -ldrm -ldrm_intel -o i965_drv_video.la -rpath /opt/X11R7/lib/dri object_heap.lo intel_batchbuffer.lo intel_memman.lo intel_driver.lo i965_media.lo i965_media_mpeg2.lo i965_render.lo i965_drv_video.lo ../src/libva.la -lpthread @inst_prefix_dir@)"

src/Makefile.am

@@ -21,13 +21,13 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 INCLUDES = \
-	$(LIBVA_CFLAGS) \
+	$(LIBVA_CFLAGS) -I$(top_srcdir)/dri/ \
 	-DIN_LIBVA
 
 libva_la_LTLIBRARIES = libva.la
 libva_ladir = $(libdir)
 libva_la_LDFLAGS = -version-number 0:30:4 -no-undefined
-libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext X11/libva_X11.la
+libva_la_LIBADD = $(LIBVA_LIBS) -ldl -lX11 -lXext ../dri/libva_dri.la
 CFLAGS = -ansi -O2 
 
 nodist_libva_la_SOURCES = va_version.h
@@ -40,9 +40,7 @@ va_version.h: Makefile
 	echo "#define VA_BUILD_GIT  \"($(shell git log  | head -n1 | cut -f2 -d' ')) \" "    >> va_version.h
 
 
-SUBDIRS = X11
-
-libva_la_SOURCES = va.c va_dricommon.c dri2_util.c dri1_util.c
+libva_la_SOURCES = va.c
 
 libvaincludedir = ${includedir}/va
-libvainclude_HEADERS = va.h va_backend.h va_dricommon.h
+libvainclude_HEADERS = va.h va_backend.h