diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-10 15:49:30 +0100 |
| commit | 3ce4375912c8ea488460e593e07c5bb15b92dca9 (patch) | |
| tree | 1011fa439bd829fd46a44fd99478135848800e73 /progs/demos/SConscript | |
| parent | f59f28093ea827bd234d8e1a36bdd56a9fce5f09 (diff) | |
| parent | 9b348d0ed125a22be3f318ac60cef6f201edfdab (diff) | |
Merge branch 'master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
src/gallium/auxiliary/tgsi/tgsi_exec.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_context.h
src/gallium/drivers/llvmpipe/lp_context.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/softpipe/sp_context.h
src/gallium/drivers/svga/svga_context.h
src/gallium/drivers/svga/svga_pipe_sampler.c
Diffstat (limited to 'progs/demos/SConscript')
| -rw-r--r-- | progs/demos/SConscript | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/progs/demos/SConscript b/progs/demos/SConscript index 10d53b50bf..20ec6a002a 100644 --- a/progs/demos/SConscript +++ b/progs/demos/SConscript @@ -4,14 +4,17 @@ progs = [ 'arbfplight', 'arbfslight', 'arbocclude', + 'arbocclude2', 'bounce', 'clearspd', 'copypix', 'cubemap', + 'dinoshade', 'dissolve', 'drawpix', 'engine', 'fbo_firecube', + 'fbotexture', 'fire', 'fogcoord', 'fplight', @@ -30,6 +33,7 @@ progs = [ 'multiarb', 'paltex', 'pointblast', + 'projtex', 'ray', 'readpix', 'reflect', @@ -50,9 +54,6 @@ progs = [ 'tunnel2', 'vao_demo', 'winpos', - 'dinoshade', - 'fbotexture', - 'projtex', ] for prog in progs: |