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.

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

Add shaderc bindings #1490

Merged
merged 29 commits into from
Jun 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
74d9346
Add shaderc bindings
Beyley Jun 6, 2023
ac5e6ac
Native: Separate out all native builds into separate source files
Beyley Jun 19, 2023
b5d7b53
Native: Fix vkd3d build, and use job count
Beyley Jun 19, 2023
b037cc6
Native: Only clone ANGLE submodule in ANGLE build
Beyley Jun 20, 2023
6fa96e5
Native: Update ANGLE commit
Beyley Jun 20, 2023
bb562ab
New binaries for ANGLE on Linux 5.15.0-1039-azure #46-Ubuntu SMP Mon …
silkdotnet Jun 20, 2023
34a1e61
New binaries for Vkd3d on Linux 5.15.0-1039-azure #46-Ubuntu SMP Mon …
silkdotnet Jun 20, 2023
1c7de0f
New binaries for DXVK on Linux 5.15.0-1039-azure #46-Ubuntu SMP Mon M…
silkdotnet Jun 20, 2023
ff61d04
Update Assimp binaries (#1513)
silkdotnet Jun 20, 2023
ce9ed2f
New binaries for SPIRV-Cross on Linux 5.15.0-1039-azure #46-Ubuntu SM…
silkdotnet Jun 20, 2023
2daacbc
Update GLFW binaries (#1511)
silkdotnet Jun 20, 2023
5481897
Update Vulkan Loader binaries (#1510)
silkdotnet Jun 20, 2023
609a69a
Update SDL2 binaries (#1509)
silkdotnet Jun 20, 2023
952eb53
Update Wgpu binaries (#1508)
silkdotnet Jun 20, 2023
a939421
New binaries for SPIRV-Reflect on Linux 5.15.0-1039-azure #46-Ubuntu …
silkdotnet Jun 20, 2023
e094b6a
Native: Disable ANGLE build/CI job
Beyley Jun 20, 2023
06f8320
Native: Fix props files for SPIRV-Cross and SPIRV-Reflect
Beyley Jun 20, 2023
3ac08e6
Native: Add Shaderc native project and CI build
Beyley Jun 20, 2023
b3c9949
Add Shaderc project to soluion
Beyley Jun 20, 2023
52bee81
Native: Strip linux shaderc binaries
Beyley Jun 20, 2023
d522241
Native: Properly complete the strips, dont cause file locking
Beyley Jun 21, 2023
e75933a
Native: Use aarch64 binutils strip to strip aarch64 lib
Beyley Jun 21, 2023
d2a0381
Native: Use glob in shaderc
Beyley Jun 21, 2023
a5805c2
Native: Strip in the zig build script, not after-the-fact
Beyley Jun 22, 2023
5c4fff1
New binaries for Shaderc on Linux 5.15.0-1039-azure #46-Ubuntu SMP Mo…
silkdotnet Jun 22, 2023
30dfbb2
Merge branch 'main' into feature/shaderc
Beyley Jun 22, 2023
4a45cb0
Native: Make it globby in here
Beyley Jun 23, 2023
a699318
Native: Globbiest glob (ARM)
Beyley Jun 23, 2023
e2aa8f2
Update SDL2 binaries (#1528)
silkdotnet Jun 23, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@
[submodule "build/submodules/SPIRV-Cross"]
path = build/submodules/SPIRV-Cross
url = https://github.com/KhronosGroup/SPIRV-Cross
[submodule "build/submodules/shaderc"]
path = build/submodules/shaderc
url = https://github.com/google/shaderc
15 changes: 15 additions & 0 deletions Silk.NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.SPIRV.Cross.Native
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tutorial 1.3 - Textures", "examples\CSharp\OpenGL Tutorials\Tutorial 1.3 - Textures\Tutorial 1.3 - Textures.csproj", "{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Shaderc", "src\SPIRV\Silk.NET.Shaderc\Silk.NET.Shaderc.csproj", "{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -3587,6 +3589,18 @@ Global
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|x64.Build.0 = Release|Any CPU
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|x86.ActiveCfg = Release|Any CPU
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0}.Release|x86.Build.0 = Release|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Debug|x64.ActiveCfg = Debug|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Debug|x64.Build.0 = Debug|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Debug|x86.ActiveCfg = Debug|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Debug|x86.Build.0 = Debug|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Release|Any CPU.Build.0 = Release|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Release|x64.ActiveCfg = Release|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Release|x64.Build.0 = Release|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Release|x86.ActiveCfg = Release|Any CPU
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -3874,6 +3888,7 @@ Global
{AFF43F5B-46EC-4560-8E92-6D241C0D9F43} = {15FC3D1A-25D7-446B-87A7-B45BA3C2225F}
{EEFD27E0-F0F3-45EF-A2CB-D9C8135BC893} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
{1E7C6166-58B2-46B3-A9BA-18099BD83AF0} = {20A4A2D1-D699-4D71-AA97-950154638576}
{E77BE8DB-3C74-42EB-9B65-67EAAA9AD7DB} = {15FC3D1A-25D7-446B-87A7-B45BA3C2225F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}
Expand Down
Binary file added build/cache/shaderc.json.gz
Binary file not shown.
1 change: 1 addition & 0 deletions build/submodules/shaderc
Submodule shaderc added at 4dc596
73 changes: 73 additions & 0 deletions generator.json
Original file line number Diff line number Diff line change
Expand Up @@ -2656,6 +2656,79 @@
}
]
},
{
"profileName": "shaderc",
"sources": [
"build/submodules/shaderc/libshaderc/include/shaderc/shaderc.h"
],
"mode": "Clang",
"cacheDir": "build/cache",
"cacheKey": "shaderc",
"controlDescriptors": [
"convert-windows-only",
"no-pre-2.18-obsolete-enums",
"typemap-native",
"no-extra-dir"
],
"converter": {},
"prefix": "shaderc_",
"clang": {
"args": [
"--language=c++",
"--std=c++17",
"-m64",
"-Wno-expansion-to-defined",
"-Wno-ignored-attributes",
"-Wno-ignored-pragma-intrinsic",
"-Wno-nonportable-include-path",
"-Wno-pragma-pack",
"-I$windowsSdkIncludes",
"-Ibuild/submodules/shaderc/libshaderc/include"
],
"traverse": [
"build/submodules/shaderc/libshaderc/include/shaderc/shaderc.h",
"build/submodules/shaderc/libshaderc/include/shaderc/env.h",
"build/submodules/shaderc/libshaderc/include/shaderc/status.h"
],
"classes": {
"shaderc.h": "[Core]Shaderc",
"env.h": "[Core]Shaderc"
}
},
"exclude": [
],
"rename": {
},
"bakery": {
"profileNames": [
"shaderc"
]
},
"output": {
"mode": "Default",
"path": "src/SPIRV/Silk.NET.Shaderc",
"licenseFile": "build/LICENSE_HEADER.txt",
"props": "build/props/bindings.props"
},
"namespace": "Silk.NET.Shaderc",
"extensionsNamespace": "Silk.NET.Shaderc.Extensions",
"nameContainer": {
"linux-x64": "libshaderc_shared.so",
"win-x64": "shaderc_shared.dll",
"win-x86": "shaderc_shared.dll",
"osx-x64": "libshaderc_shared.dylib",
"android": "libshaderc_shared.so",
"className": "ShadercLibraryNameContainer"
},
"typeMaps": [
{
},
{
"$include.commonTypeMap": "build/csharp_typemap.json",
"$include.dxTypeMap": "build/dx_typemap.json"
}
]
},
{
"profileName": "WGL",
"sources": [
Expand Down
35 changes: 35 additions & 0 deletions src/SPIRV/Silk.NET.Shaderc/Enums/CompilationStatus.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


using System;
using Silk.NET.Core.Attributes;

#pragma warning disable 1591

namespace Silk.NET.Shaderc
{
[NativeName("AnonymousName", "__AnonymousEnum_status_L23_C9")]
[NativeName("Name", "shaderc_compilation_status")]
public enum CompilationStatus : int
{
[NativeName("Name", "shaderc_compilation_status_success")]
Success = 0x0,
[NativeName("Name", "shaderc_compilation_status_invalid_stage")]
InvalidStage = 0x1,
[NativeName("Name", "shaderc_compilation_status_compilation_error")]
CompilationError = 0x2,
[NativeName("Name", "shaderc_compilation_status_internal_error")]
InternalError = 0x3,
[NativeName("Name", "shaderc_compilation_status_null_result_object")]
NullResultObject = 0x4,
[NativeName("Name", "shaderc_compilation_status_invalid_assembly")]
InvalidAssembly = 0x5,
[NativeName("Name", "shaderc_compilation_status_validation_error")]
ValidationError = 0x6,
[NativeName("Name", "shaderc_compilation_status_transformation_error")]
TransformationError = 0x7,
[NativeName("Name", "shaderc_compilation_status_configuration_error")]
ConfigurationError = 0x8,
}
}
29 changes: 29 additions & 0 deletions src/SPIRV/Silk.NET.Shaderc/Enums/EnvVersion.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


using System;
using Silk.NET.Core.Attributes;

#pragma warning disable 1591

namespace Silk.NET.Shaderc
{
[NativeName("AnonymousName", "__AnonymousEnum_env_L37_C9")]
[NativeName("Name", "shaderc_env_version")]
public enum EnvVersion : int
{
[NativeName("Name", "shaderc_env_version_vulkan_1_0")]
Vulkan10 = 0x400000,
[NativeName("Name", "shaderc_env_version_vulkan_1_1")]
Vulkan11 = 0x401000,
[NativeName("Name", "shaderc_env_version_vulkan_1_2")]
Vulkan12 = 0x402000,
[NativeName("Name", "shaderc_env_version_vulkan_1_3")]
Vulkan13 = 0x403000,
[NativeName("Name", "shaderc_env_version_opengl_4_5")]
Opengl45 = 0x1C2,
[NativeName("Name", "shaderc_env_version_webgpu")]
Webgpu = 0x1C3,
}
}
20 changes: 20 additions & 0 deletions src/SPIRV/Silk.NET.Shaderc/Enums/IncludeType.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.


using System;
using Silk.NET.Core.Attributes;

#pragma warning disable 1591

namespace Silk.NET.Shaderc
{
[NativeName("Name", "shaderc_include_type")]
public enum IncludeType : int
{
[NativeName("Name", "shaderc_include_type_relative")]
Relative = 0x0,
[NativeName("Name", "shaderc_include_type_standard")]
Standard = 0x1,
}
}
Loading