aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/bufferobj.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-04-131-0/+30
|\
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-131-0/+30
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-051-6/+6
|\|
| * libfontenc xserver pixman mesa git update 5 Mar 2012marha2012-03-051-6/+6
| | | | | | | | | | | | | | font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2
* | Merge remote-tracking branch 'origin/released'marha2012-02-061-93/+45
|\|
| * mesa git update 6 feb 2012marha2012-02-061-93/+45
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-281-7/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winkeynames.h xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwndproc.c
| * mesa xserver git update 28 jan 2012marha2012-01-281-7/+20
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-201-13/+31
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-201-13/+31
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-091-1/+4
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-091-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-061-7/+11
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-061-7/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-291-20/+6
|\|
| * mesa git update 29 nov 2011marha2011-11-291-20/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-1/+12
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-1/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-051-2/+2
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-201-0/+11
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-201-0/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-051-1/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_in.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/swrast/s_context.c mesalib/src/mesa/swrast/s_readpix.c
| * git update libxcb mesa 5 sep 2011marha2011-09-051-1/+23
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-291-62/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c libX11/configure.ac libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.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/CH12.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml libxcb/configure.ac libxcb/src/c_client.py libxcb/src/xcb_auth.c libxcb/src/xcb_util.c mesalib/common.py mesalib/configs/linux-dri mesalib/docs/GL3.txt mesalib/docs/download.html mesalib/docs/install.html mesalib/include/GL/internal/dri_interface.h mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_math.h 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/glcpp/glcpp-parse.y 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_clone.cpp mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/glsl/opt_tree_grafting.cpp mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_XML.py mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mapi/mapi/u_thread.c mesalib/src/mapi/mapi/u_thread.h mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c mesalib/src/mesa/main/api_arrayelt.c mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pbo.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shared.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/program/register_allocate.c mesalib/src/mesa/program/register_allocate.h mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/swrast/s_context.c mesalib/src/mesa/tnl/t_draw.c mesalib/src/mesa/vbo/vbo_exec_array.c mesalib/src/mesa/vbo/vbo_save_api.c pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-inlines.h pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h xorg-server/configure.ac xorg-server/fb/fbblt.c xorg-server/hw/xquartz/darwin.c xorg-server/xkeyboard-config/symbols/de
| * xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29marha2011-08-291-62/+22
| | | | | | | | aug 2011
* | Merge remote-tracking branch 'origin/released'marha2011-07-151-1918/+1917
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1918/+1917
| |
* | svn merge ^/branches/released .marha2011-05-221-8/+7
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-8/+7
| | | | | | | | May 2011
* | svn merge ^/branches/released .marha2011-04-061-0/+5
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-0/+5
| |
* | svn merge ^/branches/released .marha2011-03-201-37/+33
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-37/+33
| |
* | svn merge ^/branches/released .marha2011-03-121-0/+1
|\|
| * libX11 pixman mesa git update 12 Mar 2011marha2011-03-121-1917/+1918
| |
* | svn merge ^/branches/released .marha2011-03-081-0/+1
|\|
| * xkeyboard-config mesa git update 8 Mar 2011marha2011-03-081-0/+1
| |
* | svn merge ^/branches/released .marha2011-03-021-242/+0
|\|
| * pixman mesa git update 1 Mar 2011marha2011-03-011-242/+0
| |
* | svn merge ^/branches/released .marha2011-02-091-0/+13
|\|
| * libX11 mesa git update 9 Feb 2011marha2011-02-091-2145/+2158
| |
* | svn merge ^/branches/released .marha2011-01-081-0/+2
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-0/+2
| |
* | svn merge ^/branches/released .marha2010-12-291-2142/+2143
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-2142/+2143
| |
* | svn merge ^/branches/released .marha2010-11-291-32/+76
|\|
| * Updated to mesalib 7.9marha2010-11-221-32/+76
| |
| * Updated to following packages:marha2010-04-021-56/+497
| | | | | | | | | | mesa-7.8
* | svn merge -r524:HEAD "^/branches/released" .marha2010-04-121-56/+497
| |