-
-
Notifications
You must be signed in to change notification settings - Fork 441
[3.0] Add Vulkan bindings for Silk 3.0 #2457
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop/3.0
Are you sure you want to change the base?
Changes from all commits
09b79eb
7a14974
a420fa4
0b9d036
3725f9b
f9d72f3
d7fc141
cfeaddc
2002947
59dc770
9323632
dd1d1ef
4e75295
e3383cc
6858647
06a8680
1798e32
f7c38b0
20ef463
6f59005
57bde07
6190d6f
0be14bc
4453712
3b0a190
609cd21
e692059
e5f1edd
b2c2338
5f64399
fbe1e44
2a5694d
6e03d3c
9fcfdc3
a4b3cf9
475f6c3
e2f818e
d38e2b1
2ef78eb
9ff8016
b78306f
ad94e2d
b65b4b6
abba2c8
1183f17
b3f1be8
d83369a
a73e98f
a3f9cdb
8e26633
243fe93
ef03001
826476c
679ab18
1cfdede
a7946e5
ff2eb75
c87277b
b67724a
776a9ad
b228927
9dd3b92
34cadfd
8a4e93a
11dff8b
8557c7b
6336a6b
3f93134
cea55da
4434164
7ec8f84
cd27ba8
400cb18
17c551c
c0c3425
d1fa402
78bbb4d
b2d8acc
d8986f0
d86e127
d22529c
1e44902
42750b8
0dace6d
d64b198
4d2a162
4c68768
9bf1427
407acae
360b77c
21df0a8
565810e
b5dc97c
5c499a4
744d86d
650cc97
cf87296
81ba841
86e998d
ca98d81
daa3d18
d795e5f
8e1e2ad
cfdb477
d168396
1a3bc51
29f96b3
8ab8550
1350a08
b44ebea
bdfd3c8
d73aade
70d1279
060e3cc
64cbea3
2188fcd
b187f27
0d6b402
031e28c
4c89e4e
ae30d31
44356f1
821a7e3
cc53cf4
54322bf
35fd9e2
fb7bba2
cc7088f
ead8e31
6f4d856
d05e91a
a32b33e
0dcfda6
6129ba7
7deff18
467f2e1
affb38e
4c07392
b6a33c9
4eae792
3ccd55c
15b8ce1
205bf61
5c491d4
aa7f39a
8595555
d3ecce0
6ca8a20
e92714e
09abf5e
fa4963a
79aa5de
143cd79
7ea3608
7a88bb1
8d0bb38
f2fb4b0
9e12e38
2c080b0
56a3c49
dda4c28
54b7bd0
b2581ed
1141e99
f1ce4b1
32faef0
9897d80
2b04df7
fa449be
65e0b9b
149a6c0
fe71bca
d6d53e8
e0e4b8a
7b6d3d4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,45 @@ | ||
| <Project> | ||
| <ItemGroup> | ||
| <!-- Common --> | ||
| <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" /> | ||
| <PackageVersion Include="DotNet.ReproducibleBuilds.Isolated" Version="1.1.1" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" /> | ||
| <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" /> | ||
| <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" /> | ||
| <PackageVersion Include="DotNet.ReproducibleBuilds.Isolated" Version="1.2.39" /> | ||
| <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" /> | ||
| <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" /> | ||
| <PackageVersion Include="NAudio.Core" Version="2.2.1" /> | ||
| <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" /> | ||
| <PackageVersion Include="NUnit.Analyzers" Version="4.4.0" /> | ||
| <PackageVersion Include="coverlet.collector" Version="6.0.2" /> | ||
| <PackageVersion Include="NUnit" Version="4.2.2" /> | ||
| <PackageVersion Include="xunit" Version="2.9.2" /> | ||
| <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" /> | ||
| <PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" /> | ||
| <PackageVersion Include="NUnit.Analyzers" Version="4.11.2" /> | ||
| <PackageVersion Include="coverlet.collector" Version="6.0.4" /> | ||
| <PackageVersion Include="NUnit" Version="4.4.0" /> | ||
| <PackageVersion Include="xunit" Version="2.9.3" /> | ||
| <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" /> | ||
| <!-- eng/benchmarks --> | ||
| <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" /> | ||
| <PackageVersion Include="BenchmarkDotNet" Version="0.15.6" /> | ||
| <!-- Silk.NET.Core --> | ||
| <PackageVersion Include="Fody" Version="6.8.2" PrivateAssets="all" /> | ||
| <PackageVersion Include="InlineIL.Fody" Version="1.9.0" PrivateAssets="all" /> | ||
| <PackageVersion Include="Fody" Version="6.9.3" PrivateAssets="all" /> | ||
| <PackageVersion Include="InlineIL.Fody" Version="1.10.1" PrivateAssets="all" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" /> | ||
| <!-- Analyzers --> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25218.8" /> | ||
| <!-- SilkTouch --> | ||
| <PackageVersion Include="ClangSharp.PInvokeGenerator" Version="18.1.0.2" /> | ||
| <PackageVersion Include="ClangSharp.PInvokeGenerator" Version="20.1.2.4" /> | ||
| <PackageVersion Include="CSharpier.Core" Version="0.30.2" /> | ||
| <PackageVersion Include="Humanizer.Core" Version="2.14.1" /> | ||
| <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" /> | ||
| <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" /> | ||
| <PackageVersion Include="Microsoft.Build.Locator" Version="1.10.12" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" /> | ||
| <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0" /> | ||
| <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" /> | ||
| <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" /> | ||
| <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" /> | ||
| <PackageVersion Include="System.IO.Hashing" Version="9.0.0" /> | ||
| <!-- This is not used but it is used transitively and the version pulled in has a vulnerability --> | ||
| <PackageVersion Include="System.Formats.Asn1" Version="9.0.0" /> | ||
| <PackageVersion Include="System.IO.Hashing" Version="10.0.0" /> | ||
| <!-- SilkTouch Unit Tests --> | ||
| <PackageVersion Include="Silk.NET.BuildTools" Version="2.22.0" /> | ||
| <PackageVersion Include="System.Linq.Async" Version="6.0.1" /> | ||
| <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" /> | ||
| <PackageVersion Include="Verify.NUnit" Version="28.3.2" /> | ||
| <PackageVersion Include="Verify.NUnit" Version="31.6.0" /> | ||
| </ItemGroup> | ||
| </Project> | ||
| </Project> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| // Ported from the Vulkan headers and corresponding dependencies. | ||
| // Original source is Copyright 2015-2023 The Khronos Group Inc. Licensed under the MIT license. | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --remap | ||
| int32_t=int | ||
| uint32_t=uint | ||
| int64_t=long | ||
| uint64_t=ulong |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| @../remap-stdint.rsp | ||
| VkBool32=MaybeBool<uint> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| @../../common.rsp | ||
| --define-macro | ||
| TODO_DEFINE_MACROS=HERE | ||
| --headerFile | ||
| ../header.txt | ||
| --include-directory | ||
| ../../../submodules/vulkan-headers/include | ||
| --with-callconv | ||
| *=Winapi | ||
| --with-librarypath | ||
| *=vulkan |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| @../settings.rsp | ||
| @../remap.rsp | ||
| --exclude | ||
| VK_NULL_HANDLE | ||
| --file | ||
| vulkan-vulkan.h | ||
| --methodClassName | ||
| Vk | ||
| --namespace | ||
| Silk.NET.Vulkan | ||
| --output | ||
| ../../../../sources/Vulkan/Vulkan | ||
| --test-output | ||
| ../../../../tests/Vulkan/Vulkan | ||
| --traverse | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_av1std.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_av1std_decode.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_av1std_encode.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_h264std.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_h264std_decode.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_h264std_encode.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_h265std.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_h265std_decode.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_h265std_encode.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_vp9std.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codec_vp9std_decode.h | ||
| ../../../submodules/vulkan-headers/include/vk_video/vulkan_video_codecs_common.h | ||
| ../../../submodules/vulkan-headers/include/vulkan/vulkan.h | ||
| ../../../submodules/vulkan-headers/include/vulkan/vulkan_core.h |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #include <vk_video/vulkan_video_codec_av1std.h> | ||
| #include <vk_video/vulkan_video_codec_av1std_decode.h> | ||
| #include <vk_video/vulkan_video_codec_av1std_encode.h> | ||
| #include <vk_video/vulkan_video_codec_h264std.h> | ||
| #include <vk_video/vulkan_video_codec_h264std_decode.h> | ||
| #include <vk_video/vulkan_video_codec_h264std_encode.h> | ||
| #include <vk_video/vulkan_video_codec_h265std.h> | ||
| #include <vk_video/vulkan_video_codec_h265std_decode.h> | ||
| #include <vk_video/vulkan_video_codec_h265std_encode.h> | ||
| #include <vk_video/vulkan_video_codec_vp9std.h> | ||
| #include <vk_video/vulkan_video_codec_vp9std_decode.h> | ||
| #include <vk_video/vulkan_video_codecs_common.h> | ||
|
|
||
| #include <vulkan/vulkan.h> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "sdk": { | ||
| "version": "9.0.100", | ||
| "version": "10.0.100", | ||
| "rollForward": "major" | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #nullable enable | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs updating |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #nullable enable | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This needs updating |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| <PropertyGroup> | ||
| <!-- NOTE: Multitargeting here will be a PITA due to the references to TFM below --> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <TargetFramework>net10.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
|
|
@@ -22,6 +22,7 @@ | |
| <!-- Public API Tracking --> | ||
| <PropertyGroup> | ||
| <SilkTrackPublicAPI>true</SilkTrackPublicAPI> | ||
| <TreatWarningsAsErrors>false</TreatWarningsAsErrors> | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Probably re-enable TreatWarningsAsErrors before merging |
||
| </PropertyGroup> | ||
| <ItemGroup Condition="'$(TargetFramework)' != ''"> | ||
| <AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" /> | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this header correct? For reference: https://github.com/KhronosGroup/Vulkan-Headers/blob/main/LICENSE.md