summaryrefslogtreecommitdiffstats
path: root/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* mesa: rename src/mesa/shader/ to src/mesa/program/Brian Paul2010-06-101-3/+3
|
* mesa: move shader/slang/* sources to main/slang/*Brian Paul2010-06-101-4/+4
| | | | Reduce the source tree depth a bit.
* glew: Drop glew now that we don't need it for the progsJakob Bornecrantz2010-06-081-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Remove last bits of progs/ infrastructureKristian Høgsberg2010-06-071-4/+0
|
* mesa: remove old references to demo files and progs subdirBrian Paul2010-06-041-64/+6
|
* progs: Remove remaining EGL demos.Chia-I Wu2010-05-211-12/+0
| | | | They have been moved to git+ssh://git.freedesktop.org/git/mesa/demos.
* Update file list for the tarballs.Chia-I Wu2010-05-081-23/+35
| | | | | | | Mainly for the recent work on mapi and gles. The latter adds some sources to src/mesa/main that are generated on the fly. This makes python a requirement for building Mesa. An alternative is to package those sources into the tarballs. That may be done in another commit.
* mesa: added Makefile.egl to GALLIUM_FILESBrian Paul2010-04-051-0/+1
|
* mesa: add missing file to GALLIUM_FILESThierry Vignaud2010-04-051-0/+1
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* Update DEMO_FILES for demos using EGL.Chia-I Wu2010-04-011-8/+12
| | | | | | | | Reflect the recent addtion of eglut and reorganization of the EGL demos. This helps remove ~2k lines of duplicated code $ git diff --shortstat -M 57cc1db87b5cacffd3344c49062c8289b7d46e78 18 files changed, 298 insertions(+), 2178 deletions(-)
* Merge branch '7.8'Brian Paul2010-03-231-0/+9
|\ | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/intel/intel_blit.c src/mesa/drivers/dri/intel/intel_pixel_copy.c src/mesa/main/version.h
| * Add missing EGL files to the tarballs.Chia-I Wu2010-03-231-0/+9
| | | | | | | | | | Add the Makefile of Gallium EGL drivers and demos using EGL to the tarballs.
| * mesa: set version string to 7.8-rc27.8-rc2Ian Romanick2010-03-221-1/+1
| |
* | Merge branch '7.8' into masterPauli Nieminen2010-03-171-15/+1
|\| | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h
| * Remove nonexistant files from tarballs rule of MakefileIan Romanick2010-03-161-15/+1
| | | | | | | | | | The Makefile should eventually be fixed to stop building tarballs if one of the individual calls to tar fails.
| * mesa: set version string to 7.8-rc1Ian Romanick2010-03-161-1/+1
| |
* | include/GL: drop more deprecated headersGeorge Sapountzis2010-03-061-1/+0
| |
* | mesa: bump version to 7.9Brian Paul2010-03-051-1/+1
|/ | | | Now that the 7.8 branch has been created Mesa/master will be version 7.9
* mesa: update tarball file list, bump version stringBrian Paul2010-02-261-7/+6
|
* drop header files and demos for dropped window systemsGeorge Sapountzis2010-02-261-1/+0
|
* drop linux-solo configsGeorge Sapountzis2010-02-261-3/+0
|
* Drop classic mesa svga driverKristian Høgsberg2010-02-251-2/+0
|
* Drop glide driverKristian Høgsberg2010-02-251-3/+0
|
* Remove GGI supportKristian Høgsberg2010-02-251-11/+0
|
* Remove dos driverKristian Høgsberg2010-02-251-3/+0
|
* Remove directfb supportKristian Høgsberg2010-02-251-7/+1
|
* glapi: fix es after mvGeorge Sapountzis2010-02-241-3/+3
|
* makefiles: Don't complaint about changing configs if the same one is reselected.José Fonseca2010-02-141-4/+7
| | | | | Otherwise it creates unnecessary pain when automating builds in a build server/farm.
* mesa: remove darwin-x86ppc and dangling darwin refs in MakefileBrian Paul2010-02-111-2/+0
|
* Retire miniglx and move the actual glx code up to src/glxKristian Høgsberg2010-02-091-3/+3
|
* Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-311-2/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/lp_flush.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/llvmpipe/lp_tile_cache.c src/mesa/state_tracker/st_cb_condrender.c
| * Merge branch 'master' into opengl-es-v2Chia-I Wu2010-01-121-7/+9
| |\ | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h
| * | Clean up ES_FILES.Chia-I Wu2010-01-051-2/+2
| | | | | | | | | | | | Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
| * | Add new config for OpenGL ES.Chia-I Wu2009-11-061-0/+1
| | | | | | | | | | | | Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
| * | mesa/es: Add OpenGL ES overlay.Chia-I Wu2009-11-051-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is primitive support for OpenGL ES. It uses a subset of mesa sources to build libesXgallium.a and libesXapi.a, where X is 1 for OpenGL ES 1.x, 2 for OpenGL ES 2.x. The static libraries serve the same purpose as libmesagallium.a and libglapi.a do for OpenGL. This is based on the work of opengl-es branch. Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
* | | Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-081-18/+20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/Makefile src/gallium/drivers/llvmpipe/SConscript src/gallium/drivers/llvmpipe/lp_bld_arit.c src/gallium/drivers/llvmpipe/lp_bld_flow.c src/gallium/drivers/llvmpipe/lp_bld_interp.c src/gallium/drivers/llvmpipe/lp_clear.c src/gallium/drivers/llvmpipe/lp_context.c src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/llvmpipe/lp_draw_arrays.c src/gallium/drivers/llvmpipe/lp_jit.c src/gallium/drivers/llvmpipe/lp_jit.h src/gallium/drivers/llvmpipe/lp_prim_vbuf.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_setup_point.c src/gallium/drivers/llvmpipe/lp_state.h src/gallium/drivers/llvmpipe/lp_state_blend.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_sampler.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_tex_cache.h src/gallium/drivers/llvmpipe/lp_tex_sample.h src/gallium/drivers/llvmpipe/lp_tile_cache.c
| * | makefile: added src/glsl/Makefile.template to tarball listBrian Paul2010-01-071-0/+1
| | |
| * | Merge branch 'i965g-restart'Keith Whitwell2009-12-221-0/+1
| |\ \ | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * \ Merge commit 'origin/master' into i965g-restartKeith Whitwell2009-12-211-5/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SConstruct configs/default configs/linux-dri
| | * | | i965g: add standalone xlib debug winsysKeith Whitwell2009-11-041-0/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a dummy winsys that just debug-prints on calls into the winsys functions. Will use this to get to the point where we are generating sane-looking debug dumps and diassembly. Also fix various warnings generated with the new compiler flags set in this config.
| * | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
| | * | | mesa: set version string to 7.7-rc3mesa_7_7_rc3Ian Romanick2009-12-161-1/+1
| | | | |
| * | | | Remove grammar module -- no dependencies left.Michal Krol2009-12-121-1/+0
| | | | |
| * | | | Merge branch 'master' into glsl-pp-rework-2Michal Krol2009-12-121-17/+20
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/perf/drawoverhead.c progs/perf/teximage.c progs/perf/vbo.c progs/perf/vertexrate.c src/mesa/shader/slang/library/slang_common_builtin_gc.h
| | * | | mesa: set version string to 7.7-rc1mesa_7_7_rc2Ian Romanick2009-12-071-1/+1
| | | |/ | | |/| | | | | | | | | Also modify the Makefile to use the correct version for the tarballs.
| | * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-11-301-5/+2
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
| | | * mesa: omit VC6, VC7 project files from tarballsBrian Paul2009-11-191-5/+2
| | | | | | | | | | | | | | | | Only VC8 project file is known to work.
| | | * mesa: bump version to 7.6.1Brian Paul2009-09-291-1/+1
| | | |
| | | * Prep for 7.6 releaseIan Romanick2009-09-281-1/+1
| | | |
| | * | mesa: assorted top-level Makefile clean-upsBrian Paul2009-10-141-11/+11
| | | |