pipebuffer: Include fenced buffer manager in build

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

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index e3af41c6e04486f77da9e6f039c06d511fa7fb6e..916f5f6c91cad933f896faea6def8aa847e5be2f 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -48,12 +48,17 @@ C_SOURCES = \
        draw/draw_vs_sse.c \
        indices/u_indices_gen.c \
        indices/u_unfilled_gen.c \
+       os/os_misc.c \
+       os/os_stream_log.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 \
        pipebuffer/pb_bufmgr_alt.c \
        pipebuffer/pb_bufmgr_cache.c \
        pipebuffer/pb_bufmgr_debug.c \
-       pipebuffer/pb_bufmgr_fenced.c \
        pipebuffer/pb_bufmgr_mm.c \
        pipebuffer/pb_bufmgr_ondemand.c \
        pipebuffer/pb_bufmgr_pool.c \
@@ -89,9 +94,11 @@ C_SOURCES = \
        translate/translate.c \
        translate/translate_cache.c \
        util/u_debug.c \
-       util/u_debug_dump.c \
        util/u_debug_symbol.c \
        util/u_debug_stack.c \
+       util/u_dump_defines.c \
+       util/u_dump_state.c \
+       util/u_bitmask.c \
        util/u_blit.c \
        util/u_blitter.c \
        util/u_cache.c \
@@ -111,14 +118,12 @@ C_SOURCES = \
        util/u_math.c \
        util/u_mm.c \
        util/u_rect.c \
+       util/u_ringbuffer.c \
        util/u_simple_shaders.c \
        util/u_snprintf.c \
-       util/u_stream_stdc.c \
-       util/u_stream_wd.c \
        util/u_surface.c \
        util/u_texture.c \
        util/u_tile.c \
-       util/u_time.c \
        util/u_timed_winsys.c \
        util/u_upload_mgr.c \
        util/u_simple_screen.c \
@@ -129,39 +134,46 @@ C_SOURCES = \
        vl/vl_shader_build.c
 
 GALLIVM_SOURCES = \
-       gallivm/gallivm.cpp  \
-       gallivm/gallivm_cpu.cpp \
-       gallivm/instructions.cpp  \
-       gallivm/loweringpass.cpp \
-       gallivm/tgsitollvm.cpp \
-       gallivm/storage.cpp \
-       gallivm/storagesoa.cpp \
-       gallivm/instructionssoa.cpp
+        gallivm/lp_bld_alpha.c \
+        gallivm/lp_bld_arit.c \
+        gallivm/lp_bld_blend_aos.c \
+        gallivm/lp_bld_blend_logicop.c \
+        gallivm/lp_bld_blend_soa.c \
+        gallivm/lp_bld_const.c \
+        gallivm/lp_bld_conv.c \
+        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_sample.c \
+        gallivm/lp_bld_sample_soa.c \
+        gallivm/lp_bld_struct.c \
+        gallivm/lp_bld_swizzle.c \
+        gallivm/lp_bld_tgsi_soa.c \
+        gallivm/lp_bld_type.c
 
-INC_SOURCES = \
-       gallivm/gallivm_builtins.cpp \
-       gallivm/gallivmsoabuiltins.cpp
+GALLIVM_CPP_SOURCES = \
+        gallivm/lp_bld_misc.cpp
 
-# XXX: gallivm doesn't build correctly so disable for now
-#ifeq ($(MESA_LLVM),1)
-#DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
-#CPP_SOURCES += \
-#      $(GALLIVM_SOURCES)
-#endif
 
+ifeq ($(MESA_LLVM),1)
+C_SOURCES += \
+       $(GALLIVM_SOURCES)
+CPP_SOURCES += \
+       $(GALLIVM_CPP_SOURCES)
+endif
 
-include ../Makefile.template
 
+LIBRARY_DEFINES += -D__STDC_CONSTANT_MACROS
 
-gallivm/gallivm_builtins.cpp: gallivm/llvm_builtins.c
-       clang --emit-llvm < $< |llvm-as|opt -std-compile-opts > temp1.bin
-       (echo "static const unsigned char llvm_builtins_data[] = {"; od -txC temp1.bin | sed -e "s/^[0-9]*//" -e s"/ \([0-9a-f][0-9a-f]\)/0x\1,/g" -e"\$$d" | sed -e"\$$s/,$$/,0x00};/") >$@
-       rm temp1.bin
 
-gallivm/gallivmsoabuiltins.cpp: gallivm/soabuiltins.c
-       clang --emit-llvm < $< |llvm-as|opt -std-compile-opts > temp2.bin
-       (echo "static const unsigned char soabuiltins_data[] = {"; od -txC temp2.bin | sed -e "s/^[0-9]*//" -e s"/ \([0-9a-f][0-9a-f]\)/0x\1,/g" -e"\$$d" | sed -e"\$$s/,$$/,0x00};/") >$@
-       rm temp2.bin
+include ../Makefile.template
 
 
 indices/u_indices_gen.c: indices/u_indices_gen.py