Wine-Commits

wine-commits@list.winehq.org

October 2018

1 participants
602 discussions

Józef Kucia : vkd3d: Allocate memory for resource if heap memory cannot be used.
by Alexandre Julliard Oct. 2, 2018

Oct. 2, 2018

Module: vkd3d Branch: master Commit: 04635885910f65bfb1aa2ed5ebd1dfca24e6e88e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=04635885910f65bfb1aa2ed… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 13:57:10 2018 +0200 vkd3d: Allocate memory for resource if heap memory cannot be used. Anvil has additional restrictions for index and vertex buffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d633094..68c189a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1121,9 +1121,10 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, if (!(requirements.memoryTypeBits & (1u << heap->vk_memory_type))) { - FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x).\n", + FIXME("Memory type %u cannot be bound to resource %p (allowed types %#x), " + "allocating device memory.\n", heap->vk_memory_type, resource, requirements.memoryTypeBits); - return E_NOTIMPL; + return vkd3d_allocate_resource_memory(device, resource, &heap->desc.Properties, heap->desc.Flags); } if (d3d12_resource_is_buffer(resource))

1 0

Józef Kucia : vkd3d: Do not enable shaderTessellationAndGeometryPointSize feature.
by Alexandre Julliard Oct. 2, 2018

Oct. 2, 2018

Module: vkd3d Branch: master Commit: f7bb28dc2b8f0c0a30c327facddba6d65e9c5891 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f7bb28dc2b8f0c0a30c327f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 13:57:13 2018 +0200 vkd3d: Do not enable shaderTessellationAndGeometryPointSize feature. We don't want to write PointSize in tessellation and geometry shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 673c54a..f91c0d9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1015,6 +1015,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) return hr; + device->vk_physical_device = physical_device; + /* Create command queues */ VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &queue_family_count, NULL)); if (!(queue_properties = vkd3d_calloc(queue_family_count, sizeof(*queue_properties)))) @@ -1083,10 +1085,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); - device->vk_physical_device = physical_device; if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) goto done; + device_features.shaderTessellationAndGeometryPointSize = VK_FALSE; + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { hr = E_OUTOFMEMORY;

1 0

Jump to page: