Skip to content

Commit d9ca051

Browse files
committed
Revert "Don't check for presence of "d3dcompiler_47.dll" when running as ARM64, because that file isn't present in the CEF Redist for this architecture. (#3841)"
This reverts commit 0812ea9. Resolves #4515
1 parent 124a782 commit d9ca051

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

CefSharp/DependencyChecker.cs

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@
55
using System;
66
using System.Collections.Generic;
77
using System.IO;
8-
#if NETCOREAPP
9-
using System.Linq;
10-
#endif
118
using System.Reflection;
12-
#if NETCOREAPP
13-
using System.Runtime.InteropServices;
14-
#endif
159
using System.Text;
1610

1711
namespace CefSharp
@@ -27,11 +21,6 @@ public static class DependencyChecker
2721
/// </summary>
2822
public const string LocalesPackFile = @"locales\en-US.pak";
2923

30-
/// <summary>
31-
/// File name of the Direct3D Compiler DLL.
32-
/// </summary>
33-
private const string D3DCompilerDll = "d3dcompiler_47.dll";
34-
3524
/// <summary>
3625
/// List of Cef Dependencies
3726
/// </summary>
@@ -71,8 +60,7 @@ public static class DependencyChecker
7160
// Note: Without these components HTML5 accelerated content like 2D canvas, 3D CSS and WebGL will not function.
7261
"libEGL.dll",
7362
"libGLESv2.dll",
74-
// The D3D Compiler isn't included in the win-arm64 redist; we remove it in the static constructor.
75-
D3DCompilerDll,
63+
"d3dcompiler_47.dll",
7664
//Crashpad support
7765
"chrome_elf.dll"
7866
};
@@ -111,17 +99,6 @@ public static class DependencyChecker
11199
#endif
112100
};
113101

114-
#if NETCOREAPP
115-
static DependencyChecker()
116-
{
117-
// win-arm64 doesn't ship with a copy of the D3D Compiler, it's included with the OS.
118-
if (RuntimeInformation.ProcessArchitecture is Architecture.Arm64)
119-
{
120-
CefOptionalDependencies = CefOptionalDependencies.Where(x => x != D3DCompilerDll).ToArray();
121-
}
122-
}
123-
#endif
124-
125102
/// <summary>
126103
/// CheckDependencies iterates through the list of Cef and CefSharp dependencines
127104
/// relative to the path provided and returns a list of missing ones

0 commit comments

Comments
 (0)