Skip to content

Commit c6f0690

Browse files
curinPerksey
curin
and
Perksey
authored
Adding DirectComposition to Silk (#986)
* start of adding DirectComposition to Silk * Initial DComp Generation The bindings as generated by buildtools * Add Dcomptypes.h to DirectComposition bindings * Fix build tools added a missing conditional which was removed during the recent CI changes * Added Missing DirectComposition Redirects regenerated bindings * Updating Control Descriptors for DirectComposition * Pull main * Fix review comments Co-authored-by: Andrew <Davis> Co-authored-by: Dylan Perks <[email protected]> Co-authored-by: Dylan Perks <[email protected]>
1 parent 922d847 commit c6f0690

File tree

119 files changed

+29092
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+29092
-6
lines changed

‎Silk.NET.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
558558
EndProject
559559
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Direct3D11.Extensions.D3D11On12", "src\Microsoft\Extensions\Silk.NET.Direct3D11.Extensions.D3D11On12\Silk.NET.Direct3D11.Extensions.D3D11On12.csproj", "{82626916-C5F3-46E7-B0EC-1D38191450C7}"
560560
EndProject
561+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.DirectComposition", "src\Microsoft\Silk.NET.DirectComposition\Silk.NET.DirectComposition.csproj", "{8773396C-5EDF-498C-97D7-1D2728CB969B}"
562+
EndProject
561563
Global
562564
GlobalSection(SolutionConfigurationPlatforms) = preSolution
563565
Debug|Any CPU = Debug|Any CPU
@@ -3375,6 +3377,18 @@ Global
33753377
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|x64.Build.0 = Release|Any CPU
33763378
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|x86.ActiveCfg = Release|Any CPU
33773379
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|x86.Build.0 = Release|Any CPU
3380+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3381+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Debug|Any CPU.Build.0 = Debug|Any CPU
3382+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Debug|x64.ActiveCfg = Debug|Any CPU
3383+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Debug|x64.Build.0 = Debug|Any CPU
3384+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Debug|x86.ActiveCfg = Debug|Any CPU
3385+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Debug|x86.Build.0 = Debug|Any CPU
3386+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Release|Any CPU.ActiveCfg = Release|Any CPU
3387+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Release|Any CPU.Build.0 = Release|Any CPU
3388+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Release|x64.ActiveCfg = Release|Any CPU
3389+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Release|x64.Build.0 = Release|Any CPU
3390+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Release|x86.ActiveCfg = Release|Any CPU
3391+
{8773396C-5EDF-498C-97D7-1D2728CB969B}.Release|x86.Build.0 = Release|Any CPU
33783392
EndGlobalSection
33793393
GlobalSection(SolutionProperties) = preSolution
33803394
HideSolutionNode = FALSE
@@ -3646,6 +3660,7 @@ Global
36463660
{FB16A3D6-8401-4421-AD6A-DFC85FD2DCC7} = {49BC383A-D7E6-4013-93C7-371479B984CC}
36473661
{58FECE86-7530-4E6F-BA61-512BE44DEA83} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
36483662
{82626916-C5F3-46E7-B0EC-1D38191450C7} = {58FECE86-7530-4E6F-BA61-512BE44DEA83}
3663+
{8773396C-5EDF-498C-97D7-1D2728CB969B} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
36493664
EndGlobalSection
36503665
GlobalSection(ExtensibilityGlobals) = postSolution
36513666
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}

‎build/cache/dcomp.json.gz

55.7 KB
Binary file not shown.

‎build/include/silk.net.directcomposition.dcomp.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
typedef unsigned int UINT;
2+
typedef int BOOL;
3+
typedef unsigned char BYTE;
4+
5+
#include <dxgitype.h>
6+
#include <dxgi1_5.h>
7+
8+
#include <dcomptypes.h>
9+
#include <dcompanimation.h>
10+
#include <dcomp.h>

‎build/submodules/ANGLE

Submodule ANGLE updated from 2413621 to 7eb7596

‎build/submodules/Assimp

Submodule Assimp updated 424 files

‎build/submodules/GLFW

Submodule GLFW updated 56 files

‎build/submodules/SDL

Submodule SDL updated 1491 files

‎build/submodules/Vulkan-Headers

Submodule Vulkan-Headers updated 31 files

‎build/submodules/Vulkan-Loader

Submodule Vulkan-Loader updated 78 files

‎generator.json

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,96 @@
18061806
"$nuget/Microsoft.Direct3D.DirectStorage/*/$version": "src/Native/Silk.NET.DirectStorage.Native/version.txt"
18071807
}
18081808
},
1809+
{
1810+
"profileName": "DirectComposition",
1811+
"sources": [
1812+
"build/include/silk.net.directcomposition.dcomp.h"
1813+
],
1814+
"mode": "Clang",
1815+
"cacheDir": "build/cache",
1816+
"cacheKey": "dcomp",
1817+
"controlDescriptors": [
1818+
"convert-windows-only",
1819+
"no-obsolete-enum",
1820+
"typemap-native"
1821+
],
1822+
"converter": {},
1823+
"prefix": "DComposition",
1824+
"clang": {
1825+
"args": [
1826+
"--language=c++",
1827+
"--std=c++17",
1828+
"-m32",
1829+
"-Wno-expansion-to-defined",
1830+
"-Wno-ignored-attributes",
1831+
"-Wno-ignored-pragma-intrinsic",
1832+
"-Wno-nonportable-include-path",
1833+
"-Wno-pragma-pack",
1834+
"-I$windowsSdkIncludes",
1835+
"-Ibuild/include"
1836+
],
1837+
"traverse": [
1838+
"$windowsSdkDir/Include/$windowsSdkVersion/um/dcompanimation.h",
1839+
"$windowsSdkDir/Include/$windowsSdkVersion/shared/dcomptypes.h",
1840+
"$windowsSdkDir/Include/$windowsSdkVersion/um/dcomp.h",
1841+
],
1842+
"classes": {
1843+
"silk.net.directcomposition.dcomp.h": "[Core]DComp"
1844+
}
1845+
},
1846+
"exclude": [
1847+
"D2D_MATRIX_3X2_F",
1848+
"D2D_RECT_F",
1849+
"D2D1_COMPOSITE_MODE",
1850+
"_D3DCOLORVALUE",
1851+
"D3DMATRIX"
1852+
],
1853+
"rename": {
1854+
},
1855+
"bakery": {
1856+
"profileNames": [
1857+
"silk.net.directcomposition.dcomp"
1858+
]
1859+
},
1860+
"output": {
1861+
"mode": "Default",
1862+
"path": "src/Microsoft",
1863+
"licenseFile": "build/LICENSE_HEADER.txt",
1864+
"props": "build/props/bindings.props"
1865+
},
1866+
"namespace": "Silk.NET.DirectComposition",
1867+
"extensionsNamespace": "Silk.NET.DirectComposition.Extensions",
1868+
"nameContainer": {
1869+
"linux-x64": "libDComp.so",
1870+
"win-x64": "DComp.dll",
1871+
"win-x86": "DComp.dll",
1872+
"osx-x64": "libDComp.dylib",
1873+
"android": "libDComp.so",
1874+
"iOS": "__Internal",
1875+
"className": "DCompLibraryNameContainer"
1876+
},
1877+
"typeMaps": [
1878+
{
1879+
"D2D_MATRIX_3X2_F": "Silk.NET.Maths.Matrix3X2<float>",
1880+
"D2D_RECT_F": "Silk.NET.Maths.Rectangle<float>",
1881+
"D3DMATRIX": "Silk.NET.Maths.Matrix4X4<float>",
1882+
"_D3DCOLORVALUE": "Silk.NET.DXGI.D3Dcolorvalue",
1883+
"DXGI_RATIONAL": "Silk.NET.DXGI.Rational",
1884+
"DXGI_ALPHA_MODE": "Silk.NET.DXGI.AlphaMode",
1885+
"DXGI_HDR_METADATA_TYPE": "Silk.NET.DXGI.HdrMetadataType",
1886+
"D2D1_BORDER_MODE": "Silk.NET.Direct2D.BorderMode",
1887+
"D2D1_2DAFFINETRANSFORM_INTERPOLATION_MODE": "Silk.NET.Direct2D.D2D12DaffinetransformInterpolationMode",
1888+
"D2D1_COLORMATRIX_ALPHA_MODE": "Silk.NET.Direct2D.ColormatrixAlphaMode",
1889+
"D2D1_BLEND_MODE": "Silk.NET.Direct2D.BlendMode",
1890+
"D2D1_COMPOSITE_MODE": "Silk.NET.Direct2D.CompositeMode",
1891+
"D2D1_TURBULENCE_NOISE": "Silk.NET.Direct2D.TurbulenceNoise"
1892+
},
1893+
{
1894+
"$include.dxTypemap": "build/dx_typemap.json",
1895+
"$include.commonTypeMap": "build/csharp_typemap.json"
1896+
}
1897+
]
1898+
},
18091899
{
18101900
"profileName": "XAudio",
18111901
"_commented_out_sources": [

0 commit comments

Comments
 (0)