Skip to content

Commit f34d349

Browse files
authored
This is the September 2021 Update (v2.8.0) (#604)
* Update common.props * Update bindings for 2.8 * Update common.props * Update common.props * Fix build
1 parent a8d1cab commit f34d349

File tree

67 files changed

+2019
-288
lines changed

Some content is hidden

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

67 files changed

+2019
-288
lines changed

Silk.NET.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenXR.Extensions.
452452
EndProject
453453
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TriangleNET6", "src\Lab\Experiments\TriangleNET6\TriangleNET6.csproj", "{477046D2-AF81-4E2B-83BD-20176A971FDD}"
454454
EndProject
455+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenCL.Extensions.POCL", "src\OpenCL\Extensions\Silk.NET.OpenCL.Extensions.POCL\Silk.NET.OpenCL.Extensions.POCL.csproj", "{8881342D-6247-4826-9963-87D4B029ECB6}"
456+
EndProject
455457
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Tests", "src\OpenAL\Silk.NET.OpenAL.Tests\Silk.NET.OpenAL.Tests.csproj", "{514DED00-4DA3-46D1-B2E8-10CE826CD52D}"
456458
EndProject
457459
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL Demos", "OpenGL Demos", "{2F547104-C74A-4A84-8980-D1B973CC40C1}"
@@ -2709,6 +2711,18 @@ Global
27092711
{477046D2-AF81-4E2B-83BD-20176A971FDD}.Release|x64.Build.0 = Release|Any CPU
27102712
{477046D2-AF81-4E2B-83BD-20176A971FDD}.Release|x86.ActiveCfg = Release|Any CPU
27112713
{477046D2-AF81-4E2B-83BD-20176A971FDD}.Release|x86.Build.0 = Release|Any CPU
2714+
{8881342D-6247-4826-9963-87D4B029ECB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2715+
{8881342D-6247-4826-9963-87D4B029ECB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
2716+
{8881342D-6247-4826-9963-87D4B029ECB6}.Debug|x64.ActiveCfg = Debug|Any CPU
2717+
{8881342D-6247-4826-9963-87D4B029ECB6}.Debug|x64.Build.0 = Debug|Any CPU
2718+
{8881342D-6247-4826-9963-87D4B029ECB6}.Debug|x86.ActiveCfg = Debug|Any CPU
2719+
{8881342D-6247-4826-9963-87D4B029ECB6}.Debug|x86.Build.0 = Debug|Any CPU
2720+
{8881342D-6247-4826-9963-87D4B029ECB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
2721+
{8881342D-6247-4826-9963-87D4B029ECB6}.Release|Any CPU.Build.0 = Release|Any CPU
2722+
{8881342D-6247-4826-9963-87D4B029ECB6}.Release|x64.ActiveCfg = Release|Any CPU
2723+
{8881342D-6247-4826-9963-87D4B029ECB6}.Release|x64.Build.0 = Release|Any CPU
2724+
{8881342D-6247-4826-9963-87D4B029ECB6}.Release|x86.ActiveCfg = Release|Any CPU
2725+
{8881342D-6247-4826-9963-87D4B029ECB6}.Release|x86.Build.0 = Release|Any CPU
27122726
{514DED00-4DA3-46D1-B2E8-10CE826CD52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27132727
{514DED00-4DA3-46D1-B2E8-10CE826CD52D}.Debug|Any CPU.Build.0 = Debug|Any CPU
27142728
{514DED00-4DA3-46D1-B2E8-10CE826CD52D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -2939,6 +2953,7 @@ Global
29392953
{AE5A7BBD-E303-46C4-9DDC-29E80C9128F5} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
29402954
{0D1E5AD9-E329-4B84-A5FE-FC1EE33BF038} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
29412955
{477046D2-AF81-4E2B-83BD-20176A971FDD} = {39B598E9-44BA-4A61-A1BB-7C543734DBA6}
2956+
{8881342D-6247-4826-9963-87D4B029ECB6} = {757F2B10-B69D-4C19-BFE0-D99070A00AD9}
29422957
{514DED00-4DA3-46D1-B2E8-10CE826CD52D} = {081E7761-B200-4DBF-8950-941464DECACE}
29432958
{2F547104-C74A-4A84-8980-D1B973CC40C1} = {6842A2C6-5C7B-42DD-9825-0EDE91BFEBF7}
29442959
{58E7EE89-B67C-482D-9605-04B3BCC5CFBB} = {2F547104-C74A-4A84-8980-D1B973CC40C1}

build/cache/cl.json.gz

767 Bytes
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

565 Bytes
Binary file not shown.

build/cache/openxr.json.gz

1.89 KB
Binary file not shown.

build/cache/vulkan.json.gz

659 Bytes
Binary file not shown.

build/csharp_typemap.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,5 +164,6 @@
164164
"ULONGLONG": "ulong",
165165
"LONG_PTR": "nint",
166166
"_screen_window": "void",
167-
"_screen_context": "void"
167+
"_screen_context": "void",
168+
"int16_t": "short"
168169
}

build/props/common.props

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,31 @@
66
<LangVersion>preview</LangVersion>
77
<Authors>.NET Foundation and Contributors</Authors>
88
<PackageReleaseNotes>
9-
Silk.NET August 2021 Update
9+
Silk.NET September 2021 Update
1010

11-
- Add code signing to all Silk.NET binaries
12-
- Add support for platform-default calling conventions
11+
- Add TryGetExtension methods to AL &amp; ALContext
12+
- Add support for .NET 6 Android
13+
- Update to Vulkan 1.2.190
14+
- Update to OpenXR 1.0.19
1315
- Update to latest OpenGL specifications
14-
- Update to Vulkan 1.2.187
15-
- Update to OpenXR 1.0.18
16-
- Fix loading some OpenAL extensions
16+
- Update to latest OpenCL specifications
17+
- Fix calling CreateInput on an uninitialized IView resulting in a AccessViolationException
18+
- Fix calling Close on an uninitialized IView resulting in an AccessViolationException
19+
- Fix Silk.NET (and by extension SDL) taking full control of orientation on Android
20+
- Fix DoRender being called if Window.Close was called during DoUpdate
21+
- Fix Scalar.Abs for double values
22+
- Fix "Pfn" function pointer structures being marshalled with the incorrect calling convention
23+
- Fix Scalar.IsNaN and Scalar.IsInfinity returning true for non floating point types
24+
- Fix Box2D.Center returning bogus values
25+
- Fix incorrect documentation in Thumbstick.Direction
26+
- Fix incorrect documentation in WindowOptions
1727
</PackageReleaseNotes>
1828
<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>
1929
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2030
<PackageOutputPath>$(MSBuildThisFileDirectory)/../output_packages</PackageOutputPath>
2131
<RepositoryUrl>https://github.com/dotnet/Silk.NET</RepositoryUrl>
2232
<RepositoryType>Git</RepositoryType>
23-
<VersionPrefix>2.7.0</VersionPrefix>
33+
<VersionPrefix>2.8.0</VersionPrefix>
2434
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
2535
<Description Condition="'$(Description)' == ''">
2636
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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,8 @@
616616
},
617617
"exclude": [
618618
"XrUuidMSFT",
619-
"XrSceneSphereBoundMSFT"
619+
"XrSceneSphereBoundMSFT",
620+
"XrVector4sFB"
620621
],
621622
"typeMaps": [
622623
{
@@ -657,7 +658,8 @@
657658
"VkSamplerMipmapMode": "uint",
658659
"VkComponentSwizzle": "uint",
659660
"VkSamplerAddressMode": "uint",
660-
"VkFilter": "uint"
661+
"VkFilter": "uint",
662+
"XrVector4sFB": "Silk.NET.Maths.Vector4D<short>"
661663
},
662664
{
663665
"$include.commonTypeMap": "build/csharp_typemap.json"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ public enum KHR : int
218218
DeviceIntegerDotProductInput4x8BitPackedKhr = 0x1,
219219
[NativeName("Name", "CL_DEVICE_INTEGER_DOT_PRODUCT_CAPABILITIES_KHR")]
220220
DeviceIntegerDotProductCapabilitiesKhr = 0x1073,
221+
[NativeName("Name", "CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_8BIT_KHR")]
222+
DeviceIntegerDotProductAccelerationProperties8BitKhr = 0x1074,
223+
[NativeName("Name", "CL_DEVICE_INTEGER_DOT_PRODUCT_ACCELERATION_PROPERTIES_4x8BIT_PACKED_KHR")]
224+
DeviceIntegerDotProductAccelerationProperties4x8BitPackedKhr = 0x1075,
221225
[NativeName("Name", "CL_SAMPLER_MIP_FILTER_MODE_KHR")]
222226
SamplerMipFilterModeKhr = 0x1155,
223227
[NativeName("Name", "CL_SAMPLER_LOD_MIN_KHR")]
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
5+
using System;
6+
using Silk.NET.Core.Attributes;
7+
8+
#pragma warning disable 1591
9+
10+
namespace Silk.NET.OpenCL.Extensions.POCL
11+
{
12+
[NativeName("Name", "GLenum")]
13+
public enum POCL : int
14+
{
15+
}
16+
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
using System;
4+
using System.Runtime.InteropServices;
5+
using System.Runtime.CompilerServices;
6+
using System.Text;
7+
using Silk.NET.Core;
8+
using Silk.NET.Core.Native;
9+
using Silk.NET.Core.Attributes;
10+
using Silk.NET.Core.Contexts;
11+
using Silk.NET.Core.Loader;
12+
using Silk.NET.OpenCL;
13+
using Extension = Silk.NET.Core.Attributes.ExtensionAttribute;
14+
15+
#pragma warning disable 1591
16+
17+
namespace Silk.NET.OpenCL.Extensions.POCL
18+
{
19+
[Extension("POCL_content_size")]
20+
public unsafe partial class PoclContentSize : NativeExtension<CL>
21+
{
22+
public const string ExtensionName = "POCL_content_size";
23+
[NativeApi(EntryPoint = "clSetContentSizeBufferPoCL")]
24+
public partial int SetContentSizeBufferPoCL([Flow(FlowDirection.In)] nint buffer, [Flow(FlowDirection.In)] nint content_size_buffer);
25+
26+
public PoclContentSize(INativeContext ctx)
27+
: base(ctx)
28+
{
29+
}
30+
}
31+
}
32+
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
5+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6+
<LangVersion>preview</LangVersion>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\..\Silk.NET.OpenCL\Silk.NET.OpenCL.csproj" />
11+
</ItemGroup>
12+
13+
<Import Project="..\..\..\..\build\props\bindings.props" />
14+
</Project>
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
5+
using System;
6+
using System.Runtime.InteropServices;
7+
using System.Runtime.CompilerServices;
8+
using System.Text;
9+
using Silk.NET.Core;
10+
using Silk.NET.Core.Native;
11+
using Silk.NET.Core.Attributes;
12+
using Silk.NET.Core.Contexts;
13+
using Silk.NET.Core.Loader;
14+
15+
#pragma warning disable 1591
16+
17+
namespace Silk.NET.OpenCL
18+
{
19+
[NativeName("Name", "cl_device_integer_dot_product_acceleration_properties_khr")]
20+
public unsafe partial struct DeviceIntegerDotProductAccelerationPropertiesKhr
21+
{
22+
public DeviceIntegerDotProductAccelerationPropertiesKhr
23+
(
24+
bool? signedAccelerated = null,
25+
bool? unsignedAccelerated = null,
26+
bool? mixedSignednessAccelerated = null,
27+
bool? accumulatingSaturatingSignedAccelerated = null,
28+
bool? accumulatingSaturatingUnsignedAccelerated = null,
29+
bool? accumulatingSaturatingMixedSignednessAccelerated = null
30+
) : this()
31+
{
32+
if (signedAccelerated is not null)
33+
{
34+
SignedAccelerated = signedAccelerated.Value;
35+
}
36+
37+
if (unsignedAccelerated is not null)
38+
{
39+
UnsignedAccelerated = unsignedAccelerated.Value;
40+
}
41+
42+
if (mixedSignednessAccelerated is not null)
43+
{
44+
MixedSignednessAccelerated = mixedSignednessAccelerated.Value;
45+
}
46+
47+
if (accumulatingSaturatingSignedAccelerated is not null)
48+
{
49+
AccumulatingSaturatingSignedAccelerated = accumulatingSaturatingSignedAccelerated.Value;
50+
}
51+
52+
if (accumulatingSaturatingUnsignedAccelerated is not null)
53+
{
54+
AccumulatingSaturatingUnsignedAccelerated = accumulatingSaturatingUnsignedAccelerated.Value;
55+
}
56+
57+
if (accumulatingSaturatingMixedSignednessAccelerated is not null)
58+
{
59+
AccumulatingSaturatingMixedSignednessAccelerated = accumulatingSaturatingMixedSignednessAccelerated.Value;
60+
}
61+
}
62+
63+
/// <summary></summary>
64+
[NativeName("Type", "cl_bool")]
65+
[NativeName("Type.Name", "cl_bool")]
66+
[NativeName("Name", "signed_accelerated")]
67+
public bool SignedAccelerated;
68+
/// <summary></summary>
69+
[NativeName("Type", "cl_bool")]
70+
[NativeName("Type.Name", "cl_bool")]
71+
[NativeName("Name", "unsigned_accelerated")]
72+
public bool UnsignedAccelerated;
73+
/// <summary></summary>
74+
[NativeName("Type", "cl_bool")]
75+
[NativeName("Type.Name", "cl_bool")]
76+
[NativeName("Name", "mixed_signedness_accelerated")]
77+
public bool MixedSignednessAccelerated;
78+
/// <summary></summary>
79+
[NativeName("Type", "cl_bool")]
80+
[NativeName("Type.Name", "cl_bool")]
81+
[NativeName("Name", "accumulating_saturating_signed_accelerated")]
82+
public bool AccumulatingSaturatingSignedAccelerated;
83+
/// <summary></summary>
84+
[NativeName("Type", "cl_bool")]
85+
[NativeName("Type.Name", "cl_bool")]
86+
[NativeName("Name", "accumulating_saturating_unsigned_accelerated")]
87+
public bool AccumulatingSaturatingUnsignedAccelerated;
88+
/// <summary></summary>
89+
[NativeName("Type", "cl_bool")]
90+
[NativeName("Type.Name", "cl_bool")]
91+
[NativeName("Name", "accumulating_saturating_mixed_signedness_accelerated")]
92+
public bool AccumulatingSaturatingMixedSignednessAccelerated;
93+
}
94+
}

0 commit comments

Comments
 (0)