updated shader compiler for May 2024 release

WickedEngine/Utility/WinAdapter.h

@@ -126,7 +126,7 @@
 // Used by HRESULT <--> WIN32 error code conversion
 #define SEVERITY_ERROR 1
 #define FACILITY_WIN32 7
-#define HRESULT_CODE(hr) ((hr)&0xFFFF)
+#define HRESULT_CODE(hr) ((hr) & 0xFFFF)
 #define MAKE_HRESULT(severity, facility, code)                                 \
   ((HRESULT)(((unsigned long)(severity) << 31) |                               \
              ((unsigned long)(facility) << 16) | ((unsigned long)(code))))
@@ -238,7 +238,7 @@
 
 #define HRESULT_FROM_WIN32(x)                                                  \
   (HRESULT)(x) <= 0 ? (HRESULT)(x)                                             \
-                    : (HRESULT)(((x)&0x0000FFFF) | (7 << 16) | 0x80000000)
+                    : (HRESULT)(((x) & 0x0000FFFF) | (7 << 16) | 0x80000000)
 
 //===----------------------------------------------------------------------===//
 //
@@ -250,75 +250,19 @@
 #define _In_opt_
 #define _In_opt_count_(size)
 #define _In_opt_z_
-#define _In_reads_(size)
-#define _In_reads_bytes_(size)
-#define _In_reads_bytes_opt_(size)
-#define _In_reads_opt_(size)
-#define _In_reads_to_ptr_(ptr)
 #define _In_count_(size)
-#define _In_range_(lb, ub)
 #define _In_bytecount_(size)
-#define _In_opt_bytecount_(size)
-#define _In_NLS_string_(size)
-#define __in_bcount(size)
 
 #define _Out_
-#define _Out_bytecap_(nbytes)
-#define _Out_writes_to_(a, b)
-#define _Out_writes_to_opt_(a, b)
+#define _Out_opt_
 #define _Outptr_
 #define _Outptr_opt_
-#define _Outptr_opt_result_z_
-#define _Out_opt_
-#define _Out_writes_(size)
-#define _Out_write_bytes_(size)
-#define _Out_writes_z_(size)
-#define _Out_writes_all_(size)
-#define _Out_writes_bytes_(size)
-#define _Outref_result_buffer_(size)
-#define _Outptr_result_buffer_(size)
-#define _Out_cap_(size)
-#define _Out_cap_x_(size)
-#define _Out_range_(lb, ub)
 #define _Outptr_result_z_
-#define _Outptr_result_buffer_maybenull_(ptr)
+#define _Outptr_opt_result_z_
 #define _Outptr_result_maybenull_
 #define _Outptr_result_nullonfailure_
-
-#define __out_ecount_part(a, b)
-
-#define _Inout_
-#define _Inout_z_
-#define _Inout_opt_
-#define _Inout_cap_(size)
-#define _Inout_count_(size)
-#define _Inout_count_c_(size)
-#define _Inout_opt_count_c_(size)
-#define _Inout_bytecount_c_(size)
-#define _Inout_opt_bytecount_c_(size)
-
-#define _Ret_maybenull_
-#define _Ret_notnull_
-#define _Ret_opt_
-
-#define _Use_decl_annotations_
-#define __analysis_assume(expr)
-#define _Analysis_assume_(expr)
-#define _Analysis_assume_nullterminated_(x)
-#define _Success_(expr)
-
-#define __inexpressible_readableTo(size)
-#define __inexpressible_writableTo(size)
-
-#define _Printf_format_string_
-#define _Null_terminated_
-
-#define _Field_size_(size)
-#define _Field_size_full_(size)
-#define _Field_size_opt_(size)
-#define _Post_writable_byte_size_(size)
-#define _Post_readable_byte_size_(size)
-#define __drv_allocatesMem(mem)
+#define _Outptr_result_buffer_maybenull_(ptr)
+#define _Outptr_result_buffer_(ptr)
 
 #define _COM_Outptr_
 #define _COM_Outptr_opt_
@@ -968,32 +912,40 @@ unsigned int SysStringLen(const BSTR bstrString);
 #define CP_ACP 0
 #define CP_UTF8 65001 // UTF-8 translation.
 
-// Convert Windows codepage value to locale string
-const char *CPToLocale(uint32_t CodePage);
+// RAII style mechanism for setting/unsetting a locale for the specified Windows
+// codepage
+class ScopedLocale {
+  const char *m_prevLocale;
+
+public:
+  explicit ScopedLocale(uint32_t codePage)
+      : m_prevLocale(setlocale(LC_ALL, nullptr)) {
+    assert((codePage == CP_UTF8) &&
+           "Support for Linux only handles UTF8 code pages");
+    setlocale(LC_ALL, "en_US.UTF-8");
+  }
+  ~ScopedLocale() {
+    if (m_prevLocale != nullptr) {
+      setlocale(LC_ALL, m_prevLocale);
+    }
+  }
+};
 
 // The t_nBufferLength parameter is part of the published interface, but not
 // used here.
 template <int t_nBufferLength = 128> class CW2AEX {
 public:
-  CW2AEX(LPCWSTR psz, UINT nCodePage = CP_UTF8) {
-    const char *locale = CPToLocale(nCodePage);
-    if (locale == nullptr) {
-      // Current Implementation only supports CP_UTF8, and CP_ACP
-      assert(false && "CW2AEX implementation for Linux only handles "
-                      "UTF8 and ACP code pages");
-      return;
-    }
+  CW2AEX(LPCWSTR psz) {
+    ScopedLocale locale(CP_UTF8);
 
     if (!psz) {
       m_psz = NULL;
       return;
     }
 
-    locale = setlocale(LC_ALL, locale);
     int len = (wcslen(psz) + 1) * 4;
     m_psz = new char[len];
     std::wcstombs(m_psz, psz, len);
-    setlocale(LC_ALL, locale);
   }
 
   ~CW2AEX() { delete[] m_psz; }
@@ -1008,25 +960,17 @@ typedef CW2AEX<> CW2A;
 // used here.
 template <int t_nBufferLength = 128> class CA2WEX {
 public:
-  CA2WEX(LPCSTR psz, UINT nCodePage = CP_UTF8) {
-    const char *locale = CPToLocale(nCodePage);
-    if (locale == nullptr) {
-      // Current Implementation only supports CP_UTF8, and CP_ACP
-      assert(false && "CA2WEX implementation for Linux only handles "
-                      "UTF8 and ACP code pages");
-      return;
-    }
+  CA2WEX(LPCSTR psz) {
+    ScopedLocale locale(CP_UTF8);
 
     if (!psz) {
       m_psz = NULL;
       return;
     }
 
-    locale = setlocale(LC_ALL, locale);
     int len = strlen(psz) + 1;
     m_psz = new wchar_t[len];
     std::mbstowcs(m_psz, psz, len);
-    setlocale(LC_ALL, locale);
   }
 
   ~CA2WEX() { delete[] m_psz; }

WickedEngine/Utility/dxcerrors.h

@@ -0,0 +1,30 @@
+///////////////////////////////////////////////////////////////////////////////
+//                                                                           //
+// dxcerror.h                                                                //
+// Copyright (C) Microsoft Corporation. All rights reserved.                 //
+// This file is distributed under the University of Illinois Open Source     //
+// License. See LICENSE.TXT for details.                                     //
+//                                                                           //
+// Provides definition of error codes.                                        //
+//                                                                           //
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef __DXC_ERRORS__
+#define __DXC_ERRORS__
+
+#ifndef FACILITY_GRAPHICS
+#define FACILITY_GRAPHICS 36
+#endif
+
+#define DXC_EXCEPTION_CODE(name, status)                                       \
+  static constexpr DWORD EXCEPTION_##name =                                    \
+      (0xc0000000u | (FACILITY_GRAPHICS << 16) |                               \
+       (0xff00u | (status & 0xffu)));
+
+DXC_EXCEPTION_CODE(LOAD_LIBRARY_FAILED, 0x00u)
+DXC_EXCEPTION_CODE(NO_HMODULE, 0x01u)
+DXC_EXCEPTION_CODE(GET_PROC_FAILED, 0x02u)
+
+#undef DXC_EXCEPTION_CODE
+
+#endif