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

Support for newer glslang versions without SPIRV and HLSL libraries #17563

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for newer glslang versions without SPIRV and HLSL libraries #17563

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions qb/config.libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,6 @@ if [ "$HAVE_GLSLANG" != no ]; then
glslang/Public/ShaderLang.h \
glslang/SPIRV/GlslangToSpv.h

check_lib cxx GLSLANG -lglslang '' '-lSPIRV'
check_lib cxx GLSLANG_OSDEPENDENT -lOSDependent
check_lib cxx GLSLANG_OGLCOMPILER -lOGLCompiler
check_lib cxx GLSLANG_MACHINEINDEPENDENT -lMachineIndependent
Expand All @@ -675,10 +674,9 @@ if [ "$HAVE_GLSLANG" != no ]; then
check_lib cxx GLSLANG_SPIRV -lSPIRV
check_lib cxx GLSLANG_SPIRV_TOOLS_OPT -lSPIRV-Tools-opt
check_lib cxx GLSLANG_SPIRV_TOOLS -lSPIRV-Tools
check_lib cxx GLSLANG -lglslang '' "$GLSLANG_SPIRV_LIBS"

if [ "$HAVE_GLSLANG" = no ] ||
[ "$HAVE_GLSLANG_HLSL" = no ] ||
[ "$HAVE_GLSLANG_SPIRV" = no ] ||
[ "$HAVE_GLSLANG_SPIRV_TOOLS_OPT" = no ] ||
[ "$HAVE_GLSLANG_SPIRV_TOOLS" = no ]; then
if [ "$HAVE_BUILTINGLSLANG" != yes ]; then
Expand Down
Loading