diff options
| author | Zack Rusin <zackr@vmware.com> | 2010-02-08 18:05:22 -0500 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2010-02-08 18:22:11 -0500 |
| commit | c61bf363937f40624a5632745630d4f2b9907082 (patch) | |
| tree | bb2388269117d6783400e17957ff8b0a68dfb5b5 /src/gallium/auxiliary/Makefile | |
| parent | 74d23546c79fe8c8d87588fa423040e3b19a8fc6 (diff) | |
llvmpipe: export the tgsi translation code to a common layer
the llvmpipe tgsi translation is a lot more complete than what was in
gallivm so replacing the latter with the former. this is needed since
the draw llvm paths will use the same code. effectively the proven
llvmpipe code becomes gallivm.
Diffstat (limited to 'src/gallium/auxiliary/Makefile')
| -rw-r--r-- | src/gallium/auxiliary/Makefile | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index 66cfe9d89d..238daa2517 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -130,41 +130,40 @@ 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 -# 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) +endif include ../Makefile.template -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 - - indices/u_indices_gen.c: indices/u_indices_gen.py python $< > $@ |