Commit Graph

91 Commits

Author SHA1 Message Date
Vinson Lee 5fd97573e3 scons: Include headers from the local include directory first.
Certain headers, such as GL/glew.h, are in both the Mesa include and the
default installed include directories. On recent distros the needed
symbols can be found in both places. On older distros the installed
headers could be lacking symbols, so for a header that exists in both
places, the local one should be found first.
2010-04-26 01:08:34 -07:00
Vinson Lee bd93670bfd nvfx: Add to SCons build. 2010-04-24 16:22:47 -07:00
Vinson Lee ac942f5aa2 nv50: Add to SCons build. 2010-04-24 14:38:48 -07:00
Vinson Lee e3eed8bf21 nouveau: Add to SCons build. 2010-04-24 01:15:00 -07:00
José Fonseca 47a89e9255 scons: Always build softpipe and llvmpipe (when llvm available).
These are our reference software rasterizers. They can build everywhere
and are a precious debugging tool.

Making them always present immensily simplifies the scons logic.

If people want to avoid building it is still possible to pass
direcotries and target names to scons to narrow the build.
2010-04-11 17:17:35 +09: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
José Fonseca 9fc93b8041 scons: Use libdrm options only where needed.
Prevents needless recompiles when switching dri=yes to no.
2010-04-11 17:17:34 +09:00
Zack Rusin c60a161cc5 scons: define DRAW_LLVM if we're building it 2010-04-06 22:41:11 -04:00
José Fonseca cf5cd836de scons: Don't always include/links X11 headers/libs.
Move it into a separate tool.

TODO: Needs to be "tooled" in each SConscript that uses it.
2010-03-31 18:40:10 +01:00
José Fonseca 6047c89a23 scons: Don't always link expat.
Only needed for DRI. Should be linked in DRI specific subdirectories.
2010-03-31 18:38:23 +01:00
Keith Whitwell db5c2235d1 gallium: new raw gallium interface to support standalone tests
Provides basic window system integration behind a simple interface,
allowing tests to be written without dependency on either the driver
or window system.

With a lot of work, could turn into something like glut for gallium.
2010-03-28 10:42:38 -07:00
Jakob Bornecrantz bc88c95990 i915g: Rename winsys prefix to i915_ from intel_
Since the winsys isn't shared with i965 and never will be
2010-03-26 00:38:17 +01:00
José Fonseca e8d884eab9 scons: Fixup the libgl-gdi build. 2010-03-10 11:34:09 +00:00
José Fonseca 601bfb5951 python: Fix up state tracker for sw api. 2010-03-10 10:34:29 +00:00
José Fonseca 78d8e6c98a scons: Always build the identity driver. 2010-03-09 17:08:16 +00:00
José Fonseca 706eda3057 scons: Add new targets option.
This will likely change. Most probably we'll just add an alias to indvidual
targets and use the regular scons targets arguments.
2010-03-09 15:09:32 +00:00
José Fonseca db2e1518ff scons: Always build trace driver
There are so many state trackers and winsys that rely on it for debug
building, and trace can really build anywhere and is thin so there's no
point is making it an option.

Based on  Xavier Chantry <chantry.xavier@gmail.com>'s patch:

"I also removed the trace check in xlib SConscript which is now useless, and
that script seems to deal with the cell driver, so I added cell in the check
for supported drivers."
2010-02-25 17:02:52 +00:00
José Fonseca 8c7d39cc83 scons: A less magic way of not building progs by default.
The problem with the old way is that passing 'progs/subdir' as argument
would fail.
2010-02-15 20:48:24 +00:00
José Fonseca f6a16dfa97 scons: Only build progs when explicitly requested in the command line. 2010-02-10 20:23:10 +00:00
Zack Rusin 08e2eab8a4 scons: export drawllvm after actually checking that llvm is present 2010-02-10 00:08:36 -05:00
Zack Rusin 43f8a82a76 scons: don't assume llvm is always present 2010-02-09 00:00:35 -05: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
Alan Hourihane 32e6043150 define own embedded target and cleanup previous commit. 2010-01-28 17:26:05 +00:00
Alan Hourihane 75cd6f3ece Don't define HAVE_POSIX_MEMALIGN for embedded target. 2010-01-28 17:23:31 +00:00
Alan Hourihane dea98eb792 support an 'embedded' platform target which turns off most parts of the
build.
2010-01-26 20:59:12 +00:00
Alan Hourihane 550fc19a5f add missing SCons.Util 2010-01-26 19:57:34 +00:00
Alan Hourihane 6544be6223 Allow the environment to override certain flags. 2010-01-26 19:14:50 +00:00
Brian Paul 9b22427911 Merge branch 'mesa_7_7_branch'
Conflicts:

	src/mesa/drivers/dri/intel/intel_screen.c
	src/mesa/drivers/dri/intel/intel_swapbuffers.c
	src/mesa/drivers/dri/r300/r300_emit.c
	src/mesa/drivers/dri/r300/r300_ioctl.c
	src/mesa/drivers/dri/r300/r300_tex.c
	src/mesa/drivers/dri/r300/r300_texstate.c
2010-01-25 14:46:17 -07:00
Vinson Lee d57ba16ae3 scons: Define _DARWIN_C_SOURCE on Darwin builds. 2010-01-23 21:05:58 -08:00
José Fonseca dc6bcc92ee gallium: Provide alternative stdint.h and stdbool.h C99 headers, instead of ad-hoc definitions.
Everybody is using the C99's integer types. Everybody except Microsoft,
which in turns means everybody is including their own definitions of C99
integer types for MSVC, causing duplicate definitions when linking two
projects. This is the case of building Gallium and LLVM with MSVC.

Shipping alternative stdint.h and stdbool.h headers for MSVC allows us
to share a single definition. It also removes clutter from the Gallium
headers.
2010-01-10 10:39:29 +00:00
José Fonseca 89d778ff02 scons: Don't list cell as a driver.
Cell driver's SConscript never got written, and it is not trivial one to
write, so don't accept cell in the driver option to avoid confusion.
2010-01-01 12:16:20 +00:00
José Fonseca 7bbf7f94ea scons: Build progs together with everything else.
This is a substantial reorganization, This particular commit enables:
- building the progs for unices platforms
- glew is now built as a shared library (it is the default, and it is
inconvenient and pointless to shift away from that default)
- all progs get built by default
2010-01-01 12:16:19 +00:00
José Fonseca 97e2c5ac0b scons: Expose convienience libraries to the host environment.
This fixes MinGW cross compilation build, recently broken due to the use
of convenience libraries in the GLSL preprocessor.
2010-01-01 11:00:58 +00:00
Keith Whitwell aa02683e45 Merge branch 'i965g-restart'
Conflicts:
	configure.ac
2009-12-22 09:40:39 +00:00
Keith Whitwell a5585cb533 Merge commit 'origin/master' into i965g-restart
Conflicts:
	SConstruct
	configs/default
	configs/linux-dri
2009-12-21 19:18:41 +00:00
Michal Krol a3eb0f718e Merge branch 'master' into glsl-pp-rework-2
Conflicts:
	progs/perf/drawoverhead.c
	progs/perf/teximage.c
	progs/perf/vbo.c
	progs/perf/vertexrate.c
	src/mesa/shader/slang/library/slang_common_builtin_gc.h
2009-12-12 16:48:32 +01:00
José Fonseca 491f384c39 scons: Get GLSL code building correctly when cross compiling.
This is quite messy. GLSL code has to be built twice: one for the
host OS, another for the target OS.
2009-12-10 16:30:08 +00:00
Jakob Bornecrantz 60769b232c svga: Build svga driver 2009-11-17 03:18:06 +01:00
Jakob Bornecrantz 47cbbb7253 i965g: Builds with scons
But there are some missing symbols, "nm -u i965_dri.so"
[SNIP]
                 U brw_surface_bo
                 U brw_surface_pitch
                 U brw_texture_blanket_winsys_buffer
                 U brw_texture_get_winsys_buffer
                 U brw_update_dirty_counts
[SNIP]
2009-11-05 01:22:10 +00:00
Jakob Bornecrantz f00da2a3ff i915g: Drop the simple sufix
None of the other driver have a silly sufix,
	so just drop it. Nothing new added in this commit
	or any other commit but this is better marketing.
2009-10-05 19:48:08 +01:00
Jakob Bornecrantz c4b821a4c6 i965g: Drop i965simple
The driver never work with real hardware and has
bitrotted for quite some time now, might as well
drop it. If somebody wants to look at it just use git.
2009-10-05 19:48:03 +01:00
José Fonseca 946f432a08 llvmpipe: Fork softpipe for experimentation with llvm. 2009-08-29 09:21:15 +01:00
Michel Dänzer d22bd1421c Add support for building the Xorg state tracker with scons.
scons ... statetrackers=xorg
2009-08-25 15:39:05 +02:00
Jakob Bornecrantz d60b2c6855 identity: Add new identity driver
This driver does no transformation of the gallium calls
	going to the real driver, like the identity matrix. It is
	intended to be the basis for transforming and/or debug
	drivers like trace and rbug.

	Authors of this patch are:
		Michal Krol, orignal heavy lifting.
		José Fonesca, object wrapping code stolen from trace.
		Jakob Bornecrantz, put it all toghether and renamed a stuff.
2009-06-24 13:04:56 +02:00
José Fonseca e9fb90ab88 scons: Don't use deprecated Options. 2009-05-05 13:14:51 +01:00
Corbin Simpson b7ffe1e876 Add scons build support for radeon/r300. 2009-04-04 00:36:05 -07:00
Michel Dänzer 2b6235c9f7 scons: Also link in additional LLVM components.
They don't seem necessary here, but they shouldn't hurt either...
2009-03-09 17:46:49 +01:00
Jakob Bornecrantz 056f847e96 gallium: Also disable i965simple for scons
Please read previous commit for more info.
2009-02-18 17:15:31 +00:00
Corbin Simpson e9b08e7373 Make r300 and amd build in scons. 2009-02-01 23:30:21 -08:00
José Fonseca 9bf83fb016 scons: Build the progs into seperate dirs as well. 2009-01-24 15:56:28 +00:00