aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-128-11282/+11402
|\ | | | | | | | | | | | | 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-128-11282/+11402
| |
* | Updated version to 1.10.3.01.10.3.0marha2011-07-114-3/+659
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-1140-8832/+10146
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1140-8832/+10146
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0713-954/+1013
|\| | | | | | | | | | | | | | | 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-0713-954/+1013
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-055-35/+238
|\| | | | | | | | | | | | | | | Conflicts: pixman/Makefile.am pixman/configure.ac pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-fast-path.h
| * git update pixman 5 July 2011marha2011-07-055-35/+238
| |
* | stdlib.h -> unistd.hmarha2011-07-041-1/+1
| |
* | Solved compile warningmarha2011-07-041-2/+3
| |
* | Added include path in dix to solve compile problemmarha2011-07-041-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0467-11991/+12418
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
| * xserver mesa git update 4 July 2011marha2011-07-0467-11970/+12397
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0167-6359/+6542
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0167-6351/+6571
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-2723-5593/+5714
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2723-5593/+5714
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-2330-4693/+4008
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/state.c mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/state_tracker/st_format.h pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-arm-neon.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h pixman/pixman/pixman.h xorg-server/configure.ac xorg-server/hw/xwin/man/XWin.man xorg-server/manpages.am
| * libX11 mesa pixman xserver git update 23 June 2011marha2011-06-2330-4693/+4008
| |
* | Solved compile errors and warningsmarha2011-06-222-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-229-4449/+4472
|\| | | | | | | | | | | | | Conflicts: xkbcomp/xkbcomp.c xkbcomp/xkbcomp.h xkbcomp/xkbparse.y
| * mesa xkbcomp git update 22 June 2011marha2011-06-229-4440/+4463
| |
* | Synchronised files with mesamarha2011-06-212-19/+28
| |
* | Added suo and sdf extensions to ignoremarha2011-06-211-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-2110-88/+79
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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-2110-88/+79
| |
* | Solved MSIL .netmodule or module compiled with /GL found; restarting link ↵marha2011-06-201-0/+1
| | | | | | | | with /LTCG
* | Merge remote-tracking branch 'origin/released'marha2011-06-2025-2390/+2309
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2025-2390/+2309
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-175-94/+434
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/context.c mesalib/src/mesa/main/fbobject.c
| * mesa git update 17 June 2011marha2011-06-175-94/+434
| |
* | Syncrhonised file with mesamarha2011-06-161-1084/+2644
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-1611-1787/+8441
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp
| * xserver xkeyboard-config xkbcomp git update 16 June 2011marha2011-06-1611-1787/+8441
| |
* | Solved compile errormarha2011-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-1515-5822/+5996
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h
| * mesa xserver git update 15 June 2011marha2011-06-1515-5821/+5996
| |
* | Solved compile time warningmarha2011-06-141-1/+1
| |
* | Synchronised gen.bat file with makefilemarha2011-06-142-1/+2
| |
* | Removed obsolute visual studio 2008 solution filemarha2011-06-141-63/+0
| |
* | Reflect changes in visual studio project filesmarha2011-06-146-2924/+4
| | | | | | | | Also deleted visual studio 2008 project files
* | Merge remote-tracking branch 'origin/released'marha2011-06-1417-2903/+4381
|\| | | | | | | | | | | | | | | | | | | | | 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-1417-2903/+4381
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-1329-1455/+9457
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1329-1455/+9457
| | | | | | | | update 13 Jun 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-104-134/+10
|\| | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am
| * xwininfo xkeyboard-config git update 10 juni 2011marha2011-06-104-134/+10
| |
* | Synchronised filesmarha2011-06-092-12/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-0934-16954/+17457
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 16:12:03 +0000