Merge branch 'matthiasc/for-main' into 'main'

Grr, vulkan

See merge request GNOME/gtk!6970
This commit is contained in:
Matthias Clasen 2024-03-03 03:03:19 +00:00
commit 90c017a762
2 changed files with 5 additions and 5 deletions

View File

@ -256,14 +256,14 @@ gdk_vulkan_strerror (VkResult result)
case VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR:
return "The specified video Std header version is not supported. (VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR)";
#endif
#if VK_HEADER_VERSION >= 243
case VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR:
return "The specified Video Std parameters do not adhere to the syntactic or semantic requirements of the used video compression standard or implementation";
#endif
#if VK_HEADER_VERSION >= 246
case VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT:
return "The provided binary shader code is not compatible with this device. (VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT)";
#endif
#if VK_HEADER_VERSION >= 274
case VK_ERROR_INVALID_VIDEO_STD_PARAMETERS_KHR:
return "The specified Video Std parameters do not adhere to the syntactic or semantic requirements of the used video compression standard or implementation";
#endif
case VK_RESULT_MAX_ENUM:
default:

View File

@ -1 +1 @@
invalid5.ui:3:1 Required GTK version 5.10, current version is 4.13
invalid5.ui:3:1 Required GTK version 5.10, current version is 4.14