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

ci: Abort on assertions on the CI.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-05-14 10:50:25 +02:00 committed by Henri Verbeet
parent fb55c2b227
commit 51b65688e1
Notes: Henri Verbeet 2024-07-29 13:23:46 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/867
6 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gitlab/build-linux
View File

@ -11,7 +11,8 @@ rm -fr build
mkdir build mkdir build
cd build cd build
export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH-}" export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH-}"
if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_GLSL" && \ if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" \
CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_GLSL -DVKD3D_ABORT_ON_ERR" && \
make -j$(nproc) ; then make -j$(nproc) ; then
make -j$(nproc) AM_COLOR_TESTS=always check || \ make -j$(nproc) AM_COLOR_TESTS=always check || \
touch ../tests_failed touch ../tests_failed

4
gitlab/build-mac
View File

@ -10,7 +10,9 @@ set -Eeuxo pipefail
rm -fr build rm -fr build
mkdir build mkdir build
cd build cd build
if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Werror" VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib --with-spirv-tools && \ if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Werror" \
CPPFLAGS="-DVKD3D_ABORT_ON_ERR" \
VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib --with-spirv-tools && \
make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) ; then
make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \ make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \
touch ../tests_failed touch ../tests_failed

4
gitlab/build-mingw
View File

@ -12,7 +12,9 @@ mkdir build
cd build cd build
mkdir vulkan-headers mkdir vulkan-headers
cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers
../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \ ../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST \
SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers -DVKD3D_ABORT_ON_ERR" \
CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \
make -j$(nproc) && \ make -j$(nproc) && \
make -j$(nproc) install DESTDIR="$PWD/destdir" || \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \
touch ../pipeline_failed touch ../pipeline_failed

10
libs/vkd3d/device.c
View File

@ -308,7 +308,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio
for (i = 0; i < required_extension_count; ++i) for (i = 0; i < required_extension_count; ++i)
{ {
if (!has_extension(extensions, count, required_extensions[i])) if (!has_extension(extensions, count, required_extensions[i]))
ERR("Required %s extension %s is not supported.\n", WARN("Required %s extension %s is not supported.\n",
extension_type, debugstr_a(required_extensions[i])); extension_type, debugstr_a(required_extensions[i]));
++extension_count; ++extension_count;
} }
@ -336,7 +336,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio
for (i = 0; i < user_extension_count; ++i) for (i = 0; i < user_extension_count; ++i)
{ {
if (!has_extension(extensions, count, user_extensions[i])) if (!has_extension(extensions, count, user_extensions[i]))
ERR("Required user %s extension %s is not supported.\n", WARN("Required user %s extension %s is not supported.\n",
extension_type, debugstr_a(user_extensions[i])); extension_type, debugstr_a(user_extensions[i]));
++extension_count; ++extension_count;
} }
@ -584,7 +584,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
if (!create_info->pfn_signal_event) if (!create_info->pfn_signal_event)
{ {
ERR("Invalid signal event function pointer.\n"); WARN("Invalid signal event function pointer.\n");
return E_INVALIDARG; return E_INVALIDARG;
} }
if (!create_info->pfn_create_thread != !create_info->pfn_join_thread) if (!create_info->pfn_create_thread != !create_info->pfn_join_thread)
@ -594,7 +594,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
} }
if (create_info->wchar_size != 2 && create_info->wchar_size != 4) if (create_info->wchar_size != 2 && create_info->wchar_size != 4)
{ {
ERR("Unexpected WCHAR size %zu.\n", create_info->wchar_size); WARN("Unexpected WCHAR size %zu.\n", create_info->wchar_size);
return E_INVALIDARG; return E_INVALIDARG;
} }
@ -2155,7 +2155,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device,
vkd3d_free(extensions); vkd3d_free(extensions);
if (vr < 0) if (vr < 0)
{ {
ERR("Failed to create Vulkan device, vr %d.\n", vr); WARN("Failed to create Vulkan device, vr %d.\n", vr);
return hresult_from_vk_result(vr); return hresult_from_vk_result(vr);
} }

2
libs/vkd3d/resource.c
View File

@ -2165,7 +2165,7 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device,
if (heap_offset > heap->desc.SizeInBytes || requirements.size > heap->desc.SizeInBytes - heap_offset) if (heap_offset > heap->desc.SizeInBytes || requirements.size > heap->desc.SizeInBytes - heap_offset)
{ {
ERR("Heap too small for the resource (offset %"PRIu64", resource size %"PRIu64", heap size %"PRIu64".\n", WARN("Heap too small for the resource (offset %"PRIu64", resource size %"PRIu64", heap size %"PRIu64".\n",
heap_offset, requirements.size, heap->desc.SizeInBytes); heap_offset, requirements.size, heap->desc.SizeInBytes);
return E_INVALIDARG; return E_INVALIDARG;
} }

4
libs/vkd3d/vkd3d_main.c
View File

@ -38,12 +38,12 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info,
} }
if (!create_info->instance && !create_info->instance_create_info) if (!create_info->instance && !create_info->instance_create_info)
{ {
ERR("Instance or instance create info is required.\n"); WARN("Instance or instance create info is required.\n");
return E_INVALIDARG; return E_INVALIDARG;
} }
if (create_info->instance && create_info->instance_create_info) if (create_info->instance && create_info->instance_create_info)
{ {
ERR("Instance and instance create info are mutually exclusive parameters.\n"); WARN("Instance and instance create info are mutually exclusive parameters.\n");
return E_INVALIDARG; return E_INVALIDARG;
} }