Keith Whitwell 0397b2bb41 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		2008-09-11 16:05:15 +01:00
..
internal	Merge branch 'gallium-0.1' into gallium-0.2	2008-09-11 16:05:15 +01:00
amesa.h	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
directfbgl.h	DirectFB driver (Claudio Ciccani)	2005-01-03 15:35:00 +00:00
dmesa.h	DMesa now uses OSMesa as a back-end.	2006-03-31 20:53:12 +00:00
fxmesa.h	bump version numbers to their real values	2004-10-12 06:43:57 +00:00
ggimesa.h	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
gl.h	mesa: WinCE fixes	2008-07-16 16:11:38 -06:00
gl_mangle.h	regenerated	2007-06-29 07:53:11 -06:00
glext.h	version 41 of glext.h	2008-08-11 15:21:40 -06:00
glfbdev.h	Added initial multisampling support to glfbdev driver.	2006-08-10 10:21:17 +00:00
glu.h	Unbreak Linux builds with -fvisibility=hidden.	2007-08-23 18:38:02 -04:00
glu_mangle.h	Add missing entry points. (Warren Cashen)	2003-10-10 22:09:05 +00:00
glut.h	more Mingw32 fixes	2007-07-27 11:19:35 -06:00
glut_h.dja	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
glutf90.h	Add glut_fcb.c to the build and update to fix warnings (see bug 12405)	2007-09-12 13:40:15 -06:00
glx.h	updated GLX_EXT_texture_from_pixmap tokens (Dave Reveman)	2006-05-05 18:19:54 +00:00
glx_mangle.h	added 1.3/1.4 function mangling	2006-11-03 18:29:39 +00:00
glxext.h	version 20 of glxext.h	2008-08-11 15:21:40 -06:00
Makefile.am	* common_rules.make: Created to hold the conditional build rule	2001-03-20 00:33:18 +00:00
mesa_wgl.h	more Mingw32 fixes	2007-07-27 11:19:35 -06:00
mglmesa.h	Convert crlf->lf line endings.	2008-02-28 16:34:32 +09:00
miniglx.h	add more functionality to miniglx for glitz	2005-02-20 10:46:34 +00:00
osmesa.h	bump version number	2005-12-08 14:51:36 +00:00
svgamesa.h	Removed all RCS / CVS tags (Id, Header, Date, etc.) from everything.	2003-06-05 00:50:18 +00:00
uglglutshapes.h	WindML driver (Stephane Raimbault)	2001-08-20 16:07:10 +00:00
uglmesa.h	bump versions to 4.0	2001-09-23 16:06:13 +00:00
vms_x_fix.h	OpenVMS compile support update	2006-09-04 06:26:08 +00:00
wmesa.h	Assorted Windows fixes (Karl Schultz)	2008-05-29 10:42:02 -06:00
xmesa.h	Fix xserver build after recent XMesa changes.	2007-05-22 13:56:30 +02:00
xmesa_x.h	Fix xserver build after recent XMesa changes.	2007-05-22 13:56:30 +02:00
xmesa_xf86.h	Fix GLX build of xserver master branch.	2007-11-05 10:03:26 +01:00