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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Brian Paul	2009-12-27	1	-6/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	progs/util: Silence warn_unused_result warnings.	Vinson Lee	2009-12-25	1	-6/+14
\| \|
* \|	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Brian Paul	2009-12-11	1	-1/+6
\|\\|
\| *	progs/util: Byte swap individual members of struct _rawImageRec.	Vinson Lee	2009-12-10	1	-1/+6
\| \|
\| *	progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.	Vinson Lee	2009-12-04	1	-0/+1
\| \| \| \| \| \| \| \|	(cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
\| *	progs/util: Fix memory leak if fail to load/compile shader	Vinson Lee	2009-12-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
\| *	progs/util: Exit RawImageGetData early if malloc fails.	Vinson Lee	2009-12-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	Prevents a null pointer deference later on. (cherry picked from commit e26135a744f740430e3dc341fa692544ba99c11e)
\| *	progs/util: Fix memory leak if malloc fails in RawImageOpen.	Vinson Lee	2009-12-03	1	-0/+14
\| \| \| \| \| \| \| \|	(cherry picked from commit d36cb2396c942f05ba56c5b899792a507bb0f0fd)
\| *	progs/util: Fix memory leak if fopen fails in RawImageOpen.	Vinson Lee	2009-12-03	1	-0/+1
\| \| \| \| \| \| \| \|	(cherry picked from commit d9508e8df9da4aa13bc223194c406081738bac91)
\| *	progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.	Vinson Lee	2009-12-03	1	-0/+1
\| \| \| \| \| \| \| \|	(cherry picked from commit 786d539511eb3c5a4101b11b7f8e90d60123ac46)
\| *	progs/util: Fix memory leak if LoadRGBImage fails.	Vinson Lee	2009-12-03	1	-1/+4
\| \| \| \| \| \| \| \|	(cherry picked from commit 041cd0e110d41b543a0fe9cc484ae8373642912b)
\| *	progs/util: Fix memory if LoadRGBMipmaps2 fails.	Vinson Lee	2009-12-03	1	-0/+1
\| \| \| \| \| \| \| \|	(cherry picked from commit 28b8e4bcd76cc072b062e4c8575327c05ecb9a55)
\| *	progs/util: Fix memory leak if LoadYUVImage fails.	Vinson Lee	2009-12-03	1	-0/+1
\| \| \| \| \| \| \| \|	(cherry picked from commit 0e790ac35327a0b53a4a595a6429135317302269)
* \|	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Ian Romanick	2009-11-30	1	-1/+5
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/util/shaderutil.c src/mesa/drivers/dri/r600/r600_context.c src/mesa/main/version.h
\| *	shaderutil: Fix detection of shaders	Ian Romanick	2009-11-23	1	-2/+6
\| \| \| \| \| \| \| \| \| \|	Check for versions >= 2.0 (because some drivers return 3.0), and return GL_FALSE if shaders are not detected.
* \|	progs/util: Exit RawImageGetData early if malloc fails.	Vinson Lee	2009-11-20	1	-0/+1
\| \| \| \| \| \| \| \|	Prevents a null pointer deference later on.
* \|	progs/util: Fix memory leak if malloc fails in RawImageOpen.	Vinson Lee	2009-11-20	1	-0/+14
\| \|
* \|	progs/util: warn when GLSL not supported	Brian Paul	2009-11-17	1	-1/+2
\| \|
* \|	progs/util: Fix memory leak if fopen fails in RawImageOpen.	Vinson Lee	2009-11-17	1	-0/+1
\| \|
* \|	progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.	Vinson Lee	2009-11-17	1	-0/+1
\| \|
* \|	progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.	Vinson Lee	2009-11-17	1	-0/+1
\| \|
* \|	progs/util: Fix memory leak if LoadRGBImage fails.	Vinson Lee	2009-11-17	1	-1/+4
\| \|
* \|	progs/util: Fix memory if LoadRGBMipmaps2 fails.	Vinson Lee	2009-11-17	1	-0/+1
\| \|
* \|	progs/util: Fix memory leak if LoadYUVImage fails.	Vinson Lee	2009-11-16	1	-0/+1
\| \|
* \|	progs/util: Fix memory leak if fail to load/compile shader	Vinson Lee	2009-11-03	1	-0/+2
\|/ \| \| \|	Signed-off-by: Brian Paul <[email protected]>
*	progs/util: minor updates to glutskel.c	Brian Paul	2009-08-30	1	-31/+33
\|
*	progs/util: added ValidateShaderProgram() to shaderutil.c	Brian Paul	2009-08-25	2	-0/+23
\|
*	progs/util: added GetShaderCompile/LinkTime() to get compilation/link times	Brian Paul	2009-08-20	2	-0/+39
\|
*	progs/util: ignore pre-defined uniforms in SetUniformValues()	Brian Paul	2009-08-13	1	-1/+8
\|
*	progs/glsl: change uniform_info::type field to use GLSL vector types	Brian Paul	2009-08-12	2	-94/+17
\|
*	demos: rename InitUniforms() to SetUniformValues()	Brian Paul	2009-08-12	2	-2/+2
\| \| \| \|	And call new PrintUniforms() in demos.
*	progs/util: added more shader utility functions	Brian Paul	2009-08-12	2	-19/+200
\|
*	Merge branch 'mesa_7_5_branch'	Brian Paul	2009-07-17	1	-19/+17
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: Makefile progs/glsl/multitex.c src/mesa/main/enums.c src/mesa/main/state.c src/mesa/main/texenvprogram.c src/mesa/main/version.h
\| *	progs/util: remove extfuncs.h (we use GLEW instead)mesa_7_5	Brian Paul	2009-07-17	1	-19/+17
\| \|
* \|	Merge branch 'mesa_7_5_branch'	Brian Paul	2009-06-30	1	-1/+6
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/mesa/vbo/vbo_exec_draw.c
\| *	progs/util: make sure function pointers are initialized	Keith Whitwell	2009-06-30	1	-1/+6
\| \| \| \| \| \| \| \| \| \|	Call Init() from CompileShaderFile, was previously only called for the Text version of this function.
* \|	Merge branch 'mesa_7_5_branch'	Thomas Hellstrom	2009-06-15	1	-0/+81
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/util/extfuncs.h
\| *	util: additional function pointers	Brian Paul	2009-06-12	1	-0/+101
\| \|
* \|	demos/util: add funcs for GL_ARB_buffer_object	Brian Paul	2009-05-22	1	-0/+19
\|/
*	progs: Try to read the texture from the current dir, if full path fails.	José Fonseca	2009-03-16	1	-3/+9
\|
*	mesa: merge gallium-0.2 into gallium-master-merge	Brian Paul	2009-02-09	2	-42/+15
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+15
\| \|
\| *	util: check for frag/vertShader=0 before attaching	Brian Paul	2008-12-18	1	-2/+7
\| \|
\| *	Merge commit 'origin/master' into gallium-0.2	Alan Hourihane	2008-11-05	1	-0/+1
\| \|\
\| * \	Merge branch 'gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	5	-49/+0
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \|	Remove CVS keywords.	José Fonseca	2008-05-26	4	-7/+0
\| \| \| \|
\| \| * \|	add missing glViewport calls	Brian Paul	2008-04-11	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cherry-picked from master
\| \| * \|	mesa: added more ext funcs (from Mesa/master)	Brian	2008-04-04	1	-0/+24
\| \| \| \|
\| \| * \|	Remove files of unsupported build systems.	José Fonseca	2008-02-25	1	-42/+0
\| \| \| \|
\| \| * \|	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'.