On Tue, Feb 23, 2010 at 10:18 AM, José Fonseca <jfons...@vmware.com> wrote:
> But there is another thing that we can do: take out trace from the scons
> options and always built it, as there are so many state trackers and
> winsys that rely on it for debug building, and trace can really build
> anywhere and is thin so there's no point is making it an option.
>
I like this a lot, see attached patch.
This is my first time editing scons files so I hope I got it right.
>> A side question :
>> line 21 : if not set(('softpipe', 'llvmpipe',
>> 'trace')).intersection(env['drivers']):
>> print 'warning: no supported pipe driver: skipping build of xlib
>> libGL.so'
>> Return()
>>
>> But below in the script (line 41-58), the drivers used are softpipe ,
>> llvmpipe and cell.
>> Should trace be replaced by cell in the above check ?
>
> Yes, I think so.
>
Also changed in attached patch.
From 1ee8d9963da8a5e78e8f0acb84dc6bea7a364e4e Mon Sep 17 00:00:00 2001
From: Xavier Chantry <chantry.xav...@gmail.com>
Date: Tue, 23 Feb 2010 22:05:15 +0100
Subject: [PATCH] scons: always build trace driver
To quote Jose Fonseca :
"take out trace from the scons options and always built it, as there are so
many state trackers and winsys that rely on it for debug building, and trace
can really build anywhere and is thin so there's no point is making it an
option."
I also removed the trace check in xlib SConscript which is now useless, and
that script seems to deal with the cell driver, so I added cell in the check
for supported drivers.
Signed-off-by: Xavier Chantry <chantry.xav...@gmail.com>
---
SConstruct | 10 +++++++---
src/gallium/winsys/xlib/SConscript | 6 +-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/SConstruct b/SConstruct
index ea63b90..a3a01c2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -33,10 +33,10 @@ import common
default_statetrackers = 'mesa'
if common.default_platform in ('linux', 'freebsd', 'darwin'):
- default_drivers = 'softpipe,failover,svga,i915,i965,trace,identity,llvmpipe'
+ default_drivers = 'softpipe,failover,svga,i915,i965,identity,llvmpipe'
default_winsys = 'xlib'
elif common.default_platform in ('winddk',):
- default_drivers = 'softpipe,svga,i915,i965,trace,identity'
+ default_drivers = 'softpipe,svga,i915,i965,identity'
default_winsys = 'all'
elif common.default_platform in ('embedded',):
default_drivers = 'softpipe,llvmpipe'
@@ -50,7 +50,7 @@ common.AddOptions(opts)
opts.Add(ListVariable('statetrackers', 'state trackers to build', default_statetrackers,
['mesa', 'python', 'xorg']))
opts.Add(ListVariable('drivers', 'pipe drivers to build', default_drivers,
- ['softpipe', 'failover', 'svga', 'i915', 'i965', 'trace', 'r300', 'identity', 'llvmpipe']))
+ ['softpipe', 'failover', 'svga', 'i915', 'i965', 'r300', 'identity', 'llvmpipe']))
opts.Add(ListVariable('winsys', 'winsys drivers to build', default_winsys,
['xlib', 'vmware', 'intel', 'i965', 'gdi', 'radeon']))
@@ -63,6 +63,7 @@ env = Environment(
ENV = os.environ,
)
+
if os.environ.has_key('CC'):
env['CC'] = os.environ['CC']
if os.environ.has_key('CFLAGS'):
@@ -110,6 +111,9 @@ Export([
#######################################################################
# Environment setup
+# Always build trace driver
+env['drivers'].append('trace')
+
# Includes
env.Append(CPPPATH = [
'#/include',
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index a4dabb7..8c9d318 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -14,11 +14,7 @@ if env['dri']:
print 'warning: DRI enabled: skipping build of xlib libGL.so'
Return()
-if 'trace' not in env['drivers']:
- print 'warning: trace pipe driver disabled: skipping build of xlib libGL.so'
- Return()
-
-if not set(('softpipe', 'llvmpipe', 'trace')).intersection(env['drivers']):
+if not set(('softpipe', 'llvmpipe', 'cell')).intersection(env['drivers']):
print 'warning: no supported pipe driver: skipping build of xlib libGL.so'
Return()
--
1.7.0
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
