From a565f58edaad646942f2174e66ef1343f56ae679 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thomas=20Balling=20S=C3=B8rensen?=
 <tball@tball-laptop.(none)>
Date: Thu, 28 Oct 2010 13:40:59 +0200
Subject: [PATCH] vl: enable target va-r600

---
 configure.ac                                  |  2 +-
 src/gallium/state_trackers/va/va_subpicture.c |  6 +-
 src/gallium/targets/Makefile.va               | 62 +++++++++++++++++++
 src/gallium/targets/va-softpipe/Makefile      | 21 +++++++
 4 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 src/gallium/targets/Makefile.va
 create mode 100644 src/gallium/targets/va-softpipe/Makefile

diff --git a/configure.ac b/configure.ac
index eac293f56aa..8544c5f0a91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1590,7 +1590,7 @@ AC_ARG_ENABLE([gallium-r600],
 if test "x$enable_gallium_r600" = xyes; then
     if test "x$HAVE_LIBDRM_RADEON" = xyes; then
 	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
-	gallium_check_st "r600/drm" "dri-r600" "xvmc-r600"
+	gallium_check_st "r600/drm" "dri-r600" "xvmc-r600" "va-r600"
     else
 	AC_MSG_ERROR([libdrm_radeon is missing, cannot build gallium-r600])
     fi
diff --git a/src/gallium/state_trackers/va/va_subpicture.c b/src/gallium/state_trackers/va/va_subpicture.c
index 442b1acea5a..a6d2960e7e5 100644
--- a/src/gallium/state_trackers/va/va_subpicture.c
+++ b/src/gallium/state_trackers/va/va_subpicture.c
@@ -30,7 +30,7 @@
 #include <pipe/p_format.h>
 #include "va_private.h"
 
-#define NUM_FORMAT_SUPPORTED 2
+#define NUM_FORMATS_SUPPORTED 2
 
 typedef struct  {
 	enum pipe_format;
@@ -38,7 +38,7 @@ typedef struct  {
     unsigned int        va_flags;
 } va_subpicture_formats_supported_t;
 
-static const va_subpicture_formats_supported_t va_subpicture_formats_supported[NUM_FORMAT_SUPPORTED] = 
+static const va_subpicture_formats_supported_t va_subpicture_formats_supported[NUM_FORMATS_SUPPORTED] = 
 {
 	{ PIPE_FORMAT_B8G8R8A8_UNORM,
       { VA_FOURCC('B','G','R','A'), VA_LSB_FIRST, 32,
@@ -64,7 +64,7 @@ vlVaQuerySubpictureFormats(		VADriverContextP ctx,
 		
 	int n = 0;
 	/* Query supported formats */
-	for (n = 0; n < NUM_FORMAT_SUPPORTED; n++)
+	for (n = 0; n < NUM_FORMATS_SUPPORTED; n++)
 	{
 		flags[n] = va_subpicture_formats_supported[n].va_flags;
 		format_list[n] = va_subpicture_formats_supported[n].va_format;
diff --git a/src/gallium/targets/Makefile.va b/src/gallium/targets/Makefile.va
new file mode 100644
index 00000000000..efb0a59522a
--- /dev/null
+++ b/src/gallium/targets/Makefile.va
@@ -0,0 +1,62 @@
+# This makefile template is used to build "driver"_drv_video.so
+
+LIBNAME = lib$(LIBBASENAME).so
+VA_LIB_GLOB= lib$(LIBBASENAME).*so*
+VA_MAJOR = 0
+VA_MINOR = 3
+INCLUDES = -I$(TOP)/src/gallium/include \
+	   -I$(TOP)/src/gallium/drivers \
+	   -I$(TOP)/src/gallium/auxiliary \
+	   -I$(TOP)/src/gallium/winsys \
+	   -I$(TOP)/src/gallium/winsys/g3dvl \
+	   $(DRIVER_INCLUDES)
+DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VA_MAJOR) -DVER_MINOR=$(VA_MINOR) $(DRIVER_DEFINES)
+LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lva -lXext -lX11 -lm
+STATE_TRACKER_LIB = $(TOP)/src/gallium/state_trackers/va/libvatracker.a
+
+# XXX: Hack, VA public funcs aren't exported
+OBJECTS = $(C_SOURCES:.c=.o) \
+	  $(ASM_SOURCES:.S=.o) \
+	  $(TOP)/src/gallium/state_trackers/va/*.o
+
+##### RULES #####
+
+.c.o:
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
+.S.o:
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+
+##### TARGETS #####
+
+default: depend symlinks $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)
+
+$(TOP)/$(LIB_DIR)/gallium/$(LIBNAME): $(OBJECTS) $(PIPE_DRIVERS) $(STATE_TRACKER_LIB) $(TOP)/$(LIB_DIR)/gallium Makefile
+	$(MKLIB) -o $(LIBBASENAME) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
+		-major $(VA_MAJOR) -minor $(VA_MINOR) $(MKLIB_OPTIONS) \
+		-install $(TOP)/$(LIB_DIR)/gallium \
+		$(OBJECTS) $(STATE_TRACKER_LIB) $(PIPE_DRIVERS) $(LIBS)
+
+$(TOP)/$(LIB_DIR)/gallium:
+	mkdir -p $@
+
+depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
+	rm -f depend
+	touch depend
+	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) \
+		$(ASM_SOURCES) 2> /dev/null
+
+# Emacs tags
+tags:
+	etags `find . -name \*.[ch]` `find ../include`
+
+# Remove .o and backup files
+clean:
+	-rm -f *.o *~ *.so $(SYMLINKS)
+	-rm -f depend depend.bak
+
+install: default
+	$(INSTALL) -d $(DESTDIR)$(VA_LIB_INSTALL_DIR)
+	$(MINSTALL) -m 755 $(TOP)/$(LIB_DIR)/gallium/$(VA_LIB_GLOB) $(DESTDIR)$(VA_LIB_INSTALL_DIR)
+
+include depend
diff --git a/src/gallium/targets/va-softpipe/Makefile b/src/gallium/targets/va-softpipe/Makefile
new file mode 100644
index 00000000000..a58df36a966
--- /dev/null
+++ b/src/gallium/targets/va-softpipe/Makefile
@@ -0,0 +1,21 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBBASENAME = softpipe_drv_video
+
+DRIVER_DEFINES = -DGALLIUM_SOFTPIPE
+DRIVER_INCLUDES =
+
+PIPE_DRIVERS = \
+	$(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \
+	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+	$(TOP)/src/gallium/auxiliary/libgallium.a
+
+C_SOURCES = \
+	$(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+
+DRIVER_LIBS =
+
+include ../Makefile.va
+
+symlinks:
-- 
2.30.2