summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-089-120/+69
|\ | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
| * progs/fp: remove invalid tri-inv.c testBrian Paul2010-01-073-113/+0
| | | | | | | | INV is not a valid instruction.
| * progs/demos: Assert that input to malloc is valid.Vinson Lee2010-01-061-0/+2
| |
| * progs/xdemos: Check for string overflow.Vinson Lee2010-01-061-3/+29
| |
| * progs/xdemos: Check for string overflow.Vinson Lee2010-01-061-0/+4
| |
| * progs/xdemos: Remove comma at end of enumerator list.Vinson Lee2010-01-061-1/+1
| |
| * progs/xdemos: Use temporary variables.Vinson Lee2010-01-061-2/+2
| | | | | | | | This was missed from the previous commit to glxheads.c.
| * progs/glsl: Prevent possible string overflow.Vinson Lee2010-01-061-0/+4
| |
| * progs/xdemos: Prevent possible string overflow.Vinson Lee2010-01-061-1/+27
| |
* | progs/fp: increase buffer size to read larger shadersBrian Paul2010-01-071-1/+1
| |
* | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-0413-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 Lee2010-01-032-2/+4
| |
| * progs/samples: Silence compiler warnings.Vinson Lee2010-01-031-7/+18
| |
| * progs/vp: Ensure null-terminated byte string.Vinson Lee2010-01-031-1/+2
| |
| * progs/tests: Silence uninitialized variable warning.Vinson Lee2010-01-021-1/+1
| |
| * progs/tests: Silence warn_unused_result warning.Vinson Lee2010-01-021-5/+8
| |
| * progs/samples: 'Silence no previous prototype' warnings.Vinson Lee2010-01-017-58/+58
| |
| * progs/rbug: s/wait/rbug_wait/Vinson Lee2010-01-011-2/+2
| | | | | | | | wait conflicts with wait in /usr/include/sys/wait.h.
* | scons: Build progs together with everything else.José Fonseca2010-01-0113-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é Fonseca2010-01-012-0/+9
| |
* | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-316-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 Lee2009-12-301-5/+2
| |
| * progs/glsl: Silence compiler warnings.Vinson Lee2009-12-292-10/+3
| |
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-274-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 Lee2009-12-263-9/+25
| | |
| | * progs/util: Silence warn_unused_result warnings.Vinson Lee2009-12-251-6/+14
| | |
| | * progs/perf: Fix MSVC build.Vinson Lee2009-12-211-1/+1
| | | | | | | | | | | | (cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170)
| * | progs/tests: Fix build.Vinson Lee2009-12-221-1/+0
| | |
* | | progs/tests: added test for GL_EXT_draw_buffers2Brian Paul2009-12-313-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 programBrian Paul2009-12-313-0/+244
| | |
* | | rbug: rename pf_is_compressed to util_format_is_compressedRoland Scheidegger2009-12-232-2/+4
| | |
* | | progs/tests: Fix build.Vinson Lee2009-12-221-1/+0
| | | | | | | | | | | | (cherry picked from commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73)
* | | Merge branch 'i965g-restart'Keith Whitwell2009-12-228-5/+163
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | i965g: back out unintentional changes to gearsKeith Whitwell2009-12-211-7/+0
| | | |
| * | | Merge commit 'origin/master' into i965g-restartKeith Whitwell2009-12-21169-214/+638
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: SConstruct configs/default configs/linux-dri
| * | | | brw: add dumping to gem winsysKeith Whitwell2009-11-301-0/+7
| | | | |
| * | | | progs/vp: add param and imm testKeith Whitwell2009-11-191-0/+7
| | | | |
| * | | | progs/fp: add simple imm, param testsKeith Whitwell2009-11-193-0/+18
| | | | |
| * | | | trivial: make tri-orig more closely match the original version of tri...Keith Whitwell2009-11-111-5/+5
| | | | |
| * | | | progs/trivial: IgnoresJakob Bornecrantz2009-11-061-0/+1
| | | | |
| * | | | trivial: add vbo-tri, an even simpler version of tri.cKeith Whitwell2009-11-062-0/+132
| | | | |
* | | | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-21100-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_branchBrian Paul2009-12-2187-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 Lee2009-12-2162-296/+283
| | | | |
| | * | | progs/tests: Silence compiler warnings.Vinson Lee2009-12-2011-10/+19
| | | | |
| | * | | progs/trivial: Use C-style comments.Vinson Lee2009-12-1910-12/+12
| | | | |
| | * | | progs/xdemos: Use C-style comment.Vinson Lee2009-12-191-1/+1
| | | | |
| | * | | progs/demos: Silence compiler warning in morph3d.c.Vinson Lee2009-12-181-1/+1
| | | | |
| | * | | progs/glsl: Use C-style comments.Vinson Lee2009-12-182-3/+3
| | | | |
| | * | | progs/demos: Use C-style comment.Vinson Lee2009-12-181-1/+1
| | | | |