Merge remote branch 'origin/master' into pipe-video
[mesa.git] / src / gallium / auxiliary / Makefile
index 3b202b5bc774889abae6cd34320d71f225a8400a..bf90a704dd42a196d584a7f47978c9dee933d470 100644 (file)
@@ -4,10 +4,11 @@ include $(TOP)/configs/current
 LIBNAME = gallium
 
 C_SOURCES = \
-       cso_cache/cso_context.c \
        cso_cache/cso_cache.c \
+       cso_cache/cso_context.c \
        cso_cache/cso_hash.c \
        draw/draw_context.c \
+       draw/draw_fs.c \
        draw/draw_gs.c \
        draw/draw_pipe.c \
        draw/draw_pipe_aaline.c \
@@ -26,32 +27,32 @@ C_SOURCES = \
        draw/draw_pipe_wide_line.c \
        draw/draw_pipe_wide_point.c \
        draw/draw_pt.c \
-       draw/draw_pt_elts.c \
        draw/draw_pt_emit.c \
        draw/draw_pt_fetch.c \
        draw/draw_pt_fetch_emit.c \
        draw/draw_pt_fetch_shade_emit.c \
        draw/draw_pt_fetch_shade_pipeline.c \
        draw/draw_pt_post_vs.c \
+       draw/draw_pt_so_emit.c \
        draw/draw_pt_util.c \
-       draw/draw_pt_varray.c \
-       draw/draw_pt_vcache.c \
+       draw/draw_pt_vsplit.c \
        draw/draw_vertex.c \
        draw/draw_vs.c \
-       draw/draw_vs_varient.c \
        draw/draw_vs_aos.c \
        draw/draw_vs_aos_io.c \
        draw/draw_vs_aos_machine.c \
        draw/draw_vs_exec.c \
        draw/draw_vs_ppc.c \
        draw/draw_vs_sse.c \
+       draw/draw_vs_varient.c \
        indices/u_indices_gen.c \
        indices/u_unfilled_gen.c \
        os/os_misc.c \
+       os/os_stream.c \
        os/os_stream_log.c \
+       os/os_stream_null.c \
        os/os_stream_stdc.c \
        os/os_stream_str.c \
-       os/os_stream_null.c \
        os/os_time.c \
        pipebuffer/pb_buffer_fenced.c \
        pipebuffer/pb_buffer_malloc.c \
@@ -64,17 +65,16 @@ C_SOURCES = \
        pipebuffer/pb_bufmgr_slab.c \
        pipebuffer/pb_validate.c \
        rbug/rbug_connection.c \
+       rbug/rbug_context.c \
        rbug/rbug_core.c \
+       rbug/rbug_demarshal.c \
        rbug/rbug_texture.c \
-       rbug/rbug_context.c \
        rbug/rbug_shader.c \
-       rbug/rbug_demarshal.c \
        rtasm/rtasm_cpu.c \
        rtasm/rtasm_execmem.c \
-       rtasm/rtasm_x86sse.c \
        rtasm/rtasm_ppc.c \
        rtasm/rtasm_ppc_spe.c \
-       tgsi/tgsi_sanity.c \
+       rtasm/rtasm_x86sse.c \
        tgsi/tgsi_build.c \
        tgsi/tgsi_dump.c \
        tgsi/tgsi_exec.c \
@@ -82,19 +82,22 @@ C_SOURCES = \
        tgsi/tgsi_iterate.c \
        tgsi/tgsi_parse.c \
        tgsi/tgsi_ppc.c \
+       tgsi/tgsi_sanity.c \
        tgsi/tgsi_scan.c \
        tgsi/tgsi_sse2.c \
        tgsi/tgsi_text.c \
        tgsi/tgsi_transform.c \
        tgsi/tgsi_ureg.c \
        tgsi/tgsi_util.c \
-       translate/translate_generic.c \
-       translate/translate_sse.c \
        translate/translate.c \
        translate/translate_cache.c \
+       translate/translate_generic.c \
+       translate/translate_sse.c \
        util/u_debug.c \
-       util/u_debug_symbol.c \
+       util/u_debug_describe.c \
+       util/u_debug_refcnt.c \
        util/u_debug_stack.c \
+       util/u_debug_symbol.c \
        util/u_dump_defines.c \
        util/u_dump_state.c \
        util/u_bitmask.c \
@@ -117,18 +120,22 @@ C_SOURCES = \
        util/u_gen_mipmap.c \
        util/u_half.c \
        util/u_handle_table.c \
-       util/u_hash_table.c \
        util/u_hash.c \
+       util/u_hash_table.c \
+       util/u_index_modify.c \
        util/u_keymap.c \
        util/u_linear.c \
+       util/u_linkage.c \
        util/u_network.c \
        util/u_math.c \
+       util/u_mempool.c \
        util/u_mm.c \
        util/u_rect.c \
        util/u_ringbuffer.c \
        util/u_sampler.c \
        util/u_simple_shaders.c \
        util/u_snprintf.c \
+       util/u_staging.c \
        util/u_surface.c \
        util/u_surfaces.c \
        util/u_texture.c \
@@ -136,23 +143,24 @@ C_SOURCES = \
        util/u_transfer.c \
        util/u_resource.c \
        util/u_upload_mgr.c \
-       target-helpers/wrap_screen.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 \
+       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 \
+        gallivm/lp_bld_assert.c \
+        gallivm/lp_bld_bitarit.c \
         gallivm/lp_bld_const.c \
         gallivm/lp_bld_conv.c \
         gallivm/lp_bld_debug.c \
         gallivm/lp_bld_flow.c \
         gallivm/lp_bld_format_aos.c \
         gallivm/lp_bld_format_soa.c \
+        gallivm/lp_bld_format_yuv.c \
+        gallivm/lp_bld_gather.c \
         gallivm/lp_bld_init.c \
         gallivm/lp_bld_intr.c \
         gallivm/lp_bld_logic.c \
@@ -160,14 +168,19 @@ GALLIVM_SOURCES = \
         gallivm/lp_bld_printf.c \
         gallivm/lp_bld_quad.c \
         gallivm/lp_bld_sample.c \
+        gallivm/lp_bld_sample_aos.c \
         gallivm/lp_bld_sample_soa.c \
         gallivm/lp_bld_struct.c \
         gallivm/lp_bld_swizzle.c \
+        gallivm/lp_bld_tgsi_aos.c \
+        gallivm/lp_bld_tgsi_info.c \
         gallivm/lp_bld_tgsi_soa.c \
         gallivm/lp_bld_type.c \
         draw/draw_llvm.c \
-        draw/draw_pt_fetch_shade_pipeline_llvm.c \
-        draw/draw_llvm_translate.c
+        draw/draw_llvm_sample.c \
+        draw/draw_llvm_translate.c \
+        draw/draw_vs_llvm.c \
+        draw/draw_pt_fetch_shade_pipeline_llvm.c
 
 GALLIVM_CPP_SOURCES = \
     gallivm/lp_bld_misc.cpp
@@ -195,16 +208,17 @@ include ../Makefile.template
 
 
 indices/u_indices_gen.c: indices/u_indices_gen.py
-       python $< > $@
+       $(PYTHON2) $< > $@
 
 indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
-       python $< > $@
+       $(PYTHON2) $< > $@
 
 util/u_format_srgb.c: util/u_format_srgb.py
-       python $< > $@
+       $(PYTHON2) $< > $@
 
 util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_format_parse.py util/u_format.csv
-       python util/u_format_table.py util/u_format.csv > $@
+       $(PYTHON2) util/u_format_table.py util/u_format.csv > $@
 
 util/u_half.c: util/u_half.py
-       python util/u_half.py > $@
+       $(PYTHON2) util/u_half.py > $@
+# DO NOT DELETE