summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2009-04-20 16:17:50 +0100
committerKeith Whitwell <[email protected]>2009-04-20 16:17:50 +0100
commitd017749b3ea07f2cc43bb5e8316b83471d1e13ec (patch)
tree9e8b6216fb8dfb827c22e09c0f979f6b3cbe7907
parentc691f96e9848d05947afc40ea5c14bc2989f00cf (diff)
mesa/progs: fix scons build after recent demo moves
-rw-r--r--progs/demos/SConscript10
-rw-r--r--progs/tests/SConscript9
2 files changed, 9 insertions, 10 deletions
diff --git a/progs/demos/SConscript b/progs/demos/SConscript
index bc166dd7895..f851870bcf3 100644
--- a/progs/demos/SConscript
+++ b/progs/demos/SConscript
@@ -39,11 +39,9 @@ progs = [
'geartrain',
'glinfo',
'gloss',
- 'glslnoise',
'gltestperf',
- 'glutfx',
- 'isosurf',
'ipers',
+ 'isosurf',
'lodbias',
'morph3d',
'multiarb',
@@ -55,7 +53,6 @@ progs = [
'renormal',
'shadowtex',
'singlebuffer',
- 'streaming_rect',
'spectex',
'spriteblast',
'stex3d',
@@ -63,15 +60,16 @@ progs = [
'terrain',
'tessdemo',
'texcyl',
- 'texdown',
'texenv',
- 'texobj',
'textures',
'trispd',
'tunnel',
'tunnel2',
'vao_demo',
'winpos',
+ 'dinoshade',
+ 'fbotexture',
+ 'projtex',
]
for prog in progs:
diff --git a/progs/tests/SConscript b/progs/tests/SConscript
index bf1e7f8a7d8..4f22ca735c1 100644
--- a/progs/tests/SConscript
+++ b/progs/tests/SConscript
@@ -42,8 +42,8 @@ progs = [
'arbfptest1',
'arbfptexture',
'arbfptrig',
- 'arbnpot-mipmap',
'arbnpot',
+ 'arbnpot-mipmap',
'arbvptest1',
'arbvptest3',
'arbvptorus',
@@ -61,19 +61,18 @@ progs = [
'copypixrate',
'crossbar',
'cva',
- 'dinoshade',
'drawbuffers',
'exactrast',
'ext422square',
'fbotest1',
'fbotest2',
- 'fbotexture',
'fillrate',
'floattex',
'fog',
'fogcoord',
'fptest1',
'fptexture',
+ 'glutfx',
'interleave',
'invert',
'lineclip',
@@ -91,7 +90,6 @@ progs = [
'packedpixels',
'pbo',
'prog_parameter',
- 'projtex',
'quads',
'random',
'readrate',
@@ -101,14 +99,17 @@ progs = [
'stencil_twoside',
'stencil_wrap',
'stencilwrap',
+ 'streaming_rect',
'subtex',
'subtexrate',
'tex1d',
'texcmp',
'texcompress2',
+ 'texdown',
'texfilt',
'texgenmix',
'texline',
+ 'texobj',
'texrect',
'texwrap',
'unfilledclip',