Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into opengl-es-v2 | Chia-I Wu | 2010-01-12 | 1 | -7/+9 |
|\ | | | | | | | | | Conflicts: src/mesa/main/dd.h | ||||
| * | makefile: added src/glsl/Makefile.template to tarball list | Brian Paul | 2010-01-07 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'i965g-restart' | Keith Whitwell | 2009-12-22 | 1 | -0/+1 |
| |\ | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| | * | Merge commit 'origin/master' into i965g-restart | Keith Whitwell | 2009-12-21 | 1 | -5/+2 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SConstruct configs/default configs/linux-dri | ||||
| | * | | i965g: add standalone xlib debug winsys | Keith Whitwell | 2009-11-04 | 1 | -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 Paul | 2009-12-21 | 1 | -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_rc3 | Ian Romanick | 2009-12-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Remove grammar module -- no dependencies left. | Michal Krol | 2009-12-12 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'master' into glsl-pp-rework-2 | Michal Krol | 2009-12-12 | 1 | -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_rc2 | Ian Romanick | 2009-12-07 | 1 | -1/+1 |
| | | |/ | | |/| | | | | | | | | | Also modify the Makefile to use the correct version for the tarballs. | ||||
| | * | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-11-30 | 1 | -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 tarballs | Brian Paul | 2009-11-19 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | Only VC8 project file is known to work. | ||||
| | | * | mesa: bump version to 7.6.1 | Brian Paul | 2009-09-29 | 1 | -1/+1 |
| | | | | |||||
| | | * | Prep for 7.6 release | Ian Romanick | 2009-09-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Build mesa glsl with make. | michal | 2009-12-10 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Still don't know how to add glsl to mesa dependencies. | ||||
* | | | | Clean up ES_FILES. | Chia-I Wu | 2010-01-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> | ||||
* | | | | Add new config for OpenGL ES. | Chia-I Wu | 2009-11-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> | ||||
* | | | | mesa/es: Add OpenGL ES overlay. | Chia-I Wu | 2009-11-05 | 1 | -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 <[email protected]> | ||||
* | | | mesa: assorted top-level Makefile clean-ups | Brian Paul | 2009-10-14 | 1 | -11/+11 |
| | | | |||||
* | | | mesa: add progs/objviewer to tarball list | Brian Paul | 2009-10-01 | 1 | -0/+6 |
|/ / | |||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-09-10 | 1 | -0/+1 |
|\| | |||||
| * | mesa: include new u_format.csv file in tarballs | Brian Paul | 2009-09-09 | 1 | -0/+1 |
| | | |||||
* | | mesa: bump version to 7.7 | Brian Paul | 2009-09-08 | 1 | -1/+1 |
|/ | |||||
* | mesa: add new program parser sources to tarball | Brian Paul | 2009-08-24 | 1 | -1/+2 |
| | | | | | The end user doesn't need the .y or .l or Makefile but include them anyway in case someone wants to patch or debug things. | ||||
* | mesa: make sure r300/compiler/ sources are included in tarball | Thierry Vignaud | 2009-08-14 | 1 | -0/+2 |
| | |||||
* | mesa: added *.shtest files to demo tarball | Brian Paul | 2009-08-13 | 1 | -0/+1 |
| | |||||
* | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-07-28 | 1 | -0/+10 |
|\ | | | | | | | | | | | | | | | | | Conflicts: Makefile configs/default docs/relnotes.html src/mesa/main/version.h | ||||
| * | mesa: include glew headers in MesaDemos tarballs | Brian Paul | 2009-07-23 | 1 | -0/+3 |
| | | |||||
| * | mesa: bump version to 7.5.1 | Brian Paul | 2009-07-22 | 1 | -1/+1 |
| | | |||||
| * | mesa: include GLEW sources in MesaDemos tarball | Brian Paul | 2009-07-22 | 1 | -0/+7 |
| | | |||||
| * | mesa: set version to 7.5 | Brian Paul | 2009-07-17 | 1 | -1/+1 |
| | | |||||
| * | mesa: bump version to 7.5-rc4 | Brian Paul | 2009-06-26 | 1 | -1/+1 |
| | | |||||
| * | mesa: bump version to 7.5-rc3mesa_7_5_rc3 | Brian Paul | 2009-06-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-05-18 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h | ||||
| * | mesa: added linux-osmesa-static config | Brian Paul | 2009-05-18 | 1 | -0/+1 |
| | | | | | | | | Contributed by Nicolas Noble. See SF bug #2792536 | ||||
| * | mesa: bump version to 7.5-rc2mesa_7_5_rc2 | Brian Paul | 2009-05-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-05-11 | 1 | -7/+1 |
|\| | | | | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h | ||||
| * | mesa: added more gallium Makefiles to tarball list | Brian Paul | 2009-05-09 | 1 | -0/+1 |
| | | |||||
| * | mesa: omit files that were removed from gitmesa_7_5_rc1 | Brian Paul | 2009-05-08 | 1 | -7/+0 |
| | | |||||
| * | mesa: set version to 7.5-rc1 | Brian Paul | 2009-05-08 | 1 | -1/+1 |
| | | |||||
* | | mesa: bump version to 7.6 (devel) | Brian Paul | 2009-05-01 | 1 | -1/+1 |
|/ | |||||
* | mesa: add distclean target to top-level Makefile | Brian Paul | 2009-04-16 | 1 | -1/+4 |
| | |||||
* | mesa: add wglext.h to tarball list | Brian Paul | 2009-03-05 | 1 | -0/+1 |
| | |||||
* | mesa: added GLES 1/2 headers to tarball file list | Brian Paul | 2009-02-24 | 1 | -0/+2 |
| | |||||
* | mesa: add EGL headers to tarball list | Brian Paul | 2009-02-24 | 1 | -0/+1 |
| | |||||
* | mesa: add gallium and egl files to tarball list | Brian Paul | 2009-02-24 | 1 | -1/+32 |
| | |||||
* | mesa: remove removed VMS files from Makefile | Brian Paul | 2009-02-24 | 1 | -11/+0 |
| | | | | I'll help Jouk restore these someday if he's still maintaining VMS support... | ||||
* | mesa: s/sources/sources.mak/ in Makefile | Brian Paul | 2009-02-24 | 1 | -1/+1 |
| | |||||
* | Revert "mesa: added new linux-gallium and linux-gallium-debug configs" | Jakob Bornecrantz | 2009-02-10 | 1 | -2/+0 |
| | | | | | | | This reverts commit abbe96cb6e7581a52652030e40442b943a482840. It only reverts parts of the commit the other parts where related to libmesagallium changes. | ||||
* | mesa: added new linux-gallium and linux-gallium-debug configs | Brian Paul | 2009-02-09 | 1 | -0/+2 |
| | | | | | | | Also, remove gallium-related things from configs/default. They're in linux-gallium now. So the default builds are the same as they have been for Mesa/master. |