wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Implement support for D3D12_FEATURE_D3D12_OPTIONS5.

Browse Source 
Signed-off-by: Conor McCarthy <conor.mccarthy.444@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Conor McCarthy 2020-05-25 20:07:11 +04:30 committed by Alexandre Julliard
parent d5ad90a81e
commit 7d47f2323e
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/vkd3d_d3d12.idl
View File

@ -232,6 +232,19 @@ typedef enum D3D12_HEAP_SERIALIZATION_TIER
D3D12_HEAP_SERIALIZATION_TIER_10 = 0xa, D3D12_HEAP_SERIALIZATION_TIER_10 = 0xa,
} D3D12_HEAP_SERIALIZATION_TIER; } D3D12_HEAP_SERIALIZATION_TIER;
typedef enum D3D12_RENDER_PASS_TIER
{
D3D12_RENDER_PASS_TIER_0 = 0x0,
D3D12_RENDER_PASS_TIER_1 = 0x1,
D3D12_RENDER_PASS_TIER_2 = 0x2,
} D3D12_RENDER_PASS_TIER;
typedef enum D3D12_RAYTRACING_TIER
{
D3D12_RAYTRACING_TIER_NOT_SUPPORTED = 0x0,
D3D12_RAYTRACING_TIER_1_0 = 0xa,
} D3D12_RAYTRACING_TIER;
interface ID3D12Fence; interface ID3D12Fence;
interface ID3D12RootSignature; interface ID3D12RootSignature;
interface ID3D12Heap; interface ID3D12Heap;
@ -1733,6 +1746,13 @@ typedef struct D3D12_FEATURE_DATA_CROSS_NODE
BOOL AtomicShaderInstructions; BOOL AtomicShaderInstructions;
} D3D12_FEATURE_DATA_CROSS_NODE; } D3D12_FEATURE_DATA_CROSS_NODE;
typedef struct D3D12_FEATURE_DATA_D3D12_OPTIONS5
{
BOOL SRVOnlyTiledResourceTier3;
D3D12_RENDER_PASS_TIER RenderPassesTier;
D3D12_RAYTRACING_TIER RaytracingTier;
} D3D12_FEATURE_DATA_D3D12_OPTIONS5;
typedef enum D3D12_FEATURE typedef enum D3D12_FEATURE
{ {
D3D12_FEATURE_D3D12_OPTIONS = 0, D3D12_FEATURE_D3D12_OPTIONS = 0,
@ -1754,6 +1774,7 @@ typedef enum D3D12_FEATURE
D3D12_FEATURE_D3D12_OPTIONS4 = 23, D3D12_FEATURE_D3D12_OPTIONS4 = 23,
D3D12_FEATURE_SERIALIZATION = 24, D3D12_FEATURE_SERIALIZATION = 24,
D3D12_FEATURE_CROSS_NODE = 25, D3D12_FEATURE_CROSS_NODE = 25,
D3D12_FEATURE_D3D12_OPTIONS5 = 27,
} D3D12_FEATURE; } D3D12_FEATURE;
typedef struct D3D12_MEMCPY_DEST typedef struct D3D12_MEMCPY_DEST

22
libs/vkd3d/device.c
View File

@ -1362,6 +1362,10 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device,
* VK_KHR_shader_float16_int8. */ * VK_KHR_shader_float16_int8. */
device->feature_options4.Native16BitShaderOpsSupported = FALSE; device->feature_options4.Native16BitShaderOpsSupported = FALSE;
device->feature_options5.SRVOnlyTiledResourceTier3 = FALSE;
device->feature_options5.RenderPassesTier = D3D12_RENDER_PASS_TIER_0;
device->feature_options5.RaytracingTier = D3D12_RAYTRACING_TIER_NOT_SUPPORTED;
if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0) if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, &count, NULL))) < 0)
{ {
ERR("Failed to enumerate device extensions, vr %d.\n", vr); ERR("Failed to enumerate device extensions, vr %d.\n", vr);
@ -2949,6 +2953,24 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *
return S_OK; return S_OK;
} }
case D3D12_FEATURE_D3D12_OPTIONS5:
{
D3D12_FEATURE_DATA_D3D12_OPTIONS5 *data = feature_data;
if (feature_data_size != sizeof(*data))
{
WARN("Invalid size %u.\n", feature_data_size);
return E_INVALIDARG;
}
*data = device->feature_options5;
TRACE("SRV tiled resource tier 3 only %#x.\n", data->SRVOnlyTiledResourceTier3);
TRACE("Render pass tier %#x.\n", data->RenderPassesTier);
TRACE("Ray tracing tier %#x.\n", data->RaytracingTier);
return S_OK;
}
default: default:
FIXME("Unhandled feature %#x.\n", feature); FIXME("Unhandled feature %#x.\n", feature);
return E_NOTIMPL; return E_NOTIMPL;

1
libs/vkd3d/vkd3d_private.h
View File

@ -1135,6 +1135,7 @@ struct d3d12_device
D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2; D3D12_FEATURE_DATA_D3D12_OPTIONS2 feature_options2;
D3D12_FEATURE_DATA_D3D12_OPTIONS3 feature_options3; D3D12_FEATURE_DATA_D3D12_OPTIONS3 feature_options3;
D3D12_FEATURE_DATA_D3D12_OPTIONS4 feature_options4; D3D12_FEATURE_DATA_D3D12_OPTIONS4 feature_options4;
D3D12_FEATURE_DATA_D3D12_OPTIONS5 feature_options5;
struct vkd3d_vulkan_info vk_info; struct vkd3d_vulkan_info vk_info;