Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 33 additions & 0 deletions Silk.NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.NUKE", "build\nuke\Silk.NET.NUKE.csproj", "{B9A8D738-FE7D-4860-A446-4A03E3DDEB74}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft", "Microsoft", "{F2CF5D32-4B41-425E-B229-8FFC48F88063}"
ProjectSection(SolutionItems) = preProject
src\Microsoft\dxva.h = src\Microsoft\dxva.h
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Silk.NET.Direct3D11", "src\Microsoft\Silk.NET.Direct3D11\Silk.NET.Direct3D11.csproj", "{F3B7A9D6-5B15-45E8-925B-20B5BBD33428}"
EndProject
Expand Down Expand Up @@ -458,6 +461,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Tests", "sr
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenGL Demos", "OpenGL Demos", "{2F547104-C74A-4A84-8980-D1B973CC40C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.DXVA", "src\Microsoft\Silk.NET.DXVA\Silk.NET.DXVA.csproj", "{28D863B1-B60C-4C08-8661-EB820A5B78D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Core.Win32Extras", "src\Core\Silk.NET.Core.Win32Extras\Silk.NET.Core.Win32Extras.csproj", "{3E30D674-9282-4297-AD1F-9B233A166308}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -2735,6 +2742,30 @@ Global
{514DED00-4DA3-46D1-B2E8-10CE826CD52D}.Release|x64.Build.0 = Release|Any CPU
{514DED00-4DA3-46D1-B2E8-10CE826CD52D}.Release|x86.ActiveCfg = Release|Any CPU
{514DED00-4DA3-46D1-B2E8-10CE826CD52D}.Release|x86.Build.0 = Release|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Debug|x64.ActiveCfg = Debug|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Debug|x64.Build.0 = Debug|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Debug|x86.ActiveCfg = Debug|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Debug|x86.Build.0 = Debug|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Release|Any CPU.Build.0 = Release|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Release|x64.ActiveCfg = Release|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Release|x64.Build.0 = Release|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Release|x86.ActiveCfg = Release|Any CPU
{28D863B1-B60C-4C08-8661-EB820A5B78D2}.Release|x86.Build.0 = Release|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Debug|x64.ActiveCfg = Debug|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Debug|x64.Build.0 = Debug|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Debug|x86.ActiveCfg = Debug|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Debug|x86.Build.0 = Debug|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Release|Any CPU.Build.0 = Release|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Release|x64.ActiveCfg = Release|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Release|x64.Build.0 = Release|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Release|x86.ActiveCfg = Release|Any CPU
{3E30D674-9282-4297-AD1F-9B233A166308}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2957,6 +2988,8 @@ Global
{514DED00-4DA3-46D1-B2E8-10CE826CD52D} = {081E7761-B200-4DBF-8950-941464DECACE}
{2F547104-C74A-4A84-8980-D1B973CC40C1} = {6842A2C6-5C7B-42DD-9825-0EDE91BFEBF7}
{58E7EE89-B67C-482D-9605-04B3BCC5CFBB} = {2F547104-C74A-4A84-8980-D1B973CC40C1}
{28D863B1-B60C-4C08-8661-EB820A5B78D2} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
{3E30D674-9282-4297-AD1F-9B233A166308} = {0651C5EF-50AA-4598-8D9C-8F210ADD8490}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}
Expand Down
Binary file modified build/cache/assimp.json.gz
Binary file not shown.
Binary file modified build/cache/cl.json.gz
Binary file not shown.
Binary file modified build/cache/core.json.gz
Binary file not shown.
Binary file modified build/cache/d3d9.json.gz
Binary file not shown.
Binary file modified build/cache/dxc.json.gz
Binary file not shown.
Binary file added build/cache/dxva.json.gz
Binary file not shown.
Binary file modified build/cache/sdl.json.gz
Binary file not shown.
Binary file modified build/cache/vulkan.json.gz
Binary file not shown.
Binary file added build/cache/win32extras.json.gz
Binary file not shown.
31 changes: 14 additions & 17 deletions build/props/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,26 @@
<LangVersion>preview</LangVersion>
<Authors>.NET Foundation and Contributors</Authors>
<PackageReleaseNotes>
Silk.NET September 2021 Update
Silk.NET October 2021 Update

- Add TryGetExtension methods to AL &amp; ALContext
- Add support for .NET 6 Android
- Update to Vulkan 1.2.190
- Update to OpenXR 1.0.19
- Update to latest OpenGL specifications
- Add bindings for DirectX Video Acceleration (DXVA)
- Add bindings for D3D9Ex
- Add bindings for extra core Win32 APIs (as required by DXVA)
- Add a .NET 6 code path for GlobalMemory using NativeMemory
- Add more TFMs in addition to .NET Standard 2.0 for DirectX bindings
- Add enhanced anonymous struct support with ref-returning properties on .NET Standard 2.1 and up
- Update to Vulkan 1.2.194
- Update to latest OpenCL specifications
- Fix calling CreateInput on an uninitialized IView resulting in a AccessViolationException
- Fix calling Close on an uninitialized IView resulting in an AccessViolationException
- Fix Silk.NET (and by extension SDL) taking full control of orientation on Android
- Fix DoRender being called if Window.Close was called during DoUpdate
- Fix Scalar.Abs for double values
- Fix "Pfn" function pointer structures being marshalled with the incorrect calling convention
- Fix Scalar.IsNaN and Scalar.IsInfinity returning true for non floating point types
- Fix Box2D.Center returning bogus values
- Fix incorrect documentation in Thumbstick.Direction
- Fix incorrect documentation in WindowOptions
- Fix MarshalDirectiveException when a struct containing a char passes across a native boundary
- Fix Vulkan out parameters not having their structure type set before passing across the native boundary
- Fix native libraries not being found in some cases for self-contained executables
</PackageReleaseNotes>
<PackageTags Condition="'$(PackageTags)' == ''">OpenCL;OpenGL;OpenAL;OpenGLES;GLES;Vulkan;Assimp;DirectX;GLFW;SDL;Windowing;Input;Gamepad;Joystick;Keyboard;Mouse;SilkTouch;Source;Generator;C#;F#;.NET;DotNet;Mono;Vector;Math;Maths;Numerics;Game;Graphics;Compute;Audio;Sound;Engine;Silk;Silk.NET;Slim.NET;ElgarTK;GPU;Sharp;Science;Scientific;Visualization;Visual;Audiovisual;Windows;macOS;Linux;Android;Bindings;OSX;Wrapper;Native</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageOutputPath>$(MSBuildThisFileDirectory)/../output_packages</PackageOutputPath>
<RepositoryUrl>https://github.com/dotnet/Silk.NET</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<VersionPrefix>2.8.0</VersionPrefix>
<VersionPrefix>2.9.0</VersionPrefix>
<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
<Description Condition="'$(Description)' == ''">
Silk.NET is a high-speed, advanced library, providing bindings to popular low-level APIs such as OpenGL, OpenCL, OpenAL, OpenXR, GLFW, SDL, Vulkan, Assimp, and DirectX.
Expand All @@ -42,6 +37,8 @@
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
<Deterministic>true</Deterministic>
</PropertyGroup>
<ItemGroup Condition="'$(SilkEnableSourceLink)' != '' And '$(SilkSourceLinkExempt)' == ''">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
Expand Down
176 changes: 172 additions & 4 deletions generator.json
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@
{
"profileName": "Core",
"sources": [
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/D3DCommon.h"
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/d3dcommon.h"
],
"mode": "Clang",
"cacheDir": "build/cache",
Expand Down Expand Up @@ -824,7 +824,7 @@
"traverse": [
],
"classes": {
"D3DCommon.h": "[Core]D3DCommon"
"d3dcommon.h": "[Core]D3DCommon"
}
},
"exclude": [
Expand All @@ -835,7 +835,7 @@
},
"bakery": {
"profileNames": [
"D3DCommon"
"d3dcommon"
]
},
"output": {
Expand All @@ -845,14 +845,88 @@
"props": "build/props/bindings.props"
},
"namespace": "Silk.NET.Core.Native",
"extensionsNamespace": "Silk.NET.Core.Native.Extensions",
"extensionsNamespace": "Silk.NET.Core.Native",
"typeMaps": [
{
"$include.dxTypemap": "build/dx_typemap.json",
"$include.commonTypeMap": "build/csharp_typemap.json"
}
]
},
{
"profileName": "Win32Extras",
"sources": [
"src/Core/Silk.NET.Core/win32extras.h"
],
"mode": "Clang",
"cacheDir": "build/cache",
"cacheKey": "win32extras",
"controlDescriptors": [
"convert-windows-only",
"no-name-container"
],
"prefix": "",
"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",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/shared",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/ucrt",
"-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.28.29333/include",
"-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.28.29333/include",
"-Ibuild/include"
],
"traverse": [
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/shared/evntrace.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/minwinbase.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/timezoneapi.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/winnt.h"
],
"classes": {
"win32extras.h": "[Core]Windows"
}
},
"exclude": [
"_SECURITY_ATTRIBUTES"
],
"rename": {
"__AnonymousEnum_evntrace_L529_C9": "EtwCompressionResumptionMode"
},
"bakery": {
"profileNames": [
"win32extras"
]
},
"output": {
"mode": "Default",
"path": "src/Core",
"licenseFile": "build/LICENSE_HEADER.txt",
"props": "build/props/bindings.props"
},
"namespace": "Silk.NET.Core.Win32Extras",
"extensionsNamespace": "Silk.NET.Core.Win32Extras",
"typeMaps": [
{
"WMIDPREQUESTCODE": "Wmidprequestcode",
"_SECURITY_ATTRIBUTES": "Silk.NET.Core.Native.SecurityAttributes",
"_FILETIME": "Filetime",
"_TIME_ZONE_INFORMATION": "TimeZoneInformation",
"_WNODE_HEADER": "WnodeHeader",
"_EXCEPTION_RECORD": "ExceptionRecord"
},
{
"$include.dxTypemap": "build/dx_typemap.json",
"$include.commonTypeMap": "build/csharp_typemap.json"
}
]
},
{
"profileName": "DXGI",
"sources": [
Expand Down Expand Up @@ -945,6 +1019,100 @@
}
]
},
{
"profileName": "DXVA",
"sources": [
"src/Microsoft/dxva.h"
],
"mode": "Clang",
"cacheDir": "build/cache",
"cacheKey": "dxva",
"controlDescriptors": [
"convert-windows-only"
],
"converter": {},
"prefix": "DXVA",
"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",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/shared",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um",
"-IC:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/ucrt",
"-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Tools/MSVC/14.28.29333/include",
"-IC:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.28.29333/include",
"-Ibuild/include"
],
"traverse": [
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/dxva.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/dxva2api.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/dxva2swdev.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/dxva2trace.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/dxva9typ.h",
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um/dxvahd.h"
],
"classes": {
"dxva.h": "[Core]DXVA",
"dxva2api.h": "[Core]DXVA",
"dxva2swdev.h": "[Core]DXVA",
"dxva2trace.h": "[Core]DXVA",
"dxva9typ.h": "[Core]DXVA",
"dxvahd.h": "[Core]DXVA"
}
},
"exclude": [
],
"rename": {
"_DXVA2_VIDEOSAMPLE": "DXVA2VideoSample"
},
"bakery": {
"profileNames": [
"dxva",
"dxva2api",
"dxva2swdev",
"dxva2trace",
"dxva2typ",
"dxvahd"
]
},
"output": {
"mode": "Default",
"path": "src/Microsoft",
"licenseFile": "build/LICENSE_HEADER.txt",
"props": "build/props/bindings.props"
},
"namespace": "Silk.NET.DXVA",
"extensionsNamespace": "Silk.NET.DXVA.Extensions",
"nameContainer": {
"linux-x64": "libdxva2.so",
"win-x64": "dxva2.dll",
"win-x86": "dxva2.dll",
"osx-x64": "libdxva2.dylib",
"android": "libdxva2.so",
"iOS": "__Internal",
"className": "DXVA2LibraryNameContainer"
},
"typeMaps": [
{
"IDirect3DDevice9Ex": "Silk.NET.Direct3D9.IDirect3DDevice9Ex",
"IDirect3DDevice9": "Silk.NET.Direct3D9.IDirect3DDevice9",
"IDirect3DSurface9": "Silk.NET.Direct3D9.IDirect3DSurface9",
"_D3DFORMAT": "Silk.NET.Direct3D9.Format",
"_D3DPOOL": "Silk.NET.Direct3D9.Pool",
"_EVENT_TRACE_HEADER": "Silk.NET.Core.Win32Extras.EventTraceHeader"
},
{
"$include.dxTypemap": "build/dx_typemap.json",
"$include.commonTypeMap": "build/csharp_typemap.json"
}
]
},
{
"profileName": "D3D11",
"sources": [
Expand Down
23 changes: 23 additions & 0 deletions src/Assimp/Silk.NET.Assimp/Structs/Interpolator.gen.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// 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 System.Runtime.InteropServices;
using System.Runtime.CompilerServices;
using System.Text;
using Silk.NET.Core;
using Silk.NET.Core.Native;
using Silk.NET.Core.Attributes;
using Silk.NET.Core.Contexts;
using Silk.NET.Core.Loader;

#pragma warning disable 1591

namespace Silk.NET.Assimp
{
[NativeName("Name", "Interpolator")]
public unsafe partial struct Interpolator
{
}
}
Loading