aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/glcpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-251-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-251-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-141-0/+3
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-141-0/+3
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-041-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-041-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-40/+49
|\| | | | | | | | | | | | | | | | | 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-40/+49
| | | | | | | | update 5 oct 2011
* | Synchronised line endinge with release branchmarha2011-09-121-1906/+1906
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-121-129/+130
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/common/spantmp2.h mesalib/src/mesa/drivers/dri/common/utils.c mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h
| * git update 12 sep 2011marha2011-09-121-121/+122
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-291-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+3
| | | | | | | | aug 2011
* | Added gitignore filesmarha2011-05-301-0/+4
| |
* | svn merge ^/branches/released .marha2011-05-101-0/+4
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-101-0/+4
| |
* | svn merge ^/branches/released .marha2011-04-271-1/+5
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-1/+5
| |
* | svn merge ^/branches/released .marha2011-04-151-1896/+1896
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-151-38/+38
| |
* | svn merge ^/branches/released .marha2011-03-052-139/+133
|\|
| * xserver libxcb mesa git update 5 Mar 2011marha2011-03-052-451/+445
| |
* | svn merge ^/branches/released .marha2011-03-042-369/+320
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-042-71/+22
| |
* | svn merge ^/branches/released .marha2011-03-023-7003/+0
|\|
| * xkeyboard-config mesa git update 2 Mar 2011marha2011-03-023-7003/+0
| |
* | svn merge ^/branches/released .marha2011-02-142-4310/+4322
|\|
| * xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011marha2011-02-122-4310/+4322
| |
* | svn merge ^/branches/released .marha2011-02-031-1/+6
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-031-1/+6
| |
* | svn merge ^/branches/released .marha2011-02-018-9268/+9265
|\|
| * libX11 libXinerama mesa git update 1 Feb 2011marha2011-02-018-9260/+9257
| |
* | svn merge ^/branches/released .marha2011-01-293-6161/+6138
|\|
| * libXext libfontenc libXau libX11 libXinerama mesa libXdmcp git update 28 jan ↵marha2011-01-293-6161/+6138
| | | | | | | | 2011
* | svn merge ^/branches/released .marha2011-01-283-9/+32
|\|
| * libfontenc libXau libxcb mesalib git update 28 jan 2011marha2011-01-283-9/+32
| |
* | svn merge ^/branches/released .marha2011-01-272-6102/+6106
|\|
| * pixman and mesalib git update 27 jan 2011marha2011-01-272-6102/+6106
| |
* | svn merge ^/branches/released .marha2011-01-222-242/+238
|\|
| * mesalib git update 22/1/2011marha2011-01-222-242/+238
| |
* | svn merge ^/branches/released .marha2011-01-122-185/+229
|\|
| * xkeyboard-config libX11 mesalib git update 12 jan 2011marha2011-01-122-185/+229
| |
* | svn merge ^/branches/released .marha2010-12-296-9189/+9247
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-286-9181/+9239
| |
* | svn merge ^/branches/released .marha2010-11-291-0/+8
|/
* Updated to mesalib 7.9marha2010-11-229-0/+9702
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 16:54:30 +0000