aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/ast_to_hir.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-221-0/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+37
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-011-4/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
| * xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Julimarha2011-07-011-4/+12
| | | | | | | | 2011
* | svn merge ^/branches/released .marha2011-04-271-21/+39
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-21/+39
| |
* | svn merge ^/branches/released .marha2011-04-141-82/+64
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-141-82/+64
| |
* | svn merge ^/branches/released .marha2011-03-281-3/+10
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-3/+10
| |
* | svn merge ^/branches/released .marha2011-03-171-14/+17
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-3499/+3502
|/
* xserver libxcb mesa git update 5 Mar 2011marha2011-03-051-3461/+3499
|
* pixman mesa git update 1 Mar 2011marha2011-03-011-5/+3
|
* libX11 mesa git update 9 Feb 2011marha2011-02-091-0/+7
|
* libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-011-2/+2
|
* pixman and mesalib git update 27 jan 2011marha2011-01-271-3392/+3456
|
* mesalib git update 23/1/2011marha2011-01-231-13/+12
|
* mesalib git update 22/1/2011marha2011-01-221-3385/+3393
|
* xserver pixman mesa git update 19 jan 2011marha2011-01-191-1/+160
|
* mesa git update 14 jan 2011marha2011-01-141-3177/+3226
|
* mesalib pixman xkbcomp git update 13 jan 2011marha2011-01-131-2/+16
|
* xkeyboard-config libX11 mesalib git update 12 jan 2011marha2011-01-121-5/+5
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-5/+82
|
* xserver and mesa git update 28-12-2010marha2010-12-281-2769/+3086
|
* Updated to mesalib 7.9marha2010-11-221-0/+2769