Brian Paul
e9df31fac9
progs/demos: sort filenames
2010-02-19 11:09:05 -07:00
Brian Paul
86bf224cac
progs/demos: update arbocclude.c to do multiple queries at once
...
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.
2010-02-18 16:58:38 -07:00
Brian Paul
0583c29313
progs/demos: update GL version test to accept GL 3.x
2010-02-17 09:02:33 -07:00
Joakim Sindholt
e891a9cc3a
progs/demos: update .gitignore
2010-02-08 12:33:02 +01:00
Brian Paul
45ceabf794
progs/demos: fix typo
2010-02-05 13:16:39 -07:00
José Fonseca
bee9964b29
Merge remote branch 'origin/master' into lp-binning
...
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
2010-01-31 05:36:33 +00:00
Brian Paul
b8d4cbd7e2
progs/demos: new image dissolve demo
...
Dissolve between two images using a random pattern in the stencil
buffer and a varying stencil ref value.
2010-01-29 14:01:34 -07:00
Brian Paul
9b22427911
Merge branch 'mesa_7_7_branch'
...
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
2010-01-25 14:46:17 -07:00
Vinson Lee
7f2f42dd80
progs/demos: Remove unnecessary header from shadowtex.c.
2010-01-23 20:56:49 -08:00
Brian Paul
e5829ccc2b
progs/demos: call glutDestroyWindow() upon exit
2010-01-21 15:41:03 -07:00
José Fonseca
ba5d600c90
Merge remote branch 'origin/master' into lp-binning
...
Conflicts:
src/gallium/drivers/llvmpipe/lp_quad.h
src/gallium/drivers/llvmpipe/lp_setup.c
2010-01-16 23:21:06 +00:00
Jakob Bornecrantz
b01ffb12ed
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
src/gallium/auxiliary/util/Makefile
src/gallium/drivers/r300/r300_state_derived.c
2010-01-14 22:31:04 +00:00
Vinson Lee
78ddce9fda
progs/demos: Remove unnecessary header from morph3d.c.
2010-01-11 19:29:26 -08:00
Vinson Lee
b4bc208529
progs/demos: Remove unnecessary header from isosurf.c.
2010-01-11 19:03:18 -08:00
José Fonseca
080c40ab32
Merge remote branch 'origin/master' into lp-binning
...
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-08 15:42:57 +00:00
Brian Paul
fd70841121
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_emit.c
2010-01-08 08:21:12 -07:00
Vinson Lee
d42467687e
progs/demos: Assert that input to malloc is valid.
2010-01-06 21:39:44 -08:00
Vinson Lee
6d6c9c6688
progs/demos: Remove unnecessary header from fbotexture.c.
2010-01-11 00:24:39 -08:00
Vinson Lee
0c7814fe23
progs/demos: Bounds check input to fire.c.
2010-01-10 00:40:46 -08:00
Vinson Lee
3b82de92a0
progs/demos: Add missing initializers in engine.c.
2010-01-08 22:02:49 -08:00
José Fonseca
7bbf7f94ea
scons: Build progs together with everything else.
...
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-01 12:16:19 +00:00
Brian Paul
25024d9482
Merge branch 'mesa_7_7_branch'
...
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-31 09:02:27 -07:00
Brian Paul
d0b7ff551a
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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-27 15:31:08 -07:00
Vinson Lee
e81fe088f4
progs/demos: Silence warn_unused_result warnings.
2009-12-26 01:08:26 -08:00
Brian Paul
9eb7fc6661
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
Brian Paul
b57abd3bea
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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-21 18:23:53 -07:00
Brian Paul
79e74cda73
progs/demos: report pixel rate in million pixels / sec
2009-12-21 13:49:25 -07:00
Vinson Lee
695adf41e2
progs/demos: Silence compiler warning in morph3d.c.
2009-12-18 23:46:14 -08:00
Vinson Lee
41377942d3
progs/demos: Use C-style comment.
2009-12-18 23:34:28 -08:00
Brian Paul
263f4322e7
progs/demos: fix glut initialization calls
...
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-18 13:58:14 -07:00
Brian Paul
edf11da7f8
progs/demos/gloss: press 'n' to advance by one frame
2009-12-09 16:23:30 -07:00
Brian Paul
288ea9770a
progs/demos: call glutDestroyWindow() in gloss.c
2009-12-09 14:53:53 -07:00
Ian Romanick
8fc433fa0f
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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.
2009-12-07 17:16:10 -08:00
Vinson Lee
7d84169865
progs/demos: Fix memory leak in projtex.c.
2009-12-07 12:31:08 -08:00
Vinson Lee
b803abbaad
progs/demos: Fix memory leak in ray.c.
...
(cherry picked from commit 6b480dc21d
)
2009-12-03 22:49:18 -08:00
Vinson Lee
5820dae4ec
progs/demos: Fix memory leak in projtex.c.
...
(cherry picked from commit ee555e3d69
)
2009-12-03 22:44:55 -08:00
Vinson Lee
fc5f07de1a
progs/demos: Fix memory leak in ipers.c.
...
(cherry picked from commit a1afe303de
)
2009-12-03 22:38:44 -08:00
Vinson Lee
d245a951f3
progs/demos: Fix memory leak in fslight.c.
...
(cherry picked from commit aef3218f0b
)
2009-12-03 22:36:37 -08:00
Jakob Bornecrantz
0c75854cc1
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/mesa/main/version.h
2009-12-02 14:52:51 +01:00
Brian Paul
ba97b98842
progs/demos: remove unused glFogCoordPointer_ext var
2009-12-01 12:23:07 -07:00
Brian Paul
1888a72765
progs/demos: silence warnings
2009-11-17 16:16:30 -07:00
Vinson Lee
6b480dc21d
progs/demos: Fix memory leak in ray.c.
2009-11-16 18:06:40 -08:00
Vinson Lee
ee555e3d69
progs/demos: Fix memory leak in projtex.c.
2009-11-16 16:31:34 -08:00
Vinson Lee
a1afe303de
progs/demos: Fix memory leak in ipers.c.
2009-11-16 15:44:52 -08:00
Vinson Lee
aef3218f0b
progs/demos: Fix memory leak in fslight.c.
2009-11-16 14:56:07 -08:00
Keith Whitwell
19403935aa
progs/demos: add fps to multiarb
2009-10-23 13:56:07 +01:00
Brian Paul
91bd87c06e
progs/demos: try different depth formats in fbo_firecube.c
2009-10-14 19:13:32 -06:00
Keith Whitwell
890679d432
Merge branch 'softpipe-opt'
...
Conflicts:
progs/demos/cubemap.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_texture.c
2009-09-23 17:37:28 +01:00
Brian Paul
0b0fc4072f
progs/demos: use non-default texobj in cubemap.c
2009-09-15 18:17:42 -06:00
Brian Paul
7f86da6c60
progs/demos: create a texture object in lodbias.c
...
Before, we were using the default texture object (name=0). This caused
the intel_generate_mipmap() path to fail since passing texture=0 to
glFramebufferTexture2DEXT() causes us to _unbind_ the texture if present.
2009-09-15 18:17:42 -06:00