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

1 files changed, 0 insertions, 82 deletions

diff --git a/windows/VC6/mesa/glu/compileDebug.txt b/windows/VC6/mesa/glu/compileDebug.txt
deleted file mode 100644
index d1493022456..00000000000
--- a/windows/VC6/mesa/glu/compileDebug.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-/nologo /W2 /GX- /Zi /Od /c /TP 
-/I "../../../../include" 
-/I "../../../../src/glu/sgi/include" 
-/I "../../../../src/glu/sgi/libnurbs/interface"
-/I "../../../../src/glu/sgi/libnurbs/internals"
-/I "../../../../src/glu/sgi/libnurbs/nurbtess"
-/D "WIN32"  /D "_DEBUG"  /D "_WINDOWS"  /D "_MBCS" 
-/D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /D "LIBRARYBUILD" 
-/Fo"Debug/" /Fd"Debug/" /GZ 
-../../../../src/glu/sgi/libnurbs/interface/bezierEval.cc 
-../../../../src/glu/sgi/libnurbs/interface/bezierPatch.cc 
-../../../../src/glu/sgi/libnurbs/interface/bezierPatchMesh.cc 
-../../../../src/glu/sgi/libnurbs/interface/glcurveval.cc 
-../../../../src/glu/sgi/libnurbs/interface/glinterface.cc 
-../../../../src/glu/sgi/libnurbs/interface/glrenderer.cc 
-../../../../src/glu/sgi/libnurbs/interface/glsurfeval.cc 
-../../../../src/glu/sgi/libnurbs/interface/incurveeval.cc 
-../../../../src/glu/sgi/libnurbs/interface/insurfeval.cc 
-../../../../src/glu/sgi/libnurbs/internals/arc.cc 
-../../../../src/glu/sgi/libnurbs/internals/arcsorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/arctess.cc 
-../../../../src/glu/sgi/libnurbs/internals/backend.cc  
-../../../../src/glu/sgi/libnurbs/internals/basiccrveval.cc  
-../../../../src/glu/sgi/libnurbs/internals/basicsurfeval.cc  
-../../../../src/glu/sgi/libnurbs/internals/bin.cc  
-../../../../src/glu/sgi/libnurbs/internals/bufpool.cc 
-../../../../src/glu/sgi/libnurbs/internals/cachingeval.cc 
-../../../../src/glu/sgi/libnurbs/internals/ccw.cc 
-../../../../src/glu/sgi/libnurbs/internals/coveandtiler.cc 
-../../../../src/glu/sgi/libnurbs/internals/curve.cc 
-../../../../src/glu/sgi/libnurbs/internals/curvelist.cc 
-../../../../src/glu/sgi/libnurbs/internals/curvesub.cc 
-../../../../src/glu/sgi/libnurbs/internals/dataTransform.cc 
-../../../../src/glu/sgi/libnurbs/internals/displaylist.cc 
-../../../../src/glu/sgi/libnurbs/internals/flist.cc 
-../../../../src/glu/sgi/libnurbs/internals/flistsorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/hull.cc 
-../../../../src/glu/sgi/libnurbs/internals/intersect.cc 
-../../../../src/glu/sgi/libnurbs/internals/knotvector.cc 
-../../../../src/glu/sgi/libnurbs/internals/mapdesc.cc 
-../../../../src/glu/sgi/libnurbs/internals/mapdescv.cc 
-../../../../src/glu/sgi/libnurbs/internals/maplist.cc 
-../../../../src/glu/sgi/libnurbs/internals/mesher.cc 
-../../../../src/glu/sgi/libnurbs/internals/monoTriangulationBackend.cc 
-../../../../src/glu/sgi/libnurbs/internals/monotonizer.cc 
-../../../../src/glu/sgi/libnurbs/internals/mycode.cc 
-../../../../src/glu/sgi/libnurbs/internals/nurbsinterfac.cc 
-../../../../src/glu/sgi/libnurbs/internals/nurbstess.cc 
-../../../../src/glu/sgi/libnurbs/internals/patch.cc 
-../../../../src/glu/sgi/libnurbs/internals/patchlist.cc 
-../../../../src/glu/sgi/libnurbs/internals/quilt.cc 
-../../../../src/glu/sgi/libnurbs/internals/reader.cc 
-../../../../src/glu/sgi/libnurbs/internals/renderhints.cc 
-../../../../src/glu/sgi/libnurbs/internals/slicer.cc 
-../../../../src/glu/sgi/libnurbs/internals/sorter.cc 
-../../../../src/glu/sgi/libnurbs/internals/splitarcs.cc 
-../../../../src/glu/sgi/libnurbs/internals/subdivider.cc 
-../../../../src/glu/sgi/libnurbs/internals/tobezier.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimline.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimregion.cc 
-../../../../src/glu/sgi/libnurbs/internals/trimvertpool.cc 
-../../../../src/glu/sgi/libnurbs/internals/uarray.cc 
-../../../../src/glu/sgi/libnurbs/internals/varray.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/directedLine.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/gridWrap.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoChain.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoPolyPart.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionX.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/partitionY.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/polyDBG.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/polyUtil.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/primitiveStream.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/quicksort.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/rectBlock.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleComp.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompBot.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompRight.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleCompTop.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/sampledLine.cc 
-../../../../src/glu/sgi/libnurbs/nurbtess/searchTree.cc