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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into gallium-0.2	Keith Whitwell	2008-09-21	5	-12/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-11/+296
\| \| \| \| \| \| \| \| \| \| \| \|	Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
\| *	mesa: prefix a bunch of #include lines with "main/".	Brian Paul	2008-09-18	18	-67/+67
\| \| \| \| \| \| \| \| \| \|	This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
* \|	Merge commit 'origin/gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-18	2	-24/+53
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/mesa/shader/slang/slang_link.c
\| * \|	mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵	Brian Paul	2008-09-17	1	-18/+32
\| \| \| \| \| \| \| \| \| \| \| \|	point coord
\| * \|	mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()	Brian Paul	2008-09-17	1	-0/+9
\| \| \|
\| * \|	mesa: fix bug in previous changes to _slang_resolve_attributes()	Brian Paul	2008-09-17	1	-1/+3
\| \| \|
\| * \|	mesa: rework GLSL vertex attribute binding	Brian Paul	2008-09-16	3	-102/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
\| * \|	mesa: fix bug in get_uniform_rows_cols(): sometimes returned too many rows	Brian Paul	2008-09-16	1	-6/+13
\| \| \|
* \| \|	Merge commit 'origin/master' into gallium-0.2	Keith Whitwell	2008-09-18	3	-102/+109
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
\| * \|	mesa: fix bug in previous changes to _slang_resolve_attributes()	Brian Paul	2008-09-17	1	-1/+3
\| \| \|
\| * \|	mesa: rework GLSL vertex attribute binding	Brian Paul	2008-09-16	3	-102/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
* \| \|	mesa: regenerate shader files	Keith Whitwell	2008-09-12	1	-70/+76
\| \| \|
* \| \|	Merge commit 'origin/gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	5	-7/+9
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \|	mesa: _mesa_program_state_string() returns char , not const char .	Michal Krol	2008-09-05	4	-6/+6
\| \| \|
\| * \|	mesa: fix minor mem leak	Brian Paul	2008-09-04	1	-1/+3
\| \| \|
* \| \|	Merge branch 'gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	27	-271/+689
\|\\| \| \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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: glsl: regenerated file	Brian Paul	2008-08-22	1	-552/+552
\| \|
\| *	mesa: glsl: implement exp() functions in terms of EXP asm instruction, not pow	Brian Paul	2008-08-22	1	-14/+15
\| \|
\| *	mesa: glsl: fix a swizzle bug in storage_to_src_reg()	Brian Paul	2008-08-20	1	-2/+4
\| \| \| \| \| \| \| \|	Need to remove the 'nil' components before swizzling a swizzle
\| *	mesa: glsl: add check for exceeding max number of constants/uniforms	Brian Paul	2008-08-20	1	-0/+14
\| \|
\| *	mesa: glsl: regenerated file	Brian Paul	2008-08-20	1	-70/+76
\| \|
\| *	mesa: glsl: better implementation of ftransform()	Brian Paul	2008-08-20	1	-1/+4
\| \|
\| *	mesa: glsl: more writemask error checking	Brian Paul	2008-08-19	1	-5/+17
\| \|
\| *	mesa: glsl: added some post incr/decr error checks	Brian Paul	2008-08-19	1	-1/+5
\| \|
\| *	mesa: glsl: limit function matching through casting	Brian Paul	2008-08-19	1	-1/+14
\| \|
\| *	mesa: glsl: add usage tracking for uniform vars	Brian Paul	2008-08-19	4	-3/+35
\| \| \| \| \| \| \| \|	Unused uniforms are no longer included in the active uniforms list.
\| *	mesa: glsl: put var emit/ref code into separate functions	Brian Paul	2008-08-19	1	-53/+81
\| \|
\| *	mesa: glsl: fix linking of varying vars which are arrays	Brian Paul	2008-08-15	2	-42/+44
\| \|
\| *	mesa: glsl: fix error detection of writing to read-only variables	Brian Paul	2008-08-12	1	-17/+41
\| \|
\| *	mesa: glsl: fix comment	Brian Paul	2008-08-12	1	-1/+1
\| \|
\| *	mesa: glsl: enable bzero() in slang_typeinfo_construct()	Brian Paul	2008-08-12	1	-1/+1
\| \|
\| *	mesa: glsl: remove reads of output regs from fragment shaders too	Brian Paul	2008-08-12	1	-8/+9
\| \|
\| *	mesa: set point state	Brian Paul	2008-08-12	1	-0/+4
\| \|
\| *	mesa: allow _mesa_remove_output_reads() to work on fragment programs	Brian Paul	2008-08-12	1	-4/+4
\| \|
\| *	mesa: glsl: better error messages	Brian Paul	2008-08-12	1	-3/+3
\| \|
\| *	mesa: glsl: regenerated files	Brian Paul	2008-08-12	2	-430/+422
\| \|
\| *	mesa: glsl: additional constructors	Brian Paul	2008-08-12	1	-0/+14
\| \|
\| *	mesa: glsl: better mod() functions	Brian Paul	2008-08-12	1	-21/+15
\| \|
\| *	mesa: glsl: regenerated file	Brian Paul	2008-08-11	1	-329/+337
\| \|
\| *	mesa: glsl: change refract() functions to allow inlining	Brian Paul	2008-08-11	1	-8/+20
\| \|
\| *	mesa: glsl: use SGE instead of SGT in step() functions	Brian Paul	2008-08-11	1	-9/+9
\| \|
\| *	mesa: glsl: fix bugs in refract() functions, plus minor optimization	Brian Paul	2008-08-11	1	-11/+15
\| \|
\| *	mesa: glsl: add missing sampler types in sizeof_glsl_type(), bug 17079	Brian Paul	2008-08-11	1	-2/+13
\| \|
\| *	mesa: glsl: regenerated files	Brian Paul	2008-08-07	7	-2497/+2522
\| \|
\| *	mesa: glsl: finish up support for precision qualifiers	Brian Paul	2008-08-07	2	-4/+27
\| \|
\| *	mesa: Extend GLSL syntax to accept type precision in full type specifiers.	Michal Krol	2008-08-07	3	-24/+53
\| \|
\| *	mesa: Silence compiler warnings on Windows.	Michal Krol	2008-08-07	2	-3/+3
\| \|
\| *	mesa: glsl: regenerated file	Brian Paul	2008-08-06	1	-1/+1
\| \|
\| *	mesa: glsl: report 'Syntax Error' instead of 'Invalid external declaration'	Brian Paul	2008-08-06	1	-1/+3
\| \|