Skip to content

Commit d43aeec

Browse files
PerkseyPerksey
committed
Update native builds, use DX Agility SDK
1 parent d58d0c2 commit d43aeec

File tree

9 files changed

+35
-32
lines changed

9 files changed

+35
-32
lines changed

‎.github/workflows/angle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
env:
20-
- os: macos-13-xlarge
20+
- os: macos-latest-xlarge
2121
name: Darwin
2222
nuke_invoke: ./build.sh
2323
name: ${{ matrix.env.name }} Build

‎.github/workflows/dxvk.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
echo running extras
4141
${{ matrix.env.extras }}
4242
- name: Cache .tmp, ~/.nuget/packages
43-
uses: actions/cache@v2
43+
uses: actions/cache@v4
4444
with:
4545
path: |
4646
.tmp
@@ -54,4 +54,4 @@ jobs:
5454
5555
${{ matrix.env.nuke_invoke }} Dxvk
5656
env:
57-
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}
57+
PUSHABLE_GITHUB_TOKEN: ${{ secrets.PUSHABLE_GITHUB_TOKEN }}

‎.github/workflows/moltenvk.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
env:
20-
- os: macos-13-xlarge
20+
- os: macos-latest-xlarge
2121
name: Darwin
2222
nuke_invoke: ./build.sh
2323
extras: ""

‎.github/workflows/sdl2.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,11 @@ jobs:
4343
git config --local user.name "The Silk.NET Automaton"
4444
- name: Setup .NET Core
4545
uses: actions/setup-dotnet@v3
46-
if: runner.os == 'Windows'
4746
with:
4847
dotnet-version: |
4948
6.0.201
5049
7.0.*
5150
8.0.*
52-
env:
53-
DOTNET_INSTALL_DIR: ~/.dotnet
5451
- name: Setup PowerShell Core
5552
continue-on-error: true
5653
if: runner.os == 'Windows'

‎.github/workflows/swiftshader.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ jobs:
5050
git config --local user.email "[email protected]"
5151
git config --local user.name "The Silk.NET Automaton"
5252
- name: Extra prerequisites
53-
run: |
53+
run: |ass
5454
echo running extras
5555
${{ matrix.env.extras }}
5656
- name: Cache .tmp, ~/.nuget/packages
57-
uses: actions/cache@v2
57+
uses: actions/cache@v4
5858
with:
5959
path: |
6060
.tmp

‎build/include/silk.net.core.d3dcommon.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#include <d3dcommon.h>
2+
#include <d3dshadercacheregistration.h>

‎build/include/silk.net.direct3d12.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#include <d3d12.h>
2+
#include <d3d12compiler.h>
3+
#include <d3d12sdklayers.h>
4+
#include <d3d12shader.h>
5+
#include <d3d12video.h>

‎build/nuke/Native/Assimp.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ partial class Build {
7373
InheritedShell($"{prepare} {GetCMakeToolchainFlag(triple)}", buildDir).AssertZeroExitCode();
7474
InheritedShell(build, buildDir).AssertZeroExitCode();
7575

76-
InheritedShell($"{triple}-strip --strip-unneeded bin/libassimp.so.5", buildDir).AssertZeroExitCode();
76+
InheritedShell($"{triple}-strip --strip-unneeded bin/libassimp.so.6", buildDir).AssertZeroExitCode();
7777

78-
CopyAll((buildDir / "bin").GlobFiles("libassimp.so.5"), runtimes / rid / "native");
78+
CopyAll((buildDir / "bin").GlobFiles("libassimp.so.6"), runtimes / rid / "native");
7979
}
8080
}
8181
else if (OperatingSystem.IsMacOS())
@@ -91,9 +91,9 @@ partial class Build {
9191
InheritedShell($"{prepare} -DCMAKE_OSX_ARCHITECTURES={arch}", buildDir).AssertZeroExitCode();
9292
InheritedShell(build, buildDir).AssertZeroExitCode();
9393

94-
InheritedShell($"strip -Sx bin/libassimp.5.dylib", buildDir).AssertZeroExitCode();
94+
InheritedShell($"strip -Sx bin/libassimp.6.dylib", buildDir).AssertZeroExitCode();
9595

96-
CopyAll((buildDir / "bin").GlobFiles("libassimp.5.dylib"), runtimes / rid / "native");
96+
CopyAll((buildDir / "bin").GlobFiles("libassimp.6.dylib"), runtimes / rid / "native");
9797
}
9898
}
9999

‎generator.json‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,7 @@
10561056
{
10571057
"profileName": "Core",
10581058
"sources": [
1059-
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3dcommon.h",
1059+
"build/include/silk.net.core.d3dcommon.h",
10601060
"$windowsSdkDir/Include/$windowsSdkVersion/winrt/inspectable.h"
10611061
],
10621062
"mode": "Clang",
@@ -1080,12 +1080,16 @@
10801080
"-Wno-ignored-pragma-intrinsic",
10811081
"-Wno-nonportable-include-path",
10821082
"-Wno-pragma-pack",
1083+
"-I$nuget/Microsoft.Direct3D.D3D12/*/build/native/include",
10831084
"-I$windowsSdkIncludes",
10841085
"-Ibuild/include"
10851086
],
1086-
"traverse": [],
1087+
"traverse": [
1088+
"$nuget/Microsoft.Direct3D.D3D12/*/build/native/include/$windowsSdkVersion/um/d3dcommon.h",
1089+
"$nuget/Microsoft.Direct3D.D3D12/*/build/native/include/$windowsSdkVersion/um/d3dshadercacheregistration.h"
1090+
],
10871091
"classes": {
1088-
"d3dcommon.h": "[Core]D3DCommon",
1092+
"silk.net.core.d3dcommon.h": "[Core]D3DCommon",
10891093
"inspectable.h": "[Core]WinRT"
10901094
}
10911095
},
@@ -1107,8 +1111,7 @@
11071111
},
11081112
"bakery": {
11091113
"profileNames": [
1110-
"d3dcommon",
1111-
"silk.net.core.native.dcommon",
1114+
"silk.net.core.d3dcommon",
11121115
"inspectable"
11131116
]
11141117
},
@@ -1487,7 +1490,7 @@
14871490
"$windowsSdkDir/Include/$windowsSdkVersion/shared/dxgi1_5.h",
14881491
"$windowsSdkDir/Include/$windowsSdkVersion/shared/dxgi1_6.h",
14891492
"$windowsSdkDir/Include/$windowsSdkVersion/um/dxgidebug.h",
1490-
"$windowsSdkDir/Include/$windowsSdkVersion/shared/dxgiformat.h",
1493+
"$nuget/Microsoft.Direct3D.D3D12/*/build/native/include/dxgiformat.h",
14911494
"$windowsSdkDir/Include/$windowsSdkVersion/winrt/windows.graphics.directx.h"
14921495
],
14931496
"mode": "Clang",
@@ -2156,10 +2159,7 @@
21562159
{
21572160
"profileName": "D3D12",
21582161
"sources": [
2159-
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d12.h",
2160-
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d12shader.h",
2161-
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d12video.h",
2162-
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d12sdklayers.h"
2162+
"build/include/silk.net.direct3d12.h"
21632163
],
21642164
"mode": "Clang",
21652165
"cacheDir": "build/cache",
@@ -2180,15 +2180,17 @@
21802180
"-Wno-ignored-pragma-intrinsic",
21812181
"-Wno-nonportable-include-path",
21822182
"-Wno-pragma-pack",
2183+
"-I$nuget/Microsoft.Direct3D.D3D12/*/build/native/include",
2184+
"-I$windowsSdkIncludes",
21832185
"-I$windowsSdkIncludes",
21842186
"-Ibuild/include"
21852187
],
2186-
"traverse": [],
2188+
"traverse": [
2189+
"$nuget/Microsoft.Direct3D.D3D12/*/build/native/include/d3d12*.h",
2190+
"!$nuget/Microsoft.Direct3D.D3D12/*/build/native/include/d3d12compatibility.h"
2191+
],
21872192
"classes": {
2188-
"d3d12.h": "[Core]D3D12",
2189-
"d3d12shader.h": "[Core]D3D12",
2190-
"d3d12video.h": "[Core]D3D12",
2191-
"d3d12sdklayers.h": "[Core]D3D12"
2193+
"silk.net.direct3d12.h": "[Core]D3D12"
21922194
},
21932195
"comRefs": [
21942196
"Silk.NET.DXGI.IDXGIAdapter",
@@ -2206,10 +2208,7 @@
22062208
},
22072209
"bakery": {
22082210
"profileNames": [
2209-
"d3d12",
2210-
"d3d12shader",
2211-
"d3d12video",
2212-
"d3d12sdklayers"
2211+
"silk.net.core.direct3d12"
22132212
]
22142213
},
22152214
"output": {

0 commit comments

Comments
 (0)