summaryrefslogtreecommitdiff
path: root/progs
AgeCommit message (Collapse)Author
2010-01-08Merge remote branch 'origin/master' into lp-binningJosé Fonseca
Conflicts: src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/Makefile src/gallium/drivers/llvmpipe/SConscript src/gallium/drivers/llvmpipe/lp_bld_arit.c src/gallium/drivers/llvmpipe/lp_bld_flow.c src/gallium/drivers/llvmpipe/lp_bld_interp.c src/gallium/drivers/llvmpipe/lp_clear.c src/gallium/drivers/llvmpipe/lp_context.c src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/llvmpipe/lp_draw_arrays.c src/gallium/drivers/llvmpipe/lp_jit.c src/gallium/drivers/llvmpipe/lp_jit.h src/gallium/drivers/llvmpipe/lp_prim_vbuf.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_setup_point.c src/gallium/drivers/llvmpipe/lp_state.h src/gallium/drivers/llvmpipe/lp_state_blend.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_sampler.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_tex_cache.h src/gallium/drivers/llvmpipe/lp_tex_sample.h src/gallium/drivers/llvmpipe/lp_tile_cache.c
2010-01-07progs/fp: increase buffer size to read larger shadersBrian Paul
2010-01-04Merge branch 'mesa_7_7_branch'Brian Paul
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
2010-01-03progs/egl: Silence uninitialized variable warnings.Vinson Lee
2010-01-03progs/samples: Silence compiler warnings.Vinson Lee
2010-01-03progs/vp: Ensure null-terminated byte string.Vinson Lee
2010-01-02progs/tests: Silence uninitialized variable warning.Vinson Lee
2010-01-02progs/tests: Silence warn_unused_result warning.Vinson Lee
2010-01-01progs/samples: 'Silence no previous prototype' warnings.Vinson Lee
2010-01-01progs/rbug: s/wait/rbug_wait/Vinson Lee
wait conflicts with wait in /usr/include/sys/wait.h.
2010-01-01scons: Build progs together with everything else.José Fonseca
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
2010-01-01progs: Ignore derived files.José Fonseca
2009-12-31Merge branch 'mesa_7_7_branch'Brian Paul
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
2009-12-31progs/tests: added test for GL_EXT_draw_buffers2Brian Paul
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.
2009-12-31progs/tests: added conditional rendering test programBrian Paul
2009-12-30progs/glsl: Provide a better fix for fgets warning.Vinson Lee
2009-12-29progs/glsl: Silence compiler warnings.Vinson Lee
2009-12-27Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
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
2009-12-26progs/demos: Silence warn_unused_result warnings.Vinson Lee
2009-12-25progs/util: Silence warn_unused_result warnings.Vinson Lee
2009-12-23rbug: rename pf_is_compressed to util_format_is_compressedRoland Scheidegger
2009-12-22progs/tests: Fix build.Vinson Lee
(cherry picked from commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73)
2009-12-22Merge branch 'i965g-restart'Keith Whitwell
Conflicts: configure.ac
2009-12-22progs/tests: Fix build.Vinson Lee
2009-12-21progs/perf: Fix MSVC build.Vinson Lee
(cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170)
2009-12-21Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
2009-12-21Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
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
2009-12-21progs/redbook: Silence compiler warnings.Vinson Lee
2009-12-21progs/perf: added check for GL_ARB_framebuffer_objectBrian Paul
2009-12-21progs/demos: report pixel rate in million pixels / secBrian Paul
2009-12-21progs/osmes: add missing libGL dependency, remove unneeded linesBrian Paul
2009-12-21i965g: back out unintentional changes to gearsKeith Whitwell
2009-12-21Merge commit 'origin/master' into i965g-restartKeith Whitwell
Conflicts: SConstruct configs/default configs/linux-dri
2009-12-20progs/tests: Silence compiler warnings.Vinson Lee
2009-12-19progs/trivial: Use C-style comments.Vinson Lee
2009-12-19progs/xdemos: Use C-style comment.Vinson Lee
2009-12-18progs/demos: Silence compiler warning in morph3d.c.Vinson Lee
2009-12-18progs/glsl: Use C-style comments.Vinson Lee
2009-12-18progs/demos: Use C-style comment.Vinson Lee
2009-12-18progs/demos: fix glut initialization callsBrian Paul
Remove glutInitWindowPosition() calls to play nicer with window managers. Move glutInitWindowSize() calls before glutInit() so the the default window size can be overridden by the -geometry cmd line option.
2009-12-17Move the remaining format pf_get_* functions to u_format.h.Michal Krol
Previously they depended on format blocks, but after removing those they started depending on format encoding.
2009-12-14progs/trivial: Silence compiler warnings.Vinson Lee
2009-12-12progs/trivial: Silence compiler warnings in tri-blend-min.c.Vinson Lee
2009-12-12progs/trivial: Silence compiler warnings in tri-blend-max.cVinson Lee
2009-12-12progs/xdemos: Silence compiler warnings in glxinfo.c.Vinson Lee
2009-12-12progs/tests: Silence compiler warnings in vpeval.c.Vinson Lee
2009-12-12progs/tests: Silence compiler warnings in cva.c.Vinson Lee
2009-12-12progs/redbook: Silence compiler warnings in aaindex.c.Vinson Lee
2009-12-11Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
2009-12-11Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul