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>
66 lines
1.4 KiB
Python
66 lines
1.4 KiB
Python
#######################################################################
|
|
# SConscript for gdi winsys
|
|
|
|
Import('*')
|
|
|
|
env = env.Clone()
|
|
|
|
env.Append(CPPPATH = [
|
|
'#src',
|
|
'#src/gallium/state_trackers/wgl',
|
|
'#src/gallium/winsys/sw',
|
|
])
|
|
|
|
env.Append(LIBS = [
|
|
'gdi32',
|
|
'user32',
|
|
'kernel32',
|
|
'ws2_32',
|
|
])
|
|
|
|
env.Prepend(LIBS = [
|
|
mesautil,
|
|
nir,
|
|
spirv
|
|
])
|
|
|
|
sources = ['libgl_gdi.c']
|
|
drivers = []
|
|
|
|
if True:
|
|
drivers += [softpipe]
|
|
|
|
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.
|
|
sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
|
|
else:
|
|
sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
|
|
|
|
drivers += [trace, rbug]
|
|
|
|
env['no_import_lib'] = 1
|
|
|
|
# when GLES is enabled, gl* and _glapi_* belong to bridge_glapi and
|
|
# shared_glapi respectively
|
|
if env['gles']:
|
|
env.Prepend(LIBPATH = [shared_glapi.dir])
|
|
glapi = [bridge_glapi, 'libglapi']
|
|
|
|
opengl32 = env.SharedLibrary(
|
|
target ='opengl32',
|
|
source = sources,
|
|
LIBS = wgl + ws_gdi + glapi + compiler + mesa + drivers + gallium + glsl + nir + env['LIBS'],
|
|
)
|
|
|
|
env.Alias('opengl32', opengl32)
|
|
env.Alias('libgl-gdi', opengl32)
|