| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| | |
|
| |
| |
| |
| | |
Also set the correct release date.
|
| | |
|
| | |
|
|\| |
|
| | |
|
|\|
| |
| |
| |
| |
| | |
Conflicts:
scons/crossmingw.py
scons/gallium.py
|
| | |
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Brian Paul <[email protected]>
|
|\| |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into debian-experimental
Conflicts:
progs/tests/getprocaddress.c
progs/tests/vparray.c
progs/trivial/tri-fbo-tex-mip.c
progs/trivial/tri-fbo-tex.c
scons/gallium.py
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
progs/egl/eglgears.c
progs/egl/eglscreen.c
progs/fp/Makefile
progs/fp/SConscript
progs/rbug/simple_server.c
progs/tests/getprocaddress.c
progs/tests/interleave.c
progs/tests/texwrap.c
progs/tests/vparray.c
progs/vp/vp-tris.c
src/glut/glx/win32_menu.c
|
| | |
|
| | |
|
| | |
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gallium/auxiliary/util/u_network.c
src/gallium/auxiliary/util/u_network.h
src/gallium/drivers/i915/i915_state.c
src/gallium/drivers/trace/tr_rbug.c
src/gallium/state_trackers/vega/bezier.c
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/xorg/xorg_crtc.c
src/gallium/state_trackers/xorg/xorg_driver.c
src/gallium/winsys/xlib/xlib_brw_context.c
src/mesa/main/mtypes.h
|
| | | |
|
| | | |
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
progs/tests/bug_texstore_i8.c
progs/tests/crossbar.c
progs/tests/cva.c
progs/tests/fptest1.c
progs/tests/invert.c
progs/tests/packedpixels.c
progs/tests/quads.c
progs/tests/scissor-viewport.c
progs/tests/scissor.c
progs/tests/stencilwrap.c
progs/tests/tex1d.c
progs/tests/unfilledclip.c
progs/tests/vpeval.c
progs/trivial/clear-fbo-tex.c
progs/trivial/createwin.c
progs/trivial/dlist-begin-call-end.c
progs/trivial/draw2arrays.c
progs/trivial/drawarrays.c
progs/trivial/tri-blend-max.c
progs/trivial/tri-blend-min.c
progs/trivial/tri-blend-revsub.c
progs/trivial/tri-blend-sub.c
progs/trivial/tri-blend.c
progs/trivial/tri-fbo-tex.c
progs/trivial/tri-fp.c
progs/trivial/tri-logicop-none.c
progs/trivial/tri-logicop-xor.c
progs/trivial/tri-z.c
progs/trivial/vbo-drawarrays.c
progs/trivial/vbo-noninterleaved.c
src/glut/glx/glut_menu.c
|
| | | |
|
| | | |
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/mesa/drivers/dri/unichrome/via_ioctl.c
src/mesa/drivers/dri/unichrome/via_screen.c
src/mesa/main/version.h
src/mesa/state_tracker/st_atom.c
|
| | | |
|
|\| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doxygen/gallium.doc
progs/egl/demo1.c
progs/egl/demo2.c
progs/egl/demo3.c
progs/egl/eglgears.c
progs/egl/eglinfo.c
progs/slang/cltest.c
progs/slang/vstest.c
progs/tests/arbgpuprog.c
progs/tests/getprocaddress.c
progs/tests/getteximage.c
progs/tests/mipmap_limits.c
progs/tests/packedpixels.c
progs/tests/sharedtex.c
progs/tests/texcmp.c
progs/tests/texcomp_image.h
progs/tests/texcompsub.c
progs/tests/zreaddraw.c
scons/crossmingw.py
scons/dxsdk.py
scons/gallium.py
scons/generic.py
scons/llvm.py
scons/winddk.py
src/gallium/state_trackers/xorg/xvmc/tests/.gitignore
src/gallium/state_trackers/xorg/xvmc/tests/test_context.c
src/gallium/state_trackers/xorg/xvmc/tests/test_rendering.c
src/gallium/state_trackers/xorg/xvmc/tests/testlib.c
src/gallium/state_trackers/xorg/xvmc/tests/xvmc_bench.c
src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
windows/VC7/mesa/mesa/mesa.vcproj
|
| |\| |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
progs/demos/projtex.c
progs/xdemos/glxinfo.c
src/mesa/main/version.h
To fix the confilicts in projtex.c and glxinfo.c I just took the code from
mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from
mesa_7_7_branch to mesa_7_6_branch followed by commmits just to
mesa_7_6_branch.
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This is pretty old and needs some updating but might be useful or
interesting to some people.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/mesa/drivers/windows/gdi/mesa.def
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/mesa/drivers/dri/intel/intel_fbo.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_mipmap_tree.h
src/mesa/drivers/dri/intel/intel_tex_copy.c
src/mesa/drivers/dri/intel/intel_tex_image.c
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
git+ssh://[email protected]/git/mesa/mesa
regenerated lex.yy.c
|
| | | | | | | | |
|
| |\ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Probably need to bump other version requirements too...
|
| |\ \ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ \
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
|
| |\ \ \ \ \ \ \ \ \ \ |
|
| | | | | | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | |
| | | | | | | | | | | | | |
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/softpipe/sp_tile_cache.c
src/mesa/main/version.h
|