projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
progs
/
trivial
/
SConscript
diff --git
a/progs/trivial/SConscript
b/progs/trivial/SConscript
index 480630e210e93102e9631e2c69b8d301fa096ceb..24b4f91fb0ae18804b700c747f6fef6684eb9f56 100644
(file)
--- a/
progs/trivial/SConscript
+++ b/
progs/trivial/SConscript
@@
-1,14
+1,8
@@
-Import('env')
-
-if not env['GLUT']:
- Return()
-
-env = env.Clone()
-
-env.Prepend(LIBS = ['$GLUT_LIB'])
+Import('*')
progs = [
progs = [
- 'clear-fbo-tex',
+ 'clear-fbo-scissor',
+ 'clear-fbo-tex',
'clear-fbo',
'clear-scissor',
'clear-undefined',
'clear-fbo',
'clear-scissor',
'clear-undefined',
@@
-26,6
+20,7
@@
progs = [
'fs-tri',
'line-clip',
'line-cull',
'fs-tri',
'line-clip',
'line-cull',
+ 'line-flat',
'line-smooth',
'line-stipple-wide',
'line-userclip-clip',
'line-smooth',
'line-stipple-wide',
'line-userclip-clip',
@@
-76,6
+71,8
@@
progs = [
'quadstrip-cont',
'quadstrip-flat',
'quadstrip',
'quadstrip-cont',
'quadstrip-flat',
'quadstrip',
+ 'sub-tex',
+ 'tex-quads',
'tri-alpha',
'tri-blend-color',
'tri-blend-max',
'tri-alpha',
'tri-blend-color',
'tri-blend-max',
@@
-102,6
+99,7
@@
progs = [
'tri-logicop-xor',
'tri-mask-tri',
'tri-orig',
'tri-logicop-xor',
'tri-mask-tri',
'tri-orig',
+ 'tri-point-line-clipped',
'tri-query',
'tri-repeat',
'tri-scissor-tri',
'tri-query',
'tri-repeat',
'tri-scissor-tri',
@@
-134,6
+132,7
@@
progs = [
'tristrip-flat',
'tristrip',
'vbo-drawarrays',
'tristrip-flat',
'tristrip',
'vbo-drawarrays',
+ 'vbo-noninterleaved',
'vbo-drawelements',
'vbo-drawrange',
'vp-array',
'vbo-drawelements',
'vbo-drawrange',
'vp-array',
@@
-141,6
+140,7
@@
progs = [
'vp-clip',
'vp-line-clip',
'vp-tri',
'vp-clip',
'vp-line-clip',
'vp-tri',
+ 'vp-tri-invariant',
'vp-tri-swap',
'vp-tri-tex',
'vp-tri-imm',
'vp-tri-swap',
'vp-tri-tex',
'vp-tri-imm',
@@
-151,7
+151,7
@@
progs = [
]
for prog in progs:
]
for prog in progs:
- prog = env.Program(
+ prog =
progs_
env.Program(
target = prog,
source = prog + '.c',
)
target = prog,
source = prog + '.c',
)
@@
-159,7
+159,7
@@
for prog in progs:
# auto code generation
#getprocaddress: getprocaddress.c getproclist.h
# auto code generation
#getprocaddress: getprocaddress.c getproclist.h
-#getproclist.h: $(TOP)/src/mesa/glapi/gl_API.xml getprocaddress.c getprocaddress.py
+#getproclist.h: $(TOP)/src/mesa/glapi/g
en/g
l_API.xml getprocaddress.c getprocaddress.py
# python getprocaddress.py > getproclist.h
# python getprocaddress.py > getproclist.h