For future reference: static linking across different platforms

CMakeLists.txt

@@ -13,6 +13,16 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
+if(UNIX AND NOT APPLE)
+	if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
+		set(CMAKE_ENABLE_EXPORTS ON)
+	endif()
+endif()
+
+if(NOT WIN32)
+	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+endif()
+
 if(POLICY CMP0022)
   cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
 endif()
@@ -138,6 +148,7 @@ endif()
 # SPIRV change starts
 option(ENABLE_SPIRV_CODEGEN "Enables SPIR-V code generation." OFF)
 option(SPIRV_BUILD_TESTS "Build targets for the SPIR-V unit tests." OFF)
+option(ENABLE_DXC_STATIC_LINKING "Enable DXC static linking" OFF)
 
 # Enable SPIR-V CodeGen for Linux by default.
 if(NOT WIN32)
@@ -151,6 +162,9 @@ endif()
 if (${ENABLE_SPIRV_CODEGEN})
   add_definitions(-DENABLE_SPIRV_CODEGEN)
 endif()
+if (${ENABLE_DXC_STATIC_LINKING})
+  add_definitions(-DENABLE_DXC_STATIC_LINKING)
+endif()
 # SPIRV change ends
 
 include(VersionFromVCS)
@@ -671,6 +685,15 @@ if(LLVM_INCLUDE_TESTS AND WIN32)
   add_definitions(/DMSFT_SUPPORTS_CHILD_PROCESSES)
 endif()
 
+if(EXISTS "${LLVM_MAIN_SRC_DIR}/external")
+  add_subdirectory(external) # SPIRV change
+endif()
+if(WIN32)
+  include_directories(${DIRECTX_HEADER_INCLUDE_DIR}/directx)
+else()
+  include_directories(AFTER ${DIRECTX_HEADER_INCLUDE_DIR}/wsl/stubs ${DIRECTX_HEADER_INCLUDE_DIR}/directx)
+endif()
+
 # Put this before tblgen. Else we have a circular dependence.
 add_subdirectory(lib/Support)
 add_subdirectory(lib/MSSupport) # HLSL Change
@@ -686,11 +709,6 @@ add_subdirectory(include/dxc)
 # really depend on anything else in the build it is safe.
 list(APPEND LLVM_COMMON_DEPENDS HCTGen) 
 
-if(EXISTS "${LLVM_MAIN_SRC_DIR}/external")
-  add_subdirectory(external) # SPIRV change
-endif()
-include_directories(AFTER ${DIRECTX_HEADER_INCLUDE_DIR}/directx ${DIRECTX_HEADER_INCLUDE_DIR}/wsl/stubs)
-
 # HLSL - Change End
 
 add_subdirectory(lib)
@@ -814,7 +832,11 @@ endif()
 include(CoverageReport)
 
 # HLSL Change begin - Set default distribution value.
+if(ENABLE_DXC_STATIC_LINKING)
+set(LLVM_DISTRIBUTION_COMPONENTS "dxcompiler;dxc-headers" CACHE STRING "")
+else()
 set(LLVM_DISTRIBUTION_COMPONENTS "dxc;dxcompiler;dxc-headers" CACHE STRING "")
+endif()
 # HLSL Change end - Set default distribution value.
 
 # This must be at the end of the LLVM root CMakeLists file because it must run

external/CMakeLists.txt

@@ -9,13 +9,11 @@ endif (NOT HLSL_ENABLE_DEBUG_ITERATORS)
 
 # Need DirectX-Headers module if not on windows
 if (NOT DIRECTX_HEADER_INCLUDE_DIR)
-  if (NOT WIN32)
-    if (IS_DIRECTORY "${DXC_EXTERNAL_ROOT_DIR}/DirectX-Headers")
-      set(DIRECTX_HEADER_INCLUDE_DIR ${DXC_EXTERNAL_ROOT_DIR}/DirectX-Headers/include PARENT_SCOPE)
-    else()
-      message(FATAL_ERROR "DirectX-Headers was not found - required for reflection support on *nix see https://github.com/microsoft/DirectX-Headers")
-    endif()
-  endif (NOT WIN32)
+  if (IS_DIRECTORY "${DXC_EXTERNAL_ROOT_DIR}/DirectX-Headers")
+    set(DIRECTX_HEADER_INCLUDE_DIR ${DXC_EXTERNAL_ROOT_DIR}/DirectX-Headers/include PARENT_SCOPE)
+  else()
+    message(FATAL_ERROR "DirectX-Headers was not found - required for reflection support on *nix see https://github.com/microsoft/DirectX-Headers")
+  endif()
 endif(NOT DIRECTX_HEADER_INCLUDE_DIR)
 
 # Enabling SPIR-V codegen requires SPIRV-Headers for spirv.hpp and

include/dxc/CMakeLists.txt

@@ -34,12 +34,14 @@ endif()
 # actually build anything since the headers are static.
 add_custom_target(dxc-headers)
 
+if(NOT ENABLE_DXC_STATIC_LINKING)
 install(FILES 
     ${DXC_PUBLIC_HEADERS}
     ${DXC_PLATFORM_PUBLIC_HEADERS}
     DESTINATION include/dxc
     COMPONENT dxc-headers
     )
+endif()
 
 add_custom_target(install-dxc-headers
     DEPENDS dxc-headers

include/dxc/Support/D3DReflection.h

@@ -22,5 +22,5 @@
 #undef interface
 #pragma GCC diagnostic pop
 #else
-#include <d3d12shader.h>
+#include "d3d12shader.h"
 #endif

include/dxc/Support/Unicode.h

@@ -14,6 +14,7 @@
 #include <string>
 
 #ifdef _WIN32
+typedef int *LPBOOL;
 #include <specstrings.h>
 #else
 // MultiByteToWideChar which is a Windows-specific method.
@@ -30,7 +31,7 @@ int WideCharToMultiByte(uint32_t CodePage, uint32_t dwFlags,
                         const wchar_t *lpWideCharStr, int cchWideChar,
                         char *lpMultiByteStr, int cbMultiByte,
                         const char *lpDefaultChar = nullptr,
-                        bool *lpUsedDefaultChar = nullptr);
+                        LPBOOL lpUsedDefaultChar = nullptr);
 #endif // _WIN32
 
 namespace Unicode {
@@ -54,14 +55,15 @@ typedef char acp_char;
 typedef char ccp_char;
 
 bool UTF8ToConsoleString(const char *text, size_t textLen, std::string *pValue,
-                         bool *lossy);
+                         LPBOOL lossy);
 
-bool UTF8ToConsoleString(const char *text, std::string *pValue, bool *lossy);
+bool UTF8ToConsoleString(const char *text, std::string *pValue, LPBOOL lossy);
 
 bool WideToConsoleString(const wchar_t *text, size_t textLen,
-                         std::string *pValue, bool *lossy);
+                         std::string *pValue, LPBOOL lossy);
 
-bool WideToConsoleString(const wchar_t *text, std::string *pValue, bool *lossy);
+bool WideToConsoleString(const wchar_t *text, std::string *pValue,
+                         LPBOOL lossy);
 
 bool UTF8ToWideString(const char *pUTF8, std::wstring *pWide);
 

include/dxc/Test/D3DReflectionDumper.h

@@ -38,18 +38,32 @@ class D3DReflectionDumper : public DumpContext {
   void Dump(D3D12_SHADER_BUFFER_DESC &Desc);
   void Dump(D3D12_SHADER_INPUT_BIND_DESC &resDesc);
   void Dump(D3D12_SIGNATURE_PARAMETER_DESC &elDesc);
+  void Dump(D3D12_NODE_SHADER_DESC &Desc);
+  void Dump(D3D12_HULL_SHADER_DESC &Desc);
+  void Dump(D3D12_COMPUTE_SHADER_DESC &Desc);
+  void Dump(D3D12_MESH_SHADER_DESC &Desc);
+  void Dump(D3D12_GEOMETRY_SHADER_DESC &Desc);
+  void Dump(D3D12_DOMAIN_SHADER_DESC &Desc);
+  void Dump(D3D12_NODE_ID_DESC &Desc, const char *name);
+  void Dump(D3D12_NODE_DESC &Desc);
   void Dump(D3D12_SHADER_DESC &Desc);
   void Dump(D3D12_FUNCTION_DESC &Desc);
   void Dump(D3D12_LIBRARY_DESC &Desc);
 
+  void Dump(D3D12_FUNCTION_DESC1 &Desc);
+
   void Dump(ID3D12ShaderReflectionType *pType);
   void Dump(ID3D12ShaderReflectionVariable *pVar);
 
   void Dump(ID3D12ShaderReflectionConstantBuffer *pCBReflection);
 
-  void Dump(ID3D12ShaderReflection *pShaderReflection);
+  void Dump(ID3D12ShaderReflection *pShaderReflection,
+            BOOL printHeader = false);
+  void Dump(ID3D12ShaderReflection1 *pShaderReflection);
   void Dump(ID3D12FunctionReflection *pFunctionReflection);
+  void Dump(ID3D12FunctionReflection1 *pFunctionReflection);
   void Dump(ID3D12LibraryReflection *pLibraryReflection);
+  void Dump(ID3D12LibraryReflection1 *pLibraryReflection);
 };
 
 } // namespace dump

include/dxc/Test/D3DReflectionStrings.h

@@ -39,6 +39,8 @@ LPCSTR ToString(D3D_PARAMETER_FLAGS Flag);
 LPCSTR ToString(D3D_NAME Name);
 LPCSTR ToString(D3D_REGISTER_COMPONENT_TYPE CompTy);
 LPCSTR ToString(D3D_MIN_PRECISION MinPrec);
+LPCSTR ToString(D3D12_NODE_LAUNCH_TYPE NodeLaunchType);
+LPCSTR ToString(D3D12_DISPATCH_COMPONENT_TYPE DispatchComponentType);
 LPCSTR CompMaskToString(unsigned CompMask);
 
 // These macros declare the ToString functions for DXC types