<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">
Reviewed-by: Tim Rowley <<a href="mailto:timothy.o.rowley@intel.com" class="">timothy.o.rowley@intel.com</a>>
<div class=""><br class="">
<div>
<blockquote type="cite" class="">
<div class="">On Apr 13, 2017, at 2:17 PM, George Kyriazis <<a href="mailto:george.kyriazis@intel.com" class="">george.kyriazis@intel.com</a>> wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<div class="">Make swr compile for both linux and windows.<br class="">
---<br class="">
src/gallium/drivers/swr/SConscript | 7 +------<br class="">
src/gallium/targets/libgl-xlib/SConscript | 2 +-<br class="">
2 files changed, 2 insertions(+), 7 deletions(-)<br class="">
<br class="">
diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript<br class="">
index eca5dba..5e3784b 100644<br class="">
--- a/src/gallium/drivers/swr/SConscript<br class="">
+++ b/src/gallium/drivers/swr/SConscript<br class="">
@@ -17,11 +17,6 @@ if env['LLVM_VERSION'] < distutils.version.LooseVersion('3.9'):<br class="">
env['swr'] = False<br class="">
Return()<br class="">
<br class="">
-if env['platform'] != 'windows':<br class="">
- print "warning: swr scons build only supports windows: not building swr"<br class="">
- env['swr'] = False<br class="">
- Return()<br class="">
-<br class="">
env.MSVC2013Compat()<br class="">
<br class="">
env = env.Clone()<br class="">
@@ -205,7 +200,7 @@ envavx2.Append(CPPDEFINES = ['KNOB_ARCH=KNOB_ARCH_AVX2'])<br class="">
if env['platform'] == 'windows':<br class="">
envavx2.Append(CCFLAGS = ['/arch:AVX2'])<br class="">
else:<br class="">
- envavx2.Append(CCFLAGS = ['-mavx2'])<br class="">
+ envavx2.Append(CCFLAGS = ['-mavx2', '-mfma', '-mbmi2', '-mf16c'])<br class="">
<br class="">
swrAVX2 = envavx2.SharedLibrary(<br class="">
target = 'swrAVX2',<br class="">
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript<br class="">
index d01bb3c..a81ac79 100644<br class="">
--- a/src/gallium/targets/libgl-xlib/SConscript<br class="">
+++ b/src/gallium/targets/libgl-xlib/SConscript<br class="">
@@ -49,7 +49,7 @@ if env['llvm']:<br class="">
env.Prepend(LIBS = [llvmpipe])<br class="">
<br class="">
if env['swr']:<br class="">
- env.Append(CPPDEFINES = 'HAVE_SWR')<br class="">
+ env.Append(CPPDEFINES = 'GALLIUM_SWR')<br class="">
env.Prepend(LIBS = [swr])<br class="">
<br class="">
if env['platform'] != 'darwin':<br class="">
-- <br class="">
2.7.4<br class="">
<br class="">
_______________________________________________<br class="">
mesa-dev mailing list<br class="">
<a href="mailto:mesa-dev@lists.freedesktop.org" class="">mesa-dev@lists.freedesktop.org</a><br class="">
https://lists.freedesktop.org/mailman/listinfo/mesa-dev<br class="">
</div>
</div>
</blockquote>
</div>
<br class="">
</div>
</body>
</html>