Skip to content

Commit 61f5813

Browse files
amaitlandamaitland
committed
Remove Legacy Swiftshader
- Update readme files - Remove from targets - Remove text references Issue #4085
1 parent 0c62893 commit 61f5813

File tree

6 files changed

+7
-85
lines changed

6 files changed

+7
-85
lines changed

‎CefSharp.AfterBuild.targets‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</Target>
1818

1919
<!--
20-
Include swiftshader and locales in the Example projects
20+
Include locales in the Example projects
2121
-->
2222
<Choose>
2323
<When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x64'))">
@@ -29,13 +29,6 @@
2929
<Visible>false</Visible>
3030
<IncludeInVsix>true</IncludeInVsix>
3131
</Content>
32-
<Content Include="@(CefRuntimeWin64SwiftShader)">
33-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
34-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35-
<PublishState>Included</PublishState>
36-
<Visible>false</Visible>
37-
<IncludeInVsix>true</IncludeInVsix>
38-
</Content>
3932
</ItemGroup>
4033
</When>
4134
<When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-x86'))">
@@ -47,13 +40,6 @@
4740
<Visible>false</Visible>
4841
<IncludeInVsix>true</IncludeInVsix>
4942
</Content>
50-
<Content Include="@(CefRuntimeWin32SwiftShader)">
51-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
52-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
53-
<PublishState>Included</PublishState>
54-
<Visible>false</Visible>
55-
<IncludeInVsix>true</IncludeInVsix>
56-
</Content>
5743
</ItemGroup>
5844
</When>
5945
<When Condition="$(RuntimeIdentifier.StartsWith('win')) and $(RuntimeIdentifier.Contains('-arm64'))">
@@ -65,13 +51,6 @@
6551
<Visible>false</Visible>
6652
<IncludeInVsix>true</IncludeInVsix>
6753
</Content>
68-
<Content Include="@(CefRuntimeWinArm64SwiftShader)">
69-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
70-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
71-
<PublishState>Included</PublishState>
72-
<Visible>false</Visible>
73-
<IncludeInVsix>true</IncludeInVsix>
74-
</Content>
7554
</ItemGroup>
7655
</When>
7756
</Choose>

‎CefSharp.Core/CefSettingsBase.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ public void RegisterScheme(CefCustomScheme scheme)
412412

413413
/// <summary>
414414
/// Set command line argument to disable GPU Acceleration. WebGL will use
415-
/// software rendering via Swiftshader (https://swiftshader.googlesource.com/SwiftShader#introduction)
415+
/// software rendering
416416
/// </summary>
417417
public void DisableGpuAcceleration()
418418
{
@@ -435,9 +435,8 @@ public void EnablePrintPreview()
435435
}
436436

437437
/// <summary>
438-
/// Set command line arguments for best OSR (Offscreen and WPF) Rendering performance Swiftshader will be used for WebGL, look at the source
439-
/// to determine which flags best suite your requirements. See https://swiftshader.googlesource.com/SwiftShader#introduction for
440-
/// details on Swiftshader
438+
/// Set command line arguments for best OSR (Offscreen and WPF) Rendering performance Software Rendering will be used for WebGL, look at the source
439+
/// to determine which flags best suite your requirements.
441440
/// </summary>
442441
public void SetOffScreenRenderingBestPerformanceArgs()
443442
{

‎CefSharp.Native.props‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</Target>
1010

1111
<!--
12-
Include swiftshader and locales in the Example projects
12+
Include locales in the Example projects
1313
-->
1414
<Choose>
1515
<When Condition="'$(Platform)' == 'x64'">
@@ -21,13 +21,6 @@
2121
<Visible>false</Visible>
2222
<IncludeInVsix>true</IncludeInVsix>
2323
</Content>
24-
<Content Include="@(CefRuntimeWin64SwiftShader)">
25-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
26-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27-
<PublishState>Included</PublishState>
28-
<Visible>false</Visible>
29-
<IncludeInVsix>true</IncludeInVsix>
30-
</Content>
3124
</ItemGroup>
3225
</When>
3326
<When Condition="'$(Platform)' == 'x86' OR '$(Platform)' == 'Win32'">
@@ -39,13 +32,6 @@
3932
<Visible>false</Visible>
4033
<IncludeInVsix>true</IncludeInVsix>
4134
</Content>
42-
<Content Include="@(CefRuntimeWin32SwiftShader)">
43-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
44-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
45-
<PublishState>Included</PublishState>
46-
<Visible>false</Visible>
47-
<IncludeInVsix>true</IncludeInVsix>
48-
</Content>
4935
</ItemGroup>
5036
</When>
5137
</Choose>

‎NuGet/PackageReference/CefSharp.Common.NETCore.targets‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,6 @@
106106
<Visible>false</Visible>
107107
<IncludeInVsix>true</IncludeInVsix>
108108
</Content>
109-
<Content Include="@(CefRuntimeWin64SwiftShader)">
110-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
111-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
112-
<PublishState>Included</PublishState>
113-
<Visible>false</Visible>
114-
<IncludeInVsix>true</IncludeInVsix>
115-
</Content>
116109
</ItemGroup>
117110
</When>
118111
<When Condition="'$(CefSharpRuntimeIdentifier)' == 'win-x86'">
@@ -124,13 +117,6 @@
124117
<Visible>false</Visible>
125118
<IncludeInVsix>true</IncludeInVsix>
126119
</Content>
127-
<Content Include="@(CefRuntimeWin32SwiftShader)">
128-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
129-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
130-
<PublishState>Included</PublishState>
131-
<Visible>false</Visible>
132-
<IncludeInVsix>true</IncludeInVsix>
133-
</Content>
134120
</ItemGroup>
135121
</When>
136122
<When Condition="'$(CefSharpRuntimeIdentifier)' == 'win-arm64'">
@@ -142,13 +128,6 @@
142128
<Visible>false</Visible>
143129
<IncludeInVsix>true</IncludeInVsix>
144130
</Content>
145-
<Content Include="@(CefRuntimeWinArm64SwiftShader)">
146-
<Link>swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
147-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
148-
<PublishState>Included</PublishState>
149-
<Visible>false</Visible>
150-
<IncludeInVsix>true</IncludeInVsix>
151-
</Content>
152131
</ItemGroup>
153132
</When>
154133
<Otherwise>
@@ -163,13 +142,6 @@
163142
<Visible>false</Visible>
164143
<IncludeInVsix>true</IncludeInVsix>
165144
</Content>
166-
<Content Include="@(CefRuntimeWin32SwiftShader)">
167-
<Link>runtimes\win-x86\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
168-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
169-
<PublishState>Included</PublishState>
170-
<Visible>false</Visible>
171-
<IncludeInVsix>true</IncludeInVsix>
172-
</Content>
173145
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\lib\netcoreapp3.1\CefSharp.dll">
174146
<Link>runtimes\win-x86\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
175147
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -192,13 +164,6 @@
192164
<Visible>false</Visible>
193165
<IncludeInVsix>true</IncludeInVsix>
194166
</Content>
195-
<Content Include="@(CefRuntimeWin64SwiftShader)">
196-
<Link>runtimes\win-x64\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
197-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198-
<PublishState>Included</PublishState>
199-
<Visible>false</Visible>
200-
<IncludeInVsix>true</IncludeInVsix>
201-
</Content>
202167
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\lib\netcoreapp3.1\CefSharp.dll">
203168
<Link>runtimes\win-x64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
204169
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -221,13 +186,6 @@
221186
<Visible>false</Visible>
222187
<IncludeInVsix>true</IncludeInVsix>
223188
</Content>
224-
<Content Include="@(CefRuntimeWinArm64SwiftShader)">
225-
<Link>runtimes\win-arm64\native\swiftshader\%(RecursiveDir)%(FileName)%(Extension)</Link>
226-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
227-
<PublishState>Included</PublishState>
228-
<Visible>false</Visible>
229-
<IncludeInVsix>true</IncludeInVsix>
230-
</Content>
231189
<Content Include="$(MSBuildThisFileDirectory)..\runtimes\win-arm64\lib\netcoreapp3.1\CefSharp.dll">
232190
<Link>runtimes\win-arm64\native\%(RecursiveDir)%(FileName)%(Extension)</Link>
233191
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎NuGet/PackageReference/Readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Basic Troubleshooting:
2626
* icudtl.dat (Unicode Support data)
2727
* chrome_elf.dll(Crash reporting library)
2828
* snapshot_blob.bin, v8_context_snapshot.bin (V8 snapshot data)
29-
* locales\en-US.pak, chrome_100_percent.pak, chrome_200_percent.pak, resources.pak, d3dcompiler_47.dll, libEGL.dll, libGLESv2.dll, swiftshader/libEGL.dll, swiftshader/libGLESv2.dll
29+
* locales\en-US.pak, chrome_100_percent.pak, chrome_200_percent.pak, resources.pak, d3dcompiler_47.dll, libEGL.dll, libGLESv2.dll
3030
- Whilst these are technically listed as optional, the browser is unlikely to function without these files.
3131
- See https://github.com/cefsharp/CefSharp/wiki/Output-files-description-table-%28Redistribution%29 for details
3232
* Ijwhost.dll (To support C++/CLI libraries in .NET Core/.Net 5.0, ijwhost was created as a shim for finding and loading the runtime.)

‎NuGet/Readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Basic Troubleshooting:
2929
* icudtl.dat (Unicode Support data)
3030
* chrome_elf.dll(Crash reporting library)
3131
* snapshot_blob.bin, v8_context_snapshot.bin (V8 snapshot data)
32-
* locales\en-US.pak, chrome_100_percent.pak, chrome_200_percent.pak, resources.pak, d3dcompiler_47.dll, libEGL.dll, libGLESv2.dll, swiftshader/libEGL.dll, swiftshader/libGLESv2.dll
32+
* locales\en-US.pak, chrome_100_percent.pak, chrome_200_percent.pak, resources.pak, d3dcompiler_47.dll, libEGL.dll, libGLESv2.dll
3333
- Whilst these are technically listed as optional, the browser is unlikely to function without these files.
3434
- See https://github.com/cefsharp/CefSharp/wiki/Output-files-description-table-%28Redistribution%29 for details
3535
* CefSharp.Core.dll, CefSharp.dll, CefSharp.Core.Runtime.dll

0 commit comments

Comments
 (0)