Separate Fxc bindings and bump version 1.8.2

2026-01-14 08:06:02 +08:00 · 2022-10-10 09:06:57 +02:00
parent 3c7e8e69b2
commit eade223582
21 changed files with 168 additions and 129 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,7 +7,7 @@
    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
    <EnablePreviewFeatures>true</EnablePreviewFeatures>

-    <VersionPrefix>1.8.1</VersionPrefix>
+    <VersionPrefix>1.8.2</VersionPrefix>
    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
    
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
--- a/Vortice.Win32.sln
+++ b/Vortice.Win32.sln
@@ -38,6 +38,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Dire
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Dxgi", "src\Vortice.Win32.Graphics.Dxgi\Vortice.Win32.Graphics.Dxgi.csproj", "{9E48F17C-2AC5-45F3-8B08-3BB51690C040}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vortice.Win32.Graphics.Direct3D.Fxc", "src\Vortice.Win32.Graphics.Direct3D.Fxc\Vortice.Win32.Graphics.Direct3D.Fxc.csproj", "{65052A2C-E59E-4A75-B15D-2276225D859C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -88,6 +90,10 @@ Global
 		{9E48F17C-2AC5-45F3-8B08-3BB51690C040}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E48F17C-2AC5-45F3-8B08-3BB51690C040}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9E48F17C-2AC5-45F3-8B08-3BB51690C040}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65052A2C-E59E-4A75-B15D-2276225D859C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65052A2C-E59E-4A75-B15D-2276225D859C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65052A2C-E59E-4A75-B15D-2276225D859C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65052A2C-E59E-4A75-B15D-2276225D859C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/Generator/Program.cs
+++ b/src/Generator/Program.cs
@@ -1047,6 +1047,7 @@ public static class Program
        string wicPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Imaging");
        string d2dPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct2D");
        string dxcPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D.Dxc");
+        string fxcPath = Path.Combine(new DirectoryInfo(repoRoot).Parent.FullName, "Vortice.Win32.Graphics.Direct3D.Fxc");

        // Generate docs
        //DocGenerator.Generate(new[] { "DXGI" }, Path.Combine(repoRoot, "Generated", "Graphics", "Dxgi.xml"));
@@ -1109,12 +1110,16 @@ public static class Program
                outputPath = dwritePath;
                useSubFolders = false;
            }
-
-            else if (jsonFile.EndsWith("Direct3D.Dxc.json"))
+            else if (jsonFile == "Graphics.Direct3D.Dxc.json")
            {
                outputPath = dxcPath;
                useSubFolders = false;
            }
+            else if (jsonFile == "Graphics.Direct3D.Fxc.json")
+            {
+                outputPath = fxcPath;
+                useSubFolders = false;
+            }

            outputPath = Path.Combine(outputPath, "Generated");

@@ -1180,6 +1185,10 @@ public static class Program
        {
            docFile = $"../Vortice.Win32.Graphics.Direct3D11/Direct3D11";
        }
+        else if (jsonFile == "Graphics.Direct3D.Fxc.json")
+        {
+            docFile = $"../Vortice.Win32/Generated/Graphics/Direct3D";
+        }

        string apiName = ns;
        string apiFolder;
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Apis.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Apis.cs
@@ -2,9 +2,8 @@
 // Licensed under the MIT License (MIT). See LICENSE in the repository root for more information.

 using System.Buffers;
-using System.Text;
 using System.Text.RegularExpressions;
-using static Win32.Apis;
+using System.Text;

 namespace Win32.Graphics.Direct3D.Fxc;

--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/FxcCompilationException.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/FxcCompilationException.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/BlobPart.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/BlobPart.cs
@@ -0,0 +1,67 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+
+namespace Win32.Graphics.Direct3D.Fxc;
+
+/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART"]/*' />
+/// <unmanaged>D3D_BLOB_PART</unmanaged>
+public enum BlobPart : int
+{
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_INPUT_SIGNATURE_BLOB"]/*' />
+	/// <unmanaged>D3D_BLOB_INPUT_SIGNATURE_BLOB</unmanaged>
+	InputSignatureBlob = 0,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_OUTPUT_SIGNATURE_BLOB"]/*' />
+	/// <unmanaged>D3D_BLOB_OUTPUT_SIGNATURE_BLOB</unmanaged>
+	OutputSignatureBlob = 1,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB"]/*' />
+	/// <unmanaged>D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB</unmanaged>
+	InputAndOutputSignatureBlob = 2,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB"]/*' />
+	/// <unmanaged>D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB</unmanaged>
+	PatchConstantSignatureBlob = 3,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_ALL_SIGNATURE_BLOB"]/*' />
+	/// <unmanaged>D3D_BLOB_ALL_SIGNATURE_BLOB</unmanaged>
+	AllSignatureBlob = 4,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_DEBUG_INFO"]/*' />
+	/// <unmanaged>D3D_BLOB_DEBUG_INFO</unmanaged>
+	DebugInfo = 5,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_LEGACY_SHADER"]/*' />
+	/// <unmanaged>D3D_BLOB_LEGACY_SHADER</unmanaged>
+	LegacyShader = 6,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_XNA_PREPASS_SHADER"]/*' />
+	/// <unmanaged>D3D_BLOB_XNA_PREPASS_SHADER</unmanaged>
+	XNAPrepassShader = 7,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_XNA_SHADER"]/*' />
+	/// <unmanaged>D3D_BLOB_XNA_SHADER</unmanaged>
+	XNAShader = 8,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_PDB"]/*' />
+	/// <unmanaged>D3D_BLOB_PDB</unmanaged>
+	Pdb = 9,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_PRIVATE_DATA"]/*' />
+	/// <unmanaged>D3D_BLOB_PRIVATE_DATA</unmanaged>
+	PrivateData = 10,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_ROOT_SIGNATURE"]/*' />
+	/// <unmanaged>D3D_BLOB_ROOT_SIGNATURE</unmanaged>
+	RootSignature = 11,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_DEBUG_NAME"]/*' />
+	/// <unmanaged>D3D_BLOB_DEBUG_NAME</unmanaged>
+	DebugName = 12,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_ALTERNATE_SHADER"]/*' />
+	/// <unmanaged>D3D_BLOB_TEST_ALTERNATE_SHADER</unmanaged>
+	TestAlternateShader = 32768,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_COMPILE_DETAILS"]/*' />
+	/// <unmanaged>D3D_BLOB_TEST_COMPILE_DETAILS</unmanaged>
+	TestCompileDetails = 32769,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_COMPILE_PERF"]/*' />
+	/// <unmanaged>D3D_BLOB_TEST_COMPILE_PERF</unmanaged>
+	TestCompilePerf = 32770,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_COMPILE_REPORT"]/*' />
+	/// <unmanaged>D3D_BLOB_TEST_COMPILE_REPORT</unmanaged>
+	TestCompileReport = 32771,
+}
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileEffectFlags.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileEffectFlags.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileFlags.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileFlags.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileFlags2.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileFlags2.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileSecondaryFlags.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompileSecondaryFlags.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompressShaderFlags.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/CompressShaderFlags.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/DisasmFlags.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/DisasmFlags.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.Functions.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.Functions.cs
@@ -11,87 +11,87 @@ namespace Win32.Graphics.Direct3D.Fxc;

 public static unsafe partial class Apis
 {
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DReadFileToBlob"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DReadFileToBlob"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DReadFileToBlob(ushort* pFileName, Graphics.Direct3D.ID3DBlob** ppContents);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DWriteBlobToFile"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DWriteBlobToFile"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DWriteBlobToFile(Graphics.Direct3D.ID3DBlob* pBlob, ushort* pFileName, Bool32 bOverwrite);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCompile"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCompile"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DCompile(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCompile2"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCompile2"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DCompile2(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, uint SecondaryDataFlags, void* pSecondaryData, nuint SecondaryDataSize, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCompileFromFile"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCompileFromFile"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DCompileFromFile(ushort* pFileName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, sbyte* pEntrypoint, sbyte* pTarget, CompileFlags Flags1, uint Flags2, Graphics.Direct3D.ID3DBlob** ppCode, Graphics.Direct3D.ID3DBlob** ppErrorMsgs);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DPreprocess"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DPreprocess"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DPreprocess(void* pSrcData, nuint SrcDataSize, sbyte* pSourceName, Graphics.Direct3D.ShaderMacro* pDefines, Graphics.Direct3D.ID3DInclude* pInclude, Graphics.Direct3D.ID3DBlob** ppCodeText, Graphics.Direct3D.ID3DBlob** ppErrorMsgs);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DGetDebugInfo"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DGetDebugInfo"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DGetDebugInfo(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppDebugInfo);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DReflect"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DReflect"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DReflect(void* pSrcData, nuint SrcDataSize, Guid* pInterface, void** ppReflector);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DReflectLibrary"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DReflectLibrary"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DReflectLibrary(void* pSrcData, nuint SrcDataSize, Guid* riid, void** ppReflector);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DDisassemble"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DDisassemble"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DDisassemble(void* pSrcData, nuint SrcDataSize, DisasmFlags Flags, sbyte* szComments, Graphics.Direct3D.ID3DBlob** ppDisassembly);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DDisassembleRegion"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DDisassembleRegion"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DDisassembleRegion(void* pSrcData, nuint SrcDataSize, uint Flags, sbyte* szComments, nuint StartByteOffset, nuint NumInsts, nuint* pFinishByteOffset, Graphics.Direct3D.ID3DBlob** ppDisassembly);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DGetTraceInstructionOffsets"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DGetTraceInstructionOffsets"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DGetTraceInstructionOffsets(void* pSrcData, nuint SrcDataSize, uint Flags, nuint StartInstIndex, nuint NumInsts, nuint* pOffsets, nuint* pTotalInsts);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DGetInputSignatureBlob"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DGetInputSignatureBlob"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DGetInputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DGetOutputSignatureBlob"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DGetOutputSignatureBlob"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DGetOutputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DGetInputAndOutputSignatureBlob"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DGetInputAndOutputSignatureBlob"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DGetInputAndOutputSignatureBlob(void* pSrcData, nuint SrcDataSize, Graphics.Direct3D.ID3DBlob** ppSignatureBlob);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DStripShader"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DStripShader"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DStripShader(void* pShaderBytecode, nuint BytecodeLength, uint uStripFlags, Graphics.Direct3D.ID3DBlob** ppStrippedBlob);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DGetBlobPart"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DGetBlobPart"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DGetBlobPart(void* pSrcData, nuint SrcDataSize, BlobPart Part, uint Flags, Graphics.Direct3D.ID3DBlob** ppPart);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DSetBlobPart"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DSetBlobPart"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DSetBlobPart(void* pSrcData, nuint SrcDataSize, BlobPart Part, uint Flags, void* pPart, nuint PartSize, Graphics.Direct3D.ID3DBlob** ppNewShader);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCreateBlob"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCreateBlob"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DCreateBlob(nuint Size, Graphics.Direct3D.ID3DBlob** ppBlob);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCompressShaders"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCompressShaders"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DCompressShaders(uint uNumShaders, ShaderData* pShaderData, CompressShaderFlags uFlags, Graphics.Direct3D.ID3DBlob** ppCompressedData);

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DDecompressShaders"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DDecompressShaders"]/*' />
 	[DllImport("D3DCOMPILER_47.dll", ExactSpelling = true)]
 	public static extern HResult D3DDecompressShaders(void* pSrcData, nuint SrcDataSize, uint uNumShaders, uint uStartIndex, uint* pIndices, uint uFlags, Graphics.Direct3D.ID3DBlob** ppShaders, uint* pTotalShaders);
 }
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/Graphics.Direct3D.Fxc.Apis.cs
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/ShaderData.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/ShaderData.cs
@@ -9,13 +9,13 @@

 namespace Win32.Graphics.Direct3D.Fxc;

-/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_SHADER_DATA"]/*' />
+/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_SHADER_DATA"]/*' />
 /// <unmanaged>D3D_SHADER_DATA</unmanaged>
 public partial struct ShaderData
 {
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_SHADER_DATA::pBytecode"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_SHADER_DATA::pBytecode"]/*' />
 	public unsafe void* pBytecode;

-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_SHADER_DATA::BytecodeLength"]/*' />
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3D_SHADER_DATA::BytecodeLength"]/*' />
 	public nuint BytecodeLength;
 }
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/StripFlags.cs
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Generated/StripFlags.cs
@@ -0,0 +1,33 @@
+// ------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+// ------------------------------------------------------------------------------
+
+namespace Win32.Graphics.Direct3D.Fxc;
+
+/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS"]/*' />
+/// <unmanaged>D3DCOMPILER_STRIP_FLAGS</unmanaged>
+[Flags]
+public enum StripFlags : int
+{
+	None = 0,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_REFLECTION_DATA"]/*' />
+	/// <unmanaged>D3DCOMPILER_STRIP_REFLECTION_DATA</unmanaged>
+	ReflectionData = 1,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_DEBUG_INFO"]/*' />
+	/// <unmanaged>D3DCOMPILER_STRIP_DEBUG_INFO</unmanaged>
+	DebugInfo = 2,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_TEST_BLOBS"]/*' />
+	/// <unmanaged>D3DCOMPILER_STRIP_TEST_BLOBS</unmanaged>
+	TestBlobs = 4,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_PRIVATE_DATA"]/*' />
+	/// <unmanaged>D3DCOMPILER_STRIP_PRIVATE_DATA</unmanaged>
+	PrivateData = 8,
+	/// <include file='../../Vortice.Win32/Generated/Graphics/Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_ROOT_SIGNATURE"]/*' />
+	/// <unmanaged>D3DCOMPILER_STRIP_ROOT_SIGNATURE</unmanaged>
+	RootSignature = 16,
+}
--- a/src/Vortice.Win32.Graphics.Direct3D.Fxc/Vortice.Win32.Graphics.Direct3D.Fxc.csproj
+++ b/src/Vortice.Win32.Graphics.Direct3D.Fxc/Vortice.Win32.Graphics.Direct3D.Fxc.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <Description>FXC bindings.</Description>
+    
+    <NoWarn>$(NoWarn);CS0419;IDE0017</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Using Include="System.Numerics" />
+    <Using Include="System.Diagnostics" />
+    <Using Include="System.Runtime.CompilerServices" />
+    <Using Include="System.Runtime.InteropServices" />
+    <Using Include="System.Diagnostics.CodeAnalysis" />
+    <Using Include="Win32.Numerics" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Vortice.Win32\Vortice.Win32.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D.Fxc/BlobPart.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D.Fxc/BlobPart.cs
@@ -1,67 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-namespace Win32.Graphics.Direct3D.Fxc;
-
-/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART"]/*' />
-/// <unmanaged>D3D_BLOB_PART</unmanaged>
-public enum BlobPart : int
-{
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_INPUT_SIGNATURE_BLOB"]/*' />
-	/// <unmanaged>D3D_BLOB_INPUT_SIGNATURE_BLOB</unmanaged>
-	InputSignatureBlob = 0,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_OUTPUT_SIGNATURE_BLOB"]/*' />
-	/// <unmanaged>D3D_BLOB_OUTPUT_SIGNATURE_BLOB</unmanaged>
-	OutputSignatureBlob = 1,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB"]/*' />
-	/// <unmanaged>D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB</unmanaged>
-	InputAndOutputSignatureBlob = 2,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB"]/*' />
-	/// <unmanaged>D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB</unmanaged>
-	PatchConstantSignatureBlob = 3,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_ALL_SIGNATURE_BLOB"]/*' />
-	/// <unmanaged>D3D_BLOB_ALL_SIGNATURE_BLOB</unmanaged>
-	AllSignatureBlob = 4,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_DEBUG_INFO"]/*' />
-	/// <unmanaged>D3D_BLOB_DEBUG_INFO</unmanaged>
-	DebugInfo = 5,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_LEGACY_SHADER"]/*' />
-	/// <unmanaged>D3D_BLOB_LEGACY_SHADER</unmanaged>
-	LegacyShader = 6,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_XNA_PREPASS_SHADER"]/*' />
-	/// <unmanaged>D3D_BLOB_XNA_PREPASS_SHADER</unmanaged>
-	XNAPrepassShader = 7,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_XNA_SHADER"]/*' />
-	/// <unmanaged>D3D_BLOB_XNA_SHADER</unmanaged>
-	XNAShader = 8,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_PDB"]/*' />
-	/// <unmanaged>D3D_BLOB_PDB</unmanaged>
-	Pdb = 9,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_PRIVATE_DATA"]/*' />
-	/// <unmanaged>D3D_BLOB_PRIVATE_DATA</unmanaged>
-	PrivateData = 10,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_ROOT_SIGNATURE"]/*' />
-	/// <unmanaged>D3D_BLOB_ROOT_SIGNATURE</unmanaged>
-	RootSignature = 11,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_DEBUG_NAME"]/*' />
-	/// <unmanaged>D3D_BLOB_DEBUG_NAME</unmanaged>
-	DebugName = 12,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_ALTERNATE_SHADER"]/*' />
-	/// <unmanaged>D3D_BLOB_TEST_ALTERNATE_SHADER</unmanaged>
-	TestAlternateShader = 32768,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_COMPILE_DETAILS"]/*' />
-	/// <unmanaged>D3D_BLOB_TEST_COMPILE_DETAILS</unmanaged>
-	TestCompileDetails = 32769,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_COMPILE_PERF"]/*' />
-	/// <unmanaged>D3D_BLOB_TEST_COMPILE_PERF</unmanaged>
-	TestCompilePerf = 32770,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3D_BLOB_PART::D3D_BLOB_TEST_COMPILE_REPORT"]/*' />
-	/// <unmanaged>D3D_BLOB_TEST_COMPILE_REPORT</unmanaged>
-	TestCompileReport = 32771,
-}
--- a/src/Vortice.Win32/Generated/Graphics/Direct3D.Fxc/StripFlags.cs
+++ b/src/Vortice.Win32/Generated/Graphics/Direct3D.Fxc/StripFlags.cs
@@ -1,33 +0,0 @@
-// ------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-// ------------------------------------------------------------------------------
-
-namespace Win32.Graphics.Direct3D.Fxc;
-
-/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS"]/*' />
-/// <unmanaged>D3DCOMPILER_STRIP_FLAGS</unmanaged>
-[Flags]
-public enum StripFlags : int
-{
-	None = 0,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_REFLECTION_DATA"]/*' />
-	/// <unmanaged>D3DCOMPILER_STRIP_REFLECTION_DATA</unmanaged>
-	ReflectionData = 1,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_DEBUG_INFO"]/*' />
-	/// <unmanaged>D3DCOMPILER_STRIP_DEBUG_INFO</unmanaged>
-	DebugInfo = 2,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_TEST_BLOBS"]/*' />
-	/// <unmanaged>D3DCOMPILER_STRIP_TEST_BLOBS</unmanaged>
-	TestBlobs = 4,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_PRIVATE_DATA"]/*' />
-	/// <unmanaged>D3DCOMPILER_STRIP_PRIVATE_DATA</unmanaged>
-	PrivateData = 8,
-	/// <include file='../Direct3D.xml' path='doc/member[@name="D3DCOMPILER_STRIP_FLAGS::D3DCOMPILER_STRIP_ROOT_SIGNATURE"]/*' />
-	/// <unmanaged>D3DCOMPILER_STRIP_ROOT_SIGNATURE</unmanaged>
-	RootSignature = 16,
-}
--- a/src/Vortice.Win32/Properties/AssemblyInfo.cs
+++ b/src/Vortice.Win32/Properties/AssemblyInfo.cs
@@ -8,3 +8,4 @@
 [assembly: InternalsVisibleTo("Vortice.Win32.Graphics.DirectWrite")]
 [assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct2D")]
 [assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct3D.Dxc")]
+[assembly: InternalsVisibleTo("Vortice.Win32.Graphics.Direct3D.Fxc")]
--- a/src/samples/01-ClearScreen/01-ClearScreen.csproj
+++ b/src/samples/01-ClearScreen/01-ClearScreen.csproj
@@ -14,6 +14,7 @@
    <ProjectReference Include="..\..\Vortice.Win32.Graphics.DirectWrite\Vortice.Win32.Graphics.DirectWrite.csproj" />
    <ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct2D\Vortice.Win32.Graphics.Direct2D.csproj" />
    <ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D.Dxc\Vortice.Win32.Graphics.Direct3D.Dxc.csproj" />
+    <ProjectReference Include="..\..\Vortice.Win32.Graphics.Direct3D.Fxc\Vortice.Win32.Graphics.Direct3D.Fxc.csproj" />
  </ItemGroup>

  <ItemGroup>