aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/linker.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-221-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/linker.cpp mesalib/src/glsl/s_expression.cpp mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c
| * mesa git update 22 July 2011marha2011-07-221-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/GL3.txt mesalib/src/glsl/linker.cpp mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/formats.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/readpix.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/samplerobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/texenv.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_cb_clear.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/swrast/s_readpix.c
| * mesa update 11 july 2011marha2011-07-111-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-071-33/+75
|\| | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/opt_constant_propagation.cpp mesalib/src/mesa/program/ir_to_mesa.cpp
| * mesa xkbcomp git update 7 Juli 2011marha2011-07-071-33/+75
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-211-5/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c
| * fontconfig mesa git update 21 June 2011marha2011-06-211-5/+36
| |
* | svn merge ^/branches/released .marha2011-04-271-6/+6
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-6/+6
| |
* | svn merge ^/branches/released .marha2011-03-301-0/+13
|\|
| * mesa git update 30 Mar 2011marha2011-03-301-0/+13
| |
* | svn merge ^/branches/released .marha2011-02-221-4/+0
|\|
| * xserver libX11 pixman mesa git update 22 Feb 2011marha2011-02-221-4/+0
| |
* | svn merge ^/branches/released .marha2011-02-161-1713/+1713
|\|
| * pixman mesa git update 16 Feb 2011marha2011-02-161-1/+1
|/
* mesa git update 7 Feb 2011marha2011-02-071-0/+14
|
* libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-11/+12
|
* pixman and mesalib git update 27 jan 2011marha2011-01-271-0/+26
|
* mesa xkeyboard-config git update 26 jan 2011marha2011-01-261-1676/+1672
|
* mesalib git update 22/1/2011marha2011-01-221-4/+0
|
* xkeyboard-config libX11 mesalib git update 12 jan 2011marha2011-01-121-0/+6
|
* xserver and mesa git update 28-12-2010marha2010-12-281-1505/+1674
|
* Updated to mesalib 7.9marha2010-11-221-0/+1505