Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow using system spirv cross #17080

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow using system spirv cross #17080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45f606b
build: Allow using a system-provided SPIRV-Cross library.
Apteryks Oct 6, 2024
b6ecc22
qb/config.libs.sh: Extend default INCLUDES with GCC environment varia…
Apteryks Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1869,6 +1869,7 @@ endif

ifeq ($(HAVE_SPIRV_CROSS), 1)
DEFINES += -DHAVE_SPIRV_CROSS
ifeq ($(HAVE_BUILTINSPIRV_CROSS), 1)
INCLUDE_DIRS += -I$(DEPS_DIR)/SPIRV-Cross
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cross.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cfg.o
Expand All @@ -1877,6 +1878,13 @@ ifeq ($(HAVE_SPIRV_CROSS), 1)
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_msl.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_parser.o
OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cross_parsed_ir.o
else
CXXFLAGS += $(SPIRV_CROSS_CFLAGS)
LIBS += -lspirv-cross-core \
-lspirv-cross-glsl \
-lspirv-cross-reflect \
-lspirv-cross-msl
endif
endif

ifeq ($(WANT_WGL), 1)
Expand Down
27 changes: 26 additions & 1 deletion qb/config.libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ CLIB=-lc
PTHREADLIB=-lpthread
SOCKETLIB=-lc
SOCKETHEADER=
INCLUDES='usr/include usr/local/include'
TR='tr'
INCLUDES="$(echo $C_INCLUDE_PATH | $TR ':' ' ') \
$(echo $CPLUS_INCLUDE_PATH | $TR ':' ' ') \
usr/include usr/local/include"
SORT='sort'
EXTRA_GL_LIBS=''
VC_PREFIX=''
Expand Down Expand Up @@ -625,6 +628,7 @@ check_enabled CXX GLSLANG glslang 'The C++ compiler is' false
check_enabled CXX SPIRV_CROSS SPIRV-Cross 'The C++ compiler is' false

check_enabled GLSLANG BUILTINGLSLANG 'builtin glslang' 'glslang is' true
check_enabled SPIRV_CROSS BUILTINSPIRV_CROSS 'builtin spirv-cross' 'spirv-cross is' true

if [ "$HAVE_GLSLANG" != no ]; then
check_header cxx GLSLANG \
Expand Down Expand Up @@ -657,6 +661,27 @@ if [ "$HAVE_GLSLANG" != no ]; then
fi
fi

if [ "$HAVE_SPIRV_CROSS" != no ]; then
check_lib cxx SPIRV_CROSS -lspirv-cross-core '' '' 'spirv_cross.hpp' 'spirv_cross'
check_lib cxx SPIRV_CROSS_GLSL -lspirv-cross-glsl
check_lib cxx SPIRV_CROSS_MSL -lspirv-cross-msl
check_lib cxx SPIRV_CROSS_REFLECT -lspirv-cross-reflect
if [ "$HAVE_SPIRV_CROSS" = no ] ||
[ "$HAVE_SPIRV_CROSS_GLSL" = no ] ||
[ "$HAVE_SPIRV_CROSS_MSL" = no ] ||
[ "$HAVE_SPIRV_CROSS_REFLECT" = no ]; then
if [ "$HAVE_BUILTINSPIRV_CROSS" != yes ]; then
die : "Notice: System spirv-cross libraries not found, \
disabling spirv-cross support"
HAVE_SPIRV_CROSS=no
else
HAVE_SPIRV_CROSS=yes
fi
else
HAVE_SPIRV_CROSS=yes
fi
fi

if [ "$HAVE_CRTSWITCHRES" != no ]; then
if [ "$HAVE_CXX11" = 'no' ]; then
HAVE_CRTSWITCHRES=no
Expand Down
1 change: 1 addition & 0 deletions qb/config.params.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ C89_GLSLANG=no
HAVE_BUILTINGLSLANG=auto # Bake in glslang support
C89_BUILTINGLSLANG=no
HAVE_SPIRV_CROSS=auto # SPIRV-Cross support (requires C++11)
HAVE_BUILTINSPIRV_CROSS=auto # Use bundled SPIRV-Cross source
C89_SPIRV_CROSS=no
HAVE_METAL=no # Metal support (macOS-only)
C89_METAL=no
Expand Down
Loading