aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-262-4/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH11.xml mesalib/src/glsl/main.cpp mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/get.c mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.h xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/man/Xquartz.man xorg-server/hw/xquartz/xpr/dri.c xorg-server/xkeyboard-config/symbols/ee
| * libX11 libXext mesa pixman xserver xkeyboard-config git update 26 July 2011marha2011-07-262-4/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-181-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-152-216/+227
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-216/+227
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-071-16/+12
|\| | | | | | | | | | | | | | | 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-071-16/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-011-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-1/+3
| | | | | | | | 2011
* | Added gitignore filesmarha2011-05-301-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-292-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.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_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in
| * libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011marha2011-05-292-1/+3
| |
* | merge ^/branches/released .marha2011-05-121-0/+6
|\|
| * libxcb mesa xcb-proto git update 12 May 2011marha2011-05-121-0/+6
| |
* | svn merge ^/branches/released .marha2011-05-102-16/+25
|\|
| * libfontenc pixman mesa git update 10 May 2011marha2011-05-102-16/+25
| |
* | svn merge ^/branches/released .marha2011-05-091-1/+1
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-091-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-032-3/+3
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-032-3/+3
| |
* | svn merge ^/branches/released .marha2011-05-023-7/+27
|\|
| * mesa git update 1 May 2011marha2011-05-023-591/+611
| |
* | svn merge ^/branches/released .marha2011-04-301-455/+517
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-301-455/+517
| |
* | svn merge ^/branches/released .marha2011-04-291-0/+7
|\|
| * xserver mesa git update 28 Apr 2011marha2011-04-291-1089/+1096
| |
* | svn merge ^/branches/released .marha2011-04-281-1/+5
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-1/+5
| |
* | svn merge ^/branches/released .marha2011-04-278-369/+493
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-278-1105/+1229
| |
* | svn merge ^/branches/released .marha2011-04-143-255/+295
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-143-299/+339
| |
* | svn merge ^/branches/released .marha2011-04-122-3/+3
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-122-3277/+3277
| |
* | svn merge ^/branches/released .marha2011-04-062-408/+375
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-062-4386/+4353
| |
* | svn merge ^/branches/released .marha2011-04-011-3/+14
|\|
| * libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 ↵marha2011-04-011-1250/+1261
| | | | | | | | Apr 2011
* | svn merge ^/branches/released .marha2011-03-306-56/+64
|\|
| * mesa git update 30 Mar 2011marha2011-03-306-5602/+5610
| |
* | svn merge ^/branches/released .marha2011-03-201-20/+0
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-20/+0
| |
* | svn merge ^/branches/released .marha2011-03-171-2/+2
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-1077/+1077
| |
* | svn merge ^/branches/released .marha2011-03-151-5/+3
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-5/+3
| |
* | svn merge ^/branches/released .marha2011-03-131-1/+1
|\|
| * xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011marha2011-03-131-1/+1
| |
* | svn merge ^/branches/released .marha2011-03-124-5/+117
|\|