wine/vkd3d
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-27 01:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vkd3d: Use WARN rather than ERR in vkd3d_instance_init().

Browse Source 
ERR is used to indicate internal inconsistencies in vkd3d. Here that's
not the case, we simply have to forward the error condition to the
caller.

This fixes failures on the CI with llvmpipe, because the build we use is
compiled without support for VK_KHR_surface and related extensions.
This commit is contained in:
Giovanni Mascellani 2024-11-13 17:19:31 +01:00 committed by Henri Verbeet
parent c010fb63a1
commit 72394d9ae3
Notes: Henri Verbeet 2024-11-14 14:23:18 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1262
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gitlab/build.yml
View File

@ -63,9 +63,6 @@ build-llvmpipe-32:
build-llvmpipe-64-mesa24: build-llvmpipe-64-mesa24:
extends: .build-linux extends: .build-linux
allow_failure:
exit_codes:
- 2
variables: variables:
VK_DRIVER_FILES: '/opt/mesa24/share/vulkan/icd.d/lvp_icd.x86_64.json' VK_DRIVER_FILES: '/opt/mesa24/share/vulkan/icd.d/lvp_icd.x86_64.json'
LD_LIBRARY_PATH: '/opt/mesa24/lib/x86_64-linux-gnu' LD_LIBRARY_PATH: '/opt/mesa24/lib/x86_64-linux-gnu'

8
libs/vkd3d/device.c
View File

@ -597,7 +597,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
} }
if (!create_info->pfn_create_thread != !create_info->pfn_join_thread) if (!create_info->pfn_create_thread != !create_info->pfn_join_thread)
{ {
ERR("Invalid create/join thread function pointers.\n"); WARN("Invalid create/join thread function pointers.\n");
return E_INVALIDARG; return E_INVALIDARG;
} }
if (create_info->wchar_size != 2 && create_info->wchar_size != 4) if (create_info->wchar_size != 2 && create_info->wchar_size != 4)
@ -615,7 +615,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr))) if (FAILED(hr = vkd3d_init_vk_global_procs(instance, create_info->pfn_vkGetInstanceProcAddr)))
{ {
ERR("Failed to initialise Vulkan global procs, hr %s.\n", debugstr_hresult(hr)); WARN("Failed to initialise Vulkan global procs, hr %s.\n", debugstr_hresult(hr));
return hr; return hr;
} }
@ -697,7 +697,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
vkd3d_free(extensions); vkd3d_free(extensions);
if (vr < 0) if (vr < 0)
{ {
ERR("Failed to create Vulkan instance, vr %d.\n", vr); WARN("Failed to create Vulkan instance, vr %d.\n", vr);
if (instance->libvulkan) if (instance->libvulkan)
vkd3d_dlclose(instance->libvulkan); vkd3d_dlclose(instance->libvulkan);
return hresult_from_vk_result(vr); return hresult_from_vk_result(vr);
@ -705,7 +705,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
if (FAILED(hr = vkd3d_load_vk_instance_procs(&instance->vk_procs, vk_global_procs, vk_instance))) if (FAILED(hr = vkd3d_load_vk_instance_procs(&instance->vk_procs, vk_global_procs, vk_instance)))
{ {
ERR("Failed to load instance procs, hr %s.\n", debugstr_hresult(hr)); WARN("Failed to load instance procs, hr %s.\n", debugstr_hresult(hr));
if (instance->vk_procs.vkDestroyInstance) if (instance->vk_procs.vkDestroyInstance)
instance->vk_procs.vkDestroyInstance(vk_instance, NULL); instance->vk_procs.vkDestroyInstance(vk_instance, NULL);
if (instance->libvulkan) if (instance->libvulkan)