summaryrefslogtreecommitdiffstats
path: root/configs
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
| |
* | 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
| * 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
| |
* | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-202-0/+9
|\| | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c
| * 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.
* | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-122-2/+3
|\| | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_shader.c
| * 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]>
* | 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
| | |
* | | 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
* | configs: Add -lstdc++ to default.Vinson Lee2010-08-191-1/+1
| | | | | | | | | | | | | | This fixes the following error when trying to run glxinfo or glxgears with swrast. undefined symbol: __cxa_pure_virtual
* | configs: Add -ltalloc to linux-dri.Vinson Lee2010-08-161-1/+1
| | | | | | | | Fixes build after glsl2 branch merge, which added talloc dependency.
* | Merge branch 'master' into glsl2Ian Romanick2010-08-131-1/+1
|\ \
| * | configure: fix wrong variable name GLESv1_LIB_DEPSLi Peng2010-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | GLESv1_CM_LIB_DEPS is defined in "configs/autoconf.in", but configure.ac uses GLESv1_LIB_DEPS. Signed-off-by: Li Peng <[email protected]>
* | | configs: added -ltalloc to config filesBrian Paul2010-08-112-2/+2
|/ /
* | st/egl: Fix build on FreeBSD.Chia-I Wu2010-07-162-0/+4
| | | | | | | | | | | | | | There is no libdl on FreeBSD. Based on patch from Thinker <[email protected]>, which is against 7.8. This fixes fdo bug #29093.
* | egl_dri2: Support _EGL_PLATFORM_DRMKristian Høgsberg2010-07-081-2/+4
| | | | | | | | This lets the egl_dri2 driver initialize on just a DRM fd.
* | Use GLW_CFLAGS when building libGLwDan Nicholson2010-07-011-0/+1
| | | | | | | | | | We check for libX11 and libXt, so we might as well use the CFLAGS pkg-config tells us about.
* | Use GLUT_CFLAGS when building glutJohn Hein2010-07-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix this build error (in MesaGLUT-7.6.1)... glut_cmap.c:23:66: error: X11/Xmu/StdCmap.h: No such file or directory ...by not preventing the cflags that pkg-config finds for glut dependencies (including 'xmu') from being used. Defining GLUT_CFLAGS before running the pkg-config prevents the cflags found by pkg-config from being used. This patch lets GLUT_CFLAGS that configure & pkg-config work so hard to set actually get used. Also make sure the generated configs/autoconf defines GLUT_CFLAGS used in (at least) src/glut/glx/Makefile. Signed-off-by: Dan Nicholson <[email protected]>
* | egl: s/EGL_DISPLAY/EGL_PLATFORM/.Chia-I Wu2010-06-172-3/+3
| | | | | | | | | | A platform is already used to mean a window system in EGL. No need to use a different term.
* | glew: Drop glew now that we don't need it for the progsJakob Bornecrantz2010-06-087-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configs/beos | 2 +- configs/darwin | 2 +- configs/default | 4 +- configs/freebsd-dri | 2 +- configs/linux-cell | 2 +- configs/linux-dri-xcb | 2 +- configs/linux-indirect | 2 +- configure.ac | 2 +- include/GL/glew.h |14435 ------------------------------------------------ include/GL/glxew.h | 1476 ----- include/GL/wglew.h | 1247 ----- src/SConscript | 1 - src/glew/LICENSE.txt | 73 - src/glew/Makefile | 54 - src/glew/SConscript | 69 - src/glew/glew.c |14320 ----------------------------------------------- src/glew/glewinfo.c | 8441 ---------------------------- src/glew/visualinfo.c | 1173 ---- 18 files changed, 8 insertions(+), 41299 deletions(-) Revert "glew: update to version 1.5.4" This reverts commit a189b1c53b6a3b6c055cc86145c8ef48c580e9d0. Revert "glew: Include X11 headers and libraries in SCons build." This reverts commit efdd33985cb38429aeae845a556db2322957e71a. Revert "scons: Fix GLEW build on Mac OS X." This reverts commit 8f81769148eab0042ffb7192a702350275648715. Revert "scons: Use static glew library on Unices to avoid binary compatability issues" This reverts commit de22c940a1df66d13825dd15c015eafabb61a11d. Revert "glew: Update to version 1.5.2." This reverts commit aaf7ecfd816f82fef314f4f772cc53bc0ced553e. Revert "scons: Build glew on all platforms." This reverts commit 52eb3e4235cc661ab9626a704c555a5f096c628a. Revert "scons: Put glut and glew shared libraries into build/xxx/bin or lib." This reverts commit 8a318edd0838ee3343be0425019d93541b621567. Didn't revert scons/gallium.py Revert "scons: Fix glew build on MSVC." This reverts commit 14a8c9dac7ea43ad8a45052e17f7127451344e5a. Revert "scons: Build progs together with everything else." This reverts commit 7bbf7f94ea786e41ff1364cedaf7dd5c0bbf605a. Only changed src/glew/SConscript Revert "mesa: include glew headers in MesaDemos tarballs" This reverts commit c57d81ddc9ba3052ff7f6b72091accab2c2db0ae. Revert "mesa: include GLEW sources in MesaDemos tarball" This reverts commit b9e2e32daf5505896a662dc8df60104c0f51b4b9. Revert "glew: correct misspelling of glFramebufferTextureLayer" This reverts commit 1b05b5b4fecd9ac8ef34abdda6c085868016ad84. Revert "glew: fix GLEW_LIB_NAME" This reverts commit c10df26a31b6af5a720fbfd06411d580cd38a2c8. Revert "Add dummy install target for glew to fix 'make install'" This reverts commit c273dfe6a28d4bb64ce167685b4053d22db5a727. Revert "autoconf: Add GLEW needed by progs when building GLUT" This reverts commit 2977cee38e21b8e5ebba1635b101185d64ee44a9. Revert "glew: Build it as a static lib." This reverts commit fcf9353fea8343a1a86c8c6e0144c8429440c648. Revert "glew: Initial import." This reverts commit 57d00016cab9afa3e7853d9830044a8ece9541c4.
* | mesa: remove PROGRAM_DIRS from config filesBrian Paul2010-06-0419-22/+0
| |
* | autoconf: Remove unused APIS.Chia-I Wu2010-05-311-1/+0
| | | | | | | | It was used by glapi, which has been moved to mapi.
* | update linux-fbdev configBrian Paul2010-05-271-2/+2
| |
* | rbug: Break out of traceJakob Bornecrantz2010-05-123-3/+3
| |
* | mesa/es: Merge back to core mesa.Chia-I Wu2010-05-121-0/+1
| | | | | | | | | | | | With the omit list gone, there are not too many differences in building core mesa and ES overlay. Remove the mesa/es and build both of them in src/mesa/Makefile.
* | osmesa: add mapi/glapi to SRC_DIRS to fix buildBrian Paul2010-05-093-3/+3
| |
* | gallium: Add egl-apis target.Chia-I Wu2010-05-082-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new target installs client API modules to EGL_DRIVER_INSTALL_DIR. They are used by st/egl. The client APIs are built from OpenGL and OpenVG state trackers. For this to work, st/vega is modified to produce a static library, libvega.a, instead. st/es is also not needed any more. It is removed and --with-state-trackers=es is replaced by --enable-gles-overlay. As st/egl now has its own client API modules, this solves the ABI issue between st/egl and client APIs, as long as the client API modules are distributed with st/egl. Plus, this allows st/egl to support OpenGL with non-Gallium libGL.so.
* | Define OpenGL ES and OpenVG library names.Chia-I Wu2010-05-082-0/+25
| | | | | | | | | | | | Define <API>_LIB, <API>_LIB_NAME, <API>_LIB_GLOB, and some other variables in the configs. Fix a typo in glesv1_cm.pc.in where an inexistent variable is used.