Allow diligent to link a static DirectXShaderCompiler#723
Open
Lokomojo wants to merge 1 commit intoDiligentGraphics:masterfrom
Open
Allow diligent to link a static DirectXShaderCompiler#723Lokomojo wants to merge 1 commit intoDiligentGraphics:masterfrom
Lokomojo wants to merge 1 commit intoDiligentGraphics:masterfrom
Conversation
Contributor
TheMostDiligent
left a comment
TheMostDiligent
left a comment
There was a problem hiding this comment.
This change makes sense, there are few minor questions + formatting.
Comment on lines
+152
to
+153
| LLVMSupport | ||
| dxcompiler |
Contributor
There was a problem hiding this comment.
Why are these public dependencies?
Author
There was a problem hiding this comment.
See below for reasons - if you'd prefer to make the consumer link the libraries manually that's your call of course ;)
| ) | ||
| endif() | ||
| if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU") | ||
| target_link_libraries(Diligent-ShaderTools PRIVATE dl) |
Contributor
There was a problem hiding this comment.
I think that dl should not be needed when linking statically - can be in the else() branch
Graphics/ShaderTools/CMakeLists.txt
Outdated
| cmake_policy(SET CMP0079 NEW) | ||
| target_link_libraries(SPIRV-Tools-opt | ||
| PUBLIC | ||
| LLVMSupport |
Contributor
There was a problem hiding this comment.
Why is it public dependency?
Also, why is this dependency needed?
Author
There was a problem hiding this comment.
Well, I made it public so that anything consuming this library will inherit the dependency. When static linking on some systems the builid will fail if the host executable is not itself linked against the dependencies.
Needed due to
/usr/bin/x86_64-pc-linux-gnu-ld.bfd: lib/DirectXShaderCompiler/lib/libSPIRV-Tools-opt.a(replace_desc_array_access_using_var_index.cpp.o): in function `spvtools::opt::ReplaceDescArrayAccessUsingVarIndex::ReplaceAccessChain(spvtools::opt::Instruction*, spvtools::opt::Instruction*) const':
./DirectXShaderCompiler/external/SPIRV-Tools/source/opt/replace_desc_array_access_using_var_index.cpp:83:(.text+0x385): undefined reference to `llvm_assert'
/usr/bin/x86_64-pc-linux-gnu-ld.bfd: lib/DirectXShaderCompiler/lib/libSPIRV-Tools-opt.a(replace_desc_array_access_using_var_index.cpp.o): in function `spvtools::opt::ReplaceDescArrayAccessUsingVarIndex::HasImageOrImagePtrType(spvtools::opt::Instruction const*) const':
./DirectXShaderCompiler/external/SPIRV-Tools/source/opt/replace_desc_array_access_using_var_index.cpp:157:(.text+0xf0c): undefined reference to `llvm_assert'
/usr/bin/x86_64-pc-linux-gnu-ld.bfd: lib/DirectXShaderCompiler/lib/libSPIRV-Tools-opt.a(replace_desc_array_access_using_var_index.cpp.o): in function `spvtools::opt::(anonymous namespace)::GetValueWithKeyExistenceCheck(unsigned int, std::unordered_map<unsigned int, unsigned int, std::hash<unsigned int>, std::equal_to<unsigned int>, std::allocator<std::pair<unsigned int const, unsigned int> > > const&)':
./DirectXShaderCompiler/external/SPIRV-Tools/source/opt/replace_desc_array_access_using_var_index.cpp:34:(.text+0x1c26): undefined reference to `llvm_assert'
/usr/bin/x86_64-pc-linux-gnu-ld.bfd: lib/DirectXShaderCompiler/lib/libSPIRV-Tools-opt.a(replace_desc_array_access_using_var_index.cpp.o): in function `spvtools::opt::ReplaceDescArrayAccessUsingVarIndex::CreatePhiInstruction(spvtools::opt::BasicBlock*, std::vector<unsigned int, std::allocator<unsigned int> > const&, std::vector<unsigned int, std::allocator<unsigned int> > const&, unsigned int) const':
./DirectXShaderCompiler/external/SPIRV-Tools/source/opt/replace_desc_array_access_using_var_index.cpp:424:(.text+0x1f6b): undefined reference to `llvm_assert'
/usr/bin/x86_64-pc-linux-gnu-ld.bfd: lib/DirectXShaderCompiler/lib/libSPIRV-Tools-opt.a(replace_desc_array_access_using_var_index.cpp.o): in function `spvtools::opt::ReplaceDescArrayAccessUsingVarIndex::GetConstNull(unsigned int) const':
./DirectXShaderCompiler/external/SPIRV-Tools/source/opt/replace_desc_array_access_using_var_index.cpp:400:(.text+0x2209): undefined reference to `llvm_assert'
/usr/bin/x86_64-pc-linux-gnu-ld.bfd: lib/DirectXShaderCompiler/lib/libSPIRV-Tools-opt.a(replace_desc_array_access_using_var_index.cpp.o):./DirectXShaderCompiler/external/SPIRV-Tools/source/opt/ir_builder.h:294: more undefined references to `llvm_assert' follow
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add a flag (off by default) to allow diligent to use a statically-linked DirectXShaderCompiler