aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-182-5/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-5/+21
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-121-6/+27
|\| | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
| * mesa git update 12 July 2011marha2011-07-121-6/+27
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-114-1578/+2018
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-114-1578/+2018
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-075-250/+313
|\| | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/opt_constant_propagation.cpp mesalib/src/mesa/program/ir_to_mesa.cpp
| * mesa xkbcomp git update 7 Juli 2011marha2011-07-075-250/+313
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0112-621/+732
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp 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_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp 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.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
| * xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Julimarha2011-07-0112-621/+732
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-271-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c fontconfig/src/fcmatch.c mesalib/include/GL/internal/dri_interface.h mesalib/src/glsl/main.cpp mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_format.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/blitters-test.c
| * xwininfo fontconfig mesa pixman git update 27 June 2011marha2011-06-271-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-211-5/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c
| * fontconfig mesa git update 21 June 2011marha2011-06-211-5/+36
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-201-181/+181
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-181/+181
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-131-190/+204
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
| * libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵marha2011-06-131-190/+204
| | | | | | | | update 13 Jun 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-052-2/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de
| * libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011marha2011-06-052-2/+2
| |
* | Added gitignore filesmarha2011-05-302-0/+8
| |
* | svn merge ^/branches/released .marha2011-05-221-4/+4
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-213/+213
| | | | | | | | May 2011
* | svn merge ^/branches/released .marha2011-05-103-0/+14
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-103-0/+14
| |
* | svn merge ^/branches/released .marha2011-05-041-1/+1
|\|
| * libX11 mesa glproto git update 4 May 2011marha2011-05-041-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-033-0/+32
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-033-0/+32
| |
* | svn merge ^/branches/released .marha2011-04-275-32/+58
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-275-1322/+1348
| |
* | 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-04-143-541/+532
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-143-86/+77
| |
* | svn merge ^/branches/released .marha2011-04-121-13/+12
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-121-13/+12
| |
* | svn merge ^/branches/released .marha2011-03-304-423/+767
|\|
| * mesa git update 30 Mar 2011marha2011-03-304-1643/+1987
| |
* | svn merge ^/branches/released .marha2011-03-286-631/+708
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-286-1156/+1233
| |
* | svn merge ^/branches/released .marha2011-03-174-184/+188
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-174-5072/+5076
| |
* | svn merge ^/branches/released .marha2011-03-1510-2803/+2862
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-1510-5310/+5369
| |
* | svn merge ^/branches/released .marha2011-03-131-1/+1
|\|
| * xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-131-478/+478
| |
* | svn merge ^/branches/released .marha2011-03-122-106/+111
|\|
| * libX11 pixman mesa git update 12 Mar 2011marha2011-03-122-667/+672
| |
* | svn merge ^/branches/released .marha2011-03-103-426/+462
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 10:47:37 +0000