summaryrefslogtreecommitdiffstats
path: root/configs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pipe-video'Christian König2011-07-131-0/+6
|\
| * pipe-video: merge fixesChristian König2011-07-112-4/+3
| |
| * Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-07-043-3/+26
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-13/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/tests/unit/u_format_test.c src/gallium/winsys/r600/drm/r600_hw_context.c
| * \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-06-052-5/+12
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-05-212-0/+6
| |\ \ \ \
| * \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-04-231-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-03-192-5/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/tests/unit/SConscript
| * \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-02-248-15/+45
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-0/+9
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c
| * \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-122-2/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_shader.c
| * \ \ \ \ \ \ \ \ \ Merge remote branch 'vdpau/pipe-video' into pipe-videoChristian König2011-01-103-5/+11
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: va state-tracker configuration scriptsThomas Balling Sørensen2010-10-241-0/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into pipe-videoThomas Balling Sørensen2010-10-0521-51/+89
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-143-5/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | configs: do not let llvm-config define NDEBUG in debug buildsBrian Paul2011-07-111-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the examples of Marek and Jose for autoconf and scons.
* | | | | | | | | | | | mesa: bump version to 7.12 (devel)Brian Paul2011-06-291-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | configs: add libdrm cflags to linux-llvm configBrian Paul2011-06-291-0/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Add gbm (generic/graphics buffer manager)Benjamin Franzke2011-06-232-2/+22
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | darwin: Use -fvisibility=hidden to set default symbol visibilityJeremy Huddleston2011-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* | | | | | | | | | | darwin: Fix VG_LIB_GLOB to also match the unversioned symlinkJeremy Huddleston2011-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* | | | | | | | | | | darwin: Don't link against libGL when building libOSMesaJeremy Huddleston2011-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything should be resolved through glapi. Signed-off-by: Jeremy Huddleston <[email protected]>
* | | | | | | | | | | darwin: Set VG_LIB_{NAME,GLOB} to fix make installJeremy Huddleston2011-06-061-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* | | | | | | | | | | darwin: Define GALLIUM_DRIVERS_DIRS in darwin configJeremy Huddleston2011-06-061-0/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* | | | | | | | | | dri/nouveau: Fix build with --enable-shared-dricore.Johannes Obermayr2011-06-022-5/+12
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Based on the work of Себастьян Gliţa Κατινα <[email protected]> - Split Makefile.template into Makefile.defines and Makefile.targets - Adapt other drivers to new situation - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=35441 Signed-off-by: Brian Paul <[email protected]>
* | | | | | | | | mesa: check that flex/bison are installedBrian Paul2011-05-182-0/+6
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugs.freedesktop.org/show_bug.cgi?id=36651 NOTE: This is a candidate for the 7.10 branch.
* | | | | | | | configs: add r600 dir to DRI_DIRSBrian Paul2011-04-111-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | autoconf/make: Don't specify individual llvm libraries.José Fonseca2011-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | gallivm: Use LLVM MC disassembler, instead of udis86.José Fonseca2011-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Included in LLVM 2.7+. Unlink udis86, should support all instructions that LLVM can emit.
* | | | | | | glx: Take GLPROTO_CFLAGS into account.Henri Verbeet2011-03-071-0/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | mesa: Optionally build a dricore support library (v3)Christopher James Halse Rogers2011-02-117-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This an adds --enable-shared-dricore option to configure. When enabled, DRI modules will link against a shared copy of the common mesa routines rather than statically linking these. This saves about 30MB on disc with a full complement of classic DRI drivers. v2: Only enable with a gcc-compatible compiler that handles rpath Handle DRI_CFLAGS without filter-out magic Build shared libraries with the full mklib voodoo Fix typos v3: Resolve conflicts with talloc removal patches Signed-off-by: Christopher James Halse Rogers <[email protected]>
* | | | | | egl: Implement libwayland-eglBenjamin Franzke2011-02-072-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This library is required and defined by wayland for EGL implementations supporting wayland.
* | | | | | Remove talloc from the make and automake build systems.Kenneth Graunke2011-01-314-9/+3
| |_|_|_|/ |/| | | |
* | | | | glapi: Fix OpenGL and OpenGL ES interop.Chia-I Wu2011-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When --enable-shared-glapi is specified, libGL will share libglapi with OpenGL ES instead of defining its own copy of glapi. This makes sure an app will get only one copy of glapi in its address space. The new option is disabled by default. When enabled, libGL and libglapi must be built from the same source tree and distributed together. This requirement comes from the fact that the dispatch offsets used by these libraries are re-assigned whenever GLAPI XMLs are changed. For GLX, indirect rendering for has_different_protocol() functions is tricky. A has_different_protocol() function is assigned only one dispatch offset, yet each entry point needs a different protocol opcode. It cannot be supported by the shared glapi. The fix to this is to make glXGetProcAddress handle such functions specially before calling _glapi_get_proc_address. Note that these files are automatically generated/re-generated src/glx/indirect.c src/glx/indirect.h src/mapi/glapi/glapi_mapi_tmp.h
* | | | | glapi: Fix OpenGL ES 1.1 and 2.0 interop.Chia-I Wu2011-01-202-0/+8
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move _glapi_* symbols from libGLESv1_CM.so and libGLESv2.so to libglapi.so. This makes sure an app will get only one copy of glapi in its address space. Note that with this change, libGLES* and libglapi must be built from the same source tree and distributed together. This requirement comes from the fact that the dispatch offsets used by these libraries are re-assigned whenever GLAPI XMLs are changed.
* | | | Add GLX_TLS setting to configs/default.Tom Fogal2011-01-101-0/+1
| | | | | | | | | | | | | | | | | | | | Should have gone in with 31351dc029ff0e12a250e3ffc509f4f01e025a24, thanks to Dan Nicholson for noticing.
* | | | Export TLS support in gl.pc.Tom Fogal2011-01-101-0/+1
| | | |
* | | | mesa: Remove GLES overlay.Chia-I Wu2011-01-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With core mesa doing runtime API checks, GLES overlay is no longer needed. Make --enable-gles-overlay equivalent to --enable-gles[12]. There may still be places where compile-time checks are done. They could be fixed case by case.
* | | | noop: make noop useable like trace or rbugJerome Glisse2011-01-091-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | If you want to enable noop set GALLIUM_NOOP=1 as an env variable. You need first to enable noop wrapping for your driver see change to src/gallium/targets/dri-r600/ in this commit as an example. Signed-off-by: Jerome Glisse <[email protected]>
* | | mesa: bump version to 7.11Vinson Lee2011-01-051-1/+1
| | |
* | | mesa/llvm: use llvm-config --cppflagsBrian Paul2010-12-061-3/+2
| | | | | | | | | | | | | | | | | | | | | 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.
* | | mesa: consolidate some compiler -D flagsBrian Paul2010-12-031-2/+3
| | | | | | | | | | | | | | | -D__STDC_CONSTANT_MACROS and -D__STDC_LIMIT_MACROS are only needed for LLVM build.
* | | Fix build on systems where "python" is python 3.Kenneth Graunke2010-10-271-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | First, it changes autoconf to use a "python2" binary when available, rather than plain "python" (which is ambiguous). Secondly, it changes the Makefiles to use $(PYTHON) $(PYTHON_FLAGS) rather than calling python directly. Signed-off-by: Xavier Chantry <[email protected]> Signed-off-by: Matthew William Cox <[email protected]> Signed-off-by: Kenneth Graunke <[email protected]>
* | configs: remove egl-swrast target from linux-dri configBrian Paul2010-09-221-1/+1
| |
* | mesa: bump version to 7.10Vinson Lee2010-09-171-1/+1
| |
* | Make XF86VIDMODE extension optionalJon TURNEY2010-09-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Code in glx/glxcmds.c which uses the XF86VIDMODE extension is already guarded. Also use that guard to control inclusion of the xf86vmode.h header, and only enable that guard if the XF86VIDMODE extension is found by pkgconfig. This changes the behaviour on platforms which XF86VIDMODE exists, in that XF86VIDMODE used to be mandatory, but is now optional. Presumably other build systems are already arranging for -DXF86VIDMODE to be supplied to the complier when glxcmds.c is compiled, so are not affected by this change Signed-off-by: Jon TURNEY <[email protected]>
* | mesa: also build galahad driverBrian Paul2010-09-031-1/+1
| |
* | configs: Remove -lstdc++ from default.Vinson Lee2010-08-241-1/+1
| | | | | | | | | | | | This patch undoes commit 9b7480cd95c2d1259e23bfb5549cefaa94ebaca1. A follow-on patch will provide the proper fix.
* | mesa: Fix typo in autoconf.in that made talloc cflags still detect at runtime.Eric Anholt2010-08-221-1/+1
| |
* | mesa: AC_SUBST the talloc libs/cflags so the ./configure results are saved.Eric Anholt2010-08-222-1/+7
| | | | | | | | | | | | | | | | | | | | I had used pkg-config from the Makefile because I didn't want to screw around with the non-autoconf build, but that doesn't work because the PKG_CONFIG_PATH or TALLOC_LIBS/TALLOC_CFLAGS that people set at configure time needs to be respected and may not be present at build time. Bug #29585