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: Improve UMA memory detection.

Browse Source 
Some vulkan implementation report 2 memory types with the same
VkMemoryPropertyFlags for a device. So check property flags
to determine if UMA and CacheCoherentUMA are actually supported
by the device.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2019-04-03 21:50:27 +08:00 committed by Alexandre Julliard
parent 0ac694e7cc
commit 32a15c089a
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/vkd3d/device.c
View File

@ -2098,6 +2098,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *
D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) D3D12_FEATURE feature, void *feature_data, UINT feature_data_size)
{ {
struct d3d12_device *device = impl_from_ID3D12Device(iface); struct d3d12_device *device = impl_from_ID3D12Device(iface);
unsigned int i;
TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n", TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n",
iface, feature, feature_data, feature_data_size); iface, feature, feature_data, feature_data_size);
@ -2138,18 +2139,16 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *
FIXME("Assuming device does not support tile based rendering.\n"); FIXME("Assuming device does not support tile based rendering.\n");
data->TileBasedRenderer = FALSE; data->TileBasedRenderer = FALSE;
if (device->memory_properties.memoryTypeCount == 1) data->UMA = TRUE;
data->CacheCoherentUMA = TRUE;
for (i = 0; i < device->memory_properties.memoryTypeCount; ++i)
{ {
TRACE("Assuming cache coherent UMA.\n"); if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))
data->UMA = TRUE; data->UMA = FALSE;
data->CacheCoherentUMA = TRUE; if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT))
} data->CacheCoherentUMA = FALSE;
else
{
FIXME("Assuming NUMA.\n");
data->UMA = FALSE;
data->CacheCoherentUMA = FALSE;
} }
TRACE("UMA: %#x CacheCoherentUMA: %#x.\n", data->UMA, data->CacheCoherentUMA);
return S_OK; return S_OK;
} }