llvmpipe: use runtime loop instead of static loop for looping over quads

[mesa.git] / src / gallium / drivers / llvmpipe / Makefile

diff --git a/src/gallium/drivers/llvmpipe/Makefile b/src/gallium/drivers/llvmpipe/Makefile
index 89c06ea3ad7bce0ac8d2b4f1ee815bbcacdbb28c..ef16fc7d882257cdece66318695525ff7949ab52 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile
+++ b/src/gallium/drivers/llvmpipe/Makefile
@@ -3,19 +3,25 @@ include $(TOP)/configs/current
 
 LIBNAME = llvmpipe
 
-DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-
 C_SOURCES = \
-       lp_buffer.c \
+       lp_bld_alpha.c \
+       lp_bld_blend.c \
+       lp_bld_blend_aos.c \
+       lp_bld_blend_logicop.c \
+       lp_bld_blend_soa.c \
+       lp_bld_depth.c \
+       lp_bld_interp.c \
        lp_clear.c \
        lp_context.c \
        lp_draw_arrays.c \
        lp_fence.c \
        lp_flush.c \
        lp_jit.c \
+       lp_memory.c \
        lp_perf.c \
        lp_query.c \
        lp_rast.c \
+       lp_rast_debug.c \
        lp_rast_tri.c \
        lp_scene.c \
        lp_scene_queue.c \
@@ -29,33 +35,41 @@ C_SOURCES = \
        lp_state_clip.c \
        lp_state_derived.c \
        lp_state_fs.c \
+       lp_state_setup.c \
+       lp_state_gs.c \
        lp_state_rasterizer.c \
        lp_state_sampler.c \
+        lp_state_so.c \
        lp_state_surface.c \
        lp_state_vertex.c \
        lp_state_vs.c \
        lp_surface.c \
-       lp_tex_sample_llvm.c \
+       lp_tex_sample.c \
        lp_texture.c \
        lp_tile_image.c \
        lp_tile_soa.c
 
 CPP_SOURCES = \
 
+PROGS := lp_test_format        \
+        lp_test_arit   \
+        lp_test_blend  \
+        lp_test_conv   \
+        lp_test_printf
 
-include ../../Makefile.template
+# Need this for the lp_test_*.o files
+CLEAN_EXTRA = *.o
 
-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
-       python lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
+include ../../Makefile.template
 
+PROGS_DEPS := ../../auxiliary/libgallium.a
 
-testprogs := lp_test_format    \
-            lp_test_blend      \
-            lp_test_conv
+lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
+       $(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@
 
-LIBS += $(GL_LIB_DEPS) -L. -lllvmpipe -L../../auxiliary/ -lgallium
+LDFLAGS += $(LLVM_LDFLAGS)
+LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
+LD=$(CXX)
 
-#$(testprogs): lp_test_% : lp_test_%.o lp_test_main.o libllvmpipe.a
-#      $(LD) $(filter %.o,$^) -o $@ -Wl,--start-group  $(LIBS) -Wl,--end-group
+$(PROGS): lp_test_main.o libllvmpipe.a
 
-#default: $(testprogs)