Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit ee8c6f0

Browse files
authored
Merge pull request #1024 from amerkoleci/various_improvements
Various improvements
2 parents f60c34e + a7682ef commit ee8c6f0

4 files changed

Lines changed: 32 additions & 7 deletions

File tree

Source/SharpDX.DXGI/Mapping.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@
133133
<map struct="DXGI(.+)" name-tmp="$1" />
134134
<remove struct="DXGI_DISPLAY_COLOR_SPACE" />
135135

136-
<map field="DXGI_ADAPTER_DESC[12]?::AdapterLuid" name="Luid" />
137-
<map field="DXGI_ADAPTER_DESC[12]?::SubSysId" name="SubsystemId" />
138-
<map field="DXGI_ADAPTER_DESC[12]::Flags" type="DXGI_ADAPTER_FLAG" />
136+
<map field="DXGI_ADAPTER_DESC[123]?::AdapterLuid" name="Luid" />
137+
<map field="DXGI_ADAPTER_DESC[123]?::SubSysId" name="SubsystemId" />
138+
<map field="DXGI_ADAPTER_DESC[123]::Flags" type="DXGI_ADAPTER_FLAG" />
139139

140140
<map field="DXGI_GAMMA_CONTROL_CAPABILITIES::MaxConvertedValue" name="MaximumConvertedValue" />
141141
<map field="DXGI_GAMMA_CONTROL_CAPABILITIES::MinConvertedValue" name="MinimumConvertedValue" />
@@ -160,6 +160,8 @@
160160

161161
<map struct="DXGI_ADAPTER_DESC" pack="4"/>
162162
<map struct="DXGI_ADAPTER_DESC1" pack="4"/>
163+
<map struct="DXGI_ADAPTER_DESC2" pack="4"/>
164+
<map struct="DXGI_ADAPTER_DESC3" pack="4"/>
163165

164166
<map struct="DXGI_INFO_QUEUE_FILTER" name="InfoQueueFilter" />
165167
<map struct="DXGI_INFO_QUEUE_FILTER_DESC" name="InfoQueueFilterDescription" />

Source/SharpDX.Direct3D11/Mapping.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,11 @@
299299

300300
<map param="ID3D11Device4::RegisterDeviceRemovedEvent::pdwCookie" return="true" />
301301

302-
<map method="ID3D11Device5::OpenSharedFence" visibility="internal" />
302+
<map method="ID3D11Device5::OpenSharedFence" visibility="internal" />
303303

304-
<map method="ID3D11Device5::CreateFence" visibility="internal" />
305-
<map param="ID3D11Device5::CreateFence::ppFence" type="ID3D11Fence" attribute="out fast"/>
306-
<map param="ID3D11Fence::CreateSharedHandle::pHandle" return="true" />
304+
<map method="ID3D11Device5::CreateFence" visibility="internal" />
305+
<map param="ID3D11Device5::CreateFence::ppFence" type="ID3D11Fence" attribute="out fast"/>
306+
<map param="ID3D11Fence::CreateSharedHandle::pHandle" return="true" />
307307

308308
<!--
309309
// *****************************************************************
@@ -321,6 +321,7 @@
321321
<map param="D3D11On12CreateDevice::ppDevice" type="ID3D11Device" attribute="out" />
322322

323323
<remove function="ID3D11DeviceContext1_.*"/>
324+
<remove method="ID3D11CommandList::GetContextFlags" />
324325

325326
<context-clear />
326327
</mapping>

Source/SharpDX.Direct3D12/Device.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,26 @@ public unsafe FeatureDataArchitecture Architecture
565565
}
566566
}
567567

568+
public unsafe FeatureDataGpuVirtualAddressSupport GpuVirtualAddressSupport
569+
{
570+
get
571+
{
572+
FeatureDataGpuVirtualAddressSupport options = new FeatureDataGpuVirtualAddressSupport();
573+
this.CheckFeatureSupport(Feature.GpuVirtualAddressSupport, new IntPtr(&options), Utilities.SizeOf<FeatureDataGpuVirtualAddressSupport>());
574+
return options;
575+
}
576+
}
577+
578+
public unsafe FeatureDataShaderModel ShaderModel
579+
{
580+
get
581+
{
582+
FeatureDataShaderModel options = new FeatureDataShaderModel();
583+
this.CheckFeatureSupport(Feature.ShaderModel, new IntPtr(&options), Utilities.SizeOf<FeatureDataShaderModel>());
584+
return options;
585+
}
586+
}
587+
568588
private static void CreateDevice(Adapter adapter, FeatureLevel minFeatureLevel, Device instance)
569589
{
570590
D3D12.CreateDevice(adapter, minFeatureLevel, Utilities.GetGuidFromType(typeof(Device)), instance).CheckError();

Source/SharpDX.Direct3D12/Mapping.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@
117117
<map enum-item="D3D_SHADER_MODEL_5_1" name="Model51"/>
118118
<map enum-item="D3D_SHADER_MODEL_6_0" name="Model60"/>
119119
<map enum-item="D3D_SHADER_MODEL_6_1" name="Model61"/>
120+
<map enum="D3D12_RLDO_FLAGS" name="ReportingLevel" />
121+
120122
<!--
121123
// *****************************************************************
122124
// D3D12 Struct

0 commit comments

Comments
 (0)