diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll index 0f4d9ef52..9947f63a9 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7490aa95b516e002b30d9cf7034f4fc796d087660d028cb076fdf15ac9efe5e -size 18515848 +oid sha256:b0849eef97571a3170e20e3eb697f3467d92f98f627386ed9dbfed23a146528b +size 20067744 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib index 748275336..4a2878f4d 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxcompiler.lib @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:02d6f118c010e5a1a65c30d622871525d92e8f78a80e322d3a2d855bb502d0e2 +oid sha256:3a7281c5a0091eb1a7f6e543cd4eb57547c0a17c53ce2d5cc82ed17ac195a3e0 size 2002 diff --git a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll index 411d5e15f..01d720b18 100644 --- a/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll +++ b/Source/Platforms/Windows/Binaries/ThirdParty/x64/dxil.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c9bbaa764ec71e5087b13767a20086ccebc6127a46473a1076977b28bbc24c8 -size 1867776 +oid sha256:caaeba17de17643fc081f805942702bd62b5859dcbdca0358ace499085606e12 +size 1526184 diff --git a/Source/ThirdParty/DirectXShaderCompiler/dxcapi.h b/Source/ThirdParty/DirectXShaderCompiler/dxcapi.h index 4e4297e50..0e16bb003 100644 --- a/Source/ThirdParty/DirectXShaderCompiler/dxcapi.h +++ b/Source/ThirdParty/DirectXShaderCompiler/dxcapi.h @@ -24,9 +24,15 @@ #endif #ifdef _WIN32 -#define DECLARE_CROSS_PLATFORM_UUIDOF(T) -#define DEFINE_CROSS_PLATFORM_UUIDOF(T) + +#ifndef CROSS_PLATFORM_UUIDOF +// Warning: This macro exists in WinAdapter.h as well +#define CROSS_PLATFORM_UUIDOF(interface, spec) \ + struct __declspec(uuid(spec)) interface; +#endif + #else + #include #include "dxc/Support/WinAdapter.h" #endif @@ -55,7 +61,7 @@ typedef HRESULT(__stdcall *DxcCreateInstance2Proc)( /// The CLSID associated with the data and code that will be used to create the object. /// /// -/// A reference to the identifier of the interface to be used to communicate +/// A reference to the identifier of the interface to be used to communicate /// with the object. /// /// @@ -66,18 +72,14 @@ typedef HRESULT(__stdcall *DxcCreateInstance2Proc)( /// While this function is similar to CoCreateInstance, there is no COM involvement. /// -#ifndef _MSC_VER extern "C" -#endif DXC_API_IMPORT HRESULT __stdcall DxcCreateInstance( _In_ REFCLSID rclsid, _In_ REFIID riid, _Out_ LPVOID* ppv ); -#ifndef _MSC_VER extern "C" -#endif DXC_API_IMPORT HRESULT __stdcall DxcCreateInstance2( _In_ IMalloc *pMalloc, _In_ REFCLSID rclsid, @@ -88,9 +90,16 @@ DXC_API_IMPORT HRESULT __stdcall DxcCreateInstance2( // For convenience, equivalent definitions to CP_UTF8 and CP_UTF16. #define DXC_CP_UTF8 65001 #define DXC_CP_UTF16 1200 +#define DXC_CP_UTF32 12000 // Use DXC_CP_ACP for: Binary; ANSI Text; Autodetect UTF with BOM #define DXC_CP_ACP 0 +#ifdef _WIN32 +#define DXC_CP_WIDE DXC_CP_UTF16 +#else +#define DXC_CP_WIDE DXC_CP_UTF32 +#endif + // This flag indicates that the shader hash was computed taking into account source information (-Zss) #define DXC_HASHFLAG_INCLUDES_SOURCE 1 @@ -137,58 +146,53 @@ typedef struct DxcShaderHash { #define DXC_ARG_DEBUG_NAME_FOR_BINARY L"-Zsb" // IDxcBlob is an alias of ID3D10Blob and ID3DBlob -struct __declspec(uuid("8BA5FB08-5195-40e2-AC58-0D989C3A0102")) -IDxcBlob : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcBlob, "8BA5FB08-5195-40e2-AC58-0D989C3A0102") +struct IDxcBlob : public IUnknown { public: virtual LPVOID STDMETHODCALLTYPE GetBufferPointer(void) = 0; virtual SIZE_T STDMETHODCALLTYPE GetBufferSize(void) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcBlob) }; -struct __declspec(uuid("7241d424-2646-4191-97c0-98e96e42fc68")) -IDxcBlobEncoding : public IDxcBlob { +CROSS_PLATFORM_UUIDOF(IDxcBlobEncoding, "7241d424-2646-4191-97c0-98e96e42fc68") +struct IDxcBlobEncoding : public IDxcBlob { public: virtual HRESULT STDMETHODCALLTYPE GetEncoding(_Out_ BOOL *pKnown, _Out_ UINT32 *pCodePage) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcBlobEncoding) }; -// Notes on IDxcBlobUtf16 and IDxcBlobUtf8 -// These guarantee null-terminated text and the stated encoding. +// Notes on IDxcBlobWide and IDxcBlobUtf8 +// These guarantee null-terminated text and eithre utf8 or the native wide char encoding. // GetBufferSize() will return the size in bytes, including null-terminator // GetStringLength() will return the length in characters, excluding the null-terminator -// Name strings will use IDxcBlobUtf16, while other string output blobs, +// Name strings will use IDxcBlobWide, while other string output blobs, // such as errors/warnings, preprocessed HLSL, or other text will be based // on the -encoding option. // The API will use this interface for output name strings -struct __declspec(uuid("A3F84EAB-0FAA-497E-A39C-EE6ED60B2D84")) -IDxcBlobUtf16 : public IDxcBlobEncoding { +CROSS_PLATFORM_UUIDOF(IDxcBlobWide, "A3F84EAB-0FAA-497E-A39C-EE6ED60B2D84") +struct IDxcBlobWide : public IDxcBlobEncoding { public: virtual LPCWSTR STDMETHODCALLTYPE GetStringPointer(void) = 0; virtual SIZE_T STDMETHODCALLTYPE GetStringLength(void) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcBlobUtf16) }; -struct __declspec(uuid("3DA636C9-BA71-4024-A301-30CBF125305B")) -IDxcBlobUtf8 : public IDxcBlobEncoding { +CROSS_PLATFORM_UUIDOF(IDxcBlobUtf8, "3DA636C9-BA71-4024-A301-30CBF125305B") +struct IDxcBlobUtf8 : public IDxcBlobEncoding { public: virtual LPCSTR STDMETHODCALLTYPE GetStringPointer(void) = 0; virtual SIZE_T STDMETHODCALLTYPE GetStringLength(void) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcBlobUtf8) }; -struct __declspec(uuid("7f61fc7d-950d-467f-b3e3-3c02fb49187c")) -IDxcIncludeHandler : public IUnknown { +// Define legacy name IDxcBlobUtf16 as IDxcBlobWide for Win32 +#ifdef _WIN32 +typedef IDxcBlobWide IDxcBlobUtf16; +#endif + +CROSS_PLATFORM_UUIDOF(IDxcIncludeHandler, "7f61fc7d-950d-467f-b3e3-3c02fb49187c") +struct IDxcIncludeHandler : public IUnknown { virtual HRESULT STDMETHODCALLTYPE LoadSource( _In_z_ LPCWSTR pFilename, // Candidate filename. _COM_Outptr_result_maybenull_ IDxcBlob **ppIncludeSource // Resultant source object for included file, nullptr if not found. ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcIncludeHandler) }; // Structure for supplying bytes or text input to Dxc APIs. @@ -204,8 +208,8 @@ struct DxcDefine { _Maybenull_ LPCWSTR Value; }; -struct __declspec(uuid("73EFFE2A-70DC-45F8-9690-EFF64C02429D")) -IDxcCompilerArgs : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcCompilerArgs, "73EFFE2A-70DC-45F8-9690-EFF64C02429D") +struct IDxcCompilerArgs : public IUnknown { // Pass GetArguments() and GetCount() to Compile virtual LPCWSTR* STDMETHODCALLTYPE GetArguments() = 0; virtual UINT32 STDMETHODCALLTYPE GetCount() = 0; @@ -223,8 +227,6 @@ IDxcCompilerArgs : public IUnknown { _In_count_(defineCount) const DxcDefine *pDefines, // Array of defines _In_ UINT32 defineCount // Number of defines ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcCompilerArgs) }; ////////////////////////// @@ -232,8 +234,8 @@ IDxcCompilerArgs : public IUnknown { ///////////////////////// // NOTE: IDxcUtils replaces IDxcLibrary -struct __declspec(uuid("e5204dc7-d18c-4c3c-bdfb-851673980fe7")) -IDxcLibrary : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcLibrary, "e5204dc7-d18c-4c3c-bdfb-851673980fe7") +struct IDxcLibrary : public IUnknown { virtual HRESULT STDMETHODCALLTYPE SetMalloc(_In_opt_ IMalloc *pMalloc) = 0; virtual HRESULT STDMETHODCALLTYPE CreateBlobFromBlob( _In_ IDxcBlob *pBlob, UINT32 offset, UINT32 length, _COM_Outptr_ IDxcBlob **ppResult) = 0; @@ -255,15 +257,23 @@ IDxcLibrary : public IUnknown { _In_ IDxcBlob *pBlob, _COM_Outptr_ IStream **ppStream) = 0; virtual HRESULT STDMETHODCALLTYPE GetBlobAsUtf8( _In_ IDxcBlob *pBlob, _COM_Outptr_ IDxcBlobEncoding **pBlobEncoding) = 0; - virtual HRESULT STDMETHODCALLTYPE GetBlobAsUtf16( + + // Renamed from GetBlobAsUtf16 to GetBlobAsWide + virtual HRESULT STDMETHODCALLTYPE GetBlobAsWide( _In_ IDxcBlob *pBlob, _COM_Outptr_ IDxcBlobEncoding **pBlobEncoding) = 0; - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcLibrary) +#ifdef _WIN32 + // Alias to GetBlobAsWide on Win32 + inline HRESULT GetBlobAsUtf16( + _In_ IDxcBlob *pBlob, _COM_Outptr_ IDxcBlobEncoding **pBlobEncoding) { + return this->GetBlobAsWide(pBlob, pBlobEncoding); + } +#endif }; // NOTE: IDxcResult replaces IDxcOperationResult -struct __declspec(uuid("CEDB484A-D4E9-445A-B991-CA21CA157DC2")) -IDxcOperationResult : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcOperationResult, "CEDB484A-D4E9-445A-B991-CA21CA157DC2") +struct IDxcOperationResult : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetStatus(_Out_ HRESULT *pStatus) = 0; // GetResult returns the main result of the operation. @@ -276,13 +286,11 @@ IDxcOperationResult : public IUnknown { // GetErrorBuffer Corresponds to DXC_OUT_ERRORS. virtual HRESULT STDMETHODCALLTYPE GetErrorBuffer(_COM_Outptr_result_maybenull_ IDxcBlobEncoding **ppErrors) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcOperationResult) }; // NOTE: IDxcCompiler3 replaces IDxcCompiler and IDxcCompiler2 -struct __declspec(uuid("8c210bf3-011f-4422-8d70-6f9acb8db617")) -IDxcCompiler : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcCompiler, "8c210bf3-011f-4422-8d70-6f9acb8db617") +struct IDxcCompiler : public IUnknown { // Compile a single entry point to the target shader model virtual HRESULT STDMETHODCALLTYPE Compile( _In_ IDxcBlob *pSource, // Source text to compile @@ -316,13 +324,11 @@ IDxcCompiler : public IUnknown { _In_ IDxcBlob *pSource, // Program to disassemble. _COM_Outptr_ IDxcBlobEncoding **ppDisassembly // Disassembly text. ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcCompiler) }; // NOTE: IDxcCompiler3 replaces IDxcCompiler and IDxcCompiler2 -struct __declspec(uuid("A005A9D9-B8BB-4594-B5C9-0E633BEC4D37")) -IDxcCompiler2 : public IDxcCompiler { +CROSS_PLATFORM_UUIDOF(IDxcCompiler2, "A005A9D9-B8BB-4594-B5C9-0E633BEC4D37") +struct IDxcCompiler2 : public IDxcCompiler { // Compile a single entry point to the target shader model with debug information. virtual HRESULT STDMETHODCALLTYPE CompileWithDebug( _In_ IDxcBlob *pSource, // Source text to compile @@ -336,15 +342,13 @@ IDxcCompiler2 : public IDxcCompiler { _In_ UINT32 defineCount, // Number of defines _In_opt_ IDxcIncludeHandler *pIncludeHandler, // user-provided interface to handle #include directives (optional) _COM_Outptr_ IDxcOperationResult **ppResult, // Compiler output status, buffer, and errors - _Outptr_opt_result_z_ LPWSTR *ppDebugBlobName,// Suggested file name for debug blob. (Must be HeapFree()'d!) + _Outptr_opt_result_z_ LPWSTR *ppDebugBlobName,// Suggested file name for debug blob. (Must be CoTaskMemFree()'d!) _COM_Outptr_opt_ IDxcBlob **ppDebugBlob // Debug blob ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcCompiler2) }; -struct __declspec(uuid("F1B5BE2A-62DD-4327-A1C2-42AC1E1E78E6")) -IDxcLinker : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcLinker, "F1B5BE2A-62DD-4327-A1C2-42AC1E1E78E6") +struct IDxcLinker : public IUnknown { public: // Register a library with name to ref it later. virtual HRESULT RegisterLibrary( @@ -365,8 +369,6 @@ public: _COM_Outptr_ IDxcOperationResult **ppResult // Linker output status, buffer, and errors ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcLinker) }; ///////////////////////// @@ -374,8 +376,8 @@ public: //////////////////////// // NOTE: IDxcUtils replaces IDxcLibrary -struct __declspec(uuid("4605C4CB-2019-492A-ADA4-65F20BB7D67F")) -IDxcUtils : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcUtils, "4605C4CB-2019-492A-ADA4-65F20BB7D67F") +struct IDxcUtils : public IUnknown { // Create a sub-blob that holds a reference to the outer blob and points to its memory. virtual HRESULT STDMETHODCALLTYPE CreateBlobFromBlob( _In_ IDxcBlob *pBlob, UINT32 offset, UINT32 length, _COM_Outptr_ IDxcBlob **ppResult) = 0; @@ -419,8 +421,18 @@ IDxcUtils : public IUnknown { // Convert or return matching encoded text blobs virtual HRESULT STDMETHODCALLTYPE GetBlobAsUtf8( _In_ IDxcBlob *pBlob, _COM_Outptr_ IDxcBlobUtf8 **pBlobEncoding) = 0; - virtual HRESULT STDMETHODCALLTYPE GetBlobAsUtf16( - _In_ IDxcBlob *pBlob, _COM_Outptr_ IDxcBlobUtf16 **pBlobEncoding) = 0; + + // Renamed from GetBlobAsUtf16 to GetBlobAsWide + virtual HRESULT STDMETHODCALLTYPE GetBlobAsWide( + _In_ IDxcBlob *pBlob, _COM_Outptr_ IDxcBlobWide **pBlobEncoding) = 0; + +#ifdef _WIN32 + // Alias to GetBlobAsWide on Win32 + inline HRESULT GetBlobAsUtf16( + _In_ IDxcBlob *pBlob, _COM_Outptr_ IDxcBlobWide **pBlobEncoding) { + return this->GetBlobAsWide(pBlob, pBlobEncoding); + } +#endif virtual HRESULT STDMETHODCALLTYPE GetDxilContainerPart( _In_ const DxcBuffer *pShader, @@ -448,8 +460,6 @@ IDxcUtils : public IUnknown { // Takes the shader PDB and returns the hash and the container inside it virtual HRESULT STDMETHODCALLTYPE GetPDBContents( _In_ IDxcBlob *pPDBBlob, _COM_Outptr_ IDxcBlob **ppHash, _COM_Outptr_ IDxcBlob **ppContainer) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcUtils) }; // For use with IDxcResult::[Has|Get]Output dxcOutKind argument @@ -457,51 +467,48 @@ IDxcUtils : public IUnknown { typedef enum DXC_OUT_KIND { DXC_OUT_NONE = 0, DXC_OUT_OBJECT = 1, // IDxcBlob - Shader or library object - DXC_OUT_ERRORS = 2, // IDxcBlobUtf8 or IDxcBlobUtf16 + DXC_OUT_ERRORS = 2, // IDxcBlobUtf8 or IDxcBlobWide DXC_OUT_PDB = 3, // IDxcBlob DXC_OUT_SHADER_HASH = 4, // IDxcBlob - DxcShaderHash of shader or shader with source info (-Zsb/-Zss) - DXC_OUT_DISASSEMBLY = 5, // IDxcBlobUtf8 or IDxcBlobUtf16 - from Disassemble - DXC_OUT_HLSL = 6, // IDxcBlobUtf8 or IDxcBlobUtf16 - from Preprocessor or Rewriter - DXC_OUT_TEXT = 7, // IDxcBlobUtf8 or IDxcBlobUtf16 - other text, such as -ast-dump or -Odump + DXC_OUT_DISASSEMBLY = 5, // IDxcBlobUtf8 or IDxcBlobWide - from Disassemble + DXC_OUT_HLSL = 6, // IDxcBlobUtf8 or IDxcBlobWide - from Preprocessor or Rewriter + DXC_OUT_TEXT = 7, // IDxcBlobUtf8 or IDxcBlobWide - other text, such as -ast-dump or -Odump DXC_OUT_REFLECTION = 8, // IDxcBlob - RDAT part with reflection data DXC_OUT_ROOT_SIGNATURE = 9, // IDxcBlob - Serialized root signature output DXC_OUT_EXTRA_OUTPUTS = 10,// IDxcExtraResults - Extra outputs + DXC_OUT_REMARKS = 11, // IDxcBlobUtf8 or IDxcBlobUtf16 - text directed at stdout DXC_OUT_FORCE_DWORD = 0xFFFFFFFF } DXC_OUT_KIND; -struct __declspec(uuid("58346CDA-DDE7-4497-9461-6F87AF5E0659")) -IDxcResult : public IDxcOperationResult { +CROSS_PLATFORM_UUIDOF(IDxcResult, "58346CDA-DDE7-4497-9461-6F87AF5E0659") +struct IDxcResult : public IDxcOperationResult { virtual BOOL STDMETHODCALLTYPE HasOutput(_In_ DXC_OUT_KIND dxcOutKind) = 0; virtual HRESULT STDMETHODCALLTYPE GetOutput(_In_ DXC_OUT_KIND dxcOutKind, _In_ REFIID iid, _COM_Outptr_opt_result_maybenull_ void **ppvObject, - _COM_Outptr_ IDxcBlobUtf16 **ppOutputName) = 0; + _COM_Outptr_ IDxcBlobWide **ppOutputName) = 0; virtual UINT32 GetNumOutputs() = 0; virtual DXC_OUT_KIND GetOutputByIndex(UINT32 Index) = 0; virtual DXC_OUT_KIND PrimaryOutput() = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcResult) }; // Special names for extra output that should get written to specific streams #define DXC_EXTRA_OUTPUT_NAME_STDOUT L"*stdout*" #define DXC_EXTRA_OUTPUT_NAME_STDERR L"*stderr*" -struct __declspec(uuid("319b37a2-a5c2-494a-a5de-4801b2faf989")) -IDxcExtraOutputs : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcExtraOutputs, "319b37a2-a5c2-494a-a5de-4801b2faf989") +struct IDxcExtraOutputs : public IUnknown { virtual UINT32 STDMETHODCALLTYPE GetOutputCount() = 0; virtual HRESULT STDMETHODCALLTYPE GetOutput(_In_ UINT32 uIndex, _In_ REFIID iid, _COM_Outptr_opt_result_maybenull_ void **ppvObject, - _COM_Outptr_opt_result_maybenull_ IDxcBlobUtf16 **ppOutputType, - _COM_Outptr_opt_result_maybenull_ IDxcBlobUtf16 **ppOutputName) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcExtraOutputs) + _COM_Outptr_opt_result_maybenull_ IDxcBlobWide **ppOutputType, + _COM_Outptr_opt_result_maybenull_ IDxcBlobWide **ppOutputName) = 0; }; -struct __declspec(uuid("228B4687-5A6A-4730-900C-9702B2203F54")) -IDxcCompiler3 : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcCompiler3, "228B4687-5A6A-4730-900C-9702B2203F54") +struct IDxcCompiler3 : public IUnknown { // Compile a single entry point to the target shader model, // Compile a library to a library target (-T lib_*), // Compile a root signature (-T rootsig_*), or @@ -519,8 +526,6 @@ IDxcCompiler3 : public IUnknown { _In_ const DxcBuffer *pObject, // Program to disassemble: dxil container or bitcode. _In_ REFIID riid, _Out_ LPVOID *ppResult // IDxcResult: status, disassembly text, and errors ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcCompiler3) }; static const UINT32 DxcValidatorFlags_Default = 0; @@ -529,91 +534,139 @@ static const UINT32 DxcValidatorFlags_RootSignatureOnly = 2; static const UINT32 DxcValidatorFlags_ModuleOnly = 4; static const UINT32 DxcValidatorFlags_ValidMask = 0x7; -struct __declspec(uuid("A6E82BD2-1FD7-4826-9811-2857E797F49A")) -IDxcValidator : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcValidator, "A6E82BD2-1FD7-4826-9811-2857E797F49A") +struct IDxcValidator : public IUnknown { // Validate a shader. virtual HRESULT STDMETHODCALLTYPE Validate( _In_ IDxcBlob *pShader, // Shader to validate. _In_ UINT32 Flags, // Validation flags. _COM_Outptr_ IDxcOperationResult **ppResult // Validation output status, buffer, and errors ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcValidator) }; -struct __declspec(uuid("334b1f50-2292-4b35-99a1-25588d8c17fe")) -IDxcContainerBuilder : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcValidator2, "458e1fd1-b1b2-4750-a6e1-9c10f03bed92") +struct IDxcValidator2 : public IDxcValidator { + // Validate a shader. + virtual HRESULT STDMETHODCALLTYPE ValidateWithDebug( + _In_ IDxcBlob *pShader, // Shader to validate. + _In_ UINT32 Flags, // Validation flags. + _In_opt_ DxcBuffer *pOptDebugBitcode, // Optional debug module bitcode to provide line numbers + _COM_Outptr_ IDxcOperationResult **ppResult // Validation output status, buffer, and errors + ) = 0; +}; + +CROSS_PLATFORM_UUIDOF(IDxcContainerBuilder, "334b1f50-2292-4b35-99a1-25588d8c17fe") +struct IDxcContainerBuilder : public IUnknown { virtual HRESULT STDMETHODCALLTYPE Load(_In_ IDxcBlob *pDxilContainerHeader) = 0; // Loads DxilContainer to the builder virtual HRESULT STDMETHODCALLTYPE AddPart(_In_ UINT32 fourCC, _In_ IDxcBlob *pSource) = 0; // Part to add to the container virtual HRESULT STDMETHODCALLTYPE RemovePart(_In_ UINT32 fourCC) = 0; // Remove the part with fourCC virtual HRESULT STDMETHODCALLTYPE SerializeContainer(_Out_ IDxcOperationResult **ppResult) = 0; // Builds a container of the given container builder state - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcContainerBuilder) }; -struct __declspec(uuid("091f7a26-1c1f-4948-904b-e6e3a8a771d5")) -IDxcAssembler : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcAssembler, "091f7a26-1c1f-4948-904b-e6e3a8a771d5") +struct IDxcAssembler : public IUnknown { // Assemble dxil in ll or llvm bitcode to DXIL container. virtual HRESULT STDMETHODCALLTYPE AssembleToContainer( _In_ IDxcBlob *pShader, // Shader to assemble. _COM_Outptr_ IDxcOperationResult **ppResult // Assembly output status, buffer, and errors ) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcAssembler) }; -struct __declspec(uuid("d2c21b26-8350-4bdc-976a-331ce6f4c54c")) -IDxcContainerReflection : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcContainerReflection, "d2c21b26-8350-4bdc-976a-331ce6f4c54c") +struct IDxcContainerReflection : public IUnknown { virtual HRESULT STDMETHODCALLTYPE Load(_In_ IDxcBlob *pContainer) = 0; // Container to load. virtual HRESULT STDMETHODCALLTYPE GetPartCount(_Out_ UINT32 *pResult) = 0; virtual HRESULT STDMETHODCALLTYPE GetPartKind(UINT32 idx, _Out_ UINT32 *pResult) = 0; virtual HRESULT STDMETHODCALLTYPE GetPartContent(UINT32 idx, _COM_Outptr_ IDxcBlob **ppResult) = 0; virtual HRESULT STDMETHODCALLTYPE FindFirstPartKind(UINT32 kind, _Out_ UINT32 *pResult) = 0; virtual HRESULT STDMETHODCALLTYPE GetPartReflection(UINT32 idx, REFIID iid, void **ppvObject) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcContainerReflection) }; -struct __declspec(uuid("AE2CD79F-CC22-453F-9B6B-B124E7A5204C")) -IDxcOptimizerPass : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcOptimizerPass, "AE2CD79F-CC22-453F-9B6B-B124E7A5204C") +struct IDxcOptimizerPass : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetOptionName(_COM_Outptr_ LPWSTR *ppResult) = 0; virtual HRESULT STDMETHODCALLTYPE GetDescription(_COM_Outptr_ LPWSTR *ppResult) = 0; virtual HRESULT STDMETHODCALLTYPE GetOptionArgCount(_Out_ UINT32 *pCount) = 0; virtual HRESULT STDMETHODCALLTYPE GetOptionArgName(UINT32 argIndex, _COM_Outptr_ LPWSTR *ppResult) = 0; virtual HRESULT STDMETHODCALLTYPE GetOptionArgDescription(UINT32 argIndex, _COM_Outptr_ LPWSTR *ppResult) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcOptimizerPass) }; -struct __declspec(uuid("25740E2E-9CBA-401B-9119-4FB42F39F270")) -IDxcOptimizer : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcOptimizer, "25740E2E-9CBA-401B-9119-4FB42F39F270") +struct IDxcOptimizer : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetAvailablePassCount(_Out_ UINT32 *pCount) = 0; virtual HRESULT STDMETHODCALLTYPE GetAvailablePass(UINT32 index, _COM_Outptr_ IDxcOptimizerPass** ppResult) = 0; virtual HRESULT STDMETHODCALLTYPE RunOptimizer(IDxcBlob *pBlob, _In_count_(optionCount) LPCWSTR *ppOptions, UINT32 optionCount, _COM_Outptr_ IDxcBlob **pOutputModule, _COM_Outptr_opt_ IDxcBlobEncoding **ppOutputText) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcOptimizer) }; static const UINT32 DxcVersionInfoFlags_None = 0; static const UINT32 DxcVersionInfoFlags_Debug = 1; // Matches VS_FF_DEBUG static const UINT32 DxcVersionInfoFlags_Internal = 2; // Internal Validator (non-signing) -struct __declspec(uuid("b04f5b50-2059-4f12-a8ff-a1e0cde1cc7e")) -IDxcVersionInfo : public IUnknown { +CROSS_PLATFORM_UUIDOF(IDxcVersionInfo, "b04f5b50-2059-4f12-a8ff-a1e0cde1cc7e") +struct IDxcVersionInfo : public IUnknown { virtual HRESULT STDMETHODCALLTYPE GetVersion(_Out_ UINT32 *pMajor, _Out_ UINT32 *pMinor) = 0; virtual HRESULT STDMETHODCALLTYPE GetFlags(_Out_ UINT32 *pFlags) = 0; - - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcVersionInfo) }; -struct __declspec(uuid("fb6904c4-42f0-4b62-9c46-983af7da7c83")) -IDxcVersionInfo2 : public IDxcVersionInfo { - virtual HRESULT STDMETHODCALLTYPE GetCommitInfo(_Out_ UINT32 *pCommitCount, _Out_ char **pCommitHash) = 0; +CROSS_PLATFORM_UUIDOF(IDxcVersionInfo2, "fb6904c4-42f0-4b62-9c46-983af7da7c83") +struct IDxcVersionInfo2 : public IDxcVersionInfo { + virtual HRESULT STDMETHODCALLTYPE GetCommitInfo( + _Out_ UINT32 *pCommitCount, // The total number commits. + _Outptr_result_z_ char **pCommitHash // The SHA of the latest commit. (Must be CoTaskMemFree()'d!) + ) = 0; +}; - DECLARE_CROSS_PLATFORM_UUIDOF(IDxcVersionInfo2) +CROSS_PLATFORM_UUIDOF(IDxcVersionInfo3, "5e13e843-9d25-473c-9ad2-03b2d0b44b1e") +struct IDxcVersionInfo3 : public IUnknown { + virtual HRESULT STDMETHODCALLTYPE GetCustomVersionString( + _Outptr_result_z_ char **pVersionString // Custom version string for compiler. (Must be CoTaskMemFree()'d!) + ) = 0; +}; + +struct DxcArgPair { + const WCHAR *pName; + const WCHAR *pValue; +}; + +CROSS_PLATFORM_UUIDOF(IDxcPdbUtils, "E6C9647E-9D6A-4C3B-B94C-524B5A6C343D") +struct IDxcPdbUtils : public IUnknown { + virtual HRESULT STDMETHODCALLTYPE Load(_In_ IDxcBlob *pPdbOrDxil) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetSourceCount(_Out_ UINT32 *pCount) = 0; + virtual HRESULT STDMETHODCALLTYPE GetSource(_In_ UINT32 uIndex, _COM_Outptr_ IDxcBlobEncoding **ppResult) = 0; + virtual HRESULT STDMETHODCALLTYPE GetSourceName(_In_ UINT32 uIndex, _Outptr_result_z_ BSTR *pResult) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetFlagCount(_Out_ UINT32 *pCount) = 0; + virtual HRESULT STDMETHODCALLTYPE GetFlag(_In_ UINT32 uIndex, _Outptr_result_z_ BSTR *pResult) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetArgCount(_Out_ UINT32 *pCount) = 0; + virtual HRESULT STDMETHODCALLTYPE GetArg(_In_ UINT32 uIndex, _Outptr_result_z_ BSTR *pResult) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetArgPairCount(_Out_ UINT32 *pCount) = 0; + virtual HRESULT STDMETHODCALLTYPE GetArgPair(_In_ UINT32 uIndex, _Outptr_result_z_ BSTR *pName, _Outptr_result_z_ BSTR *pValue) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetDefineCount(_Out_ UINT32 *pCount) = 0; + virtual HRESULT STDMETHODCALLTYPE GetDefine(_In_ UINT32 uIndex, _Outptr_result_z_ BSTR *pResult) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetTargetProfile(_Outptr_result_z_ BSTR *pResult) = 0; + virtual HRESULT STDMETHODCALLTYPE GetEntryPoint(_Outptr_result_z_ BSTR *pResult) = 0; + virtual HRESULT STDMETHODCALLTYPE GetMainFileName(_Outptr_result_z_ BSTR *pResult) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetHash(_COM_Outptr_ IDxcBlob **ppResult) = 0; + virtual HRESULT STDMETHODCALLTYPE GetName(_Outptr_result_z_ BSTR *pResult) = 0; + + virtual BOOL STDMETHODCALLTYPE IsFullPDB() = 0; + virtual HRESULT STDMETHODCALLTYPE GetFullPDB(_COM_Outptr_ IDxcBlob **ppFullPDB) = 0; + + virtual HRESULT STDMETHODCALLTYPE GetVersionInfo(_COM_Outptr_ IDxcVersionInfo **ppVersionInfo) = 0; + + virtual HRESULT STDMETHODCALLTYPE SetCompiler(_In_ IDxcCompiler3 *pCompiler) = 0; + virtual HRESULT STDMETHODCALLTYPE CompileForFullPDB(_COM_Outptr_ IDxcResult **ppResult) = 0; + virtual HRESULT STDMETHODCALLTYPE OverrideArgs(_In_ DxcArgPair *pArgPairs, UINT32 uNumArgPairs) = 0; + virtual HRESULT STDMETHODCALLTYPE OverrideRootSignature(_In_ const WCHAR *pRootSignature) = 0; }; // Note: __declspec(selectany) requires 'extern' @@ -694,4 +747,12 @@ CLSID_SCOPE const GUID CLSID_DxcContainerBuilder = { 0x411f, 0x4574, {0xb4, 0xd0, 0x87, 0x41, 0xe2, 0x52, 0x40, 0xd2}}; + +// {54621dfb-f2ce-457e-ae8c-ec355faeec7c} +CLSID_SCOPE const GUID CLSID_DxcPdbUtils = { + 0x54621dfb, + 0xf2ce, + 0x457e, + {0xae, 0x8c, 0xec, 0x35, 0x5f, 0xae, 0xec, 0x7c}}; + #endif