Merge remote branch 'origin/master' into lp-binning

[android-x86/external-mesa.git] / src / gallium / drivers / llvmpipe / Makefile

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 7c4cf32..264999a 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -6,8 +6,8 @@ LIBNAME = llvmpipe
 CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
 
 C_SOURCES = \
-       lp_bin.c \
-       lp_bin_queue.c \
+       lp_scene.c \
+       lp_scene_queue.c \
        lp_bld_alpha.c \
        lp_bld_arit.c \
        lp_bld_blend_aos.c \
@@ -19,10 +19,13 @@ C_SOURCES = \
        lp_bld_depth.c \
        lp_bld_flow.c \
        lp_bld_format_aos.c \
+       lp_bld_format_query.c \
        lp_bld_format_soa.c \
        lp_bld_interp.c \
        lp_bld_intr.c \
        lp_bld_logic.c \
+       lp_bld_pack.c \
+       lp_bld_sample.c \
        lp_bld_sample_soa.c \
        lp_bld_swizzle.c \
        lp_bld_struct.c \
@@ -35,13 +38,13 @@ C_SOURCES = \
        lp_fence.c \
        lp_flush.c \
        lp_jit.c \
-       lp_prim_vbuf.c \
        lp_rast.c \
        lp_rast_tri.c \
        lp_setup.c \
        lp_setup_line.c \
        lp_setup_point.c \
        lp_setup_tri.c \
+       lp_setup_vbuf.c \
        lp_query.c \
        lp_screen.c \
        lp_state_blend.c \
@@ -58,6 +61,9 @@ C_SOURCES = \
        lp_texture.c \
        lp_tile_soa.c
 
+CPP_SOURCES = \
+       lp_bld_misc.cpp
+
 include ../../Makefile.template
 
 lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_access.py ../../auxiliary/util/u_format.csv