mirror/Vortice.Win32
1
0
Fork 0
mirror of https://github.com/amerkoleci/Vortice.Win32.git synced 2026-01-14 08:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve Fxc compilation part.

Browse Source
This commit is contained in:
Amer Koleci
2022-12-29 17:13:23 +01:00
parent 1a60b9218a
commit 43185286e8
3 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@@ -14,7 +14,7 @@
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<RestoreConfigFile>$(MSBuildThisFileDirectory)NuGet.config</RestoreConfigFile>
<VersionPrefix>1.9.5</VersionPrefix>
<VersionPrefix>1.9.6</VersionPrefix>
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

58
src/Vortice.Win32.Graphics.Direct3D.Fxc/Apis.cs
View File

@@ -12,23 +12,69 @@ public static unsafe partial class Apis
{
public static ID3DInclude* D3D_COMPILE_STANDARD_FILE_INCLUDE => (ID3DInclude*)(nuint)1;
public static ComPtr<ID3DBlob> D3DCompile(
string source,
string entryPoint,
string target,
CompileFlags flags = CompileFlags.None)
{
byte[] sourceUtf8 = Encoding.UTF8.GetBytes(source);
byte[] entryPointUtf8 = Encoding.UTF8.GetBytes(entryPoint);
byte[] targetUtf8 = Encoding.UTF8.GetBytes(target);
using ComPtr<ID3DBlob> d3dBlobBytecode = default;
using ComPtr<ID3DBlob> d3dBlobErrors = default;
fixed (byte* sourcePtr = sourceUtf8)
fixed (byte* entryPointPtr = entryPointUtf8)
fixed (byte* targetPtr = targetUtf8)
{
HResult hr = D3DCompile(
pSrcData: sourcePtr,
SrcDataSize: (nuint)sourceUtf8.Length,
pSourceName: null,
pDefines: null,
pInclude: D3D_COMPILE_STANDARD_FILE_INCLUDE,
pEntrypoint: (sbyte*)entryPointPtr,
pTarget: (sbyte*)targetPtr,
Flags1: flags,
Flags2: 0u,
ppCode: d3dBlobBytecode.GetAddressOf(),
ppErrorMsgs: d3dBlobErrors.GetAddressOf()
);
if (hr.Failure)
{
// Throw if an error was retrieved, then also double check the HRESULT
if (d3dBlobErrors.Get() is not null)
{
ThrowHslsCompilationException(d3dBlobErrors.Get());
}
}
ThrowIfFailed(hr);
return d3dBlobBytecode.Move();
}
}
public static ComPtr<ID3DBlob> D3DCompile(
ReadOnlySpan<char> source,
ReadOnlySpan<char> entryPoint,
ReadOnlySpan<char> target,
CompileFlags flags = CompileFlags.None)
{
int maxLength = Encoding.ASCII.GetMaxByteCount(source.Length);
int maxLength = Encoding.UTF8.GetMaxByteCount(source.Length);
byte[] sourceBuffer = ArrayPool<byte>.Shared.Rent(maxLength);
int writtenBytes = Encoding.ASCII.GetBytes(source, sourceBuffer);
int writtenBytes = Encoding.UTF8.GetBytes(source, sourceBuffer);
maxLength = Encoding.ASCII.GetMaxByteCount(entryPoint.Length);
maxLength = Encoding.UTF8.GetMaxByteCount(entryPoint.Length);
byte[] entryPointBuffer = ArrayPool<byte>.Shared.Rent(maxLength);
int entryPointWrittenBytes = Encoding.ASCII.GetBytes(entryPoint, entryPointBuffer);
int entryPointWrittenBytes = Encoding.UTF8.GetBytes(entryPoint, entryPointBuffer);
maxLength = Encoding.ASCII.GetMaxByteCount(target.Length);
maxLength = Encoding.UTF8.GetMaxByteCount(target.Length);
byte[] targetBuffer = ArrayPool<byte>.Shared.Rent(maxLength);
int targetWrittenBytes = Encoding.ASCII.GetBytes(target, targetBuffer);
int targetWrittenBytes = Encoding.UTF8.GetBytes(target, targetBuffer);
try
{

3
src/Vortice.Win32.Graphics.Direct3D.Fxc/FxcCompilationException.cs
View File

@@ -31,9 +31,6 @@ public sealed class FxcCompilationException : Exception
builder.AppendLine("The FXC compiler encountered one or more errors while trying to compile the shader:");
builder.AppendLine();
builder.AppendLine(error.Trim());
builder.AppendLine();
builder.AppendLine("Make sure to only be using supported features by checking the README file in the ComputeSharp repository: https://github.com/Sergio0694/ComputeSharp.");
builder.Append("If you're sure that your C# shader code is valid, please open an issue an include a working repro and this error message.");
return builder.ToString();
}