Merge branch '7.8'

[mesa.git] / src / gallium / auxiliary / Makefile

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index 60f9c2ae3c3ba6ab1bdf6148708460742ed99a9e..843778d81007d1658a2c033d981831f7783d1d02 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -105,9 +105,12 @@ C_SOURCES = \
        util/u_cpu_detect.c \
        util/u_dl.c \
        util/u_draw_quad.c \
-       util/u_format_access.c \
+       util/u_format.c \
+       util/u_format_s3tc.c \
        util/u_format_table.c \
+       util/u_format_tests.c \
        util/u_gen_mipmap.c \
+       util/u_half.c \
        util/u_handle_table.c \
        util/u_hash_table.c \
        util/u_hash.c \
@@ -118,6 +121,7 @@ C_SOURCES = \
        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_surface.c \
@@ -126,11 +130,14 @@ C_SOURCES = \
        util/u_timed_winsys.c \
        util/u_upload_mgr.c \
        util/u_simple_screen.c \
-       vl/vl_bitstream_parser.c \
-       vl/vl_mpeg12_mc_renderer.c \
-       vl/vl_compositor.c \
-       vl/vl_csc.c \
-       vl/vl_shader_build.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 \
 
 GALLIVM_SOURCES = \
         gallivm/lp_bld_alpha.c \
@@ -143,13 +150,12 @@ GALLIVM_SOURCES = \
         gallivm/lp_bld_debug.c \
         gallivm/lp_bld_depth.c \
         gallivm/lp_bld_flow.c \
-        gallivm/lp_bld_format_aos.c \
-        gallivm/lp_bld_format_query.c \
         gallivm/lp_bld_format_soa.c \
         gallivm/lp_bld_interp.c \
         gallivm/lp_bld_intr.c \
         gallivm/lp_bld_logic.c \
         gallivm/lp_bld_pack.c \
+        gallivm/lp_bld_printf.c \
         gallivm/lp_bld_sample.c \
         gallivm/lp_bld_sample_soa.c \
         gallivm/lp_bld_struct.c \
@@ -158,14 +164,13 @@ GALLIVM_SOURCES = \
         gallivm/lp_bld_type.c
 
 GALLIVM_CPP_SOURCES = \
-        gallivm/lp_bld_misc.cpp
+        gallivm/lp_bld_init.cpp
 
 GENERATED_SOURCES = \
        indices/u_indices_gen.c \
        indices/u_unfilled_gen.c \
-       util/u_format_access.c \
-       util/u_format_pack.h \
-       util/u_format_table.c
+       util/u_format_table.c \
+       util/u_half.c
 
 
 ifeq ($(MESA_LLVM),1)
@@ -188,12 +193,11 @@ indices/u_indices_gen.c: indices/u_indices_gen.py
 indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
        python $< > $@
 
-util/u_format_table.c: util/u_format_table.py util/u_format_parse.py util/u_format.csv
+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 > $@
 
-util/u_format_pack.h: util/u_format_pack.py util/u_format_parse.py util/u_format.csv
-       python util/u_format_pack.py util/u_format.csv > $@
-
 util/u_format_access.c: util/u_format_access.py util/u_format_parse.py util/u_format.csv
        python util/u_format_access.py util/u_format.csv > $@
 
+util/u_half.c: util/u_half.py
+       python util/u_half.py > $@