X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=progs%2Ftrivial%2FSConscript;h=29062564adc6eed3c9585a88070ac557dc0bd73e;hb=080c40ab32b2abd6d8381b4a0cc143d36a1652b2;hp=edb8386c5beb45d4c4a517d6b5fb8c9cb45c4b07;hpb=a22d865f93a1db7f72e0bfe216810f67bf4c2f2c;p=mesa.git

diff --git a/progs/trivial/SConscript b/progs/trivial/SConscript
index edb8386c5be..29062564adc 100644
--- a/progs/trivial/SConscript
+++ b/progs/trivial/SConscript
@@ -1,11 +1,4 @@
-Import('env')
-
-if not env['GLUT']:
-    Return()
-
-env = env.Clone()
-
-env.Prepend(LIBS = ['$GLUT_LIB'])
+Import('*')
 
 progs = [
     'clear-fbo-tex',
@@ -19,12 +12,14 @@ progs = [
 	'dlist-edgeflag',
 	'dlist-degenerate',
 	'drawarrays',
+	'draw2arrays',
 	'drawelements',
 	'drawrange',
 	'flat-clip',
 	'fs-tri',
 	'line-clip',
 	'line-cull',
+	'line-flat',
 	'line-smooth',
 	'line-stipple-wide',
 	'line-userclip-clip',
@@ -65,14 +60,18 @@ progs = [
 	'quad-tex-3d',
 	'quad-tex-alpha',
 	'quad-tex-pbo',
+	'quad-tex-sub',
 	'quad-unfilled-clip',
 	'quad-unfilled-stipple',
 	'quad-unfilled',
 	'quad',
 	'quads',
+	'quadstrip-clip',
 	'quadstrip-cont',
 	'quadstrip-flat',
 	'quadstrip',
+	'sub-tex',
+	'tex-quads',
 	'tri-alpha',
 	'tri-blend-color',
 	'tri-blend-max',
@@ -81,10 +80,12 @@ progs = [
 	'tri-blend-sub',
 	'tri-blend',
 	'tri-clip',
+	'tri-clear',
 	'tri-cull-both',
 	'tri-cull',
 	'tri-dlist',
 	'tri-edgeflag',
+	'tri-fbo-tex-mip',
 	'tri-fbo-tex',
 	'tri-fbo',
 	'tri-flat-clip',
@@ -93,15 +94,20 @@ progs = [
 	'tri-fp',
 	'tri-fp-const-imm',
 	'tri-lit',
+	'tri-logicop-none',
+	'tri-logicop-xor',
 	'tri-mask-tri',
 	'tri-orig',
 	'tri-query',
 	'tri-repeat',
 	'tri-scissor-tri',
 	'tri-stencil',
+	'tri-stipple',
+	'tri-multitex-vbo',
 	'tri-tex',
 	'tri-tex-3d',
 	'tri-tri',
+	'tri-unfilled-fog',
 	'tri-unfilled-edgeflag',
 	'tri-unfilled-clip',
 	'tri-unfilled-smooth',
@@ -111,6 +117,7 @@ progs = [
 	'tri-unfilled-userclip',
 	'tri-unfilled',
 	'tri-userclip',
+	'tri-viewport',
 	'tri-z-eq',
 	'tri-z',
 	'tri',
@@ -123,6 +130,7 @@ progs = [
 	'tristrip-flat',
 	'tristrip',
 	'vbo-drawarrays',
+	'vbo-noninterleaved',
 	'vbo-drawelements',
 	'vbo-drawrange',
 	'vp-array',
@@ -130,6 +138,7 @@ progs = [
 	'vp-clip',
 	'vp-line-clip',
 	'vp-tri',
+	'vp-tri-invariant',
 	'vp-tri-swap',
 	'vp-tri-tex',
 	'vp-tri-imm',
@@ -140,7 +149,7 @@ progs = [
 ]
 
 for prog in progs:
-    prog = env.Program(
+    prog = progs_env.Program(
         target = prog,
         source = prog + '.c',
     )