Looks great. Reviewed-by: Jose Fonseca <jfons...@vmware.com>
On 26/10/18 17:52, Brian Paul wrote: > This reverts commit a5fd54f8bf6713312fa5efd7ef5cd125557a0ffe. > > The whole point was to add a way to pass -DVMX86_STATS to the build, > but we can do that with a command line argument when we invoke scons. > --- > common.py | 2 +- > scons/gallium.py | 8 +++----- > src/gallium/drivers/svga/svga_screen.c | 2 -- > 3 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/common.py b/common.py > index be3ccfc..e2afff9 100644 > --- a/common.py > +++ b/common.py > @@ -86,7 +86,7 @@ def AddOptions(opts): > from SCons.Options.EnumOption import EnumOption > opts.Add(EnumOption('build', 'build type', 'debug', > allowed_values=('debug', 'checked', 'profile', > - 'release', 'opt'))) > + 'release'))) > opts.Add(BoolOption('verbose', 'verbose output', 'no')) > opts.Add(EnumOption('machine', 'use machine-specific assembly code', > default_machine, > diff --git a/scons/gallium.py b/scons/gallium.py > index aa7201a..963834a 100755 > --- a/scons/gallium.py > +++ b/scons/gallium.py > @@ -279,7 +279,7 @@ def generate(env): > if env['build'] == 'profile': > env['debug'] = False > env['profile'] = True > - if env['build'] in ('release', 'opt'): > + if env['build'] == 'release': > env['debug'] = False > env['profile'] = False > > @@ -325,8 +325,6 @@ def generate(env): > cppdefines += ['NDEBUG'] > if env['build'] == 'profile': > cppdefines += ['PROFILE'] > - if env['build'] in ('opt', 'profile'): > - cppdefines += ['VMX86_STATS'] > if env['platform'] in ('posix', 'linux', 'freebsd', 'darwin'): > cppdefines += [ > '_POSIX_SOURCE', > @@ -477,7 +475,7 @@ def generate(env): > ccflags += [ > '/O2', # optimize for speed > ] > - if env['build'] in ('release', 'opt'): > + if env['build'] == 'release': > if not env['clang']: > ccflags += [ > '/GL', # enable whole program optimization > @@ -588,7 +586,7 @@ def generate(env): > shlinkflags += ['-Wl,--enable-stdcall-fixup'] > #shlinkflags += ['-Wl,--kill-at'] > if msvc: > - if env['build'] in ('release', 'opt') and not env['clang']: > + if env['build'] == 'release' and not env['clang']: > # enable Link-time Code Generation > linkflags += ['/LTCG'] > env.Append(ARFLAGS = ['/LTCG']) > diff --git a/src/gallium/drivers/svga/svga_screen.c > b/src/gallium/drivers/svga/svga_screen.c > index ab9a3c7..95dde8b 100644 > --- a/src/gallium/drivers/svga/svga_screen.c > +++ b/src/gallium/drivers/svga/svga_screen.c > @@ -92,8 +92,6 @@ svga_get_name( struct pipe_screen *pscreen ) > */ > build = "build: DEBUG;"; > mutex = "mutex: " PIPE_ATOMIC ";"; > -#elif defined(VMX86_STATS) > - build = "build: OPT;"; > #else > build = "build: RELEASE;"; > #endif > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev