aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/texobj.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-08-051-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-151-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+4
| |
* | 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-06-201-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
| * libX11 xserver mesa git update 20 June 2011marha2011-06-201-0/+2
| |
* | merge ^/branches/released .marha2011-05-131-0/+1
|\|
| * mesa git update 13 May 2011marha2011-05-131-0/+1
| |
* | svn merge ^/branches/released .marha2011-05-091-0/+2
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-091-0/+2
| |
* | svn merge ^/branches/released .marha2011-04-121-44/+46
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-1274/+1276
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-1267/+1274
|
* xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-1265/+1267
|
* mesalib git update 16/1/2011marha2011-01-161-0/+1
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-0/+6
|
* xserver and mesa git update 28-12-2010marha2010-12-281-1236/+1258
|
* Updated to mesalib 7.9marha2010-11-221-3/+3
|
* Updated to following packages:marha2010-04-021-11/+11
| | | | | mesa-7.8
* Updated to Mesa 7.7marha2010-03-071-8/+7
|
* Updated to mesa_7_6_1_rc1marha2009-12-221-1/+1
|
* Added MesaLib-7.6marha2009-10-081-0/+1237
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 13:52:04 +0000