Allow libdxcompiler.so and dxc to find libdxil.so #5004
Merged
Conversation
This file contains 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
|
❌ Build DirectXShaderCompiler 1.0.2749 failed (commit b813259bce by @pow2clk) |
|
✅ Build DirectXShaderCompiler 1.0.2751 completed (commit 4e037f9c97 by @pow2clk) |
|
✅ Build DirectXShaderCompiler 1.0.2752 completed (commit 1c3d450748 by @pow2clk) |
When present in the library search path, linux builds of libdxcompiler.so and the dxc executable should load libdxil.so and use it for validation and signing. However, the code to do that was still searching for dxil.dll even on these platforms. This change creates appropriate names for the dxcompiler and dxil libraries for each platform and uses them where appropriate. In addition, this changes some of the internal interfaces from wide chars to simple chars as the wide interface wasn't useful here.
|
✅ Build DirectXShaderCompiler 1.0.2756 completed (commit 2b48a4d929 by @pow2clk) |
|
✅ Build DirectXShaderCompiler 1.0.2757 completed (commit 697d523856 by @pow2clk) |
python3kgae
approved these changes
Feb 9, 2023
llvm-beanz
approved these changes
Feb 9, 2023
|
The k- prefix is included in all other such string constants. Just trying to be consistent! 😄 |
pow2clk
added a commit
that referenced
this pull request
Feb 27, 2023
When present in the library search path, linux builds of libdxcompiler.so and the dxc executable should load libdxil.so and use it for validation and signing. However, the code to do that was still searching for dxil.dll even on these platforms. This change creates appropriate names for the dxcompiler and dxil libraries for each platform and uses them where appropriate. In addition, this changes some of the internal interfaces from wide chars to simple chars as the wide interface wasn't useful here. (cherry picked from commit ae51624)
pow2clk
added a commit
that referenced
this pull request
Feb 27, 2023
Merge relevant changes into release 1.7.2212 7ce4986 Fix opt.exe external lib loading (#5049) 8f4d1f4 PIX: DxcPixDxilInstructionOffsets should operate on libs (#5046) 0795b94 Fix AppVeyor Linux tests failing loading dxil.so (#5024) 6d3574a Remove SO version from unix binaries (#5010) 6d480fd Allow libdxcompiler.so and dxc to find libdxil.so (#5004) d751bd8 Correct WinAdapter path assumptions in public headers (#5003) 484f1b0 Fix instruction order issue in scalarizer (#5001) d9d83d0 Fix two issues found in our internal build (#5002) c8603e4 Added a workaround for PDBs with empty defines. (#4945) 073d860 [bug] Fix memory leak in dxil validator (#4966) 87fc5b5 PIX: Symbol manager: don't allow static members to contribute to member offsets (#4952) 8588ecb Turn off structurize-returns when cleanup blocks are present. (#4927) bac7aa7 build: disable LLVM_ENABLE_TERMINFO by default. (#4908)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When present in the library search path, linux builds of libdxcompiler.so and the dxc executable should load libdxil.so and use it for validation and signing. However, the code to do that was still searching for dxil.dll even on these platforms. This adds code to search for the right name on the right platforms.