summaryrefslogtreecommitdiffstats
path: root/configure.ac
Commit message (Collapse)AuthorAgeFilesLines
* r600g: first step into winsys/radeonMarek Olšák2011-08-161-1/+1
| | | | Reviewed-by: Alex Deucher <[email protected]>
* glw: Remove GLw source.Kenneth Graunke2011-08-151-76/+0
| | | | | | | | | | libGLw is an old OpenGL widget library with optional Motif support. It almost never changes and very few people actually still care about it, so we've decided to ship it separately. The new home for libGLw is: git://git.freedesktop.org/mesa/glw/ Reviewed-by: Brian Paul <[email protected]>
* egl: Native Display autodetectionBenjamin Franzke2011-08-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | EGL doesnt define howto manage different native platforms. So mesa has a builtime configurable default platform, whith non-standard envvar (EGL_PLATFORM) overwrites. This caused unneeded bugreports, when EGL_PLATFORM was forgotten. Detection is grouped into basic types of NativeDisplays (which itself needs to be detected). The final decision is based on characteristcs of these basic types: File Desciptor based platforms (fbdev): - fstat(2) to check for being a fd that belongs to a character device - check kernel subsystem (todo) Pointer to structuctures (x11, wayland, drm/gbm): - mincore(2) to check whether its valid pointer to some memory. - magic elements (e.g. pointers to exported symbols): o wayland display stores interface type pointer (first elm.) o gbm stores pointer to its constructor (first elm.) o x11 as a fallback (FIXME?) Reviewed-by: Kristian Høgsberg <[email protected]>
* configure.ac: add DLOPEN_LIBS to xlib buildMarek Olšák2011-07-281-1/+1
| | | | | | Otherwise xlib-based llvmpipe fails to link. NOTE: This is a candidate for the 7.11 branch.
* configure.ac: fix xlib-based softpipe buildMarek Olšák2011-07-281-7/+5
| | | | | | Tested-by: Jon TURNEY <[email protected]> NOTE: This is a candidate for the 7.11 branch.
* configure.ac: do not check for llvm-config if llvm is disabledMarek Olšák2011-07-251-3/+2
| | | | NOTE: This is a candidate for the 7.11 branch.
* configure: Move gbm before egl in SRC_DIRSBenjamin Franzke2011-07-251-35/+35
| | | | | | egl_dri2 built into libEGL depends on libgbm. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=39515
* configure.ac: check for libdrm_radeon only when building classicMarek Olšák2011-07-211-5/+5
|
* configure.ac: Check for the respective libdrm_* when building gallium driversEmil Velikov2011-07-191-0/+3
| | | | | | | | | | | | In a rare case of building gallium only, we need to check if the required packages are available libdrm_[intel|nouveau] - gallium[i915 i965|nouveau] v2: r300g and r600g do not need libdrm_radeon Signed-off-by: Emil Velikov <[email protected]> Signed-off-by: Marek Olšák <[email protected]>
* g3dvl: Build softpipe when needed.Younes Manton2011-07-151-0/+3
|
* g3dvl: Build the right winsys dependencies when needed.Younes Manton2011-07-151-6/+15
|
* Squashed commit of the following:José Fonseca2011-07-141-60/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1856230d9fa61710cce3e152b8d88b1269611a73 Author: José Fonseca <[email protected]> Date: Tue Jul 12 23:41:27 2011 +0100 make: Use better var names on packaging. commit d1ae72d0bd14e820ecfe9f8f27b316f9566ceb0c Author: José Fonseca <[email protected]> Date: Tue Jul 12 23:38:21 2011 +0100 make: Apply several of Dan Nicholson's suggestions. commit f27cf8743ac9cbf4c0ad66aff0cd3f97efde97e4 Author: José Fonseca <[email protected]> Date: Sat Jul 9 14:18:20 2011 +0100 make: Put back the tar.bz2 creation rule. Removed by accident. commit 34983337f9d7db984e9f0117808274106d262110 Author: José Fonseca <[email protected]> Date: Sat Jul 9 11:59:29 2011 +0100 make: Determine tarballs contents via git ls-files. The wildcards were a mess: - lots of files for non Linux platforms missing - several files listed and archived twice Using git-ls-files ensures things are not loss when making the tarballs. commit 34a28ccbf459ed5710aafba5e7149e8291cb808c Author: José Fonseca <[email protected]> Date: Sat Jul 9 11:07:14 2011 +0100 glut: Remove GLUT source. Most distros ship freeglut, and most people don't care one vs the other, and it hasn't been really maintained. So it is better to have Mesa GLUT be revisioned and built separately from Mesa. commit 5c26a2c3c0c7e95ef853e19d12d75c4f80137e7d Author: José Fonseca <[email protected]> Date: Sat Jul 9 10:31:02 2011 +0100 Ignore the tarballs. commit 26edecac589819f0d0efe2165ab748dbc4e53394 Author: José Fonseca <[email protected]> Date: Sat Jul 9 10:30:24 2011 +0100 make: Create the Mesa-xxx-devel symlink automatically. Also actually remote the intermediate uncompressed tarballs.
* configure: allow C{,XX}FLAGS overrideMarcin Baczyński2011-07-141-0/+8
| | | | | | NOTE: This is a candidate for the 7.11 branch. Signed-off-by: Brian Paul <[email protected]>
* configure: fix gcc version checkMarcin Baczyński2011-07-141-1/+1
| | | | | | NOTE: This is a candidate for the 7.11 branch. Signed-off-by: Brian Paul <[email protected]>
* g3dvl: check for existense of VA API header/libsChristian König2011-07-141-1/+4
| | | | | Building the VA state tracker only works when the header/libs are available. Also add a warning that the state tracker is currently undmaintained.
* g3dvl: check for existense of VDPAU header/libsChristian König2011-07-141-2/+2
| | | | Building the VDPAU state tracker only works when the header/libs are available.
* g3dvl: check for existense of XvMC header/libsChristian König2011-07-141-2/+2
| | | | Building the XvMC state tracker only works when the header/libs are available.
* configure.ac: don't build gallium driver libs just to see if there are no errorsMarek Olšák2011-07-141-7/+18
| | | | | | I think the past are those times when the gallium interface was changed all the time. Now it is not, so there is no reason to always compile the libs if they are not needed.
* gallium/targets: do not link every driver with libllvmpipe.aMarek Olšák2011-07-141-1/+1
| | | | Only some targets need that, the others don't.
* Merge branch 'pipe-video'Christian König2011-07-131-7/+109
|\
| * Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-07-111-2/+2
| |\ | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_state_inlines.h
| * \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-07-041-498/+578
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/r600/r600_state_inlines.h src/gallium/tests/trivial/Makefile src/gallium/winsys/g3dvl/dri/XF86dri.c src/gallium/winsys/g3dvl/dri/driclient.c src/gallium/winsys/g3dvl/dri/driclient.h src/gallium/winsys/g3dvl/dri/xf86dri.h src/gallium/winsys/g3dvl/dri/xf86dristr.h src/gallium/winsys/r600/drm/r600_bo.c
| * \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-06-051-8/+15
| |\ \ \
| * | | | Initial r300g supportChristian König2011-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based uppon a patch from Pali Rohár <[email protected]>. This seems to get at least YUV->RGB conversion working. So a simple "mplayer -vo vdpau" now seems to work fine.
| * | | | Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-05-211-2/+8
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-05-151-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-05-071-2/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_state.c
| * \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-04-231-20/+64
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_state.c src/gallium/include/pipe/p_format.h src/gallium/tests/graw/fragment-shader/frag-abs.sh src/gallium/tests/graw/fragment-shader/frag-add.sh src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh src/gallium/tests/graw/fragment-shader/frag-cb-2d.sh src/gallium/tests/graw/fragment-shader/frag-dp3.sh src/gallium/tests/graw/fragment-shader/frag-dp4.sh src/gallium/tests/graw/fragment-shader/frag-dst.sh src/gallium/tests/graw/fragment-shader/frag-ex2.sh src/gallium/tests/graw/fragment-shader/frag-face.sh src/gallium/tests/graw/fragment-shader/frag-flr.sh src/gallium/tests/graw/fragment-shader/frag-frc.sh src/gallium/tests/graw/fragment-shader/frag-kil.sh src/gallium/tests/graw/fragment-shader/frag-lg2.sh src/gallium/tests/graw/fragment-shader/frag-lit.sh src/gallium/tests/graw/fragment-shader/frag-lrp.sh src/gallium/tests/graw/fragment-shader/frag-mad-immx.sh src/gallium/tests/graw/fragment-shader/frag-mad.sh src/gallium/tests/graw/fragment-shader/frag-max.sh src/gallium/tests/graw/fragment-shader/frag-min.sh src/gallium/tests/graw/fragment-shader/frag-mov.sh src/gallium/tests/graw/fragment-shader/frag-mul.sh src/gallium/tests/graw/fragment-shader/frag-rcp.sh src/gallium/tests/graw/fragment-shader/frag-rsq.sh src/gallium/tests/graw/fragment-shader/frag-sge.sh src/gallium/tests/graw/fragment-shader/frag-slt.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-abs.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-absneg.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-neg.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-swz.sh src/gallium/tests/graw/fragment-shader/frag-sub.sh src/gallium/tests/graw/fragment-shader/frag-tempx.sh src/gallium/tests/graw/fragment-shader/frag-xpd.sh src/gallium/tests/graw/vertex-shader/vert-abs.sh src/gallium/tests/graw/vertex-shader/vert-add.sh src/gallium/tests/graw/vertex-shader/vert-arl.sh src/gallium/tests/graw/vertex-shader/vert-arr.sh src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh src/gallium/tests/graw/vertex-shader/vert-cb-2d.sh src/gallium/tests/graw/vertex-shader/vert-dp3.sh src/gallium/tests/graw/vertex-shader/vert-dp4.sh src/gallium/tests/graw/vertex-shader/vert-dst.sh src/gallium/tests/graw/vertex-shader/vert-ex2.sh src/gallium/tests/graw/vertex-shader/vert-flr.sh src/gallium/tests/graw/vertex-shader/vert-frc.sh src/gallium/tests/graw/vertex-shader/vert-lg2.sh src/gallium/tests/graw/vertex-shader/vert-lit.sh src/gallium/tests/graw/vertex-shader/vert-lrp.sh src/gallium/tests/graw/vertex-shader/vert-mad.sh src/gallium/tests/graw/vertex-shader/vert-max.sh src/gallium/tests/graw/vertex-shader/vert-min.sh src/gallium/tests/graw/vertex-shader/vert-mov.sh src/gallium/tests/graw/vertex-shader/vert-mul.sh src/gallium/tests/graw/vertex-shader/vert-rcp.sh src/gallium/tests/graw/vertex-shader/vert-rsq.sh src/gallium/tests/graw/vertex-shader/vert-sge.sh src/gallium/tests/graw/vertex-shader/vert-slt.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-abs.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-absneg.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-neg.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-swz.sh src/gallium/tests/graw/vertex-shader/vert-sub.sh src/gallium/tests/graw/vertex-shader/vert-xpd.sh src/gallium/tools/trace/dump.py src/gallium/tools/trace/format.py src/gallium/tools/trace/model.py src/gallium/tools/trace/parse.py
| * | | | | | | | [g3dvl] fix configure.ac for r600 video targetsChristian König2011-03-221-1/+1
| | | | | | | | |
| * | | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-03-191-7/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/tests/unit/SConscript
| * | | | | | | | | vdpau: add vdpau-r600 targetChristian König2011-03-191-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-03-031-5/+8
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-02-241-41/+92
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_asm.h src/gallium/drivers/r600/r600_shader.c src/gallium/drivers/r600/r600_state_inlines.h src/gallium/drivers/r600/r600_texture.c
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-201-0/+34
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-121-39/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_shader.c
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'vdpau/pipe-video' into pipe-videoChristian König2011-01-101-6/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/softpipe/sp_video_context.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/xorg/xvmc/context.c src/gallium/tests/unit/SConscript
| | * | | | | | | | | | | | | vl: enable target va-r600Thomas Balling Sørensen2010-10-281-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | vl: commited Orasanu Lucian's patch containing va stubs.Thomas Balling Sørensen2010-10-271-0/+3
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | vl: pipe-video branch merged with Königs pipe-video branchThomas Balling Sørensen2010-10-261-21/+4
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'pipe-video' of ↵Thomas Balling Sørensen2010-10-261-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://anongit.freedesktop.org/~deathsimple/xvmc-r600 into pipe-video Conflicts: configure.ac src/gallium/auxiliary/vl/vl_compositor.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/softpipe/sp_video_context.c src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h
| | * | | | | | | | | | | | | | vl: va state-tracker configuration scriptsThomas Balling Sørensen2010-10-241-2/+25
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' into pipe-videoThomas Balling Sørensen2010-10-051-158/+299
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri configure.ac src/gallium/drivers/nvfx/Makefile src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h src/gallium/include/state_tracker/dri1_api.h src/gallium/include/state_tracker/drm_api.h src/gallium/tests/python/samples/tri.py src/gallium/tests/trivial/Makefile src/gallium/tests/unit/Makefile src/gallium/tests/unit/SConscript src/gallium/tests/unit/u_format_test.c src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
| | * | | | | | | | | | | | | | | vdpau changesThomas Balling Sørensen2010-07-141-4/+21
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-081-14/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/r600/eg_asm.c src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_asm.h src/gallium/include/pipe/p_format.h src/gallium/targets/dri-nouveau/Makefile
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2010-12-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_texture.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2010-11-211-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2010-11-111-121/+254
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-videoChristian König2010-10-281-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/include/pipe/p_format.h
| * | | | | | | | | | | | | | | | | | | | First xvmc-r600 implementationChristian König2010-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-videoChristian König2010-10-121-163/+301
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | / / / / / / / / / / / / / | | | |_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/nvfx/Makefile src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h src/gallium/include/state_tracker/dri1_api.h src/gallium/include/state_tracker/drm_api.h src/gallium/winsys/nouveau/drm/nouveau_drm_api.c