Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/gallium-0.2' into gallium-xlib-rework | Keith Whitwell | 2009-01-19 | 1 | -3/+3 |
|\ | |||||
| * | gallivm: Explicitly specify the LLVM components we need. | Michel Dänzer | 2009-01-12 | 1 | -3/+3 |
| | | |||||
* | | cell: fix breakage from xlib re-org | Brian Paul | 2009-01-08 | 1 | -1/+1 |
| | | | | | | | | Some of these fixes are quick band-aids for now. | ||||
* | | gallium: split driver-independent code out of xlib winsys | Keith Whitwell | 2009-01-08 | 1 | -1/+1 |
|/ | | | | Place in new xlib state-tracker. This is a statetracker for the GLX API. | ||||
* | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-15 | 2 | -0/+35 |
|\ | |||||
| * | Add OSMesa pkg-config file | Dan Nicholson | 2008-12-14 | 2 | -2/+4 |
| | | | | | | | | This makes the GLU .pc file a little simpler, too. | ||||
| * | Add more package metadata to the pkg-config files | Dan Nicholson | 2008-12-14 | 2 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The pkg-config files have been filled in more thoroughly to allow users to use mesa more effectively. By adding metadata to Requires.private, Libs.private and Cflags, we can ensure that all the libraries and headers will be found in all situations. However, the full substitutions are only done when using the configure script. This also fixes the glu pkg-config file to account for using GL or OSMesa. Fixes bug 18161. | ||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-08 | 1 | -2/+2 |
|\| | | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| * | darwin: Use -Os instead of -O2 | Jeremy Huddleston | 2008-12-03 | 1 | -2/+2 |
| | | | | | | | | (cherry picked from commit 456dbb143a0d11b69d8af0d493cd84efb0596273) | ||||
* | | cell: only build Cell and softpipe drivers | Brian Paul | 2008-11-21 | 1 | -1/+2 |
| | | |||||
* | | build default set of progs + egl | Alan Hourihane | 2008-11-13 | 1 | -2/+1 |
| | | |||||
* | | Fix configs/linux-dri to build winsys again. | Pekka Paalanen | 2008-11-13 | 1 | -4/+0 |
| | | | | | | | | | | | | SRC_DIRS was being reset, which left winsys unbuilt. Signed-off-by: Pekka Paalanen <[email protected]> | ||||
* | | Merge branch 'gallium-0.2' of ↵ | Stephane Marchesin | 2008-11-13 | 1 | -1/+1 |
|\ \ | | | | | | | | | | git+ssh://[email protected]/git/nouveau/mesa into gallium-0.2 | ||||
| * \ | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Pekka Paalanen | 2008-11-12 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'origin/gallium-0.1': Mesa: fix number of buffers in st_draw_vbo(). Nouveau: fix nv20_vertex_layout() Nouveau: update nv20 miptree according to nv40. Nouveau: build, link and use nv20. Nouveau: name replace for nv20. Nouveau: Rename nv20/ files as nv20. Nouveau: copy nv30_vertprog.c to nv20. Nouveau: start nv20 by copying the nv10 tree. | ||||
| | * | | Nouveau: build, link and use nv20. | Pekka Paalanen | 2008-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Pekka Paalanen <[email protected]> | ||||
| * | | | Merge remote branch 'origin/gallium-0.2' into gallium-0.2 | Ben Skeggs | 2008-11-10 | 1 | -1/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'origin/gallium-0.2' into gallium-0.2 | Ben Skeggs | 2008-10-27 | 2 | -9/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote branch 'origin/gallium-0.2' into gallium-0.2 | Ben Skeggs | 2008-10-15 | 5 | -7/+9 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2 | Ben Skeggs | 2008-09-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2 | Ben Skeggs | 2008-09-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri | ||||
| | * | | | | | | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-09-12 | 2 | -1/+7 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-09-11 | 4 | -7/+21 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/default | ||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-07-23 | 2 | -0/+4 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-07-14 | 2 | -12/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | nv04. | Stephane Marchesin | 2008-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-06-23 | 2 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/default | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-05-25 | 2 | -1/+68 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-04-23 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-03-30 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | nv10. | Stephane Marchesin | 2008-03-15 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-03-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1 | Ben Skeggs | 2008-02-27 | 1 | -42/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | nouveau: fix build | Ben Skeggs | 2008-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | cell: added -Wmissing-prototypes | Brian Paul | 2008-11-12 | 1 | -1/+2 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | cell: added -D_BSD_SOURCE flag | Brian Paul | 2008-10-27 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to get MAP_ANONYMOUS in execmem.c and to define timezone type in glxgears.c Adding -std=c99 earlier caused this regression. | ||||
* | | | | | | | | | | | | | | | | cell: add -std=c99 flag to solve some warning/prototype issues | Brian Paul | 2008-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | build "GLX" egl driver by default and egl demos | Alan Hourihane | 2008-10-16 | 1 | -8/+3 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-10-10 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms | ||||
| * | | | | | | | | | | | | | | configs: darwin: Don't build GLw | Jeremy Huddleston | 2008-09-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ef688ba1ee366a8937a41075cbe8b76a9bf75013) | ||||
* | | | | | | | | | | | | | | | cell: implement more built-in shader functions, link spu code with -lm | Brian Paul | 2008-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Gallivm: port to llvm 2.4. | Stephane Marchesin | 2008-10-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Gallivm: need to link with libstdc++ for llvm. | Stephane Marchesin | 2008-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Add -msse and -msse2 to the *-x86 configs. | José Fonseca | 2008-10-01 | 2 | -2/+3 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | mesa: build gallium directories before core mesa | Keith Whitwell | 2008-09-12 | 1 | -1/+1 |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge commit 'origin/gallium-0.1' into gallium-0.2 | Keith Whitwell | 2008-09-11 | 3 | -3/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c | ||||
| * | | | | | | | | | | | | define new APP_CC configuration variable for building apps/demos/tests | Brian Paul | 2008-09-11 | 2 | -1/+7 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For Cell, need to use different compilers for the libraries vs. the demos/tests to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0" | ||||
| * | | | | | | | | | | | cell: add -DDEBUG flag, fixes to Cell Makefiles | Brian Paul | 2008-09-03 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Cell: added linux-cell-debug config | Brian Paul | 2008-09-03 | 2 | -2/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linux-cell is now the optimized configuration. Remove some Cell-specific stuff from winsys/xlib/Makefile. | ||||
| * | | | | | | | | | | | cell: use SDK 3.0 by default | Brian Paul | 2008-08-26 | 1 | -1/+5 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | add gallium dir | Alan Hourihane | 2008-09-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | winsys/common -> winsys/ |