aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program/program.c
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised line endinge with release branchmarha2011-09-121-1080/+1080
|
* Merge remote-tracking branch 'origin/released'marha2011-08-051-3/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/texcompress_rgtc_tmp.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_print.c mesalib/src/mesa/program/prog_statevars.c mesalib/src/mesa/program/program.c mesalib/src/mesa/program/program_parse.y mesalib/src/mesa/program/program_parser.h mesalib/src/mesa/program/sampler.cpp mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/vbo/vbo_exec_array.c pixman/pixman/pixman-arm-neon-asm.S pixman/pixman/pixman-arm-neon.c
| * mesa pixman git update 5 aug 2011marha2011-08-051-3/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-151-6/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c
| * xserver libX11 mesa git update 15 Julymarha2011-07-151-6/+8
| |
* | svn merge ^/branches/released .marha2011-04-271-1/+0
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-1077/+1076
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-1077/+1077
|
* xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-1077/+1077
|
* xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-131-1/+1
|
* libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-1077/+1077
|
* xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-1074/+1077
|
* xkeyboard-config and mesa git update 9/1/2011marha2011-01-091-0/+1
|
* xserver and mesa git update 28-12-2010marha2010-12-281-976/+1073
|
* Added missing needed files for mesalibmarha2010-11-231-0/+976