Merge remote branch 'origin/master' into pipe-video
authorChristian König <deathsimple@vodafone.de>
Sun, 21 Nov 2010 18:40:52 +0000 (19:40 +0100)
committerChristian König <deathsimple@vodafone.de>
Sun, 21 Nov 2010 18:40:52 +0000 (19:40 +0100)
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript

1  2 
configure.ac
src/gallium/auxiliary/Makefile
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_texture.c
src/gallium/include/pipe/p_defines.h

diff --cc configure.ac
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge