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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit 'origin/master' into gallium-0.2	Alan Hourihane	2008-12-12	2	-5/+9
\|\
\| *	tnl: Fix zeroing of the 3ub part of a 3ub+1ub attrib pair in SSE.	Guillaume Melquiond	2008-12-09	1	-1/+3
\| \| \| \| \| \| \| \|	Bug #16520.
\| *	tnl: Optimize SSE load[23]f_1 since they don't need the identity swizzle.	Guillaume Melquiond	2008-12-09	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	SSE movss from memory zeroes out everything above the destination dword, so we get the (a, 0) or (a, 0, 0) result that these functions needed. Bug #16520.
\| *	tnl: Fix typo that resulted in fallback from SSE for EMIT_3UB_3F_RGB/BGR.	Guillaume Melquiond	2008-12-09	1	-1/+1
\| \| \| \| \| \| \| \|	Bug #16520
\| *	tnl: Avoid undefined input value use in insert_3f_viewport_2().	Guillaume Melquiond	2008-12-09	1	-1/+1
\| \| \| \| \| \| \| \|	Bug #16520.
* \|	Merge commit 'origin/master' into gallium-0.2	Keith Whitwell	2008-10-10	2	-25/+62
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
\| *	mesa: vertex emit debug code (disabled)	Brian Paul	2008-10-08	1	-22/+58
\| \|
\| *	mesa: asst updates for VMS	Jouk Jansen	2008-09-29	1	-3/+4
\| \|
* \|	Merge branch 'master' into gallium-0.2	Keith Whitwell	2008-09-21	5	-12/+20
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/GLES/egl.h include/GLES/egltypes.h src/egl/main/eglconfig.c src/egl/main/eglconfig.h src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/Makefile src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/tdfx/tdfx_dd.h src/mesa/drivers/x11/xm_buffer.c src/mesa/glapi/glapi.c src/mesa/main/dispatch.c src/mesa/main/state.c src/mesa/main/texstate.c src/mesa/shader/arbprogparse.c src/mesa/shader/arbprogram.c src/mesa/shader/nvfragparse.c src/mesa/shader/nvprogram.c src/mesa/shader/shader_api.c src/mesa/sources src/mesa/swrast/s_aaline.c src/mesa/swrast/s_aaline.h src/mesa/swrast/s_aatriangle.h src/mesa/swrast/s_accum.c src/mesa/swrast/s_alpha.h src/mesa/swrast/s_bitmap.c src/mesa/swrast/s_blend.h src/mesa/swrast/s_context.c src/mesa/swrast/s_copypix.c src/mesa/swrast/s_depth.c src/mesa/swrast/s_depth.h src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_drawpix.h src/mesa/swrast/s_feedback.c src/mesa/swrast/s_feedback.h src/mesa/swrast/s_fog.h src/mesa/swrast/s_lines.h src/mesa/swrast/s_logic.h src/mesa/swrast/s_masking.h src/mesa/swrast/s_points.c src/mesa/swrast/s_points.h src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast/s_span.h src/mesa/swrast/s_stencil.h src/mesa/swrast/s_texcombine.c src/mesa/swrast/s_texcombine.h src/mesa/swrast/s_texfilter.c src/mesa/swrast/s_texfilter.h src/mesa/swrast/s_texstore.c src/mesa/swrast/s_triangle.c src/mesa/swrast/s_triangle.h src/mesa/swrast/s_zoom.h src/mesa/swrast_setup/ss_context.c src/mesa/swrast_setup/ss_triangle.h src/mesa/tnl/t_draw.c src/mesa/tnl/t_vb_light.c src/mesa/tnl/t_vertex_generic.c src/mesa/tnl/t_vertex_sse.c src/mesa/tnl/t_vp_build.h src/mesa/tnl/tnl.h src/mesa/x86/common_x86.c
\| *	mesa: move fixed function vertex program builder from tnl to core mesa	Keith Whitwell	2008-09-21	4	-1593/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
\| *	mesa: move rastpos helper to tnl	Keith Whitwell	2008-09-21	2	-0/+509
\| \|
\| *	mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834	Brian Paul	2008-09-18	1	-6/+14
\| \|
\| *	mesa: prefix a bunch of #include lines with "main/".	Brian Paul	2008-09-18	17	-76/+76
\| \| \| \| \| \| \| \| \| \|	This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
* \|	tree builds	Alan Hourihane	2008-09-11	1	-437/+3
\| \|
* \|	Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵	Alan Hourihane	2008-09-11	1	-0/+431
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
\| *	mesa: bump MAX_INSN to 350	Brian Paul	2008-08-28	1	-1/+1
\| \|
* \|	Merge branch 'gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	21	-1657/+598
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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: Prefix main includes with dir to avoid conflicts.	José Fonseca	2008-07-24	19	-79/+79
\| \| \| \| \| \| \| \| \| \|	Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
\| *	set outputs_safe to 0 as it's possible for the code generation	Alan Hourihane	2008-03-19	1	-1/+1
\| \| \| \| \| \| \| \|	to slip over the allocated memory for the vb.
\| *	remove redundant init	Alan Hourihane	2008-03-19	1	-2/+0
\| \|
\| *	Remove files of unsupported build systems.	José Fonseca	2008-02-25	1	-75/+0
\| \|
\| *	New vbo_set_draw_func() to keep vbo context opaque to state tracker and tnl ↵	Brian	2007-12-07	1	-0/+3
\| \| \| \| \| \| \| \|	module.
\| *	remove dead program cache code	Brian	2007-10-31	4	-1638/+1
\| \|
\| *	Use ffvertex_prog.c code instead of t_vp_build.c code.	Brian	2007-10-31	3	-1/+13
\| \|
\| *	refactoring to begin removing dependency on tnl context	Brian	2007-10-29	1	-6/+33
\| \|
\| *	simplify getting of current frag prog	Brian	2007-10-29	1	-6/+1
\| \|
\| *	Refactor _tnl_UpdateFixedFunctionProgram().	Brian	2007-10-29	2	-35/+57
\| \| \| \| \| \| \| \|	New _mesa_get_fixed_func_vertex_program() function...
\| *	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'.
\| *	properly init dst reg's CondMask/Swizzle fields	Brian	2007-10-23	1	-3/+3
\| \|
\| *	When in GL_FEEDBACK mode, make sure we emit color and texcoord registers.	Brian	2007-10-17	1	-0/+5
\| \|
\| *	fix incorrect register in get_eye_normal() for rescale_normals case	Brian	2007-10-15	1	-2/+1
\| \|
\| *	Fix useabs logic in build_fog().	Brian	2007-10-15	1	-2/+5
\| \| \| \| \| \| \| \| \| \|	We always need to compute the absolute value of the fogcoord if we're passing it through for per-fragment fog.
\| *	remove feedback hack	Brian	2007-10-15	1	-7/+0
\| \|
\| *	Undo prev changes.	Brian	2007-10-15	1	-0/+7
\| \|
\| *	Use linked fragment shader inputs (if present) to determine which outputs ↵	Brian	2007-10-09	1	-1/+8
\| \| \| \| \| \| \| \|	are needed.
\| *	move FLUSH_CURRENT	Brian	2007-09-10	1	-3/+0
\| \|
\| *	Move guts of glRasterPos down into T&L module.	Brian	2007-09-06	1	-0/+3
\| \|
\| *	Move guts of glRasterPos into tnl module, called via new ↵	Brian	2007-09-06	1	-0/+508
\| \| \| \| \| \| \| \|	ctx->Driver.RasterPos() function.
\| *	Sketch out per-vertex point size.	Brian	2007-08-30	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The code is all in place, but mostly disabled for now: In t_vp_build.c, write the VERT_RESULT_PSIZE register In sp_state_derived.c, need to emit vertex point size if drawing points. In setup_point() use the point size from the vertex.
\| *	checkpoint in constant tracking rework	Keith Whitwell	2007-08-25	1	-0/+7
\| \|
\| *	added null VB->AttribPtr[i] check	Brian	2007-08-17	1	-1/+1
\| \|
* \|	init machine->Samplers (fixes vertex program texture fetches)	Brian Paul	2008-07-01	1	-0/+2
\| \|
* \|	Compute/setup fog coordinates even if vertex program is enabled.	H. Verbeet	2008-06-16	2	-4/+4
\| \| \| \| \| \| \| \| \| \|	Only when fog's enabled, of course. In the usual case, this is just a pass-through operation.
* \|	Don't compute vertex fog when fragment program is active.	H. Verbeet	2008-06-16	1	-7/+7
\| \|
* \|	[t_vp_build] Fix refcounting-related memory leak	Nicolai Haehnle	2008-06-02	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This memory leak is identical to the earlier one in texenvprogram. Fixed by not creating an additional reference to new programs in cache_item. On top of that, remove some duplicated state setting.
* \|	fix merge collision	Brian Paul	2008-05-16	1	-3/+1
\| \|
* \|	free(key) in _tnl_UpdateFixedFunctionProgram()	Shunichi Fuji	2008-05-16	1	-0/+3
\| \|
* \|	Fix memory leak in _tnl_UpdateFixedFunctionProgram	Shunichi Fuji	2008-05-16	1	-0/+2
\| \|
* \|	fix refcounting bugs in tnl/tex program caches	Brian Paul	2008-05-07	2	-26/+27
\| \|
* \|	implement full reference counting for vertex/fragment programs	Brian	2008-05-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test.