Skip to content

Commit 4b6b1cd

Browse files
tgjonestgjones
committed
Add exe shim for D3DCompiler_47
1 parent feb10e2 commit 4b6b1cd

File tree

10 files changed

+175
-64
lines changed

10 files changed

+175
-64
lines changed

‎.gitattributes

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Declare files that will always have CRLF line endings on checkout.
5+
*.txt text eol=lf

‎lib/x64/dxcompiler.dll

-17.7 MB
Binary file not shown.

‎lib/x86/dxcompiler.dll

-10.8 MB
Binary file not shown.

‎src/ShaderPlayground.Core/Compilers/Fxc/FxcCompiler.cs

+29-48
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
using System;
22
using System.Collections.Generic;
3-
using SharpDX.D3DCompiler;
3+
using System.IO;
4+
using ShaderPlayground.Core.Util;
45

56
namespace ShaderPlayground.Core.Compilers.Fxc
67
{
78
public sealed class FxcCompiler : IShaderCompiler
89
{
9-
static FxcCompiler()
10-
{
11-
// Preload native DLL, so that we can explicitly
12-
// load either 32-bit or 64-bit DLL.
13-
NativeMethods.LoadDll("d3dcompiler_47.dll");
14-
}
15-
1610
public string Name { get; } = "FXC";
1711
public string DisplayName { get; } = "Microsoft FXC";
1812
public string Description { get; } = "Legacy HLSL-to-DXBC compiler (fxc.exe)";
@@ -76,48 +70,35 @@ public ShaderCompilerResult Compile(string code, Dictionary<string, string> argu
7670
var disableOptimizations = Convert.ToBoolean(arguments["DisableOptimizations"]);
7771
var optimizationLevel = Convert.ToInt32(arguments["OptimizationLevel"]);
7872

79-
var shaderFlags = ShaderFlags.None;
80-
81-
if (disableOptimizations)
82-
{
83-
shaderFlags |= ShaderFlags.SkipOptimization;
84-
}
85-
86-
switch (optimizationLevel)
73+
using (var tempFile = TempFile.FromText(code))
8774
{
88-
case 0:
89-
shaderFlags |= ShaderFlags.OptimizationLevel0;
90-
break;
91-
92-
case 1:
93-
shaderFlags |= ShaderFlags.OptimizationLevel1;
94-
break;
95-
96-
case 2:
97-
shaderFlags |= ShaderFlags.OptimizationLevel2;
98-
break;
99-
100-
case 3:
101-
shaderFlags |= ShaderFlags.OptimizationLevel3;
102-
break;
75+
var args = $"--target {targetProfile} --entrypoint {entryPoint} --optimizationlevel {optimizationLevel}";
76+
77+
if (disableOptimizations)
78+
{
79+
args += " --disableoptimizations";
80+
}
81+
82+
ProcessHelper.Run(
83+
Path.Combine(AppContext.BaseDirectory, "Binaries", "Fxc", "ShaderPlayground.Shims.Fxc.exe"),
84+
$"{args} \"{tempFile.FilePath}\"",
85+
out var stdOutput,
86+
out var stdError);
87+
88+
int? selectedOutputIndex = null;
89+
90+
var disassembly = stdOutput;
91+
if (string.IsNullOrWhiteSpace(stdOutput))
92+
{
93+
disassembly = "Compilation error occurred; no disassembly available.";
94+
selectedOutputIndex = 1;
95+
}
96+
97+
return new ShaderCompilerResult(
98+
selectedOutputIndex,
99+
new ShaderCompilerOutput("Disassembly", "DXBC", disassembly),
100+
new ShaderCompilerOutput("Build output", null, stdError));
103101
}
104-
105-
var compilationResult = ShaderBytecode.Compile(
106-
code,
107-
entryPoint,
108-
targetProfile,
109-
shaderFlags);
110-
111-
var hasCompilationErrors = compilationResult.HasErrors || compilationResult.Bytecode == null;
112-
113-
var disassembly = !hasCompilationErrors
114-
? compilationResult.Bytecode.Disassemble(DisassemblyFlags.None)
115-
: "Compilation error occurred; no disassembly available.";
116-
117-
return new ShaderCompilerResult(
118-
hasCompilationErrors ? 1 : (int?) null,
119-
new ShaderCompilerOutput("Disassembly", "DXBC", disassembly),
120-
new ShaderCompilerOutput("Build output", null, compilationResult.Message ?? "<No build output>"));
121102
}
122103
}
123104
}

‎src/ShaderPlayground.Core/ShaderPlayground.Core.csproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,20 @@
66

77
<ItemGroup>
88
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
9-
<PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" />
109
</ItemGroup>
1110

1211
<ItemGroup>
12+
<Content Include="$(MSBuildThisFileDirectory)..\ShaderPlayground.Shims.Fxc\bin\$(Configuration)\net461\**\*.*">
13+
<Link>Binaries\Fxc\%(RecursiveDir)%(Filename)%(Extension)</Link>
14+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
15+
</Content>
1316
<Content Include="Binaries\**\*">
1417
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1518
</Content>
1619
</ItemGroup>
1720

21+
<ItemGroup>
22+
<Folder Include="Binaries\Fxc\" />
23+
</ItemGroup>
24+
1825
</Project>

‎src/ShaderPlayground.Shims.Fxc/NativeMethods.cs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System;
2+
using System.IO;
3+
using System.Runtime.InteropServices;
4+
5+
namespace ShaderPlayground.Shims.Fxc
6+
{
7+
internal static class NativeMethods
8+
{
9+
[DllImport("kernel32.dll", SetLastError = true)]
10+
private static extern IntPtr LoadLibrary(string dllToLoad);
11+
12+
public static void LoadDll(string fileName)
13+
{
14+
var rootDirectory = AppContext.BaseDirectory;
15+
16+
var libraryAddress = LoadLibrary(Environment.Is64BitProcess
17+
? Path.Combine(rootDirectory, $"Native/x64/{fileName}")
18+
: Path.Combine(rootDirectory, $"Native/x86/{fileName}"));
19+
if (libraryAddress == IntPtr.Zero)
20+
{
21+
var errorCode = Marshal.GetLastWin32Error();
22+
throw new Exception($"Could not load {fileName}: {errorCode}");
23+
}
24+
}
25+
}
26+
}

‎src/ShaderPlayground.Shims.Fxc/Program.cs

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
using System;
2+
using System.CommandLine;
3+
using SharpDX.D3DCompiler;
4+
5+
namespace ShaderPlayground.Shims.Fxc
6+
{
7+
public static class Program
8+
{
9+
static Program()
10+
{
11+
// Preload native DLL, so that we can explicitly
12+
// load either 32-bit or 64-bit DLL.
13+
NativeMethods.LoadDll("d3dcompiler_47.dll");
14+
}
15+
16+
public static void Main(string[] args)
17+
{
18+
string targetProfile = null;
19+
string entryPoint = null;
20+
bool disableOptimizations = false;
21+
int optimizationLevel = 1;
22+
string file = null;
23+
24+
ArgumentSyntax.Parse(args, syntax =>
25+
{
26+
syntax.DefineOption("target", ref targetProfile, true, "Target profile");
27+
syntax.DefineOption("entrypoint", ref entryPoint, true, "Entry point");
28+
syntax.DefineOption("disableoptimizations", ref disableOptimizations, "Disable optimizations");
29+
syntax.DefineOption("optimizationlevel", ref optimizationLevel, "Optimization level");
30+
syntax.DefineParameter("file", ref file, "File to compile");
31+
});
32+
33+
var shaderFlags = ShaderFlags.None;
34+
35+
if (disableOptimizations)
36+
{
37+
shaderFlags |= ShaderFlags.SkipOptimization;
38+
}
39+
40+
switch (optimizationLevel)
41+
{
42+
case 0:
43+
shaderFlags |= ShaderFlags.OptimizationLevel0;
44+
break;
45+
46+
case 1:
47+
shaderFlags |= ShaderFlags.OptimizationLevel1;
48+
break;
49+
50+
case 2:
51+
shaderFlags |= ShaderFlags.OptimizationLevel2;
52+
break;
53+
54+
case 3:
55+
shaderFlags |= ShaderFlags.OptimizationLevel3;
56+
break;
57+
}
58+
59+
var compilationResult = ShaderBytecode.CompileFromFile(
60+
file,
61+
entryPoint,
62+
targetProfile,
63+
shaderFlags);
64+
65+
var hasCompilationErrors = compilationResult.HasErrors || compilationResult.Bytecode == null;
66+
67+
Console.Error.Write(compilationResult.Message);
68+
69+
if (!hasCompilationErrors)
70+
{
71+
var disassembly = compilationResult.Bytecode.Disassemble(DisassemblyFlags.None);
72+
Console.Out.Write(disassembly);
73+
}
74+
}
75+
}
76+
}

‎src/ShaderPlayground.Shims.Fxc/ShaderPlayground.Shims.Fxc.csproj

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net461</TargetFramework>
6+
</PropertyGroup>
7+
8+
<ItemGroup>
9+
<PackageReference Include="System.CommandLine" Version="0.1.0-preview2-180220-2" />
10+
<PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" />
11+
</ItemGroup>
12+
13+
<ItemGroup>
14+
<Content Include="..\..\lib\x64\d3dcompiler_47.dll" Link="Native\x64\d3dcompiler_47.dll">
15+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16+
</Content>
17+
<Content Include="..\..\lib\x86\d3dcompiler_47.dll" Link="Native\x86\d3dcompiler_47.dll">
18+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19+
</Content>
20+
</ItemGroup>
21+
22+
</Project>

‎src/ShaderPlayground.Web/ShaderPlayground.Web.csproj

-15
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@
1515
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.3" />
1616
</ItemGroup>
1717

18-
<ItemGroup>
19-
<Content Include="..\..\lib\x64\d3dcompiler_47.dll" Link="Native\x64\d3dcompiler_47.dll">
20-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
21-
</Content>
22-
<Content Include="..\..\lib\x64\dxcompiler.dll" Link="Native\x64\dxcompiler.dll">
23-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
24-
</Content>
25-
<Content Include="..\..\lib\x86\d3dcompiler_47.dll" Link="Native\x86\d3dcompiler_47.dll">
26-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
</Content>
28-
<Content Include="..\..\lib\x86\dxcompiler.dll" Link="Native\x86\dxcompiler.dll">
29-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30-
</Content>
31-
</ItemGroup>
32-
3318
<ItemGroup>
3419
<ProjectReference Include="..\ShaderPlayground.Core\ShaderPlayground.Core.csproj" />
3520
</ItemGroup>

‎src/ShaderPlayground.sln

+9
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 15.0.27625.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShaderPlayground.Core", "ShaderPlayground.Core\ShaderPlayground.Core.csproj", "{74E07AA8-CB76-4BE1-8337-C2027EDB8748}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{095C15B8-3516-4681-B1E3-244C5938B32B} = {095C15B8-3516-4681-B1E3-244C5938B32B}
9+
EndProjectSection
710
EndProject
811
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShaderPlayground.Core.Tests", "ShaderPlayground.Core.Tests\ShaderPlayground.Core.Tests.csproj", "{72EA48A9-BAEA-4CD1-BA02-00F01CEEF6E2}"
912
EndProject
1013
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShaderPlayground.Web", "ShaderPlayground.Web\ShaderPlayground.Web.csproj", "{A00D02E4-AAAC-4D14-A0FD-36E66FFADFA1}"
1114
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShaderPlayground.Shims.Fxc", "ShaderPlayground.Shims.Fxc\ShaderPlayground.Shims.Fxc.csproj", "{095C15B8-3516-4681-B1E3-244C5938B32B}"
16+
EndProject
1217
Global
1318
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1419
Debug|Any CPU = Debug|Any CPU
@@ -27,6 +32,10 @@ Global
2732
{A00D02E4-AAAC-4D14-A0FD-36E66FFADFA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
2833
{A00D02E4-AAAC-4D14-A0FD-36E66FFADFA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
2934
{A00D02E4-AAAC-4D14-A0FD-36E66FFADFA1}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{095C15B8-3516-4681-B1E3-244C5938B32B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36+
{095C15B8-3516-4681-B1E3-244C5938B32B}.Debug|Any CPU.Build.0 = Debug|Any CPU
37+
{095C15B8-3516-4681-B1E3-244C5938B32B}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{095C15B8-3516-4681-B1E3-244C5938B32B}.Release|Any CPU.Build.0 = Release|Any CPU
3039
EndGlobalSection
3140
GlobalSection(SolutionProperties) = preSolution
3241
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)