Update directx headers to facilitate future updates

CMakeLists.txt

@@ -662,6 +662,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
@@ -679,11 +688,6 @@ list(APPEND LLVM_COMMON_DEPENDS HCTGen)
 
 add_subdirectory(utils/hct)
 
-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)

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/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);