Skip to content

Commit

Permalink
Add d3d11on12 bindings (#1193)
Browse files Browse the repository at this point in the history
* Add d3d11on12 bindings

* Move d3d11on12 to extension

* Revert "Move d3d11on12 to extension"

Its easier to do this trust me

This reverts commit ac1beb6.

* Fix namespace and stage generator.json

* Add project to solution
  • Loading branch information
Beyley authored Jan 2, 2023
1 parent 16ae301 commit 93b39c4
Show file tree
Hide file tree
Showing 13 changed files with 6,436 additions and 7 deletions.
18 changes: 18 additions & 0 deletions Silk.NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenXR.Extensions.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Vulkan.Extensions.LUNARG", "src\Vulkan\Extensions\Silk.NET.Vulkan.Extensions.LUNARG\Silk.NET.Vulkan.Extensions.LUNARG.csproj", "{FB16A3D6-8401-4421-AD6A-DFC85FD2DCC7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{58FECE86-7530-4E6F-BA61-512BE44DEA83}"
EndProject
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}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -3329,6 +3333,18 @@ Global
{FB16A3D6-8401-4421-AD6A-DFC85FD2DCC7}.Release|x64.Build.0 = Release|Any CPU
{FB16A3D6-8401-4421-AD6A-DFC85FD2DCC7}.Release|x86.ActiveCfg = Release|Any CPU
{FB16A3D6-8401-4421-AD6A-DFC85FD2DCC7}.Release|x86.Build.0 = Release|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Debug|x64.ActiveCfg = Debug|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Debug|x64.Build.0 = Debug|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Debug|x86.ActiveCfg = Debug|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Debug|x86.Build.0 = Debug|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|Any CPU.Build.0 = Release|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|x64.ActiveCfg = Release|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|x64.Build.0 = Release|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|x86.ActiveCfg = Release|Any CPU
{82626916-C5F3-46E7-B0EC-1D38191450C7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -3595,6 +3611,8 @@ Global
{A84C539A-3CB7-474D-9673-F7CD1DFA4F1A} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
{CF943055-E40D-4AF2-8FD2-C2E5849D11EB} = {90471225-AC23-424E-B62E-F6EC4C6ECAC0}
{FB16A3D6-8401-4421-AD6A-DFC85FD2DCC7} = {49BC383A-D7E6-4013-93C7-371479B984CC}
{58FECE86-7530-4E6F-BA61-512BE44DEA83} = {F2CF5D32-4B41-425E-B229-8FFC48F88063}
{82626916-C5F3-46E7-B0EC-1D38191450C7} = {58FECE86-7530-4E6F-BA61-512BE44DEA83}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5273D7F-3334-48DF-94E3-41AE6816CD4D}
Expand Down
Binary file modified build/cache/d3d11.json.gz
Binary file not shown.
20 changes: 13 additions & 7 deletions generator.json
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
"CL_DRIVER_UUID_KHR": "CL_DEVICE_DRIVER_UUID_KHR",

"CL_PRINTF_CALLBACK_ARM": "CL_CONTEXT_PRINTF_CALLBACK_ARM",
"CL_PRINTF_BUFFERSIZE_ARM": "CL_CONTEXT_PRINTF_BUFFERSIZE_ARM",
"CL_PRINTF_BUFFERSIZE_ARM": "CL_CONTEXT_PRINTF_BUFFERSIZE_ARM"
},
"bakery": {
"profileNames": [
Expand Down Expand Up @@ -317,7 +317,7 @@
},
{
"cl_icd_dispatch": "void",
"cl_svm_mem_flags": "cl_mem_flags",
"cl_svm_mem_flags": "cl_mem_flags"
},
{
"$include.commonTypeMap": "build/csharp_typemap.json",
Expand Down Expand Up @@ -864,7 +864,7 @@

],
"classes": {
"d3dcommon.h": "[Core]D3DCommon",
"d3dcommon.h": "[Core]D3DCommon"
}
},
"exclude": [
Expand Down Expand Up @@ -1294,7 +1294,8 @@
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d11_4.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d11shader.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d11shadertracing.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d11sdklayers.h"
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d11sdklayers.h",
"$windowsSdkDir/Include/$windowsSdkVersion/um/d3d11on12.h"
],
"mode": "Clang",
"cacheDir": "build/cache",
Expand Down Expand Up @@ -1328,7 +1329,8 @@
"d3d11_4.h": "[Core]D3D11",
"d3d11shader.h": "[Core]D3D11",
"d3d11shadertracing.h": "[Core]D3D11",
"d3d11sdklayers.h": "[Core]D3D11"
"d3d11sdklayers.h": "[Core]D3D11",
"d3d11on12.h": "[D3D11On12:D3D11]D3D11On12"
},
"comRefs": [
"Silk.NET.DXGI.IDXGIAdapter",
Expand All @@ -1353,7 +1355,8 @@
"d3d11_4",
"d3d11shader",
"d3d11shadertracing",
"d3d11sdklayers"
"d3d11sdklayers",
"d3d11on12"
]
},
"output": {
Expand All @@ -1376,7 +1379,10 @@
"typeMaps": [
{
"D3D11_AUTHENTICATED_PROTECTION_FLAGS::__MIDL___MIDL_itf_d3d11_0000_0034_0001": "MIDLMIDLItfD3d11000000340001",
"ID3D10Blob": "Silk.NET.Core.Native.ID3D10Blob"
"ID3D10Blob": "Silk.NET.Core.Native.ID3D10Blob",
"D3D12_RESOURCE_STATES": "Silk.NET.Direct3D12.ResourceStates",
"ID3D12Fence": "Silk.NET.Direct3D12.ID3D12Fence",
"ID3D12CommandQueue": "Silk.NET.Direct3D12.ID3D12CommandQueue"
},
{
"$include.dxTypemap": "build/dx_typemap.json",
Expand Down
Loading

0 comments on commit 93b39c4

Please sign in to comment.