Skip to content

Commit c940b96

Browse files
PerkseyPerksey
committed
Merge remote-tracking branch 'origin/main' into proposal/windowing-3.0
2 parents 35ab26e + e3f057d commit c940b96

File tree

1,021 files changed

+333027
-10601
lines changed

Some content is hidden

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

1,021 files changed

+333027
-10601
lines changed

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ updates:
66
schedule:
77
interval: weekly
88
day: thursday
9+
groups:
10+
All 2.X Dependencies:
11+
patterns:
12+
- "*"
913
- package-ecosystem: nuget
1014
target-branch: develop/3.0
1115
directory: "/"
1216
schedule:
1317
interval: weekly
1418
day: thursday
19+
groups:
20+
All 3.0 Dependencies:
21+
patterns:
22+
- "*"

‎.github/workflows/bindings-regeneration.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ jobs:
1616
token: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
1717
- name: Checkout submodules, configure git.
1818
run: |
19-
git -c submodule.third_party/git-hooks.update=none submodule update --init --recursive
19+
# Keep this in sync with generator.json!
20+
git -c submodule.third_party/git-hooks.update=none submodule update --init --depth 0 build/submodules/Vulkan-Headers build/submodules/Assimp build/submodules/SDL build/submodules/webgpu-headers build/submodules/dawn build/submodules/SPIRV-Headers build/submodules/SPIRV-Reflect build/submodules/SPIRV-Cross build/submodules/shaderc
21+
git submodule update --init --depth 0 --recursive build/submodules/wgpu-native
2022
git config --local user.email "[email protected]"
2123
git config --local user.name "The Silk.NET Automaton"
2224
- name: Setup .NET Core
@@ -44,11 +46,6 @@ jobs:
4446
uses: actions/setup-dotnet@v1
4547
with:
4648
dotnet-version: 3.1.404
47-
- name: Setup NUKE
48-
run: dotnet tool install Nuke.GlobalTool --global
49-
- name: Install Workloads
50-
# TODO: This is slow. Maybe we can make a docker container with this already done?
51-
run: dotnet workload install android ios maccatalyst
5249
- uses: GuillaumeFalourd/[email protected]
5350
name: Setup Windows 11 SDK
5451
with:

‎.github/workflows/shaderc.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
env:
20-
- os: ubuntu-latest
21-
name: Linux
22-
nuke_invoke: ./build.sh
20+
- os: windows-2022
21+
name: Windows
22+
nuke_invoke: ./build.cmd
23+
extras: ""
2324
name: ${{ matrix.env.name }} Build
2425
runs-on: ${{ matrix.env.os }}
2526
steps:
@@ -43,6 +44,7 @@ jobs:
4344
dotnet-version: |
4445
6.0.201
4546
7.0.*
47+
8.0.*
4648
- name: Build Shaderc
4749
run: ${{ matrix.env.nuke_invoke }} Shaderc
4850
env:

‎.github/workflows/swiftshader.yml‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,17 @@ jobs:
1919
matrix:
2020
env:
2121
- os: ubuntu-22.04
22-
name: Linux
22+
name: Linux x64
2323
nuke_invoke: ./build.sh
24-
extras: |
25-
# We need to adjust APT sources for multiarch. Use the ones corresponding to
26-
# Ubuntu 22.04 with appropriate `arch` values. ports.ubuntu.com is required
27-
# for armhf and arm64.
28-
sudo tee /etc/apt/sources.list << EOF
29-
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy main multiverse restricted universe
30-
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
31-
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
32-
deb [arch=amd64] http://archive.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
33-
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy main multiverse restricted universe
34-
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-backports main multiverse restricted universe
35-
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-security main multiverse restricted universe
36-
deb [arch=arm64,armhf] http://ports.ubuntu.com jammy-updates main multiverse restricted universe
37-
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy main multiverse restricted universe
38-
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-backports main multiverse restricted universe
39-
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-security main multiverse restricted universe
40-
deb [arch=amd64] http://security.ubuntu.com/ubuntu jammy-updates main multiverse restricted universe
41-
EOF
42-
sudo dpkg --add-architecture arm64
43-
sudo dpkg --add-architecture armhf
44-
sudo apt update
45-
sudo apt install -y gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
46-
sudo apt install -y g++-aarch64-linux-gnu g++-arm-linux-gnueabihf
47-
for arch in amd64 arm64 armhf; do
48-
sudo apt install -y libx11-xcb-dev:$arch
49-
done
24+
nuke_extra: --matrix-arg linux-x64
25+
- os: ubuntu-22.04
26+
name: Linux ARM32
27+
nuke_invoke: ./build.sh
28+
nuke_extra: --matrix-arg linux-arm
29+
- os: ubuntu-22.04
30+
name: Linux ARM64
31+
nuke_invoke: ./build.sh
32+
nuke_extra: --matrix-arg linux-arm64
5033
- os: windows-2022
5134
name: Windows
5235
nuke_invoke: ./build.cmd
@@ -83,7 +66,10 @@ jobs:
8366
dotnet-version: |
8467
6.0.201
8568
7.0.*
69+
- name: Install Zig
70+
if: ${{ matrix.env.os == 'ubuntu-22.04' }}
71+
uses: goto-bus-stop/setup-zig@v2
8672
- name: Build SwiftShader
87-
run: ${{ matrix.env.nuke_invoke }} SwiftShader
73+
run: ${{ matrix.env.nuke_invoke }} SwiftShader ${{ matrix.env.nuke_extra }}
8874
env:
8975
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}

‎.github/workflows/vulkan-loader.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ jobs:
4646
for arch in amd64 arm64 armhf; do
4747
sudo apt install -y libx11-xcb-dev:$arch libxkbcommon-dev:$arch libwayland-dev:$arch libxrandr-dev:$arch
4848
done
49-
wget https://github.com/mstorsjo/llvm-mingw/releases/download/20240417/llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
49+
wget https://github.com/mstorsjo/llvm-mingw/releases/download/20241015/llvm-mingw-20241015-msvcrt-ubuntu-20.04-x86_64.tar.xz
5050
sudo mkdir /opt/llvm-mingw-msvcrt
51-
sudo tar xf llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz --strip-components 1 -C /opt/llvm-mingw-msvcrt
52-
rm llvm-mingw-20240417-msvcrt-ubuntu-20.04-x86_64.tar.xz
51+
sudo tar xf llvm-mingw-20241015-msvcrt-ubuntu-20.04-x86_64.tar.xz --strip-components 1 -C /opt/llvm-mingw-msvcrt
52+
rm llvm-mingw-20241015-msvcrt-ubuntu-20.04-x86_64.tar.xz
5353
- os: windows-2022
5454
name: Windows
5555
nuke_invoke: ./build.cmd

‎.nuke/build.schema.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"VSCode"
6868
]
6969
},
70+
"MatrixArg": {
71+
"type": "string",
72+
"description": "Matrix job argument e.g. a RID for native builds"
73+
},
7074
"MsbuildProperties": {
7175
"type": "array",
7276
"description": "Extra properties passed to MSBuild commands",

‎Silk.NET.sln‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.
618618
EndProject
619619
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Assimp.Tests", "src\Assimp\Silk.NET.Assimp.Tests\Silk.NET.Assimp.Tests.csproj", "{12D0A556-7DDF-4902-8911-1DA3F6331149}"
620620
EndProject
621+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.Tests", "src\Core\Silk.NET.Core.Tests\Silk.NET.Core.Tests.csproj", "{4D871493-0B88-477A-99A1-3E05561CFAD9}"
622+
EndProject
621623
Global
622624
GlobalSection(SolutionConfigurationPlatforms) = preSolution
623625
Debug|Any CPU = Debug|Any CPU
@@ -3771,6 +3773,18 @@ Global
37713773
{12D0A556-7DDF-4902-8911-1DA3F6331149}.Release|x64.Build.0 = Release|Any CPU
37723774
{12D0A556-7DDF-4902-8911-1DA3F6331149}.Release|x86.ActiveCfg = Release|Any CPU
37733775
{12D0A556-7DDF-4902-8911-1DA3F6331149}.Release|x86.Build.0 = Release|Any CPU
3776+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3777+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
3778+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Debug|x64.ActiveCfg = Debug|Any CPU
3779+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Debug|x64.Build.0 = Debug|Any CPU
3780+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Debug|x86.ActiveCfg = Debug|Any CPU
3781+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Debug|x86.Build.0 = Debug|Any CPU
3782+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
3783+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Release|Any CPU.Build.0 = Release|Any CPU
3784+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Release|x64.ActiveCfg = Release|Any CPU
3785+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Release|x64.Build.0 = Release|Any CPU
3786+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Release|x86.ActiveCfg = Release|Any CPU
3787+
{4D871493-0B88-477A-99A1-3E05561CFAD9}.Release|x86.Build.0 = Release|Any CPU
37743788
EndGlobalSection
37753789
GlobalSection(SolutionProperties) = preSolution
37763790
HideSolutionNode = FALSE
@@ -4072,6 +4086,7 @@ Global
40724086
{25ABCA5E-4FF6-43ED-9A5E-443E1373EC5C} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
40734087
{01B6FFA0-5B37-44EA-ABDF-7BABD05874C5} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
40744088
{12D0A556-7DDF-4902-8911-1DA3F6331149} = {6EADA376-E83F-40B7-9539-71DD17AEF7A4}
4089+
{4D871493-0B88-477A-99A1-3E05561CFAD9} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490}
40754090
EndGlobalSection
40764091
GlobalSection(ExtensibilityGlobals) = postSolution
40774092
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}

‎build/cache/assimp.json.gz‎

0 Bytes
Binary file not shown.

‎build/cache/cl.json.gz‎

97.1 KB
Binary file not shown.

‎build/cache/core.json.gz‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)