Skip to content

Commit 23f9bd4

Browse files
authored
This is the April 2021 Update (v2.3.0) & #443
* Remove SDL mirror * Add the real SDL, fix generator paths * Regenerate D3D9 and SDL for 64-bit (build will probably fail) * Fix build errors * Fix fusion reactor not respecting desired names * Update Windows and Linux binary * Update libsilkdroid * Update macOS binary * Update iOS binary * This is the April 2021 Update (v2.3.0)
1 parent 1c90cfe commit 23f9bd4

File tree

122 files changed

+9430
-6218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+9430
-6218
lines changed

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "build/submodules/SDL-mirror"]
2-
path = build/submodules/SDL-mirror
3-
url = https://github.com/spurious/SDL-mirror
1+
[submodule "build/submodules/SDL"]
2+
path = build/submodules/SDL
3+
url = https://github.com/libsdl-org/SDL

Silk.NET.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{488775D1-32C
329329
EndProject
330330
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE", "build\nuke\Silk.NET.NUKE.csproj", "{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}"
331331
EndProject
332-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE.SshAgent", "src\Core\Silk.NET.NUKE.SshAgent\Silk.NET.NUKE.SshAgent.csproj", "{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}"
333-
EndProject
334332
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft", "Microsoft", "{F2CF5D32-4B41-425E-B229-8FFC48F88063}"
335333
EndProject
336334
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Direct3D11", "src\Microsoft\Silk.NET.Direct3D11\Silk.NET.Direct3D11.csproj", "{F3B7A9D6-5B15-45E8-925B-20B5BBD33428}"
@@ -2024,18 +2022,6 @@ Global
20242022
{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}.Release|x64.Build.0 = Release|Any CPU
20252023
{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}.Release|x86.ActiveCfg = Release|Any CPU
20262024
{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}.Release|x86.Build.0 = Release|Any CPU
2027-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2028-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
2029-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x64.ActiveCfg = Debug|Any CPU
2030-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x64.Build.0 = Debug|Any CPU
2031-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x86.ActiveCfg = Debug|Any CPU
2032-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Debug|x86.Build.0 = Debug|Any CPU
2033-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
2034-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|Any CPU.Build.0 = Release|Any CPU
2035-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x64.ActiveCfg = Release|Any CPU
2036-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x64.Build.0 = Release|Any CPU
2037-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x86.ActiveCfg = Release|Any CPU
2038-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9}.Release|x86.Build.0 = Release|Any CPU
20392025
{BD86AB4D-74FD-429D-9AEE-79B0C429BB3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20402026
{BD86AB4D-74FD-429D-9AEE-79B0C429BB3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
20412027
{BD86AB4D-74FD-429D-9AEE-79B0C429BB3A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2402,7 +2388,6 @@ Global
24022388
{603F28D1-E982-47C0-98D9-3E6DA1DD37E2} = {488775D1-32CC-46D7-8DD7-BB331EC659B9}
24032389
{488775D1-32CC-46D7-8DD7-BB331EC659B9} = {23324041-2076-477C-A4BF-B385B8066C6C}
24042390
{B9A8D738-FE7D-4860-A446-4A03E3DDEB74} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490}
2405-
{5D2BCEBE-A163-47E2-9B56-2151D4EC30B9} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490}
24062391
{F3B7A9D6-5B15-45E8-925B-20B5BBD33428} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
24072392
{A768A346-6388-4881-8FF6-15F0163B76E0} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
24082393
{2C3099EA-C01C-4639-8300-153A9BD79292} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}

build/cache/d3d9.json.gz

0 Bytes
Binary file not shown.

build/cache/gl.json.gz

0 Bytes
Binary file not shown.

build/cache/glcore.json.gz

166 Bytes
Binary file not shown.

build/cache/gles2.json.gz

58 Bytes
Binary file not shown.

build/cache/sdl.json.gz

5.25 KB
Binary file not shown.

build/cache/vulkan.json.gz

1.16 KB
Binary file not shown.

build/nuke/Build.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,13 +293,13 @@ Dictionary<string, object> ProcessedMsbuildProperties
293293
return default;
294294
}
295295

296-
var sdlMirror = RootDirectory / "build" / "submodules" / "SDL-mirror";
296+
var sdl = RootDirectory / "build" / "submodules" / "SDL";
297297
var silkDroid = SourceDirectory / "Windowing" / "Android" / "SilkDroid";
298298
var xcopy = new (string, string)[]
299299
{
300-
(sdlMirror / "android-project" / "app" / "src" / "main" / "java",
300+
(sdl / "android-project" / "app" / "src" / "main" / "java",
301301
silkDroid / "app" / "src" / "main" / "java"),
302-
(sdlMirror, silkDroid / "app" / "jni" / "SDL2")
302+
(sdl, silkDroid / "app" / "jni" / "SDL2")
303303
};
304304

305305
foreach (var (from, to) in xcopy)

build/props/common.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
<LangVersion>preview</LangVersion>
77
<Authors>.NET Foundation and Contributors</Authors>
88
<PackageReleaseNotes>
9-
Silk.NET March 2021 Update
10-
11-
- Add memory pooling for Input State Capture extensions
12-
- Add Input State Capture stability and robustness improvements
13-
- Update to Vulkan 1.2.171
14-
- Update to latest OpenGL as of 22nd February 2021
15-
- Update to latest OpenCL as of 2nd March 2021
16-
- Fix window disposal/reset bugs
17-
- Fix a build toolchain issue where packages released in Debug mode (#416)
18-
- Fix a string marshalling issue and OpenAL regression (#414)
9+
Silk.NET April 2021 Update
10+
11+
- Add a new Silk.NET.OpenGL.Extensions.ImGui package, a first-party ImGui integration for Silk.NET.OpenGL
12+
- Add support for native method definitions across multiple partial classes
13+
- Add improved SDL exception throwing, only throwing when a function indicates an error
14+
- Updated metadata to reference .NET Foundation and dotnet following our .NET Foundation onboarding
15+
- Update to SDL 2.0.14
16+
- Update to GLFW 3.3.3
17+
- Miscellaneous build system related fixes
18+
- Miscellaneous SourceLink related fixes
1919
</PackageReleaseNotes>
2020
<PackageTags Condition="'$(PackageTags)' == ''">OpenCL;OpenGL;OpenAL;OpenGLES;GLES;Vulkan;Assimp;DirectX;GLFW;SDL;Windowing;Input;Gamepad;Joystick;Keyboard;Mouse;SilkTouch;Source;Generator;C#;F#;.NET;DotNet;Mono;Vector;Math;Maths;Numerics;Game;Graphics;Compute;Audio;Sound;Engine;Silk;Silk.NET;Slim.NET;ElgarTK;GPU;Sharp;Science;Scientific;Visualization;Visual;Audiovisual;Windows;macOS;Linux;Android;Bindings;OSX;Wrapper;Native</PackageTags>
2121
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2222
<PackageOutputPath>$(MSBuildThisFileDirectory)/../output_packages</PackageOutputPath>
2323
<RepositoryUrl>https://github.com/dotnet/Silk.NET</RepositoryUrl>
2424
<RepositoryType>Git</RepositoryType>
25-
<VersionPrefix>2.2.0</VersionPrefix>
25+
<VersionPrefix>2.3.0</VersionPrefix>
2626
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
2727
<Description Condition="'$(Description)' == ''">
2828
Silk.NET is a high-speed, advanced library, providing bindings to popular low-level APIs such as OpenGL, OpenCL, OpenAL, OpenXR, GLFW, SDL, Vulkan, Assimp, and DirectX.

0 commit comments

Comments
 (0)