From: Christian König <deathsimple@vodafone.de>
Date: Sun, 21 Nov 2010 18:40:52 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into pipe-video
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6b71530daea3059ee362d4df51575e27e026b22;p=mesa.git

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

Conflicts:
	src/gallium/auxiliary/Makefile
	src/gallium/auxiliary/SConscript
---

e6b71530daea3059ee362d4df51575e27e026b22
diff --cc src/gallium/auxiliary/Makefile
index 07b3372c914,53a0847f032..bf90a704dd4
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@@ -142,13 -142,14 +142,12 @@@ C_SOURCES = 
  	util/u_tile.c \
  	util/u_transfer.c \
  	util/u_resource.c \
 -	util/u_upload_mgr.c
 -
 -	# Disabling until pipe-video branch gets merged in
 -	#vl/vl_bitstream_parser.c \
 -	#vl/vl_mpeg12_mc_renderer.c \
 -	#vl/vl_compositor.c \
 -	#vl/vl_csc.c \
 -	#vl/vl_shader_build.c \
 +	util/u_upload_mgr.c \
- 	target-helpers/wrap_screen.c \
 +	vl/vl_bitstream_parser.c \
 +	vl/vl_mpeg12_mc_renderer.c \
 +	vl/vl_compositor.c \
 +	vl/vl_csc.c \
 +        vl/vl_idct.c
  
  GALLIVM_SOURCES = \
          gallivm/lp_bld_arit.c \
@@@ -222,3 -223,3 +221,4 @@@ util/u_format_table.c: util/u_format_ta
  
  util/u_half.c: util/u_half.py
  	$(PYTHON2) util/u_half.py > $@
++# DO NOT DELETE