Skip to content

Commit d986a03

Browse files
PerkseyPerksey
committed
This is the December 2021 Update (v2.11.0) (#712)
* Regenerate bindings * Release notes * Apply duct tape
1 parent 5909972 commit d986a03

File tree

69 files changed

+5990
-111
lines changed

Some content is hidden

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

69 files changed

+5990
-111
lines changed

‎.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
if-no-files-found: warn
4545
retention-days: 1
4646
- name: Push to NuGet
47-
run: nuke PushToNuGet --skip Clean Restore Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }} --sign-username "${{ secrets.SIGN_USERNAME }}" --sign-password "${{ secrets.SIGN_PASSWORD }}"
47+
run: nuke SignPackages PushToNuGet --skip Clean Restore Pack --configuration Release --msbuild-properties ContinuousIntegrationBuild=true SilkEnableSourceLink=true --feature-sets Android iOS --nuget-api-key ${{ secrets.NUGET_TOKEN }} --sign-username "${{ secrets.SIGN_USERNAME }}" --sign-password "${{ secrets.SIGN_PASSWORD }}"
4848
- name: Upload Signed Artifacts to Actions
4949
uses: actions/upload-artifact@v2.2.4
5050
with:

‎build/cache/cl.json.gz

27.2 KB
Binary file not shown.

‎build/cache/gl.json.gz

0 Bytes
Binary file not shown.

‎build/cache/glcore.json.gz

0 Bytes
Binary file not shown.

‎build/cache/gles2.json.gz

517 Bytes
Binary file not shown.

‎build/cache/openxr.json.gz

158 Bytes
Binary file not shown.

‎build/cache/vulkan.json.gz

1.52 KB
Binary file not shown.

‎build/csharp_typemap.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,5 +165,6 @@
165165
"LONG_PTR": "nint",
166166
"_screen_window": "void",
167167
"_screen_context": "void",
168-
"int16_t": "short"
168+
"int16_t": "short",
169+
"cl_properties": "ulong"
169170
}

‎build/nuke/Build.CodeSigning.cs

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Nuke.Common.Tools.DotNet;
1111
using Nuke.Common.Tools.SignClient;
1212
using static Nuke.Common.Tools.DotNet.DotNetTasks;
13-
using static Nuke.Common.Tools.SignClient.SignClientTasks;
13+
using static Nuke.Common.Tooling.ProcessTasks;
1414

1515
partial class Build
1616
{
@@ -51,19 +51,47 @@ partial class Build
5151
(
5252
outputs, (current, pkg) => current.Concat
5353
(
54-
SignClientSign
54+
// TODO this doesn't work for some reason
55+
// > C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\codesigning\tool\SignClient.exe sign \
56+
// --config C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\codesigning\config.json \
57+
// --input C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\output_packages\Silk.NET.2.11.0.nupkg \
58+
// --baseDirectory C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\output_packages \
59+
// --fileList C:\Users\perks\Documents\_Silk.NET\Silk.NET\build\codesigning\filelist.txt \
60+
// --secret [hidden] \
61+
// --user *** \
62+
// --name Silk.NET \
63+
// --description Silk.NET \
64+
// --descriptionUrl https://github.com/dotnet/Silk.NET
65+
// @ C:\Users\perks\Documents\_Silk.NET\Silk.NET
66+
// Error output:
67+
// --name parameter is required
68+
// SignClientSign
69+
// (
70+
// s => s.SetProcessToolPath(execPath)
71+
// .SetBaseDirectory(PackageDirectory)
72+
// .SetInput(pkg)
73+
// .SetConfig(basePath / "config.json")
74+
// .SetFileList(basePath / "filelist.txt")
75+
// .SetUsername(SignUsername)
76+
// .SetSecret(SignPassword)
77+
// .SetName("Silk.NET")
78+
// .SetDescription("Silk.NET")
79+
// .SetDescriptionUrl("https://github.com/dotnet/Silk.NET")
80+
// )
81+
StartProcess
5582
(
56-
s => s.SetProcessToolPath(execPath)
57-
.SetBaseDirectory(PackageDirectory)
58-
.SetInput(pkg)
59-
.SetConfig(basePath / "config.json")
60-
.SetFileList(basePath / "filelist.txt")
61-
.SetUsername(SignUsername)
62-
.SetSecret(SignPassword)
63-
.SetName("Silk.NET")
64-
.SetDescription("Silk.NET")
65-
.SetDescriptionUrl("https://github.com/dotnet/Silk.NET")
66-
)
83+
execPath,
84+
"sign " +
85+
$"--baseDirectory {PackageDirectory} " +
86+
$"--input \"{pkg}\" " +
87+
$"--config \"{basePath / "config.json"}\" " +
88+
$"--filelist \"{basePath / "filelist.txt"}\" " +
89+
$"--user \"{SignUsername}\" " +
90+
$"--secret \"{SignPassword}\" " +
91+
"--name \"Silk.NET\" " +
92+
"--description \"Silk.NET\" " +
93+
"--descriptionUrl \"https://github.com/dotnet/Silk.NET\""
94+
).AssertZeroExitCode().Output
6795
)
6896
);
6997
}

‎build/nuke/Build.NuGet.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ partial class Build
2525

2626
Target PushToNuGet => CommonTarget
2727
(
28-
x => x.DependsOn(CanCodeSign ? new[] { Pack } : new[] { Pack, SignPackages })
28+
x => x.DependsOn(Pack)
29+
.After(SignPackages)
2930
.Executes(PushPackages)
3031
);
3132

‎build/props/common.props

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,25 @@
55
<LangVersion>preview</LangVersion>
66
<Authors>.NET Foundation and Contributors</Authors>
77
<PackageReleaseNotes>
8-
Silk.NET .NET Conf 2021 Update
8+
Silk.NET December 2021 Update
99

10-
- Fixes issues with 2.10 (compiled against .NET 6 RC1) not working correctly in projects using the .NET 6 Release SDK.
10+
- Add a high-level C# wrapper over Vulkan Structure Chains (thanks @thargy).
11+
- Add a WindowClass option in Windowing for setting the X11 class name (thanks @Pydacor)
12+
- Add a IsContextControlDisabled option in Windowing to disable automatically making OpenGL contexts current
13+
- Add support for cloning Vk objects to allow reuse of their function tables independently
14+
- Update to latest OpenCL specifications
15+
- Update to latest OpenGL and OpenGLES specifications
16+
- Update to Vulkan 1.2.210
17+
- Fix string marshalling regression which resulted in multiple string-overloaded functions throwing
18+
- Fix multiple input-related problems when using the SDL backend of our Windowing abstractions
19+
- Discontinued support for Legacy Xamarin (exclusively supporting .NET 6 mobile from now on)
1120
</PackageReleaseNotes>
1221
<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>
1322
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1423
<PackageOutputPath>$(MSBuildThisFileDirectory)/../output_packages</PackageOutputPath>
1524
<RepositoryUrl>https://github.com/dotnet/Silk.NET</RepositoryUrl>
1625
<RepositoryType>Git</RepositoryType>
17-
<VersionPrefix>2.10.1</VersionPrefix>
26+
<VersionPrefix>2.11</VersionPrefix>
1827
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
1928
<Description Condition="'$(Description)' == ''">
2029
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.

‎generator.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,15 @@
417417
"cl_semaphore_payload_khr": "cl_ulong",
418418
"cl_external_semaphore_handle_type_khr": "cl_uint",
419419
"cl_external_memory_handle_type_khr": "cl_uint",
420+
"cl_device_command_buffer_capabilities_khr": "cl_bitfield",
421+
"cl_sync_point_khr": "cl_uint",
422+
"cl_command_buffer_info_khr": "cl_uint",
423+
"cl_command_buffer_state_khr": "cl_uint",
424+
"cl_command_buffer_properties_khr": "cl_properties",
425+
"cl_command_buffer_flags_khr": "cl_bitfield",
426+
"cl_ndrange_kernel_command_properties_khr": "cl_properties",
427+
"cl_mutable_command_khr": "intptr_t",
428+
"cl_command_buffer_khr": "intptr_t"
420429
},
421430
{
422431
"$include.commonTypeMap": "build/csharp_typemap.json"

‎src/OpenCL/Extensions/Silk.NET.OpenCL.Extensions.INTEL/Enums/INTEL.gen.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,8 @@ public enum INTEL : int
420420
CommandReleaseDX9ObjectsIntel = 0x402B,
421421
[NativeName("Name", "CL_EGL_YUV_PLANE_INTEL")]
422422
EglYuvPlaneIntel = 0x4107,
423+
[NativeName("Name", "CL_QUEUE_THREAD_LOCAL_EXEC_ENABLE_INTEL")]
424+
QueueThreadLocalExecEnableIntel = unchecked((int)0x80000000),
423425
[NativeName("Name", "CL_MEM_CHANNEL_INTEL")]
424426
MemChannelIntel = 0x4213,
425427
[NativeName("Name", "CL_MEM_FORCE_HOST_MEMORY_INTEL")]
@@ -476,8 +478,6 @@ public enum INTEL : int
476478
DeviceSimultaneousInteropsIntel = 0x4104,
477479
[NativeName("Name", "CL_DEVICE_NUM_SIMULTANEOUS_INTEROPS_INTEL")]
478480
DeviceNumSimultaneousInteropsIntel = 0x4105,
479-
[NativeName("Name", "CL_QUEUE_THREAD_LOCAL_EXEC_ENABLE_INTEL")]
480-
QueueThreadLocalExecEnableIntel = unchecked((int)0x80000000),
481481
[NativeName("Name", "CL_DEVICE_HOST_MEM_CAPABILITIES_INTEL")]
482482
DeviceHostMemCapabilitiesIntel = 0x4190,
483483
[NativeName("Name", "CL_DEVICE_DEVICE_MEM_CAPABILITIES_INTEL")]
@@ -500,6 +500,10 @@ public enum INTEL : int
500500
MemAllocFlagsIntel = 0x4195,
501501
[NativeName("Name", "CL_MEM_ALLOC_WRITE_COMBINED_INTEL")]
502502
MemAllocWriteCombinedIntel = 0x1,
503+
[NativeName("Name", "CL_MEM_ALLOC_INITIAL_PLACEMENT_DEVICE_INTEL")]
504+
MemAllocInitialPlacementDeviceIntel = 0x2,
505+
[NativeName("Name", "CL_MEM_ALLOC_INITIAL_PLACEMENT_HOST_INTEL")]
506+
MemAllocInitialPlacementHostIntel = 0x4,
503507
[NativeName("Name", "CL_MEM_ALLOC_TYPE_INTEL")]
504508
MemAllocTypeIntel = 0x419A,
505509
[NativeName("Name", "CL_MEM_ALLOC_BASE_PTR_INTEL")]

‎src/OpenCL/Extensions/Silk.NET.OpenCL.Extensions.KHR/Enums/KHR.gen.cs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,48 @@ namespace Silk.NET.OpenCL.Extensions.KHR
1212
[NativeName("Name", "GLenum")]
1313
public enum KHR : int
1414
{
15+
[NativeName("Name", "CL_DEVICE_COMMAND_BUFFER_CAPABILITIES_KHR")]
16+
DeviceCommandBufferCapabilitiesKhr = 0x12A9,
17+
[NativeName("Name", "CL_DEVICE_COMMAND_BUFFER_REQUIRED_QUEUE_PROPERTIES_KHR")]
18+
DeviceCommandBufferRequiredQueuePropertiesKhr = 0x12AA,
19+
[NativeName("Name", "CL_COMMAND_BUFFER_CAPABILITY_KERNEL_PRINTF_KHR")]
20+
CommandBufferCapabilityKernelPrintfKhr = 0x1,
21+
[NativeName("Name", "CL_COMMAND_BUFFER_CAPABILITY_DEVICE_SIDE_ENQUEUE_KHR")]
22+
CommandBufferCapabilityDeviceSideEnqueueKhr = 0x2,
23+
[NativeName("Name", "CL_COMMAND_BUFFER_CAPABILITY_SIMULTANEOUS_USE_KHR")]
24+
CommandBufferCapabilitySimultaneousUseKhr = 0x4,
25+
[NativeName("Name", "CL_COMMAND_BUFFER_CAPABILITY_OUT_OF_ORDER_KHR")]
26+
CommandBufferCapabilityOutOfOrderKhr = 0x8,
27+
[NativeName("Name", "CL_COMMAND_BUFFER_FLAGS_KHR")]
28+
CommandBufferFlagsKhr = 0x1293,
29+
[NativeName("Name", "CL_COMMAND_BUFFER_SIMULTANEOUS_USE_KHR")]
30+
CommandBufferSimultaneousUseKhr = 0x1,
31+
[NativeName("Name", "CL_INVALID_COMMAND_BUFFER_KHR")]
32+
InvalidCommandBufferKhr = unchecked((int)0xFFFFFFFFFFFFFB8E),
33+
[NativeName("Name", "CL_INVALID_SYNC_POINT_WAIT_LIST_KHR")]
34+
InvalidSyncPointWaitListKhr = unchecked((int)0xFFFFFFFFFFFFFB8D),
35+
[NativeName("Name", "CL_INCOMPATIBLE_COMMAND_QUEUE_KHR")]
36+
IncompatibleCommandQueueKhr = unchecked((int)0xFFFFFFFFFFFFFB8C),
37+
[NativeName("Name", "CL_COMMAND_BUFFER_QUEUES_KHR")]
38+
CommandBufferQueuesKhr = 0x1294,
39+
[NativeName("Name", "CL_COMMAND_BUFFER_NUM_QUEUES_KHR")]
40+
CommandBufferNumQueuesKhr = 0x1295,
41+
[NativeName("Name", "CL_COMMAND_BUFFER_REFERENCE_COUNT_KHR")]
42+
CommandBufferReferenceCountKhr = 0x1296,
43+
[NativeName("Name", "CL_COMMAND_BUFFER_STATE_KHR")]
44+
CommandBufferStateKhr = 0x1297,
45+
[NativeName("Name", "CL_COMMAND_BUFFER_PROPERTIES_ARRAY_KHR")]
46+
CommandBufferPropertiesArrayKhr = 0x1298,
47+
[NativeName("Name", "CL_COMMAND_BUFFER_STATE_RECORDING_KHR")]
48+
CommandBufferStateRecordingKhr = 0x0,
49+
[NativeName("Name", "CL_COMMAND_BUFFER_STATE_EXECUTABLE_KHR")]
50+
CommandBufferStateExecutableKhr = 0x1,
51+
[NativeName("Name", "CL_COMMAND_BUFFER_STATE_PENDING_KHR")]
52+
CommandBufferStatePendingKhr = 0x2,
53+
[NativeName("Name", "CL_COMMAND_BUFFER_STATE_INVALID_KHR")]
54+
CommandBufferStateInvalidKhr = 0x3,
55+
[NativeName("Name", "CL_COMMAND_COMMAND_BUFFER_KHR")]
56+
CommandCommandBufferKhr = 0x12A8,
1557
[NativeName("Name", "CL_INVALID_D3D10_DEVICE_KHR")]
1658
InvalidD3D10DeviceKhr = unchecked((int)0xFFFFFFFFFFFFFC16),
1759
[NativeName("Name", "CL_INVALID_D3D10_RESOURCE_KHR")]

0 commit comments

Comments
 (0)