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

DirectStorage bindings #855

Merged
merged 9 commits into from
Mar 29, 2022
Merged

DirectStorage bindings #855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b0ce221
DirectStorage bindings
Perksey Mar 21, 2022
0775436
Add native binaries
Perksey Mar 21, 2022
defd36e
Update src/Core/Silk.NET.BuildTools/Cpp/Clang.cs
Perksey Mar 23, 2022
60a0968
Sort out duplicate generated constant friendly names + regen bindings
Perksey Mar 27, 2022
44d7970
Merge remote-tracking branch 'origin/feature/directstorage' into feat…
Perksey Mar 27, 2022
7137a0d
Update Vulkan Loader binaries (#866)
silkdotnet Mar 27, 2022
b76e7b0
Merge remote-tracking branch 'origin/main' into feature/directstorage
Perksey Mar 28, 2022
5aa6191
Fix validation errors
Perksey Mar 28, 2022
683b9e0
Add missing .NET Framework 4.6.1 file
Perksey Mar 28, 2022
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
30 changes: 30 additions & 0 deletions Silk.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.OpenGL.Legacy.Exte
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.Vulkan.Extensions.SEC", "src\Vulkan\Extensions\Silk.NET.Vulkan.Extensions.SEC\Silk.NET.Vulkan.Extensions.SEC.csproj", "{22FDAB62-4DE6-4896-BB6E-CC19BBBE5951}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.DirectStorage.Native", "src\Native\Silk.NET.DirectStorage.Native\Silk.NET.DirectStorage.Native.csproj", "{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.DirectStorage", "src\Microsoft\Silk.NET.DirectStorage\Silk.NET.DirectStorage.csproj", "{950FCED7-5720-4855-ACA3-B0EAB246F669}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -2959,6 +2963,30 @@ Global
{22FDAB62-4DE6-4896-BB6E-CC19BBBE5951}.Release|x64.Build.0 = Release|Any CPU
{22FDAB62-4DE6-4896-BB6E-CC19BBBE5951}.Release|x86.ActiveCfg = Release|Any CPU
{22FDAB62-4DE6-4896-BB6E-CC19BBBE5951}.Release|x86.Build.0 = Release|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Debug|Any CPU.Build.0 = Debug|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Debug|x64.ActiveCfg = Debug|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Debug|x64.Build.0 = Debug|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Debug|x86.ActiveCfg = Debug|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Debug|x86.Build.0 = Debug|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Release|Any CPU.ActiveCfg = Release|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Release|Any CPU.Build.0 = Release|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Release|x64.ActiveCfg = Release|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Release|x64.Build.0 = Release|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Release|x86.ActiveCfg = Release|Any CPU
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160}.Release|x86.Build.0 = Release|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Debug|Any CPU.Build.0 = Debug|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Debug|x64.ActiveCfg = Debug|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Debug|x64.Build.0 = Debug|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Debug|x86.ActiveCfg = Debug|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Debug|x86.Build.0 = Debug|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Release|Any CPU.ActiveCfg = Release|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Release|Any CPU.Build.0 = Release|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Release|x64.ActiveCfg = Release|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Release|x64.Build.0 = Release|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Release|x86.ActiveCfg = Release|Any CPU
{950FCED7-5720-4855-ACA3-B0EAB246F669}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -3196,6 +3224,8 @@ Global
{62513482-8713-4568-9086-247FE554B4E4} = {CF69D5C3-4ACE-4458-BA5A-0E9A3B294CDC}
{6E79F43A-D9EE-401B-8CAE-0635382F975F} = {CF69D5C3-4ACE-4458-BA5A-0E9A3B294CDC}
{22FDAB62-4DE6-4896-BB6E-CC19BBBE5951} = {49BC383A-D7E6-4013-93C7-371479B984CC}
{100C6D6A-F8B9-4E41-B82C-F665C3BD2160} = {72E7FA64-5B1E-477D-BD30-63B7F206B3C4}
{950FCED7-5720-4855-ACA3-B0EAB246F669} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}
Expand Down
Binary file modified build/cache/assimp.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/d3d11.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/d3d12.json.gz
View file
Open in desktop
Binary file not shown.
Binary file added build/cache/dstorage.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/dxgi.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/sdl.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/vulkan.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/vulkan_video.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/win32extras.json.gz
View file
Open in desktop
Binary file not shown.
Binary file modified build/cache/xaudio.json.gz
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions build/csharp_typemap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
"jobject": "nint",
"timespec": "Timespec",
"LARGE_INTEGER": "long",
"ULARGE_INTEGER": "ulong",
"xcb_glx_fbconfig_t": "nint",
"xcb_glx_drawable_t": "nint",
"xcb_glx_context_t": "nint",
Expand All @@ -146,6 +147,7 @@
"HMONITOR__**": "nint*",
"_LUID": "Luid",
"_LARGE_INTEGER": "long",
"_ULARGE_INTEGER": "ulong",
"IUnknown": "Silk.NET.Core.Native.IUnknown",
"tagRECT": "Silk.NET.Maths.Rectangle<int>",
"tagPOINT": "Silk.NET.Maths.Vector2D<int>",
Expand Down
2 changes: 1 addition & 1 deletion build/submodules/Vulkan-Headers
Open in desktop
Submodule Vulkan-Headers updated 21 files
+32 −0 .github/ISSUE_TEMPLATE/bug_report.md
+3 −0 BUILD.gn
+49 −52 include/vk_video/vulkan_video_codec_h264std.h
+11 −6 include/vk_video/vulkan_video_codec_h264std_decode.h
+38 −11 include/vk_video/vulkan_video_codec_h264std_encode.h
+118 −119 include/vk_video/vulkan_video_codec_h265std.h
+11 −5 include/vk_video/vulkan_video_codec_h265std_decode.h
+38 −27 include/vk_video/vulkan_video_codec_h265std_encode.h
+95 −80 include/vulkan/vulkan.hpp
+1 −1 include/vulkan/vulkan_android.h
+17 −55 include/vulkan/vulkan_beta.h
+42 −44 include/vulkan/vulkan_core.h
+56 −143 include/vulkan/vulkan_enums.hpp
+839 −414 include/vulkan/vulkan_funcs.hpp
+420 −695 include/vulkan/vulkan_handles.hpp
+5 −69 include/vulkan/vulkan_hash.hpp
+266 −230 include/vulkan/vulkan_raii.hpp
+3,098 −2,080 include/vulkan/vulkan_structs.hpp
+1 −1 registry/genvk.py
+330 −128 registry/validusage.json
+81 −100 registry/vk.xml
2 changes: 1 addition & 1 deletion build/submodules/Vulkan-Loader
Open in desktop
Submodule Vulkan-Loader updated 102 files
93 changes: 90 additions & 3 deletions generator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@
"args": [
"--language=c++",
"--std=c++17",
"-m32",
"-m64",
"-Wno-expansion-to-defined",
"-Wno-ignored-attributes",
"-Wno-ignored-pragma-intrinsic",
Expand All @@ -1015,7 +1015,9 @@
"$windowsSdkDir/Include/$windowsSdkVersion/shared/evntrace.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/minwinbase.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/timezoneapi.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/winnt.h"
"$windowsSdkDir/Include/$windowsSdkVersion/um/winnt.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/handleapi.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/fileapi.h"
],
"classes": {
"win32extras.h": "[Core]Windows"
Expand Down Expand Up @@ -1047,7 +1049,8 @@
"_FILETIME": "Filetime",
"_TIME_ZONE_INFORMATION": "TimeZoneInformation",
"_WNODE_HEADER": "WnodeHeader",
"_EXCEPTION_RECORD": "ExceptionRecord"
"_EXCEPTION_RECORD": "ExceptionRecord",
"_FILE_SEGMENT_ELEMENT": "FileSegmentElement"
},
{
"$include.dxTypemap": "build/dx_typemap.json",
Expand Down Expand Up @@ -1618,6 +1621,90 @@
}
]
},
{
"profileName": "DirectStorage",
"sources": [
"src/Microsoft/Silk.NET.DirectStorage/silk.net.directstorage.h"
],
"mode": "Clang",
"cacheDir": "build/cache",
"cacheKey": "dstorage",
"controlDescriptors": [
"convert-windows-only"
],
"prefix": "DStorage",
"clang": {
"args": [
"--language=c++",
"--std=c++17",
"-m32",
"-Wno-expansion-to-defined",
"-Wno-ignored-attributes",
"-Wno-ignored-pragma-intrinsic",
"-Wno-nonportable-include-path",
"-Wno-pragma-pack",
"-I$windowsSdkIncludes",
"-I$nuget/Microsoft.Direct3D.DirectStorage/*/Include/DirectStorage"
],
"traverse": [
"$nuget/Microsoft.Direct3D.DirectStorage/*/Include/DirectStorage/*.h"
],
"classes": {
"silk.net.directstorage.h": "[Core]DStorage"
}
},
"exclude": [
"ID3D12Resource",
"ID3D12Fence"
],
"rename": {
},
"bakery": {
"profileNames": [
"silk.net.directstorage"
]
},
"output": {
"mode": "Default",
"path": "src/Microsoft",
"licenseFile": "build/LICENSE_HEADER.txt",
"props": "build/props/bindings.props"
},
"namespace": "Silk.NET.DirectStorage",
"extensionsNamespace": "Silk.NET.DirectStorage.Extensions",
"nameContainer": {
"linux-x64": "libdstorage.so",
"win-x64": "dstorage.dll",
"win-x86": "dstorage.dll",
"osx-x64": "libdstorage.dylib",
"android": "libdstorage.so",
"iOS": "__Internal",
"className": "DStorageLibraryNameContainer"
},
"typeMaps": [
{
"ID3D12Resource": "Silk.NET.Direct3D12.ID3D12Resource",
"ID3D12Fence": "Silk.NET.Direct3D12.ID3D12Fence",
"ID3D12Device": "Silk.NET.Direct3D12.ID3D12Device",
"D3D12_TILED_RESOURCE_COORDINATE": "Silk.NET.Direct3D12.TiledResourceCoordinate",
"D3D12_TILE_REGION_SIZE": "Silk.NET.Direct3D12.TileRegionSize",
"_BY_HANDLE_FILE_INFORMATION": "Silk.NET.Core.Win32Extras.ByHandleFileInformation",
"D3D12_BOX": "Silk.NET.Direct3D12.Box"
},
{
"$include.dxTypemap": "build/dx_typemap.json",
"$include.commonTypeMap": "build/csharp_typemap.json"
}
],
"copy": {
"$nuget/Microsoft.Direct3D.DirectStorage/*/bin/ARM/*.dll": "src/Native/Silk.NET.DirectStorage.Native/runtimes/win-arm/native",
"$nuget/Microsoft.Direct3D.DirectStorage/*/bin/ARM64/*.dll": "src/Native/Silk.NET.DirectStorage.Native/runtimes/win-arm64/native",
"$nuget/Microsoft.Direct3D.DirectStorage/*/bin/x64/*.dll": "src/Native/Silk.NET.DirectStorage.Native/runtimes/win-x64/native",
"$nuget/Microsoft.Direct3D.DirectStorage/*/bin/x86/*.dll": "src/Native/Silk.NET.DirectStorage.Native/runtimes/win-x86/native",
"$nuget/Microsoft.Direct3D.DirectStorage/*/LICENSE.txt": "src/Native/Silk.NET.DirectStorage.Native/LICENSE.txt",
"$nuget/Microsoft.Direct3D.DirectStorage/*/$version": "src/Native/Silk.NET.DirectStorage.Native/version.txt"
}
},
{
"profileName": "XAudio",
"_commented_out_sources": [
Expand Down
Loading