diff options
| author | George Kyriazis <[email protected]> | 2016-11-11 12:09:36 -0600 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2016-11-21 12:44:47 -0600 |
| commit | 9aae167e9474b7c220cbc3f172a27c0b6bf9b20a (patch) | |
| tree | d9f470a239193a8c95d1c597748510bd11c70da3 /src/gallium | |
| parent | 5b4d1500dd3cc43c1d0fc2f83744144fb1742aa9 (diff) | |
gallium: Add support for SWR compilation
Include swr library and include -DHAVE_SWR in the compile line.
v3: split to a separate commit
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/targets/libgl-gdi/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 4 | ||||
| -rw-r--r-- | src/gallium/targets/osmesa/SConscript | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index 2a5236360ba..d3251caec57 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -30,6 +30,10 @@ if env['llvm']: env.Append(CPPDEFINES = 'HAVE_LLVMPIPE') drivers += [llvmpipe] + if env['swr']: + env.Append(CPPDEFINES = 'HAVE_SWR') + drivers += [swr] + if env['gcc'] and env['machine'] != 'x86_64': # DEF parser in certain versions of MinGW is busted, as does not behave as # MSVC. mingw-w64 works fine. diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 0a4f31be86d..d01bb3c2563 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -48,6 +48,10 @@ if env['llvm']: env.Append(CPPDEFINES = ['GALLIUM_LLVMPIPE']) env.Prepend(LIBS = [llvmpipe]) + if env['swr']: + env.Append(CPPDEFINES = 'HAVE_SWR') + env.Prepend(LIBS = [swr]) + if env['platform'] != 'darwin': # Disallow undefined symbols, except with Address Sanitizer, since libasan # is not linked on shared libs, as it should be LD_PRELOAD'ed instead diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript index 7a2a00c85fe..47937a23d29 100644 --- a/src/gallium/targets/osmesa/SConscript +++ b/src/gallium/targets/osmesa/SConscript @@ -30,6 +30,10 @@ if env['llvm']: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Prepend(LIBS = [llvmpipe]) + if env['swr']: + env.Append(CPPDEFINES = 'HAVE_SWR') + env.Prepend(LIBS = [swr]) + if env['platform'] == 'windows': if env['gcc'] and env['machine'] != 'x86_64': sources += ['osmesa.mingw.def'] |