wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Implement d3d12_device_GetCustomHeapProperties().

Browse Source 
Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Derek Lesho
2019-11-07 19:30:43 +03:30
committed by Alexandre Julliard
parent 4576236199
commit 1d955506a3
4 changed files with 105 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/d3d12.c
View File

@@ -1991,6 +1991,7 @@ static void test_create_committed_resource(void)
static void test_create_heap(void)
{
D3D12_FEATURE_DATA_ARCHITECTURE architecture;
D3D12_FEATURE_DATA_D3D12_OPTIONS options;
D3D12_HEAP_DESC desc, result_desc;
ID3D12Device *device, *tmp_device;
@@ -2137,6 +2138,53 @@ static void test_create_heap(void)
refcount = ID3D12Heap_Release(heap);
ok(!refcount, "ID3D12Heap has %u references left.\n", (unsigned int)refcount);
memset(&architecture, 0, sizeof(architecture));
hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ARCHITECTURE, &architecture, sizeof(architecture));
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
for (i = D3D12_HEAP_TYPE_DEFAULT; i < D3D12_HEAP_TYPE_CUSTOM; ++i)
{
vkd3d_test_set_context("Test %u\n", i);
desc.Properties = ID3D12Device_GetCustomHeapProperties(device, 1, i);
ok(desc.Properties.Type == D3D12_HEAP_TYPE_CUSTOM, "Got unexpected heap type %#x.\n", desc.Properties.Type);
switch (i)
{
case D3D12_HEAP_TYPE_DEFAULT:
ok(desc.Properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE,
"Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty);
ok(desc.Properties.MemoryPoolPreference == (architecture.UMA
? D3D12_MEMORY_POOL_L0 : D3D12_MEMORY_POOL_L1),
"Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference);
break;
case D3D12_HEAP_TYPE_UPLOAD:
ok(desc.Properties.CPUPageProperty == (architecture.CacheCoherentUMA
? D3D12_CPU_PAGE_PROPERTY_WRITE_BACK : D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE),
"Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty);
ok(desc.Properties.MemoryPoolPreference == D3D12_MEMORY_POOL_L0,
"Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference);
break;
case D3D12_HEAP_TYPE_READBACK:
ok(desc.Properties.CPUPageProperty == D3D12_CPU_PAGE_PROPERTY_WRITE_BACK,
"Got unexpected CPUPageProperty %#x.\n", desc.Properties.CPUPageProperty);
ok(desc.Properties.MemoryPoolPreference == D3D12_MEMORY_POOL_L0,
"Got unexpected MemoryPoolPreference %#x.\n", desc.Properties.MemoryPoolPreference);
break;
default:
ok(0, "Invalid heap type %#x.\n", i);
continue;
}
hr = ID3D12Device_CreateHeap(device, &desc, &IID_ID3D12Heap, (void **)&heap);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
result_desc = ID3D12Heap_GetDesc(heap);
check_heap_desc(&result_desc, &desc);
ID3D12Heap_Release(heap);
}
vkd3d_test_set_context(NULL);
is_pool_L1_supported = is_memory_pool_L1_supported(device);
desc.Properties.Type = D3D12_HEAP_TYPE_CUSTOM;
desc.Properties.CreationNodeMask = 1;