OSDN Git Service

spirv: Fix building with SCons
authorNeil Roberts <nroberts@igalia.com>
Fri, 30 Mar 2018 15:12:00 +0000 (09:12 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 30 Mar 2018 20:33:03 +0000 (14:33 -0600)
commit31d91f019b58ca362c05db1fd0c75fedd169cd7b
treef2339281d532a806827960cffa8158837639929f
parentcdc34e2cea73b7932e51ad407595d487d2d565c3
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>
src/compiler/Makefile.nir.am
src/compiler/SConscript
src/compiler/SConscript.spirv [new file with mode: 0644]
src/gallium/targets/dri/SConscript
src/gallium/targets/haiku-softpipe/SConscript
src/gallium/targets/libgl-gdi/SConscript
src/gallium/targets/libgl-xlib/SConscript
src/gallium/targets/osmesa/SConscript
src/mesa/drivers/osmesa/SConscript
src/mesa/drivers/x11/SConscript