mesa.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	demos: Add polygon mode point to isosurf	Jakob Bornecrantz	2009-02-13	1	-4/+10
\|
*	progs: Prevent clash with min macro.	José Fonseca	2009-02-12	1	-0/+3
\|
*	Merge commit 'origin/gallium-master-merge'	Brian Paul	2009-02-10	72	-5587/+6085
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c
\| *	mesa: merge gallium-0.2 into gallium-master-merge	Brian Paul	2009-02-09	72	-5590/+6088
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
\| \| *	progs: Get more samples building on windows.	José Fonseca	2009-02-01	7	-34/+48
\| \| \|
\| \| *	progs: Fix isosurf.	José Fonseca	2009-01-24	1	-6/+4
\| \| \|
\| \| *	progs: Port most of the demos to glew.	José Fonseca	2009-01-24	12	-18/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A couple of test weren't ported due to glew breakage -- it undefines GLAPIENTRY.
\| \| *	demos: all glutDestroyWindow() upon exit to test query object clean-up	Brian Paul	2008-12-18	1	-2/+3
\| \| \|
\| \| *	Merge commit 'origin/master' into gallium-0.2	Alan Hourihane	2008-11-28	1	-3/+12
\| \| \|\
\| \| * \|	progs: Add ignores	Jakob Bornecrantz	2008-11-24	1	-0/+1
\| \| \| \|
\| \| * \|	scons: Build progs.	José Fonseca	2008-11-21	1	-0/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just demos and trivial dirs for starters.
\| \| * \|	mesa: more test options in progs/demos/textures.c	Brian Paul	2008-10-20	1	-17/+87
\| \| \| \|
\| \| * \|	mesa: revert accidental change to fslight.c demo	Brian Paul	2008-10-15	1	-1/+1
\| \| \| \|
\| \| * \|	mesa: simple multiple textures test	Brian Paul	2008-10-09	2	-0/+305
\| \| \| \|
\| \| * \|	CELL: mark several transient files as .gitignore	Robert Ellison	2008-09-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	progs/demos: added new demo "fbo_firecube" progs/glsl: added new demo "pointcoord" src/gallium/drivers/cell/spu: added the g3d_spu executable, a Cell SPU executable file, which seems to be occasionally built as part of the cell driver src/glu/sgi: added "exptmp", a byproduct of the "mklib" process that sometimes gets deleted and sometimes not.
\| \| * \|	Merge commit 'origin/master' into gallium-0.2	Keith Whitwell	2008-09-18	1	-1/+1
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
\| \| * \| \|	cell: dump generated code if CELL_DEBUG=asm	Brian Paul	2008-09-17	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	demos: fix LIBS ref in makefile	Keith Whitwell	2008-09-11	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Merge commit 'origin/gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	1	-14/+14
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile progs/demos/Makefile progs/glsl/Makefile progs/redbook/Makefile progs/samples/Makefile progs/tests/Makefile progs/trivial/Makefile progs/xdemos/Makefile src/gallium/Makefile src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/vbo/vbo_exec_draw.c
\| \| \| * \| \|	define new APP_CC configuration variable for building apps/demos/tests	Brian Paul	2008-09-11	1	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For Cell, need to use different compilers for the libraries vs. the demos/tests to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
\| \| * \| \| \|	Merge branch 'gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	52	-5523/+5553
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| * \| \|	mesa: call glutDestroyWindow() on exit	Brian Paul	2008-07-09	1	-0/+2
\| \| \| \| \| \|
\| \| \| * \| \|	Fix CRLF line endings.	José Fonseca	2008-06-24	43	-5475/+5475
\| \| \| \| \| \|
\| \| \| * \| \|	added ARCH_FLAGS	seventh guardian	2008-06-16	1	-5/+5
\| \| \| \| \| \|
\| \| \| * \| \|	fix assorted bugs, works now	Brian	2008-05-21	1	-12/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 55d4f32fc211dbc37bd28c0e67da5ce5e0da5777)
\| \| \| * \| \|	mesa: call glutDestroyWindow()	Brian Paul	2008-05-20	1	-2/+3
\| \| \| \| \| \|
\| \| \| * \| \|	mesa: call glutDestroyWindow()	Brian Paul	2008-05-20	1	-1/+3
\| \| \| \| \| \|
\| \| \| * \| \|	disable GL_TEXTURE_1D at end of frame to fix failed assertion	Brian Paul	2008-04-29	1	-0/+1
\| \| \| \| \| \|
\| \| \| * \| \|	mesa: test code to exercise more GLSL functions	Brian	2008-04-04	1	-27/+18
\| \| \| \| \| \|
\| \| \| * \| \|	mesa: destroy window upon exit	Brian	2008-04-01	1	-1/+4
\| \| \| \| \| \|
\| \| \| * \| \|	mesa: call glutDestroyWindow (help find mem leaks)	Brian Paul	2008-03-24	1	-1/+4
\| \| \| \| \| \|
\| \| \| * \| \|	Convert crlf->lf line endings.	José Fonseca	2008-02-28	1	-119/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Windows/DOS users should enable core.autocrlf from now on.
\| \| \| * \| \|	Remove files of unsupported build systems.	José Fonseca	2008-02-25	1	-90/+0
\| \| \| \| \| \|
\| \| \| * \| \|	press 0,1,2,etc keys for specific bias values	Brian	2008-02-12	1	-0/+12
\| \| \| \| \| \|
\| \| \| * \| \|	push out far clip plane to 200	Brian	2008-01-28	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Added d/D keys to change viewing distance, 'a' to toggle animation	Brian	2008-01-28	1	-6/+29
\| \| \| \| \| \|
\| \| \| * \| \|	Rename 'mms-config.' to 'mms.config'.	Michal Krol	2007-10-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
\| \| \| * \| \|	Fix fragment shader.	michal	2007-10-27	1	-1/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Optimize fragment program.	michal	2007-10-27	1	-13/+20
\| \| \| \| \| \|
\| \| \| * \| \|	Ignore generated files.	José Fonseca	2007-10-25	1	-1/+13
\| \| \| \| \| \|
\| \| \| * \| \|	hack in some code to test loops, break	Brian	2007-09-29	1	-1/+11
\| \| \| \| \| \|
\| \| \| * \| \|	temporary hack to test nested conditionals	Brian	2007-09-28	1	-0/+14
\| \| \| \| \| \|
* \| \| \| \| \|	demos: remove OSMESA stuff from Makefile	Brian	2009-02-09	1	-6/+0
\|/ / / / /
* \| \| \| \|	demos: remove unused function	Brian Paul	2009-02-04	1	-5/+0
\| \| \| \| \|
* \| \| \| \|	demos: silence uninitialized var warning	Brian Paul	2009-02-04	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	demos: all glutDestroyWindow() upon exit to test query object clean-up	Brian Paul	2008-12-18	1	-2/+3
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	demos: press SPACE to toggle fbo_firecube animation	Brian Paul	2008-11-26	1	-3/+12
\| \|_\|/ \|/\| \|
* \| \|	silence warning	Guillaume Melquiond	2008-09-13	1	-1/+1
\|/ /
* \|	mesa: clear the unused upper-left region to black instead of leaving it ↵	Brian Paul	2008-08-13	1	-5/+11
\| \| \| \| \| \| \| \|	undefined
* \|	Always pass CFLAGS when compiling or linking demos	Guillaume Melquiond	2008-07-30	1	-6/+6
\| \| \| \| \| \| \| \| \| \|	To ensure that the correct architecture flags are used, always pass the user's CFLAGS when compiling or linking the demos. Fixes #16860.