Skip to content
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.

Sign up for GitHub

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

Jump to bottom

ANGLE, SwiftShader, and Vulkan Loader prebuilts #746

Merged
merged 62 commits into from
Mar 6, 2022
Merged

ANGLE, SwiftShader, and Vulkan Loader prebuilts #746

merged 62 commits into from
Mar 6, 2022

Conversation

Perksey
Copy link
Member

@Perksey Perksey commented Jan 4, 2022

No description provided.

Perksey and others added 30 commits January 3, 2022 22:01
@Perksey
This pipeline _will_ fail, but want to see how far it will get
c1f4d30
@HurricanKai
Update build.sh
979c864
@Perksey
Remove workflow autogeneration, revert build script changes
f1added
@Perksey
Merge remote-tracking branch 'origin/feature/angle-swiftshader-prebui…
075ae45 
…lts' into feature/angle-swiftshader-prebuilts
@Perksey
Fix pipeline
6464b4e
@Perksey
Move temp folder
d1a082f
@Perksey
Recursive checkout
a54aded
@Perksey
Recursive checkout except for one private Google submodule
6308614
@Perksey
Update SwiftShader.yml
ca5c4da
@Perksey
Ensure we checkout a branch maybe?
a283ebb
@Perksey
Use checkout v2
636e998
@Perksey
Install xcb
cf72278
@Perksey
Sudo install xcb
d5343d2
@Perksey
Setup .NET 6
cd3c88d
@Perksey
Checkout with the right token
b3caf99
@Perksey
Don't do a parallelised run in CI - slaughters the runner
93dc234
@Perksey
Update SwiftShader.yml
9c584cc
@Perksey
Add ANGLE
f9afd2a
@Perksey
WHY
76587a8
@Perksey
Make the damned thing executable
2bf8e84
@Perksey
No idea why we need PHP for Apache installed to build ANGLE but why not
5f81be9
@Perksey
Run as sudo for good measure
5c81491
@Perksey
Attempt to diagnose janky apt setup
267db17
@Perksey
Wtf is going on
5e64696
@Perksey
Use -X theirs instead of -s theirs which doesn't exist
412df60
@Perksey
Ensure we're not affected by other [NUKE] changes harder
055f028
@silkdotnet @dotnet-bot
Update ANGLE binaries (#749)
9992d3f 
* New binaries for ANGLE on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for ANGLE on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@Perksey
You are the bane of my existence.
5a5a533
@Perksey
Merge remote-tracking branch 'origin/feature/angle-swiftshader-prebui…
9f29700 
…lts' into feature/angle-swiftshader-prebuilts
@Perksey
Allow overwrites
0585360
silkdotnet and others added 9 commits January 6, 2022 18:23
@silkdotnet @dotnet-bot
New binaries for Vulkan Loader on Microsoft Windows 10.0.17763 (#764)
c8b9468 
Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@silkdotnet @dotnet-bot @Perksey
Update SwiftShader binaries (#747)
0f127c6 
* New binaries for SwiftShader on Windows

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
Co-authored-by: Dylan Perks <dmp9biz@gmail.com>
@Perksey
Add packages for the new binaries
dd5e324
@Perksey
Adjust glob, let's figure out where it's actually putting these files...
855ca59
@Perksey
Actually glob the right paths
0c7a9eb
@Perksey
cont'd
9351498
@Perksey
cont'd 2
d404b80
@silkdotnet @dotnet-bot
Update Vulkan Loader binaries (#765)
4298a05 
* New binaries for Vulkan Loader on Microsoft Windows 10.0.17763

* New binaries for Vulkan Loader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for Vulkan Loader on Microsoft Windows 10.0.17763

* New binaries for Vulkan Loader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@silkdotnet @dotnet-bot
Update SwiftShader binaries (#766)
cc56d01 
* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@Perksey Perksey marked this pull request as ready for review January 7, 2022 11:30
@Perksey Perksey requested a review from a team as a code owner January 7, 2022 11:30
@Perksey
Copy link
Member Author

Perksey commented Jan 7, 2022

Ready to review. ANGLE on Windows was built locally because GitHub Actions doesn't have enough disk space.

This does not need to be in 2.12.

@Perksey Perksey mentioned this pull request Feb 5, 2022
Closed
HurricanKai
HurricanKai reviewed Mar 5, 2022
View reviewed changes
Copy link
Member

@HurricanKai HurricanKai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good!
Not remembering why we need to have a Vulkan native package though, IIRC that should never be needed anyways (double-checking that right now)

.nuke Show resolved Hide resolved
.nuke/build.schema.json Show resolved Hide resolved
.nuke/build.schema.json Show resolved Hide resolved
@Perksey
Copy link
Member Author

Perksey commented Mar 5, 2022

The Vulkan loader package is primarily for drivers which aren't integrated to the OS, i.e. MoltenVK and SwiftShader (the most pertinent! originally needed this because of Jupyter and the custom layers it needs for headless surfaces)

@HurricanKai
Copy link
Member

For future reference I've asked about the ins-and-outs of shipping the vulkan loader on the VK discord and this seems reasonable (link to convo)

@HurricanKai
Copy link
Member

Please have a look at the build error, but given it's nothing related to this PR this is good to go.

@Perksey
Copy link
Member Author

Perksey commented Mar 6, 2022

Action items post-merge and post-release:

  • Install Windows SDK in Actions (will fix ANGLE Windows Build)
  • Ignore cases where the binaries don't change (will fix Linux Builds)

silkdotnet and others added 3 commits March 6, 2022 16:42
@silkdotnet @dotnet-bot
Update Vulkan Loader binaries (#825)
5eb27b8 
* New binaries for Vulkan Loader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64

* New binaries for Vulkan Loader on Microsoft Windows 10.0.20348

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@silkdotnet @dotnet-bot
New binaries for ANGLE on Darwin 20.6.0 Darwin Kernel Version 20.6.0:…
2ffc7bb 
… Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 (#827)

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@silkdotnet @dotnet-bot
Update SwiftShader binaries (#826)
8df41df 
* New binaries for SwiftShader on Microsoft Windows 10.0.20348

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@Perksey Perksey enabled auto-merge (squash) March 6, 2022 16:43
@Perksey Perksey merged commit bdefe55 into main Mar 6, 2022
@Perksey Perksey deleted the feature/angle-swiftshader-prebuilts branch March 6, 2022 18:37
Perksey added a commit that referenced this pull request Mar 25, 2022
@Perksey @HurricanKai
@silkdotnet @dotnet-bot
ANGLE, SwiftShader, and Vulkan Loader prebuilts (#746)
62a09c7 
* This pipeline _will_ fail, but want to see how far it will get

* Update build.sh

* Remove workflow autogeneration, revert build script changes

* Fix pipeline

* Move temp folder

* Recursive checkout

* Recursive checkout except for one private Google submodule

* Update SwiftShader.yml

* Ensure we checkout a branch maybe?

* Use checkout v2

* Install xcb

* Sudo install xcb

* Setup .NET 6

* Checkout with the right token

* Don't do a parallelised run in CI - slaughters the runner

* Update SwiftShader.yml

* Add ANGLE

* WHY

* Make the damned thing executable

* No idea why we need PHP for Apache installed to build ANGLE but why not

* Run as sudo for good measure

* Attempt to diagnose janky apt setup

* Wtf is going on

* Use -X theirs instead of -s theirs which doesn't exist

* Ensure we're not affected by other [NUKE] changes harder

* Update ANGLE binaries (#749)

* New binaries for ANGLE on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for ANGLE on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

* You are the bane of my existence.

* Allow overwrites

* Add Vulkan loader

* Add a workflow for Vulkan Loader

* cont'd

* I'm stupid

* Install Wayland

* Install X11

* Pull... fkn race conditions man!

* Update gitignore for good measure

* Install different packages?

* Glob the correct files, stop wasting Actions minutes unnecessarily

* Update Vulkan Loader binaries (#763)

* New binaries for Vulkan Loader on Microsoft Windows 10.0.17763

* New binaries for Vulkan Loader on Microsoft Windows 10.0.17763

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

* No fail fast for SwiftShader

* No fail fast for ANGLE

* No fail fast for Vulkan Loader

* Remove workflow file in push paths on Vulkan Loader

* Remove workflow file in push paths on SwiftShader

* Remove workflow file in push paths on ANGLE

* New binaries for Vulkan Loader on Microsoft Windows 10.0.17763 (#764)

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

* Update SwiftShader binaries (#747)

* New binaries for SwiftShader on Windows

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
Co-authored-by: Dylan Perks <dmp9biz@gmail.com>

* Add packages for the new binaries

* Adjust glob, let's figure out where it's actually putting these files...

* Actually glob the right paths

* cont'd

* cont'd 2

* Update Vulkan Loader binaries (#765)

* New binaries for Vulkan Loader on Microsoft Windows 10.0.17763

* New binaries for Vulkan Loader on Linux 5.11.0-1022-azure #23~20.04.1-Ubuntu SMP Fri Nov 19 10:20:52 UTC 2021

* New binaries for Vulkan Loader on Microsoft Windows 10.0.17763

* New binaries for Vulkan Loader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Nov 10 22:23:07 PST 2021; root:xnu-7195.141.14~1/RELEASE_X86_64

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

* Update SwiftShader binaries (#766)

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

* New binaries for SwiftShader on Microsoft Windows 10.0.17763

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

* Fix CI Build

* Update Vulkan Loader binaries (#825)

* New binaries for Vulkan Loader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64

* New binaries for Vulkan Loader on Microsoft Windows 10.0.20348

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

* New binaries for ANGLE on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 (#827)

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

* Update SwiftShader binaries (#826)

* New binaries for SwiftShader on Microsoft Windows 10.0.20348

* New binaries for SwiftShader on Darwin 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64

Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>

Co-authored-by: Kai Jellinghaus <contact@kaij.tech>
Co-authored-by: silkdotnet <85832961+silkdotnet@users.noreply.github.com>
Co-authored-by: The Silk.NET Automaton <9011267+dotnet-bot@users.noreply.github.com>
@HurricanKai HurricanKai mentioned this pull request Feb 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HurricanKai HurricanKai HurricanKai approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Perksey @HurricanKai @silkdotnet