31d91f019b
The SCons build broke with commit ba975140d3 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>
55 lines
1.2 KiB
Plaintext
55 lines
1.2 KiB
Plaintext
import common
|
|
|
|
Import('*')
|
|
|
|
from sys import executable as python_cmd
|
|
|
|
env = env.Clone()
|
|
|
|
env.MSVC2013Compat()
|
|
|
|
env.Prepend(CPPPATH = [
|
|
'#include',
|
|
'#src',
|
|
'#src/mapi',
|
|
'#src/mesa',
|
|
'#src/gallium/include',
|
|
'#src/gallium/auxiliary',
|
|
'#src/compiler/nir',
|
|
'#src/compiler/spirv',
|
|
])
|
|
|
|
# Make generated headers reachable from the include path.
|
|
env.Prepend(CPPPATH = [Dir('.').abspath, Dir('nir').abspath])
|
|
env.Prepend(CPPPATH = [Dir('.').abspath, Dir('spirv').abspath])
|
|
|
|
# spirv generated sources
|
|
|
|
env.CodeGenerate(
|
|
target = 'spirv/spirv_info.c',
|
|
script = 'spirv/spirv_info_c.py',
|
|
source = ['spirv/spirv.core.grammar.json'],
|
|
command = python_cmd + ' $SCRIPT $SOURCE $TARGET'
|
|
)
|
|
|
|
env.CodeGenerate(
|
|
target = 'spirv/vtn_gather_types.c',
|
|
script = 'spirv/vtn_gather_types_c.py',
|
|
source = ['spirv/spirv.core.grammar.json'],
|
|
command = python_cmd + ' $SCRIPT $SOURCE $TARGET'
|
|
)
|
|
|
|
# parse Makefile.sources
|
|
source_lists = env.ParseSourceList('Makefile.sources')
|
|
|
|
spirv_sources = source_lists['SPIRV_FILES']
|
|
spirv_sources += source_lists['SPIRV_GENERATED_FILES']
|
|
|
|
spirv = env.ConvenienceLibrary(
|
|
target = 'spirv',
|
|
source = spirv_sources,
|
|
)
|
|
|
|
env.Alias('spirv', spirv)
|
|
Export('spirv')
|