add sprite demo from Armin Reese

Also fixed up the copyright header a bit. No comments on the coding
styled used ;-)

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Makefile.am

@@ -19,7 +19,7 @@
 #  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.
 
-SUBDIRS = lib man tools scripts tests benchmarks
+SUBDIRS = lib man tools scripts tests benchmarks demos
 
 if BUILD_SHADER_DEBUGGER
 SUBDIRS += debugger

configure.ac

@@ -53,7 +53,7 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.16)
 XORG_DEFAULT_OPTIONS
 
-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.30 libdrm])
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.31 libdrm])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 
 # for testdisplay
@@ -112,6 +112,7 @@ AC_SUBST([THREAD_CFLAGS])
 AC_CONFIG_FILES([
 	Makefile
 	benchmarks/Makefile
+	demos/Makefile
 	lib/Makefile
 	man/Makefile
 	scripts/Makefile

demos/.gitignore

@@ -0,0 +1 @@
+sprite_on

demos/Makefile.am

@@ -0,0 +1,7 @@
+bin_PROGRAMS = 				\
+	sprite_on			\
+	$(NULL)
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
+AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS)
+LDADD = $(top_builddir)/lib/libintel_tools.la $(DRM_LIBS) $(PCIACCESS_LIBS)

tests/.gitignore

@@ -7,6 +7,7 @@ gem_bad_batch
 gem_bad_blit
 gem_bad_length
 gem_basic
+gem_cs_prefetch
 gem_double_irq_loop
 gem_dummy_reloc_loop
 gem_exec_bad_domains