fix Zig/clang msvc support

Signed-off-by: Stephen Gutekanst <[email protected]>

Author: Stephen Gutekanst

include/dxc/Support/dxcapi.use.h

@@ -14,6 +14,10 @@
 
 #include "dxc/dxcapi.h"
 
+// Mach change start: static dxcompiler/dxil
+#include <string>
+// Mach change end
+
 namespace dxc {
 
 extern const char *kDxCompilerLib;

include/dxc/ZigGNUWinAdapter.h

@@ -9,6 +9,34 @@
 #ifndef LLVM_SUPPORT_ZIG_GNU_WIN_ADAPTER_H
 #define LLVM_SUPPORT_ZIG_GNU_WIN_ADAPTER_H
 
+#if defined(__clang__) && defined(_MSC_VER) && defined(_WIN32) // Zig windows-msvc target
+
+// ETW tracing shims, because we do not use ETW (requires codegen tool)
+//
+// Event Tracing for Windows (ETW) provides application programmers the ability
+// to start and stop event tracing sessions, instrument an application to
+// provide trace events, and consume trace events.
+//---------------------------------------------------------------------
+#define DxcEtw_DXCompilerShutdown_Start()
+#define DxcEtw_DXCompilerShutdown_Stop(e)
+#define DxcEtw_DXCompilerCreateInstance_Start()
+#define DxcEtw_DXCompilerCreateInstance_Stop(hr)
+#define DxcEtw_DXCompilerCompile_Start()
+#define DxcEtw_DXCompilerCompile_Stop(hr)
+#define DxcEtw_DXCompilerDisassemble_Start()
+#define DxcEtw_DXCompilerDisassemble_Stop(hr)
+#define DxcEtw_DXCompilerPreprocess_Start()
+#define DxcEtw_DXCompilerPreprocess_Stop(hr)
+#define DxcEtw_DxcValidation_Start()
+#define DxcEtw_DxcValidation_Stop(hr)
+
+#define DxcEtw_DXCompilerInitialization_Start()
+#define DxcEtw_DXCompilerInitialization_Stop(e)
+#define EventRegisterMicrosoft_Windows_DXCompiler_API()
+#define EventUnregisterMicrosoft_Windows_DXCompiler_API()
+
+#endif // Zig windows-msvc target
+
 #if defined(__clang__) && !defined(_MSC_VER) && defined(_WIN32) // Zig windows-gnu target
 
 // MinGW UUIDOF specializations

lib/DxcSupport/WinAdapter.cpp

@@ -21,7 +21,7 @@
 // Mach change start
 // #include "dxc/Support/WinIncludes.h"
 // #ifndef _WIN32
-#if !defined(_WIN32) || defined(__clang__)
+#if !defined(_WIN32) || (defined(__clang__) && !defined(_MSC_VER))
 // Mach change end
 
 #include "dxc/Support/Unicode.h"

lib/DxcSupport/WinFunctions.cpp

@@ -19,11 +19,14 @@
 #include <map>
 #include <string.h>
 #include <sys/stat.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif
 
 #include "dxc/Support/WinFunctions.h"
 #include "dxc/Support/microcom.h"
 
+#ifndef _MSC_VER
 HRESULT UInt32Mult(UINT a, UINT b, UINT *out) {
   uint64_t result = (uint64_t)a * (uint64_t)b;
   if (result > uint64_t(UINT_MAX))
@@ -32,6 +35,7 @@ HRESULT UInt32Mult(UINT a, UINT b, UINT *out) {
   *out = (uint32_t)result;
   return S_OK;
 }
+#endif // _MSC_VER
 #endif // defined(__clang__) && defined(_WIN32)
 // Mach change end