On 13 April 2017 at 20:17, George Kyriazis <george.kyria...@intel.com> wrote:
> Make swr compile for both linux and windows.
> ---
> src/gallium/drivers/swr/SConscript | 7 +------
> 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 eca5dba..5e3784b 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 d01bb3c..a81ac79 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')
Seems like we want the same fix in src/gallium/targets/osmesa/SConscript.
Please squash that alongside a small note in docs/relnotes/17.1.0.html
With the above
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
As a follow-up commit can we have $sed -i s/HAVE_/GALLIUM_
src/gallium/targets/libgl-xlib/* && git commit -asm "..."
Thanks
Emil
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
