summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorNeil Roberts <nroberts@igalia.com>2018-03-30 09:12:00 -0600
committerBrian Paul <brianp@vmware.com>2018-03-30 14:33:03 -0600
commit31d91f019b58ca362c05db1fd0c75fedd169cd7b (patch)
treef2339281d532a806827960cffa8158837639929f /src/mesa/drivers/x11
parentcdc34e2cea73b7932e51ad407595d487d2d565c3 (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 <brianp@vmware.com> Tested-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/SConscript2
1 files changed, 2 insertions, 0 deletions
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 = [