summaryrefslogtreecommitdiffstats
path: root/configs
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-152-0/+35
|\
| * Add OSMesa pkg-config fileDan Nicholson2008-12-142-2/+4
| | | | | | | | This makes the GLU .pc file a little simpler, too.
| * Add more package metadata to the pkg-config filesDan Nicholson2008-12-142-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.2Alan Hourihane2008-12-081-2/+2
|\| | | | | | | | | | | Conflicts: progs/glsl/Makefile
| * darwin: Use -Os instead of -O2Jeremy Huddleston2008-12-031-2/+2
| | | | | | | | (cherry picked from commit 456dbb143a0d11b69d8af0d493cd84efb0596273)
* | cell: only build Cell and softpipe driversBrian Paul2008-11-211-1/+2
| |
* | build default set of progs + eglAlan Hourihane2008-11-131-2/+1
| |
* | Fix configs/linux-dri to build winsys again.Pekka Paalanen2008-11-131-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 Marchesin2008-11-131-1/+1
|\ \ | | | | | | | | | git+ssh://[email protected]/git/nouveau/mesa into gallium-0.2
| * \ Merge commit 'origin/gallium-0.1' into gallium-0.2Pekka Paalanen2008-11-121-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 Paalanen2008-11-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Pekka Paalanen <[email protected]>
| * | | Merge remote branch 'origin/gallium-0.2' into gallium-0.2Ben Skeggs2008-11-101-1/+1
| |\ \ \
| * \ \ \ Merge remote branch 'origin/gallium-0.2' into gallium-0.2Ben Skeggs2008-10-272-9/+4
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'origin/gallium-0.2' into gallium-0.2Ben Skeggs2008-10-155-7/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2Ben Skeggs2008-09-121-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'nouveau/gallium-0.1' into nouveau-gallium-0.2Ben Skeggs2008-09-121-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri
| | * | | | | | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-09-122-1/+7
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-09-114-7/+21
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/default
| | * \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-07-232-0/+4
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-07-142-12/+2
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | nv04.Stephane Marchesin2008-07-081-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-06-232-5/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/default
| | * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-05-252-1/+68
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-04-231-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-03-301-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | nv10.Stephane Marchesin2008-03-152-2/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-03-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1Ben Skeggs2008-02-271-42/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | nouveau: fix buildBen Skeggs2008-02-221-1/+1
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | cell: added -Wmissing-prototypesBrian Paul2008-11-121-1/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | cell: added -D_BSD_SOURCE flagBrian Paul2008-10-271-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 issuesBrian Paul2008-10-221-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | build "GLX" egl driver by default and egl demosAlan Hourihane2008-10-161-8/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-10-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
| * | | | | | | | | | | | | | configs: darwin: Don't build GLwJeremy Huddleston2008-09-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ef688ba1ee366a8937a41075cbe8b76a9bf75013)
* | | | | | | | | | | | | | | cell: implement more built-in shader functions, link spu code with -lmBrian Paul2008-10-081-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Gallivm: port to llvm 2.4.Stephane Marchesin2008-10-021-0/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Gallivm: need to link with libstdc++ for llvm.Stephane Marchesin2008-10-021-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Add -msse and -msse2 to the *-x86 configs.José Fonseca2008-10-012-2/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | mesa: build gallium directories before core mesaKeith Whitwell2008-09-121-1/+1
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-113-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/testsBrian Paul2008-09-112-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 MakefilesBrian Paul2008-09-031-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Cell: added linux-cell-debug configBrian Paul2008-09-032-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linux-cell is now the optimized configuration. Remove some Cell-specific stuff from winsys/xlib/Makefile.
| * | | | | | | | | | | cell: use SDK 3.0 by defaultBrian Paul2008-08-261-1/+5
| | | | | | | | | | | |
* | | | | | | | | | | | add gallium dirAlan Hourihane2008-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | winsys/common -> winsys/
* | | | | | | | | | | | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
| * | | | | | | | | | | change MESA_MINOR to 3Brian Paul2008-08-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1136-105/+314
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * | | | | | | | | | consolidate intel directories.Alan Hourihane2008-08-172-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we now have src/gallium/winsys/drm/intel/{common,dri,egl}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 06:46:50 +0000