aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/swrast
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-181-1516/+1505
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
| * pixman git update 18 July 2011marha2011-07-181-1516/+1505
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-112-4/+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-112-4/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-142-232/+896
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/swrast/s_texrender.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/xkeyboard-config/configure.in
| * libxcb mesa xkeyboard-config git update 14 June 2011marha2011-06-142-232/+896
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-081-230/+238
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.xml libX11/specs/libX11/CH02.xml libX11/specs/libX11/CH03.xml libX11/specs/libX11/CH04.xml libX11/specs/libX11/CH05.xml libX11/specs/libX11/CH06.xml libX11/specs/libX11/CH07.xml libX11/specs/libX11/CH08.xml libX11/specs/libX11/CH09.xml libX11/specs/libX11/CH11.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml mesalib/src/mesa/main/fbobject.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/test/input.c xorg-server/xkb/xkbfmisc.c
| * xserver libX11 mesa git update 8 Jun 2011marha2011-06-081-230/+238
| |
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-011-619/+616
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-301-619/+616
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/shaderapi.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_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.c
| * | mesa git update 30 May 2011marha2011-05-301-619/+616
| |/
* | svn merge ^/branches/released .marha2011-05-223-0/+414
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-223-5563/+5977
| | | | | | | | May 2011
* | svn merge ^/branches/released .marha2011-04-276-22/+29
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-276-2153/+2160
| |
* | svn merge ^/branches/released .marha2011-04-125-147/+150
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-125-3060/+3063
| |
* | svn merge ^/branches/released .marha2011-04-061-6/+1
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-6/+1
| |
* | svn merge ^/branches/released .marha2011-03-201-1/+2
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-1/+2
| |
* | svn merge ^/branches/released .marha2011-03-122-3/+5
|\|
| * libX11 pixman mesa git update 12 Mar 2011marha2011-03-122-3/+5
| |
* | svn merge ^/branches/released .marha2011-03-101-32/+35
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-101-3311/+3314
| |
* | svn merge ^/branches/released .marha2011-03-024-6/+3
|\|
| * pixman mesa git update 1 Mar 2011marha2011-03-014-2224/+2221
|/
* xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-121-31/+0
|
* mesalib git update 16/1/2011marha2011-01-161-46/+46
|
* xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-082-2/+1
|
* xserver and mesa git update 28-12-2010marha2010-12-2855-22796/+22680
|
* Updated to mesalib 7.9marha2010-11-2228-49/+101
|
* Updated to following packages:marha2010-04-0238-1667/+418
| | | | | mesa-7.8
* Updated to Mesa 7.7marha2010-03-0713-1059/+229
|
* Forgotten files in previous commitmarha2009-12-221-0/+55
|
* Updated to mesa_7_6_1_rc1marha2009-12-221-1/+3
|
* Added MesaLib-7.6marha2009-10-0858-0/+24879
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 13:28:09 +0000