diff options
| author | Neil Roberts <[email protected]> | 2018-03-30 09:12:00 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2018-03-30 14:33:03 -0600 |
| commit | 31d91f019b58ca362c05db1fd0c75fedd169cd7b (patch) | |
| tree | f2339281d532a806827960cffa8158837639929f /src/mesa | |
| parent | cdc34e2cea73b7932e51ad407595d487d2d565c3 (diff) | |
spirv: Fix building with SCons
The SCons build broke with commit ba975140d3c9 because a SPIR-V
function is called from Mesa main. This adds a convenience library for
SPIR-V and adds it to everything that was including nir. It also adds
both nir and spirv to drivers/x11/SConscript.
Also add nir/spirv modules to osmesa and libgl-gdi targets. (Brian Paul)
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105817
Reviewed-by: Brian Paul <[email protected]>
Tested-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/osmesa/SConscript | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/SConscript | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/osmesa/SConscript b/src/mesa/drivers/osmesa/SConscript index 9391dc32827..064f3da5da9 100644 --- a/src/mesa/drivers/osmesa/SConscript +++ b/src/mesa/drivers/osmesa/SConscript @@ -15,6 +15,8 @@ env.Prepend(LIBS = [ glapi, compiler, mesa, + spirv, + nir, glsl, ]) diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript index 59c8df4b3c2..b097dcc5900 100644 --- a/src/mesa/drivers/x11/SConscript +++ b/src/mesa/drivers/x11/SConscript @@ -21,6 +21,8 @@ env.Prepend(LIBS = [ compiler, glsl, mesa, + spirv, + nir, ]) sources = [ |