git.libre-soc.org Git - mesa.git/commit

Merge branch 'gallium-0.1' into gallium-0.2

A first attempt at moving gallium onto a branch directly off master...

It will be interesting to see how much work this takes to get running.

Have resolved the conflicts semi-arbitarily, not compiled or tested.

Conflicts:

.gitignore
Makefile
configs/config.mgw
configs/darwin
configs/darwin-x86ppc
configs/default
configs/freebsd-dri
configs/linux-dri
configs/linux-dri-xcb
configs/linux-fbdev
configs/linux-static
configs/linux-x86-64-static
configs/linux-x86-static
doxygen/Makefile
include/GL/gl.h
progs/demos/Makefile
progs/demos/descrip.mms
progs/demos/texenv.c
progs/egl/.gitignore
progs/egl/Makefile
progs/glsl/.gitignore
progs/glsl/Makefile
progs/glsl/convolutions.c
progs/samples/Makefile.mgw
progs/tests/.gitignore
progs/trivial/.gitignore
progs/trivial/point-param.c
progs/trivial/tri.c
progs/xdemos/.gitignore
progs/xdemos/glthreads.c
src/egl/drivers/demo/Makefile
src/egl/drivers/dri/Makefile
src/egl/main/Makefile
src/glu/Makefile
src/glu/sgi/Makefile
src/glu/sgi/Makefile.mgw
src/glut/glx/Makefile.mgw
src/glut/os2/WarpWin.cpp
src/glut/os2/glut_cindex.cpp
src/glut/os2/glut_gamemode.cpp
src/glut/os2/glut_win.cpp
src/glut/os2/glut_winmisc.cpp
src/glut/os2/os2_glx.cpp
src/glut/os2/os2_menu.cpp
src/glut/os2/os2_winproc.cpp
src/glw/Makefile
src/glx/x11/dri_glx.c
src/glx/x11/glxext.c
src/mesa/Makefile
src/mesa/Makefile.mgw
src/mesa/descrip.mms
src/mesa/drivers/beos/Makefile
src/mesa/drivers/common/descrip.mms
src/mesa/drivers/common/driverfuncs.c
src/mesa/drivers/directfb/Makefile
src/mesa/drivers/dri/Makefile.template
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_bufmgr.h
src/mesa/drivers/dri/common/dri_util.c
src/mesa/drivers/dri/common/extension_helper.h
src/mesa/drivers/dri/common/mmio.h
src/mesa/drivers/dri/common/utils.c
src/mesa/drivers/dri/common/utils.h
src/mesa/drivers/dri/glcore/Makefile
src/mesa/drivers/dri/i810/i810screen.c
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/drivers/dri/i915/intel_ioctl.h
src/mesa/drivers/dri/i915/intel_screen.c
src/mesa/drivers/dri/i915/server/i830_common.h
src/mesa/drivers/dri/i915/server/i830_dri.h
src/mesa/drivers/dri/i965/intel_screen.c
src/mesa/drivers/dri/i965/server/i830_common.h
src/mesa/drivers/dri/i965/server/i830_dri.h
src/mesa/drivers/dri/mach64/mach64_screen.c
src/mesa/drivers/dri/nouveau/nouveau_context.h
src/mesa/drivers/dri/nouveau/nouveau_fifo.c
src/mesa/drivers/dri/nouveau/nouveau_fifo.h
src/mesa/drivers/dri/nouveau/nouveau_screen.c
src/mesa/drivers/dri/nouveau/nouveau_screen.h
src/mesa/drivers/dri/r128/r128_tex.h
src/mesa/drivers/dri/savage/savageioctl.h
src/mesa/drivers/fbdev/Makefile
src/mesa/drivers/osmesa/Makefile
src/mesa/drivers/osmesa/descrip.mms
src/mesa/drivers/x11/Makefile
src/mesa/drivers/x11/descrip.mms
src/mesa/drivers/x11/xm_dd.c
src/mesa/glapi/glapi.c
src/mesa/glapi/glthread.c
src/mesa/main/api_validate.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/bufferobj.h
src/mesa/main/buffers.c
src/mesa/main/config.h
src/mesa/main/context.c
src/mesa/main/descrip.mms
src/mesa/main/drawpix.c
src/mesa/main/enums.c
src/mesa/main/fbobject.c
src/mesa/main/glheader.h
src/mesa/main/imports.c
src/mesa/main/mipmap.c
src/mesa/main/mm.c
src/mesa/main/mm.h
src/mesa/main/mtypes.h
src/mesa/main/points.c
src/mesa/main/sources
src/mesa/main/state.c
src/mesa/main/texcompress_fxt1.c
src/mesa/main/texenvprogram.c
src/mesa/main/texobj.c
src/mesa/main/texstate.c
src/mesa/main/texstore.c
src/mesa/math/descrip.mms
src/mesa/shader/arbprogram.c
src/mesa/shader/descrip.mms
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_statevars.c
src/mesa/shader/prog_statevars.h
src/mesa/shader/prog_uniform.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/shader_api.c
src/mesa/shader/slang/descrip.mms
src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
src/mesa/sources
src/mesa/swrast/descrip.mms
src/mesa/swrast/s_drawpix.c
src/mesa/swrast/s_fragprog.c
src/mesa/swrast/s_readpix.c
src/mesa/swrast/s_span.c
src/mesa/swrast_setup/descrip.mms
src/mesa/tnl/descrip.mms
src/mesa/tnl/t_context.h
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/tnl.h
src/mesa/vbo/descrip.mms
src/mesa/vbo/vbo_context.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/x86-64/xform4.S
src/mesa/x86/rtasm/x86sse.c
src/mesa/x86/rtasm/x86sse.h
windows/VC6/progs/glut/glut.dsp
windows/VC7/mesa/gdi/gdi.vcproj
windows/VC7/mesa/glu/glu.vcproj
windows/VC7/mesa/mesa.sln
windows/VC7/mesa/mesa/mesa.vcproj
windows/VC7/mesa/osmesa/osmesa.vcproj
windows/VC7/progs/glut/glut.vcproj
windows/VC8/mesa/gdi/gdi.vcproj
windows/VC8/mesa/glu/glu.vcproj
windows/VC8/mesa/mesa.sln
windows/VC8/mesa/mesa/mesa.vcproj
windows/VC8/progs/glut/glut.vcproj

author	Keith Whitwell <keith@tungstengraphics.com>
	Thu, 11 Sep 2008 15:05:15 +0000 (16:05 +0100)
committer	Keith Whitwell <keith@tungstengraphics.com>
	Thu, 11 Sep 2008 15:05:15 +0000 (16:05 +0100)
commit	0397b2bb41b0f337af2949a15bcd7d0e7e8a7dc1
tree	732c93d74ed806942a13bf15575a61aa4f001253	tree
parent	80af50b35b5a4e8890e15b28940576f8a1ac1476	commit \| diff
parent	e6887a5752774c18cf527477fdd3e57e4893ff3b	commit \| diff

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
configs/beos	diff1 \|	diff2 \|	blob \| history
configs/default	diff1 \|	diff2 \|	blob \| history
configs/freebsd-dri	diff1 \|	diff2 \|	blob \| history
configs/linux-directfb	diff1 \|	diff2 \|	blob \| history
configs/linux-dri	diff1 \|	diff2 \|	blob \| history
configs/linux-dri-x86	diff1 \|	diff2 \|	blob \| history
configs/linux-dri-x86-64	diff1 \|	diff2 \|	blob \| history
configs/linux-dri-xcb	diff1 \|	diff2 \|	blob \| history
configs/linux-fbdev	diff1 \|	diff2 \|	blob \| history
configs/linux-indirect	diff1 \|	diff2 \|	blob \| history
configs/linux-osmesa	diff1 \|	diff2 \|	blob \| history
configs/linux-osmesa16	diff1 \|	diff2 \|	blob \| history
configs/linux-osmesa16-static	diff1 \|	diff2 \|	blob \| history
configs/linux-osmesa32	diff1 \|	diff2 \|	blob \| history
configs/linux-solo	diff1 \|	diff2 \|	blob \| history
configs/linux-solo-x86	diff1 \|	diff2 \|	blob \| history
configs/linux-static	diff1 \|	diff2 \|	blob \| history
configs/linux-x86-64-static	diff1 \|	diff2 \|	blob \| history
configs/linux-x86-glide	diff1 \|	diff2 \|	blob \| history
configs/linux-x86-static	diff1 \|	diff2 \|	blob \| history
configs/sunos5-gcc	diff1 \|	diff2 \|	blob \| history
docs/OLD/MESA_packed_depth_stencil.spec	diff1 \|	\|	blob \| history
docs/OLD/MESA_program_debug.spec	diff1 \|	\|	blob \| history
docs/OLD/MESA_sprite_point.spec	diff1 \|	\|	blob \| history
docs/OLD/MESA_trace.spec	diff1 \|	\|	blob \| history
docs/news.html	diff1 \|	diff2 \|	blob \| history
include/GL/internal/glcore.h	diff1 \|	diff2 \|	blob \| history
progs/demos/.gitignore	diff1 \|	diff2 \|	blob \| history
progs/egl/Makefile	diff1 \|	diff2 \|	blob \| history
progs/fbdev/Makefile	diff1 \|	diff2 \|	blob \| history
progs/fp/Makefile	diff1 \|	diff2 \|	blob \| history
progs/glsl/.gitignore	diff1 \|	diff2 \|	blob \| history
progs/glsl/Makefile	diff1 \|	diff2 \|	blob \| history
progs/glsl/convolutions.c	diff1 \|	diff2 \|	blob \| history
progs/glsl/texdemo1.c	diff1 \|	diff2 \|	blob \| history
progs/miniglx/Makefile	diff1 \|	diff2 \|	blob \| history
progs/tests/.gitignore	diff1 \|	diff2 \|	blob \| history
progs/tests/Makefile	diff1 \|	diff2 \|	blob \| history
progs/tests/antialias.c	diff1 \|	diff2 \|	blob \| history
progs/tests/cva.c	diff1 \|	diff2 \|	blob \| history
progs/tests/multipal.c	diff1 \|	diff2 \|	blob \| history
progs/tests/texline.c	diff1 \|	diff2 \|	blob \| history
progs/trivial/Makefile	diff1 \|	diff2 \|	blob \| history
progs/trivial/point-param.c	diff1 \|	diff2 \|	blob \| history
progs/trivial/quad-clip-nearplane.c	diff1 \|	diff2 \|	blob \| history
progs/trivial/tri.c	diff1 \|	diff2 \|	blob \| history
src/egl/Makefile	diff1 \|	diff2 \|	blob \| history
src/egl/drivers/dri/Makefile	diff1 \|	diff2 \|	blob \| history
src/egl/main/Makefile	diff1 \|	diff2 \|	blob \| history
src/glu/mini/project.c	diff1 \|	diff2 \|	blob \| history
src/glu/sgi/libnurbs/interface/bezierPatch.cc	diff1 \|	diff2 \|	blob \| history
src/glu/sgi/libnurbs/interface/insurfeval.cc	diff1 \|	diff2 \|	blob \| history
src/glu/sgi/libutil/error.c	diff1 \|	diff2 \|	blob \| history
src/glu/sgi/libutil/project.c	diff1 \|	diff2 \|	blob \| history
src/glut/beos/Makefile	diff1 \|	diff2 \|	blob \| history
src/glut/directfb/Makefile	diff1 \|	diff2 \|	blob \| history
src/glut/fbdev/Makefile	diff1 \|	diff2 \|	blob \| history
src/glut/ggi/Makefile	diff1 \|	diff2 \|	blob \| history
src/glut/glx/Makefile	diff1 \|	diff2 \|	blob \| history
src/glut/mini/Makefile	diff1 \|	diff2 \|	blob \| history
src/glw/Makefile	diff1 \|	diff2 \|	blob \| history
src/glx/mini/Makefile	diff1 \|	diff2 \|	blob \| history
src/glx/x11/Makefile	diff1 \|	diff2 \|	blob \| history
src/glx/x11/XF86dri.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/glxclient.h	diff1 \|	diff2 \|	blob \| history
src/glx/x11/glxcmds.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/glxext.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/indirect.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/pixelstore.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/singlepix.c	diff1 \|	diff2 \|	blob \| history
src/glx/x11/xf86dri.h	diff1 \|	diff2 \|	blob \| history
src/glx/x11/xfont.c	diff1 \|	diff2 \|	blob \| history
src/mesa/Makefile	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/common/driverfuncs.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/Makefile.template	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/dri_util.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/dri_util.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/mmio.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/texmem.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/utils.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/utils.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/vblank.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/vblank.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/fb/fb_dri.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/ffb/ffb_clear.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/ffb/ffb_linetmp.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/ffb/ffb_pointtmp.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/ffb/ffb_vtxfmt.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/ffb/ffb_xmesa.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/gamma/gamma_context.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/gamma/gamma_render.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/gamma/gamma_span.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/gamma/gamma_xmesa.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i810/i810context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i810/i810ioctl.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i810/i810screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i810/i810state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/i810/i810tris.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_context.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_ioctl.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_ioctl.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_lock.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_screen.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_span.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_tex.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mach64/mach64_tris.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mga/mga_xmesa.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mga/mgacontext.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mga/mgadd.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mga/mgaioctl.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mga/mgarender.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/mga/mgatris.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_context.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_ioctl.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_ioctl.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_screen.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_span.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r128/r128_tex.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r200/r200_ioctl.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r200/r200_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_ioctl.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_ioctl.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_screen.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_tcl.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_tex.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_texmem.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/radeon/radeon_texstate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/savage/savage_xmesa.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/savage/savageioctl.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/savage/savagestate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/savage/savagetex.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/savage/savagetris.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/sis/sis_context.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/sis/sis_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/sis/sis_span.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/sis/sis_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/sis/sis_tex.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/sis/sis_tris.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/tdfx/tdfx_context.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/tdfx/tdfx_render.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/tdfx/tdfx_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/tdfx/tdfx_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/unichrome/via_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/unichrome/via_state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/svga/svgamesa24.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/svga/svgamesa32.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/windows/gdi/wgl.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/x11/xm_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/x11/xm_dd.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/x11/xm_tri.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/x11/xmesaP.h	diff1 \|	diff2 \|	blob \| history
src/mesa/glapi/glapi.c	diff1 \|	diff2 \|	blob \| history
src/mesa/glapi/glthread.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/api_validate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/attrib.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/bufferobj.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/bufferobj.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/buffers.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/buffers.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/clear.c	\|	diff2 \|	blob \| history
src/mesa/main/config.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/context.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/dd.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/dlist.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/drawpix.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enable.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enums.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/fbobject.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/framebuffer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/get.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/get_gen.py	diff1 \|	diff2 \|	blob \| history
src/mesa/main/glheader.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/image.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/imports.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/imports.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/light.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mipmap.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/mtypes.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/points.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/state.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texcompress_fxt1.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texenvprogram.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texformat.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/teximage.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texstate.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texstate.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texstore.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texstore.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/varray.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/varray.h	diff1 \|	diff2 \|	blob \| history
src/mesa/math/m_debug_util.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_execute.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_statevars.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_statevars.h	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/prog_uniform.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/program.c	diff1 \|	diff2 \|	blob \| history
src/mesa/shader/program.h	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_accum.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_blend.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_blit.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_buffers.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_copypix.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_drawpix.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_points.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_readpix.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_span.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_stencil.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_texfilter.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_texstore.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_triangle.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast/s_zoom.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast_setup/ss_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/swrast_setup/ss_triangle.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_draw.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_vb_fog.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_vertex_sse.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_vp_build.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/tnl.h	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/x86-64/Makefile	diff1 \|	diff2 \|	blob \| history
src/mesa/x86/Makefile	diff1 \|	diff2 \|	blob \| history
src/mesa/x86/rtasm/x86sse.c	diff1 \|	diff2 \|	blob \| history