diff options
| -rw-r--r-- | src/gallium/drivers/swr/SConscript | 7 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index eca5dba8304..5e3784b51f4 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -17,11 +17,6 @@ if env['LLVM_VERSION'] < distutils.version.LooseVersion('3.9'): env['swr'] = False Return() -if env['platform'] != 'windows': - print "warning: swr scons build only supports windows: not building swr" - env['swr'] = False - Return() - env.MSVC2013Compat() env = env.Clone() @@ -205,7 +200,7 @@ envavx2.Append(CPPDEFINES = ['KNOB_ARCH=KNOB_ARCH_AVX2']) if env['platform'] == 'windows': envavx2.Append(CCFLAGS = ['/arch:AVX2']) else: - envavx2.Append(CCFLAGS = ['-mavx2']) + envavx2.Append(CCFLAGS = ['-mavx2', '-mfma', '-mbmi2', '-mf16c']) swrAVX2 = envavx2.SharedLibrary( target = 'swrAVX2', diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index d01bb3c2563..a81ac793251 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -49,7 +49,7 @@ if env['llvm']: env.Prepend(LIBS = [llvmpipe]) if env['swr']: - env.Append(CPPDEFINES = 'HAVE_SWR') + env.Append(CPPDEFINES = 'GALLIUM_SWR') env.Prepend(LIBS = [swr]) if env['platform'] != 'darwin': |