Commit graph

32 commits

Author SHA1 Message Date
Stéphane Marchesin
3db309aece configure: replace pkg-config calls with $(PKG_CONFIG) in the makefiles.
Us poor souls who cross compile mesa want to be able to specify which pkg-config to pick, or at least just change one place.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
2011-10-04 11:19:48 -07:00
Brian Paul
be8551220c configs: do not let llvm-config define NDEBUG in debug builds
Following the examples of Marek and Jose for autoconf and scons.
2011-07-11 10:07:43 -06:00
Brian Paul
600e01e758 configs: add libdrm cflags to linux-llvm config 2011-06-29 07:38:10 -06:00
José Fonseca
202c345c7c autoconf/make: Don't specify individual llvm libraries.
We need more and more of these, and it is difficult and prone to version
incompatability issues trying to single out every one of them.

This mimicks what was done in SCons.
2011-03-14 20:05:56 +00:00
José Fonseca
e6314db0ac gallivm: Use LLVM MC disassembler, instead of udis86.
Included in LLVM 2.7+. Unlink udis86, should support all instructions that
LLVM can emit.
2011-03-13 19:24:26 +00:00
Kenneth Graunke
d1d8120545 Remove talloc from the make and automake build systems. 2011-01-31 10:17:09 -08:00
Brian Paul
c1095f0b0c mesa/llvm: use llvm-config --cppflags
Use --cppflags instead of --cflags so that we get the -I and -D flags
we want, but not compiler options like -O3.

A similar change should probably be made for autoconf.
2010-12-06 10:11:00 -07:00
Brian Paul
b87369e863 mesa: consolidate some compiler -D flags
-D__STDC_CONSTANT_MACROS and -D__STDC_LIMIT_MACROS are only needed for
LLVM build.
2010-12-03 13:52:59 -07:00
Brian Paul
dcb3a2899e configs: added -ltalloc to config files 2010-08-11 15:06:13 -06:00
Brian Paul
816fe9dd09 mesa: add -D__STDC_CONSTANT_MACROS to linux-llvm
This is needed in more places (st_cb_feedback.c) since the new LLVM
code has been added to the gallium/draw module.
2010-04-14 14:32:09 -06:00
José Fonseca
ea532f0e72 scons: Make LLVM a black-white dependency.
Now that draw depends on llvm it is very difficult to correctly handle
broken llvm installations. Either the user requests LLVM and it needs to
supply a working installation. Or it doesn't, and it gets no LLVM
accelerate pipe drivers.
2010-04-11 17:17:34 +09:00
Chris Li
d4b103e031 auto detect llvm version 2010-03-26 15:56:02 -07:00
Brian Paul
b22bb34533 llvmpipe: remove -m32 flag from linux-llvm config 2010-03-17 10:53:55 -06:00
Zack Rusin
c61bf36393 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.
2010-02-08 18:22:11 -05:00
Chris Li
476b668ccc allow make to build lp_test_* for llvmpipe
Signed-off-by: José Fonseca <jfonseca@vmware.com>
2010-02-05 15:34:28 +00:00
José Fonseca
080c40ab32 Merge remote branch 'origin/master' into lp-binning
Conflicts:
	src/gallium/auxiliary/util/u_surface.c
	src/gallium/drivers/llvmpipe/Makefile
	src/gallium/drivers/llvmpipe/SConscript
	src/gallium/drivers/llvmpipe/lp_bld_arit.c
	src/gallium/drivers/llvmpipe/lp_bld_flow.c
	src/gallium/drivers/llvmpipe/lp_bld_interp.c
	src/gallium/drivers/llvmpipe/lp_clear.c
	src/gallium/drivers/llvmpipe/lp_context.c
	src/gallium/drivers/llvmpipe/lp_context.h
	src/gallium/drivers/llvmpipe/lp_draw_arrays.c
	src/gallium/drivers/llvmpipe/lp_jit.c
	src/gallium/drivers/llvmpipe/lp_jit.h
	src/gallium/drivers/llvmpipe/lp_prim_vbuf.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_state.h
	src/gallium/drivers/llvmpipe/lp_state_blend.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_state_sampler.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.h
	src/gallium/drivers/llvmpipe/lp_tex_sample.h
	src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-01-08 15:42:57 +00:00
José Fonseca
c978ab017d gallium: Hunt down all references to GALLIUM_AUXILIARY_DIRS. 2010-01-02 20:22:52 +00:00
Brian Paul
04794080d2 llvmpipe: change configs/linux-llvm from debug build to optimized build
Basically equivalent to the SCons non-debug build now.
2009-12-18 11:13:06 -07:00
Brian Paul
d6d4f8b66e llvmpipe: use the udis86 lib to print the x86 assembly code 2009-08-29 09:21:36 +01:00
Brian Paul
4c6fd574b1 llvmpipe: re-enable other gallium drivers
No more symbol collisions between drivers, AFAICT.
2009-08-29 09:21:35 +01:00
Brian Paul
1ea1cd8468 llvmpipe: repurpose linux-llvm config to build the llvmpipe driver
The gallivm module is no longer built.  If/when gallivm is resuscitated we
can revisit this.
2009-08-29 09:21:35 +01:00
Kamalneet Singh
37fdfe89dd linux-llvm config: Linking with required llvm libs 2009-03-09 17:42:59 +01:00
Michel Dänzer
359bbe7432 gallivm: Explicitly specify the LLVM components we need. 2009-01-12 12:37:13 +01:00
Stephane Marchesin
3f4b67f5d7 Gallivm: port to llvm 2.4. 2008-10-02 10:19:47 -04:00
Stephane Marchesin
9859edc606 Gallivm: need to link with libstdc++ for llvm. 2008-10-02 10:19:47 -04:00
José Fonseca
0448dbd64a Update for llvm -> gallivm rename. 2008-02-18 12:33:34 +00:00
José Fonseca
bfd5916eaf Code reorganization: split gallium and mesa makefiles.
In other words, don't build src/gallium source code from within src/mesa/Makefile.

Also, allow to customize which gallium auxiliary dirs, driver driver, winsys
dirs get built from the config/* files.
2008-02-18 14:25:04 +09:00
Zack Rusin
9789c301b4 llvm: we need custom rules so had to redo the build a little bit
also don't use sse when llvm is enabled
2008-01-04 09:27:42 -05:00
Zack Rusin
63a9d835ce Redo the fragment program examples to match vp's
we just load text files instead of compiling tons of small
binaries
2007-12-11 09:49:34 -05:00
Michel Dänzer
8568fadaf2 LLVM requires linking with the C++ compiler.
It's basically luck if it works with the C compiler on some platforms...
2007-10-25 18:26:26 +02:00
Zack Rusin
d76a7b61bb Cleanup some code. 2007-10-24 11:21:05 -04:00
Zack Rusin
b04430efd9 Introduce linux-llvm target. Remove the llvm code from the default build for now.
Cleanup some of the debugging output.
2007-10-24 11:21:04 -04:00