Skip to content

Commit

Permalink
Merge branch 'main' into hotfix/aot-tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Perksey
Perksey authored Oct 20, 2023
2 parents 5e33e78 + eeedf77 commit 794a5af
Show file tree
Hide file tree
Showing 375 changed files with 14,230 additions and 2,134 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/assimp.yml
View file
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
View file
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
View file
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
View file
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
View file
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
63 changes: 63 additions & 0 deletions Silk.NET.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,16 @@ 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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -3629,6 +3639,54 @@ 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
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x64.Build.0 = Debug|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x86.ActiveCfg = Debug|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Debug|x86.Build.0 = Debug|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|Any CPU.Build.0 = Release|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x64.ActiveCfg = Release|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x64.Build.0 = Release|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x86.ActiveCfg = Release|Any CPU
{9CB90BB8-946F-4962-9365-A97BF5C6550A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -3919,6 +3977,11 @@ 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
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}
Expand Down
Binary file modified build/cache/assimp.json.gz
View file
Binary file not shown.
Binary file modified build/cache/cl.json.gz
View file
Binary file not shown.
Binary file modified build/cache/gles2.json.gz
View file
Binary file not shown.
Binary file modified build/cache/openxr.json.gz
View file
Binary file not shown.
Binary file modified build/cache/sdl.json.gz
View file
Binary file not shown.
Binary file modified build/cache/spirv-cross.json.gz
View file
Binary file not shown.
Binary file modified build/cache/spirv-reflect.json.gz
View file
Binary file not shown.
Binary file modified build/cache/spirv.json.gz
View file
Binary file not shown.
Binary file modified build/cache/vulkan.json.gz
View file
Binary file not shown.
Binary file modified build/cache/vulkan_video.json.gz
View file
Binary file not shown.
Binary file modified build/cache/webgpu.json.gz
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion build/nuke/Build.NuGet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ async Task<IEnumerable<Output>> PushPackages()
);
}

srcSettings = srcSettings.SetUsername(NugetUsername).SetPassword(NugetPassword);
srcSettings = srcSettings.SetUsername(NugetUsername).SetPassword(NugetPassword).SetStorePasswordInClearText(true);
}

outputs = outputs.Concat(DotNetNuGetAddSource(srcSettings));
Expand Down
29 changes: 16 additions & 13 deletions build/nuke/Native/SPIRVCross.cs
View file
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
View file
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 794a5af

Please sign in to comment.