svga: add opt to the list of valid build types

For opt build, add VMX86_STATS to the list of cpp defines.

Reviewed-by: Brian Paul <brianp@vmware.com>

common.py

         from SCons.Options.EnumOption import EnumOption
     opts.Add(EnumOption('build', 'build type', 'debug',
                         allowed_values=('debug', 'checked', 'profile',
-                                        'release')))
+                                        'release', 'opt')))
     opts.Add(BoolOption('verbose', 'verbose output', 'no'))
     opts.Add(EnumOption('machine', 'use machine-specific assembly code',
                         default_machine,

scons/gallium.py

         if env['build'] == 'profile':
             env['debug'] = False
             env['profile'] = True
-        if env['build'] == 'release':
+        if env['build'] in ('release', 'opt'):
             env['debug'] = False
             env['profile'] = False
 
         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',
             ccflags += [
                 '/O2', # optimize for speed
             ]
-        if env['build'] == 'release':
+        if env['build'] in ('release', 'opt'):
             if not env['clang']:
                 ccflags += [
                     '/GL', # enable whole program optimization
             shlinkflags += ['-Wl,--enable-stdcall-fixup']
             #shlinkflags += ['-Wl,--kill-at']
     if msvc:
-        if env['build'] == 'release' and not env['clang']:
+        if env['build'] in ('release', 'opt') and not env['clang']:
             # enable Link-time Code Generation
             linkflags += ['/LTCG']
             env.Append(ARFLAGS = ['/LTCG'])

src/gallium/drivers/svga/svga_screen.c

     */
    build = "build: DEBUG;";
    mutex = "mutex: " PIPE_ATOMIC ";";
+#elif defined(VMX86_STATS)
+   build = "build: OPT;";
 #else
    build = "build: RELEASE;";
 #endif