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-08	1	-541/+477
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/glsl/Makefile
\| *	mesa: assorted clean-ups, updated comments, etc.	Brian	2008-12-05	1	-155/+137
\| \|
\| *	mesa: replace large macros with inline functions	Brian	2008-12-05	1	-386/+338
\| \|
\| *	mesa: add missing break statements	Brian Paul	2008-11-28	1	-0/+2
\| \|
* \|	Merge commit 'origin/master' into gallium-0.2	Brian Paul	2008-10-10	1	-0/+1
\|\\|
\| *	mesa: include needed header	Brian Paul	2008-10-10	1	-0/+1
\| \|
* \|	Merge commit 'origin/master' into gallium-0.2	Keith Whitwell	2008-10-10	3	-15/+15
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/mesa/glapi/descrip.mms src/mesa/shader/grammar/descrip.mms
\| *	mesa: pass 'mask', not NULL to renderbuffer->Put functions	Brian Paul	2008-10-07	1	-10/+10
\| \| \| \| \| \| \| \|	Fixes bug 17800.
\| *	mesa: adjust texcoords for swrast sprite points.	Brian Paul	2008-10-06	1	-2/+2
\| \| \| \| \| \| \| \|	Fixes glean pointSprite test w/ software rendering
\| *	Unify ARB_depth_texture and SGIX_depth_texture	Ian Romanick	2008-10-01	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	The ARB extension is a superset of the older SGIX extension. Any hardware that can support the SGIX version can also support the ARB version. In Mesa, any driver that supports one also supports the other. This unification just simplifies some bits of code.
* \|	swrast: remove dead file not present in master	Keith Whitwell	2008-09-21	1	-36/+0
\| \|
* \|	swrast: remove merge droppings	Keith Whitwell	2008-09-21	1	-4/+0
\| \|
* \|	Merge branch 'master' into gallium-0.2	Keith Whitwell	2008-09-21	34	-56/+44
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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: remove unneeded s_drawpix.h header	Brian	2008-09-18	2	-36/+0
\| \|
\| *	mesa: fix asst path/include mistakes in prev commits	Chris Rankin	2008-09-18	1	-1/+1
\| \|
\| *	mesa: prefix a bunch of #include lines with "main/".	Brian Paul	2008-09-18	47	-168/+152
\| \| \| \| \| \| \| \| \| \|	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/master' into gallium-0.2	Keith Whitwell	2008-09-18	1	-0/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
\| *	mesa: return after _mesa_problem() calls	Guillaume Melquiond	2008-09-13	1	-0/+2
\| \|
* \|	Merge branch 'gallium-0.1' into gallium-0.2	Keith Whitwell	2008-09-11	47	-132/+135
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	47	-131/+131
\| \| \| \| \| \| \| \| \| \|	Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
\| *	mesa: fix issues around multisample enable	Roland Scheidegger	2008-07-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	multisample enable is enabled by default, however gl mandates multisample rendering rules only apply if there's also a multisampled buffer.
\| *	mesa: refactor: move pixel map/scale/bias code into image.c	Brian Paul	2008-06-09	1	-1/+1
\| \| \| \| \| \| \| \|	pixel.c is just the API-related code now.
\| *	Consolidate texture fetch code and use partial derivatives when possible.	Brian Paul	2008-05-14	1	-1/+1
\| \| \| \| \| \| \| \|	picked from master
\| *	mesa: sync up swrast/s_fragprog.c with master	Brian Paul	2008-05-14	1	-16/+22
\| \|
\| *	gallium: fix typo s/_mesa_unmap_drapix_pbo/_mesa_unmap_drawpix_pbo/	Brian Paul	2008-04-25	1	-1/+1
\| \|
\| *	Refactor PBO validate/map code.	Brian	2008-03-21	3	-10/+5
\| \| \| \| \| \| \| \| \| \| \| \|	We always need to do PBO validation, so do that in core Mesa before calling driv er routine. cherry-picked from Mesa/master.
\| *	add a number of PBO validate/map/unmap functions	Brian Paul	2008-03-21	3	-74/+18
\| \| \| \| \| \| \| \| \| \|	Helper functions for (some) drivers, including swrast. cherry-picked from Mesa/master
\| *	Remove files of unsupported build systems.	José Fonseca	2008-02-25	1	-80/+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'.
\| *	Re-implement GLSL texture sampler variables.	Brian	2007-10-26	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	GLSL sampler variables indicate which texture unit to use for TEX instructions. Previously, this was baked into the fragment/vertex program and couldn't be readily changed once set. Now, SamplerUnits[] array indicates which texture unit is to be used for each sampler variable. These values are set with glUniform1i(). This is extra state that must be passed to the fragment/vertex program executor at runtime.
\| *	Implement gl_PointCoord attribute for GLSL fragment shaders.	Brian	2007-10-24	4	-52/+69
\| \| \| \| \| \| \| \|	Contains the normalized fragment position within a point sprite.
\| *	check for null swrast (pipe work-around)	Brian	2007-08-16	1	-0/+3
\| \|
* \|	mesa: fix float blend bug	Mark Anderson	2008-08-20	1	-3/+4
\| \|
* \|	mesa: fix a swrast state validation bug	Brian Paul	2008-08-13	1	-1/+9
\| \| \| \| \| \| \| \|	Fixes progs/glsl/points.c
* \|	mesa: added comment about gl_PointCoord	Brian Paul	2008-08-11	1	-0/+1
\| \|
* \|	added null texObj ptr check (bug 15567)	Brian Paul	2008-07-08	1	-12/+16
\| \|
* \|	mesa: fix issues around multisample enable	Roland Scheidegger	2008-07-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	multisample enable is enabled by default, however gl mandates multisample rendering rules only apply if there's also a multisampled buffer.
* \|	mesa: tweak mipmap level selection for cube maps	Brian Paul	2008-06-19	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is just a hack. After we convert the 3D texcoord into a face plus 2D texcoord we need to recompute the partial derivatives and mipmap LOD. But we don't have the info to do that. Adjusting the original mipmap level by -1 seems to give somewhat better results than before though.
* \|	mesa: allocate pixel zoom arrays on heap, not stack	Brian Paul	2008-06-16	3	-10/+20
\| \| \| \| \| \| \| \|	Fixes stack overflow on Windows.
* \|	Updated GLSL uniform/sampler handling from gallium-0.1 branch	Brian Paul	2008-05-14	2	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, the shader linker combined the uniforms used by the vertex and fragment shaders into a combined set of uniforms. This made the implementation of glUniform*() simple, but was rather inefficient otherwise. Now each shader gets its own set of uniforms (no more modelview matrix showing up in the fragment shader uniforms, for example). cherry-picked by hand from gallium-0.1 branch
* \|	swrast/dri: switch over users of generate_mipmap to new interface	Dave Airlie	2008-05-09	1	-5/+5
\| \|
* \|	mesa: Call RENDER_FINISH on the zero pixel case.	Xiang, Haihao	2008-05-08	1	-1/+3
\| \|
* \|	glcore: drop outdated sources files intented for xorg	George Sapountzis	2008-04-23	1	-65/+0
\| \|
* \|	fix multi-draw buffer regression	Brian	2008-04-14	1	-2/+1
\| \|
* \|	Refactor PBO validate/map code.	Brian	2008-03-21	3	-12/+7
\| \| \| \| \| \| \| \|	We always need to do PBO validation, so do that in core Mesa before calling driver routine.
* \|	add a number of PBO validate/map/unmap functions	Brian	2008-03-21	3	-79/+19
\| \| \| \| \| \| \| \|	Helper functions for (some) drivers, including swrast.
* \|	mesa: The span array is only populated in single-pixel	Xiang, Haihao	2008-03-20	1	-2/+4
\| \| \| \| \| \| \| \|	point drawing function.
* \|	fix botched test for clearing color buffers (should fix depth peeling ↵	Brian	2008-03-09	1	-3/+4
\| \| \| \| \| \| \| \|	regression)
* \|	Fix some issues with glDrawBuffer(GL_NONE), bug 14198	Brian	2008-01-22	3	-7/+13
\| \| \| \| \| \| \| \| \| \|	Set _ColorDrawBuffers[0] = NULL if no renderbuffers enabled. Check that _ColorDrawBuffers[0] is non-null before dereferencing in a few places.
* \|	Simplify ctx->_NumColorDrawBuffers, _ColorDrawBuffers and fix bug 13835.	Brian	2008-01-06	10	-148/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These fields are no longer indexed by shader output. Now, we just have a simple array of renderbuffer pointers. If the shader writes to gl_FragData[i], send those colors to the N _ColorDrawBuffers. Otherwise, replicate the single gl_FragColor (or the fixed-function color) to the N _ColorDrawBuffers. A few more changes and simplifications can follow from this...