-
-
Notifications
You must be signed in to change notification settings - Fork 416
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into proposal/windowing-3.0
- Loading branch information
Showing
1,021 changed files
with
333,027 additions
and
10,601 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,9 @@ 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 | ||
| # Keep this in sync with generator.json! | ||
| 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 | ||
| git submodule update --init --depth 0 --recursive build/submodules/wgpu-native | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "The Silk.NET Automaton" | ||
| - name: Setup .NET Core | ||
|
|
@@ -44,11 +46,6 @@ jobs: | |
| uses: actions/setup-dotnet@v1 | ||
| with: | ||
| dotnet-version: 3.1.404 | ||
| - name: Setup NUKE | ||
| run: dotnet tool install Nuke.GlobalTool --global | ||
| - name: Install Workloads | ||
| # TODO: This is slow. Maybe we can make a docker container with this already done? | ||
| run: dotnet workload install android ios maccatalyst | ||
| - uses: GuillaumeFalourd/[email protected] | ||
| name: Setup Windows 11 SDK | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Origignal script from https://github.com/ziglang/zig/issues/4911 | ||
| # Modified to add SILKDOTNET_ paths in response to some issues with SwiftShader | ||
|
|
||
| args="" | ||
| for arg in "$@" | ||
| do | ||
| parg="$arg" | ||
|
|
||
| option=${arg%=*} | ||
| target=${arg#*=} | ||
| if [[ $option == "-march" || $option == "-mcpu" || $option == "-mtune" ]]; then | ||
| moveon=0 | ||
| for replace in $SILKDOTNET_ReplaceArchitectureZigCcFlags | ||
| do | ||
| replacetarget=${replace%=*} | ||
| replacement=${replace#*=} | ||
| # echo $replacetarget A $replacement B $target END | ||
| if [[ $replacetarget == $target ]]; then | ||
| if [[ "$replacement" == "" ]]; then | ||
| moveon=1 | ||
| else | ||
| target="$replacement" | ||
| fi | ||
| fi | ||
| done | ||
| if [[ $moveon == 1 || "$SILKDOTNET_RemoveAllPotentiallyProblematicZigCcFlags" == "1" ]]; then | ||
| continue | ||
| else | ||
| fixedTarget=${target//-/_} | ||
| parg="$option=$fixedTarget" | ||
| fi | ||
| fi | ||
| args="$args $parg" | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| @echo off | ||
| zig ar %* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/sh | ||
| zig ar "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| @echo off | ||
| : TODO add -march/-mtune handling if necessary | ||
| zig c++ %* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #!/bin/bash | ||
| . "$(dirname ${BASH_SOURCE[0]})/fudge.sh" $args | ||
| zig c++ $args |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| @echo off | ||
| : TODO add -march/-mtune handling if necessary | ||
| zig cc %* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #!/bin/bash | ||
| . "$(dirname ${BASH_SOURCE[0]})/fudge.sh" $args | ||
| zig cc $args |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| @echo off | ||
| zig ranlib %* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/sh | ||
| zig ranlib "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| @echo off | ||
| zig rc %* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/sh | ||
| zig rc "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| set(ZIG_TARGET "aarch64-linux-gnu.2.17") | ||
| include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| set(ZIG_TARGET "arm-linux-gnueabihf.2.17") | ||
| include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| set(ZIG_TARGET "x86_64-linux-gnu.2.17") | ||
| include(${CMAKE_CURRENT_LIST_DIR}/zig-toolchain.cmake) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| include_guard() | ||
|
|
||
| if(CMAKE_GENERATOR MATCHES "Visual Studio") | ||
| message(FATAL_ERROR "Visual Studio generator not supported, use: cmake -G Ninja") | ||
| endif() | ||
|
|
||
| if(NOT ZIG_TARGET MATCHES "^([a-zZ-Z0-9_]+)-([a-zZ-Z0-9_]+)-([a-zZ-Z0-9_.]+)$") | ||
| message(FATAL_ERROR "Expected -DZIG_TARGET=<arch>-<os>-<abi>") | ||
| endif() | ||
|
|
||
| set(ZIG_ARCH ${CMAKE_MATCH_1}) | ||
| set(ZIG_OS ${CMAKE_MATCH_2}) | ||
| set(ZIG_ABI ${CMAKE_MATCH_3}) | ||
|
|
||
| if(ZIG_OS STREQUAL "linux") | ||
| set(CMAKE_SYSTEM_NAME "Linux") | ||
| elseif(ZIG_OS STREQUAL "windows") | ||
| set(CMAKE_SYSTEM_NAME "Windows") | ||
| elseif(ZIG_OS STREQUAL "macos") | ||
| set(CMAKE_SYSTEM_NAME "Darwin") | ||
| else() | ||
| message(WARNING "Unknown OS: ${ZIG_OS}") | ||
| endif() | ||
|
|
||
| set(CMAKE_SYSTEM_VERSION 1) | ||
| set(CMAKE_SYSTEM_PROCESSOR ${ZIG_ARCH}) | ||
|
|
||
| if(WIN32) | ||
| set(SCRIPT_SUFFIX ".cmd") | ||
| else() | ||
| set(SCRIPT_SUFFIX ".sh") | ||
| endif() | ||
|
|
||
| # This is working (thanks to Simon for finding this trick) | ||
| set(CMAKE_AR "${CMAKE_CURRENT_LIST_DIR}/zig-ar${SCRIPT_SUFFIX}") | ||
| set(CMAKE_RANLIB "${CMAKE_CURRENT_LIST_DIR}/zig-ranlib${SCRIPT_SUFFIX}") | ||
| set(CMAKE_RC_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-rc${SCRIPT_SUFFIX}") | ||
| set(CMAKE_ASM_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-cc${SCRIPT_SUFFIX}" -target ${ZIG_TARGET}) | ||
| set(CMAKE_C_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-cc${SCRIPT_SUFFIX}" -target ${ZIG_TARGET}) | ||
| set(CMAKE_CXX_COMPILER "${CMAKE_CURRENT_LIST_DIR}/zig-c++${SCRIPT_SUFFIX}" -target ${ZIG_TARGET}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.