diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
| commit | dbf3a15313eed930a3d8fdde12e457259c43651b (patch) | |
| tree | 78bc54fa866ff1e97e61802f52dabe3f4f3380b1 /src/gallium/auxiliary/Makefile | |
| parent | 1dccc4cfaa423f15ab582d2a0253a84a0ae0b9fa (diff) | |
| parent | 547e7619aac74ae13bdaa7fdf403a4ceb5212467 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
src/gallium/include/pipe/p_format.h
Diffstat (limited to 'src/gallium/auxiliary/Makefile')
| -rw-r--r-- | src/gallium/auxiliary/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile index 05096b12a86..ed96725d782 100644 --- a/src/gallium/auxiliary/Makefile +++ b/src/gallium/auxiliary/Makefile @@ -173,6 +173,7 @@ GALLIVM_SOURCES = \ gallivm/lp_bld_struct.c \ gallivm/lp_bld_swizzle.c \ gallivm/lp_bld_tgsi_aos.c \ + gallivm/lp_bld_tgsi_info.c \ gallivm/lp_bld_tgsi_soa.c \ gallivm/lp_bld_type.c \ draw/draw_llvm.c \ |