Skip to content

Commit

Permalink
Update all bindings (#1708)
Browse files Browse the repository at this point in the history
* update oh no

* Update zig build scripts

* Update workflows to not clone everything

* New binaries for SPIRV-Cross on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023 (#1719)

Co-authored-by: The Silk.NET Automaton <[email protected]>

* Update Assimp binaries (#1718)

* New binaries for Assimp on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023

* New binaries for Assimp on Darwin 21.6.0 Darwin Kernel Version 21.6.0: Thu Jul  6 22:18:26 PDT 2023; root:xnu-8020.240.18.702.13~1/RELEASE_X86_64

* New binaries for Assimp on Microsoft Windows 10.0.20348

---------

Co-authored-by: The Silk.NET Automaton <[email protected]>

* Update Vulkan Loader binaries (#1716)

* New binaries for Vulkan Loader on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023

* New binaries for Vulkan Loader on Darwin 21.6.0 Darwin Kernel Version 21.6.0: Fri Sep 15 16:17:23 PDT 2023; root:xnu-8020.240.18.703.5~1/RELEASE_X86_64

* New binaries for Vulkan Loader on Microsoft Windows 10.0.20348

---------

Co-authored-by: The Silk.NET Automaton <[email protected]>

* Update GLFW binaries (#1715)

* New binaries for GLFW on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023

* New binaries for GLFW on Darwin 21.6.0 Darwin Kernel Version 21.6.0: Thu Jul  6 22:18:26 PDT 2023; root:xnu-8020.240.18.702.13~1/RELEASE_X86_64

* New binaries for GLFW on Microsoft Windows 10.0.20348

---------

Co-authored-by: The Silk.NET Automaton <[email protected]>

* New binaries for MoltenVK on Darwin 21.6.0 Darwin Kernel Version 21.6.0: Thu Jul  6 22:18:26 PDT 2023; root:xnu-8020.240.18.702.13~1/RELEASE_X86_64 (#1714)

Co-authored-by: The Silk.NET Automaton <[email protected]>

* New binaries for SPIRV-Reflect on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023 (#1713)

Co-authored-by: The Silk.NET Automaton <[email protected]>

* New binaries for DXVK on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023 (#1712)

Co-authored-by: The Silk.NET Automaton <[email protected]>

* Update SDL2 binaries (#1710)

* New binaries for SDL2 on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023

* New binaries for SDL2 on Microsoft Windows 10.0.20348

* New binaries for SDL2 on Darwin 21.6.0 Darwin Kernel Version 21.6.0: Fri Sep 15 16:17:23 PDT 2023; root:xnu-8020.240.18.703.5~1/RELEASE_X86_64

---------

Co-authored-by: The Silk.NET Automaton <[email protected]>

* Update Wgpu binaries (#1709)

* New binaries for Wgpu on Darwin 21.6.0 Darwin Kernel Version 21.6.0: Thu Jul  6 22:18:26 PDT 2023; root:xnu-8020.240.18.702.13~1/RELEASE_X86_64

* New binaries for Wgpu on Linux 6.2.0-1012-azure #12~22.04.1-Ubuntu SMP Thu Sep  7 14:07:14 UTC 2023

* New binaries for Wgpu on Microsoft Windows 10.0.20348

---------

Co-authored-by: The Silk.NET Automaton <[email protected]>

* Add missing projects to solution

* Map missing PFN to void*

* Fix OpenXR compilation

It seems something a bit more sinister is happening with enum trimming, and instead of introducing *another* enum trimming special case to handle just this specific enum in this specific case (fixing the logic globally will likely cause more things to break, so the fix would need to be opt-in), lets just use the prefix override

* Update shaderc compilation

* Update Shaderc binaries (#1729)

Co-authored-by: The Silk.NET Automaton <[email protected]>

* Update native lib versions

* Non-recursively clone submdoules in build.yml

---------

Co-authored-by: silkdotnet <[email protected]>
Co-authored-by: The Silk.NET Automaton <[email protected]>
Co-authored-by: Dylan Perks <[email protected]>
  • Loading branch information
4 people authored Oct 20, 2023
1 parent 762b0b7 commit eeedf77
Show file tree
Hide file tree
Showing 359 changed files with 13,786 additions and 2,094 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/assimp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
- name: Checkout submodules, configure git.
run: |
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/Assimp
git config --local user.email "[email protected]"
git config --local user.name "The Silk.NET Automaton"
- name: Extra prerequisites
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
- uses: actions/[email protected]
with:
submodules: 'false'
- name: Clone submodules non-recursively
run: git submodule update --init --depth 0
- name: Setup Java JDK 11
uses: actions/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/glfw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
- name: Checkout submodules, configure git
run: |
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/GLFW
git config --local user.email "[email protected]"
git config --local user.name "The Silk.NET Automaton"
- name: Extra prerequisites
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/swiftshader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
- name: Checkout submodules, configure git
run: |
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/SwiftShader
git config --local user.email "[email protected]"
git config --local user.name "The Silk.NET Automaton"
- name: Extra prerequisites
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vulkan-loader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
- name: Checkout submodules, configure git
run: |
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive --depth 0 build/submodules/Vulkan-Loader
git config --local user.email "[email protected]"
git config --local user.name "The Silk.NET Automaton"
- name: Extra prerequisites
Expand Down
45 changes: 45 additions & 0 deletions Silk.NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Shaderc.Native", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.MoltenVK.Native", "src\Native\Silk.NET.MoltenVK.Native\Silk.NET.MoltenVK.Native.csproj", "{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.ANDROID", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.ANDROID\Silk.NET.OpenXR.Extensions.ANDROID.csproj", "{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.YVR", "src\OpenXR\Extensions\Silk.NET.OpenXR.Extensions.YVR\Silk.NET.OpenXR.Extensions.YVR.csproj", "{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Vulkan.Extensions.AMDX", "src\Vulkan\Extensions\Silk.NET.Vulkan.Extensions.AMDX\Silk.NET.Vulkan.Extensions.AMDX.csproj", "{A0E20061-FFF6-4444-86E0-4519A0CA6944}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenCL Demos", "OpenCL Demos", "{FD0C9C4B-3777-4755-A87B-60FE65D92750}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld", "examples\CSharp\OpenCL Demos\HelloWorld\HelloWorld.csproj", "{9CB90BB8-946F-4962-9365-A97BF5C6550A}"
Expand Down Expand Up @@ -3633,6 +3639,42 @@ Global
{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}.Release|x64.Build.0 = Release|Any CPU
{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}.Release|x86.ActiveCfg = Release|Any CPU
{32BE0963-C372-4BCA-A7C2-3CA844FDBB78}.Release|x86.Build.0 = Release|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x64.ActiveCfg = Debug|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x64.Build.0 = Debug|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x86.ActiveCfg = Debug|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Debug|x86.Build.0 = Debug|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|Any CPU.Build.0 = Release|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x64.ActiveCfg = Release|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x64.Build.0 = Release|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x86.ActiveCfg = Release|Any CPU
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB}.Release|x86.Build.0 = Release|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x64.ActiveCfg = Debug|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x64.Build.0 = Debug|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x86.ActiveCfg = Debug|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Debug|x86.Build.0 = Debug|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|Any CPU.Build.0 = Release|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x64.ActiveCfg = Release|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x64.Build.0 = Release|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x86.ActiveCfg = Release|Any CPU
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75}.Release|x86.Build.0 = Release|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x64.ActiveCfg = Debug|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x64.Build.0 = Debug|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x86.ActiveCfg = Debug|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Debug|x86.Build.0 = Debug|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|Any CPU.Build.0 = Release|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x64.ActiveCfg = Release|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x64.Build.0 = Release|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x86.ActiveCfg = Release|Any CPU
{A0E20061-FFF6-4444-86E0-4519A0CA6944}.Release|x86.Build.0 = Release|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -3935,6 +3977,9 @@ Global
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB} = {15FC3D1A-25D7-446B-87A7-B45BA3C2225F}
{D1E4EDC7-0A06-498A-B0F9-275B7D508A0E} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
{32BE0963-C372-4BCA-A7C2-3CA844FDBB78} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
{D35926CB-6F79-4B5A-A3D8-F60D660D55EB} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
{91E22BDE-9DBA-4AB0-97C3-66DA3EF15B75} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
{A0E20061-FFF6-4444-86E0-4519A0CA6944} = {49BC383A-D7E6-4013-93C7-371479B984CC}
{FD0C9C4B-3777-4755-A87B-60FE65D92750} = {6842A2C6-5C7B-42DD-9825-0EDE91BFEBF7}
{9CB90BB8-946F-4962-9365-A97BF5C6550A} = {FD0C9C4B-3777-4755-A87B-60FE65D92750}
EndGlobalSection
Expand Down
Binary file modified build/cache/assimp.json.gz
Binary file not shown.
Binary file modified build/cache/cl.json.gz
Binary file not shown.
Binary file modified build/cache/gles2.json.gz
Binary file not shown.
Binary file modified build/cache/openxr.json.gz
Binary file not shown.
Binary file modified build/cache/sdl.json.gz
Binary file not shown.
Binary file modified build/cache/spirv-cross.json.gz
Binary file not shown.
Binary file modified build/cache/spirv-reflect.json.gz
Binary file not shown.
Binary file modified build/cache/spirv.json.gz
Binary file not shown.
Binary file modified build/cache/vulkan.json.gz
Binary file not shown.
Binary file modified build/cache/vulkan_video.json.gz
Binary file not shown.
Binary file modified build/cache/webgpu.json.gz
Binary file not shown.
29 changes: 16 additions & 13 deletions build/nuke/Native/SPIRVCross.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,22 @@ pub fn build(b: *std.Build) void {
if (mode != .Debug)
lib.defineCMacro(""NDEBUG"", ""1"");
lib.addCSourceFiles(&.{
root_path ++ ""spirv_cross.cpp"",
root_path ++ ""spirv_cfg.cpp"",
root_path ++ ""spirv_cpp.cpp"",
root_path ++ ""spirv_cross_c.cpp"",
root_path ++ ""spirv_cross_parsed_ir.cpp"",
root_path ++ ""spirv_cross_util.cpp"",
root_path ++ ""spirv_glsl.cpp"",
root_path ++ ""spirv_hlsl.cpp"",
root_path ++ ""spirv_msl.cpp"",
root_path ++ ""spirv_parser.cpp"",
root_path ++ ""spirv_reflect.cpp"",
}, flags);
lib.addCSourceFiles(.{
.files = &.{
root_path ++ ""spirv_cross.cpp"",
root_path ++ ""spirv_cfg.cpp"",
root_path ++ ""spirv_cpp.cpp"",
root_path ++ ""spirv_cross_c.cpp"",
root_path ++ ""spirv_cross_parsed_ir.cpp"",
root_path ++ ""spirv_cross_util.cpp"",
root_path ++ ""spirv_glsl.cpp"",
root_path ++ ""spirv_hlsl.cpp"",
root_path ++ ""spirv_msl.cpp"",
root_path ++ ""spirv_parser.cpp"",
root_path ++ ""spirv_reflect.cpp"",
},
.flags = flags
});
b.installArtifact(lib);
}
Expand Down
2 changes: 1 addition & 1 deletion build/nuke/Native/SPIRVReflect.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pub fn build(b: *std.Build) void {
const lib: *std.build.LibExeObjStep = b.addSharedLibrary(shared_lib_options);
lib.linkLibC();
lib.addCSourceFiles(&.{""spirv_reflect.c""}, &.{ ""-std=c99"", ""-fPIC"" });
lib.addCSourceFiles(.{ .files = &.{""spirv_reflect.c""}, .flags = &.{ ""-std=c99"", ""-fPIC"" } });
b.installArtifact(lib);
}";

Expand Down
Loading

0 comments on commit eeedf77

Please sign in to comment.