aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/framebuffer.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-09-081-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/relnotes.html mesalib/scons/gallium.py mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/colortab.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/get.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/texstate.c mesalib/src/mesa/swrast/s_drawpix.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h
| * mesa git update 8 sep 2011marha2011-09-081-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-291-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/texparam.c pixman/pixman/pixman-arm-neon-asm.S
| * libX11 mesa pixman git update 29 jul 2011marha2011-07-291-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-151-8/+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-8/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-111-2/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+8
| |
* | svn merge ^/branches/released .marha2011-04-151-1/+13
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-151-1085/+1097
|/
* xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-2/+2
|
* xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-1083/+1085
|
* xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-1/+1
|
* pixman mesa git update 1 Mar 2011marha2011-03-011-4/+1
|
* mesa git update 7 Feb 2011marha2011-02-071-1084/+1086
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-4/+4
|
* xserver and mesa git update 28-12-2010marha2010-12-281-1063/+1084
|
* Updated to mesalib 7.9marha2010-11-221-4/+54
|
* Updated to following packages:marha2010-04-021-23/+39
| | | | | mesa-7.8
* Updated to Mesa 7.7marha2010-03-071-30/+66
|
* Added MesaLib-7.6marha2009-10-081-0/+961