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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'mesa_7_7_branch'	Brian Paul	2010-01-04	13	-76/+93
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c
\| *	progs/egl: Silence uninitialized variable warnings.	Vinson Lee	2010-01-03	2	-2/+4
\| \|
\| *	progs/samples: Silence compiler warnings.	Vinson Lee	2010-01-03	1	-7/+18
\| \|
\| *	progs/vp: Ensure null-terminated byte string.	Vinson Lee	2010-01-03	1	-1/+2
\| \|
\| *	progs/tests: Silence uninitialized variable warning.	Vinson Lee	2010-01-02	1	-1/+1
\| \|
\| *	progs/tests: Silence warn_unused_result warning.	Vinson Lee	2010-01-02	1	-5/+8
\| \|
\| *	progs/samples: 'Silence no previous prototype' warnings.	Vinson Lee	2010-01-01	7	-58/+58
\| \|
\| *	progs/rbug: s/wait/rbug_wait/	Vinson Lee	2010-01-01	1	-2/+2
\| \| \| \| \| \| \| \|	wait conflicts with wait in /usr/include/sys/wait.h.
* \|	scons: Build progs together with everything else.	José Fonseca	2010-01-01	13	-272/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a substantial reorganization, This particular commit enables: - building the progs for unices platforms - glew is now built as a shared library (it is the default, and it is inconvenient and pointless to shift away from that default) - all progs get built by default
* \|	progs: Ignore derived files.	José Fonseca	2010-01-01	2	-0/+9
\| \|
* \|	Merge branch 'mesa_7_7_branch'	Brian Paul	2009-12-31	6	-27/+41
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
\| *	progs/glsl: Provide a better fix for fgets warning.	Vinson Lee	2009-12-30	1	-5/+2
\| \|
\| *	progs/glsl: Silence compiler warnings.	Vinson Lee	2009-12-29	2	-10/+3
\| \|
\| *	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Brian Paul	2009-12-27	4	-15/+39
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/demos: Silence warn_unused_result warnings.	Vinson Lee	2009-12-26	3	-9/+25
\| \| \|
\| \| *	progs/util: Silence warn_unused_result warnings.	Vinson Lee	2009-12-25	1	-6/+14
\| \| \|
\| \| *	progs/perf: Fix MSVC build.	Vinson Lee	2009-12-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170)
\| * \|	progs/tests: Fix build.	Vinson Lee	2009-12-22	1	-1/+0
\| \| \|
* \| \|	progs/tests: added test for GL_EXT_draw_buffers2	Brian Paul	2009-12-31	3	-0/+366
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render into two color buffers (render targets). Display half of each buffer in the window. Use different color masks for each render target. Only enable blending for the second render target.
* \| \|	progs/tests: added conditional rendering test program	Brian Paul	2009-12-31	3	-0/+244
\| \| \|
* \| \|	rbug: rename pf_is_compressed to util_format_is_compressed	Roland Scheidegger	2009-12-23	2	-2/+4
\| \| \|
* \| \|	progs/tests: Fix build.	Vinson Lee	2009-12-22	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	(cherry picked from commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73)
* \| \|	Merge branch 'i965g-restart'	Keith Whitwell	2009-12-22	8	-5/+163
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac
\| * \| \|	i965g: back out unintentional changes to gears	Keith Whitwell	2009-12-21	1	-7/+0
\| \| \| \|
\| * \| \|	Merge commit 'origin/master' into i965g-restart	Keith Whitwell	2009-12-21	169	-214/+638
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: SConstruct configs/default configs/linux-dri
\| * \| \| \|	brw: add dumping to gem winsys	Keith Whitwell	2009-11-30	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	progs/vp: add param and imm test	Keith Whitwell	2009-11-19	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	progs/fp: add simple imm, param tests	Keith Whitwell	2009-11-19	3	-0/+18
\| \| \| \| \|
\| * \| \| \|	trivial: make tri-orig more closely match the original version of tri...	Keith Whitwell	2009-11-11	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	progs/trivial: Ignores	Jakob Bornecrantz	2009-11-06	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	trivial: add vbo-tri, an even simpler version of tri.c	Keith Whitwell	2009-11-06	2	-0/+132
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mesa_7_7_branch'	Brian Paul	2009-12-21	100	-363/+362
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
\| * \| \| \|	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Brian Paul	2009-12-21	87	-323/+318
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h
\| \| * \| \|	progs/redbook: Silence compiler warnings.	Vinson Lee	2009-12-21	62	-296/+283
\| \| \| \| \|
\| \| * \| \|	progs/tests: Silence compiler warnings.	Vinson Lee	2009-12-20	11	-10/+19
\| \| \| \| \|
\| \| * \| \|	progs/trivial: Use C-style comments.	Vinson Lee	2009-12-19	10	-12/+12
\| \| \| \| \|
\| \| * \| \|	progs/xdemos: Use C-style comment.	Vinson Lee	2009-12-19	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	progs/demos: Silence compiler warning in morph3d.c.	Vinson Lee	2009-12-18	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	progs/glsl: Use C-style comments.	Vinson Lee	2009-12-18	2	-3/+3
\| \| \| \| \|
\| \| * \| \|	progs/demos: Use C-style comment.	Vinson Lee	2009-12-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	progs/perf: added check for GL_ARB_framebuffer_object	Brian Paul	2009-12-21	1	-0/+6
\| \| \| \| \|
\| * \| \| \|	progs/demos: report pixel rate in million pixels / sec	Brian Paul	2009-12-21	1	-4/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'mesa_7_6_branch' into mesa_7_7_branch	Ian Romanick	2009-12-15	11	-36/+33
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
\| \| * \| \|	progs/trivial: Silence compiler warnings.	Vinson Lee	2009-12-14	5	-15/+12
\| \| \| \| \|
\| \| * \| \|	progs/trivial: Silence compiler warnings in tri-blend-min.c.	Vinson Lee	2009-12-12	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	progs/trivial: Silence compiler warnings in tri-blend-max.c	Vinson Lee	2009-12-12	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	progs/xdemos: Silence compiler warnings in glxinfo.c.	Vinson Lee	2009-12-12	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	progs/tests: Silence compiler warnings in vpeval.c.	Vinson Lee	2009-12-12	1	-5/+5
\| \| \| \| \|
\| \| * \| \|	progs/tests: Silence compiler warnings in cva.c.	Vinson Lee	2009-12-12	1	-4/+4
\| \| \| \| \|
\| \| * \| \|	progs/redbook: Silence compiler warnings in aaindex.c.	Vinson Lee	2009-12-12	1	-4/+4
\| \| \| \| \|