Skip to content

Allow diligent to link a static DirectXShaderCompiler #723

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

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

Allow diligent to link a static DirectXShaderCompiler #723

Show file tree
Hide file tree
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
19 changes: 17 additions & 2 deletions Graphics/ShaderTools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ set(SOURCE
src/HLSLTokenizer.cpp
)

option(DILIGENT_USE_STATIC_DXC "Link DXC statically and bypass dlopen" OFF)

set(DXC_SUPPORTED FALSE)
if((PLATFORM_WIN32 AND NOT MINGW_BUILD) OR PLATFORM_UNIVERSAL_WINDOWS OR PLATFORM_LINUX)
set(DXC_SUPPORTED TRUE)
Expand Down Expand Up @@ -143,8 +145,14 @@ if (DXC_SUPPORTED)
endif()

if (NOT PLATFORM_WIN32)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
CMAKE_CXX_COMPILER_ID MATCHES "GNU")
if (DILIGENT_USE_STATIC_DXC)
target_compile_definitions(Diligent-ShaderTools PRIVATE DILIGENT_USE_STATIC_DXC=1)
target_link_libraries(Diligent-ShaderTools
PUBLIC
LLVMSupport
dxcompiler
Comment on lines +152 to +153
Copy link
Contributor

@TheMostDiligent TheMostDiligent Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these public dependencies?

Copy link
Author

@Lokomojo Lokomojo Nov 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See below for reasons - if you'd prefer to make the consumer link the libraries manually that's your call of course ;)

)
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
target_link_libraries(Diligent-ShaderTools PRIVATE dl)
Copy link
Contributor

@TheMostDiligent TheMostDiligent Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that dl should not be needed when linking statically - can be in the else() branch

endif()
endif()
Expand Down Expand Up @@ -176,6 +184,13 @@ if(ENABLE_SPIRV)
endif()

if (${USE_SPIRV_TOOLS})
if (NOT PLATFORM_WIN32 AND DILIGENT_USE_STATIC_DXC)
cmake_policy(SET CMP0079 NEW)
target_link_libraries(SPIRV-Tools-opt
PUBLIC
LLVMSupport
)
endif()
target_link_libraries(Diligent-ShaderTools
PRIVATE
SPIRV-Tools-opt
Expand Down
12 changes: 10 additions & 2 deletions Graphics/ShaderTools/src/DXCompilerLibraryLinux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,34 @@ namespace Diligent

void DXCompilerLibrary::Load()
{
#if defined(DILIGENT_USE_STATIC_DXC)
m_Library = reinterpret_cast<void*>(0x1);
m_DxcCreateInstance = &DxcCreateInstance;
#else
if (!m_LibName.empty())
m_Library = dlopen(m_LibName.c_str(), RTLD_LOCAL | RTLD_LAZY);

if (m_Library == nullptr)
m_Library = dlopen("libdxcompiler.so", RTLD_LOCAL | RTLD_LAZY);

// try to load from default path
if (m_Library == nullptr)
m_Library = dlopen("/usr/lib/dxc/libdxcompiler.so", RTLD_LOCAL | RTLD_LAZY);

m_DxcCreateInstance = m_Library != nullptr ? reinterpret_cast<DxcCreateInstanceProc>(dlsym(m_Library, "DxcCreateInstance")) : nullptr;
m_DxcCreateInstance = m_Library != nullptr
? reinterpret_cast<DxcCreateInstanceProc>(dlsym(m_Library, "DxcCreateInstance"))
: nullptr;
#endif
}

void DXCompilerLibrary::Unload()
{
#if !defined(DILIGENT_USE_STATIC_DXC)
if (m_Library != nullptr)
{
dlclose(m_Library);
m_Library = nullptr;
}
#endif
}

} // namespace Diligent