summaryrefslogtreecommitdiffstats
path: root/progs/demos
Commit message (Collapse)AuthorAgeFilesLines
* progs/demos: sort filenamesBrian Paul2010-02-191-3/+3
|
* progs/demos: update arbocclude.c to do multiple queries at onceBrian Paul2010-02-181-105/+108
| | | | | | Issue a whole bunch of queries then get the results and render. Draw the test object in red instead of orange if the result was not ready when we first queried it.
* progs/demos: update GL version test to accept GL 3.xBrian Paul2010-02-171-2/+2
|
* progs/demos: update .gitignoreJoakim Sindholt2010-02-081-0/+1
|
* progs/demos: fix typoBrian Paul2010-02-051-1/+1
|
* Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-314-8/+160
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/auxiliary/util/u_surface.c src/gallium/drivers/llvmpipe/lp_flush.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.c src/gallium/drivers/llvmpipe/lp_state_surface.c src/gallium/drivers/llvmpipe/lp_tex_cache.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/llvmpipe/lp_tile_cache.c src/mesa/state_tracker/st_cb_condrender.c
| * progs/demos: new image dissolve demoBrian Paul2010-01-293-0/+160
| | | | | | | | | | Dissolve between two images using a random pattern in the stencil buffer and a varying stencil ref value.
| * Merge branch 'mesa_7_7_branch'Brian Paul2010-01-252-8/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c
| | * progs/demos: Remove unnecessary header from shadowtex.c.Vinson Lee2010-01-232-8/+0
| | |
* | | progs/demos: call glutDestroyWindow() upon exitBrian Paul2010-01-211-1/+4
| | |
* | | Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-165-7/+24
|\| | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/llvmpipe/lp_quad.h src/gallium/drivers/llvmpipe/lp_setup.c
| * | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2010-01-145-7/+22
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
| | * progs/demos: Remove unnecessary header from morph3d.c.Vinson Lee2010-01-111-1/+0
| | |
| | * progs/demos: Remove unnecessary header from isosurf.c.Vinson Lee2010-01-111-1/+0
| | |
| | * progs/demos: Remove unnecessary header from fbotexture.c.Vinson Lee2010-01-111-1/+0
| | |
| | * progs/demos: Bounds check input to fire.c.Vinson Lee2010-01-101-1/+7
| | |
| | * progs/demos: Add missing initializers in engine.c.Vinson Lee2010-01-081-3/+15
| | |
| * | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-081-0/+2
| |\| | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c
| | * progs/demos: Assert that input to malloc is valid.Vinson Lee2010-01-061-0/+2
| | |
* | | Merge remote branch 'origin/master' into lp-binningJosé Fonseca2010-01-0846-202/+193
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | scons: Build progs together with everything else.José Fonseca2010-01-011-71/+53
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-313-9/+25
| |\| | | | | | | | | | | | | | | | | | | | | | 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
| | * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-273-9/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| * | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-212-5/+6
| |\| | | | | | | | | | | | | | | | | | | | | | 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-211-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/demos: Silence compiler warning in morph3d.c.Vinson Lee2009-12-181-1/+1
| | | |
| | | * progs/demos: Use C-style comment.Vinson Lee2009-12-181-1/+1
| | | |
| | * | progs/demos: report pixel rate in million pixels / secBrian Paul2009-12-211-4/+5
| | | |
| * | | progs/demos: fix glut initialization callsBrian Paul2009-12-1845-106/+54
| |/ / | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-071-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch.
| | * progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-12-071-0/+1
| | |
| | * progs/demos: Fix memory leak in ray.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | | | | | (cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293)
| | * progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-12-031-0/+3
| | | | | | | | | | | | (cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b)
| | * progs/demos: Fix memory leak in ipers.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | | | | | (cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f)
| | * progs/demos: Fix memory leak in fslight.c.Vinson Lee2009-12-031-0/+1
| | | | | | | | | | | | (cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e)
| * | Merge commit 'mesa_7_6_branch' into mesa_7_7_branchJakob Bornecrantz2009-12-021-2/+0
| |\| | | | | | | | | | | | | Conflicts: src/mesa/main/version.h
| | * progs/demos: remove unused glFogCoordPointer_ext varBrian Paul2009-12-011-2/+0
| | |
| * | progs/demos: silence warningsBrian Paul2009-11-172-2/+3
| | |
| * | progs/demos: Fix memory leak in ray.c.Vinson Lee2009-11-161-0/+2
| | |
| * | progs/demos: Fix memory leak in projtex.c.Vinson Lee2009-11-161-0/+3
| | |
| * | progs/demos: Fix memory leak in ipers.c.Vinson Lee2009-11-161-0/+2
| | |
| * | progs/demos: Fix memory leak in fslight.c.Vinson Lee2009-11-161-0/+1
| | |
| * | progs/demos: add fps to multiarbKeith Whitwell2009-10-231-0/+16
| | |
| * | progs/demos: try different depth formats in fbo_firecube.cBrian Paul2009-10-141-8/+28
| | |
* | | progs/demos/gloss: press 'n' to advance by one frameBrian Paul2009-12-091-0/+3
| | |
* | | progs/demos: call glutDestroyWindow() in gloss.cBrian Paul2009-12-091-1/+3
|/ /
* | Merge branch 'softpipe-opt'Keith Whitwell2009-09-231-0/+16
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c
| * | progs/demos: add fps output to cubemapKeith Whitwell2009-08-231-0/+16
| | |
* | | progs/demos: use non-default texobj in cubemap.cBrian Paul2009-09-151-0/+5
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-15 06:42:14 +0000