From 2c7734404843486f1fc13675c9a04f83efd0e8fc Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 24 Apr 2023 16:07:30 -0400 Subject: [PATCH] bump VVL to 1.3.248 Reviewed-by: Emma Anholt Part-of: --- .gitlab-ci/container/build-vulkan-validation.sh | 3 +- .gitlab-ci/image-tags.yml | 4 +-- .../zink/ci/zink-anv-tgl-validation-settings.txt | 37 ++++++++++++++++++- .../zink/ci/zink-lvp-validation-settings.txt | 42 +++++++++++++++++++++- 4 files changed, 81 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-vulkan-validation.sh b/.gitlab-ci/container/build-vulkan-validation.sh index 572fa71..3846e16 100644 --- a/.gitlab-ci/container/build-vulkan-validation.sh +++ b/.gitlab-ci/container/build-vulkan-validation.sh @@ -3,10 +3,11 @@ # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: # DEBIAN_X86_TEST_GL_TAG +# KERNEL_ROOTFS_TAG: set -ex -VALIDATION_TAG="v1.3.238" +VALIDATION_TAG="v1.3.248" git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git pushd Vulkan-ValidationLayers diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 2aed20d..bd8be4a 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,12 +16,12 @@ variables: DEBIAN_X86_TEST_ANDROID_IMAGE_PATH: "debian/x86_test-android" DEBIAN_X86_TEST_ANDROID_TAG: "2023-04-24-deqp" - DEBIAN_X86_TEST_GL_TAG: "2023-04-24-deqp" + DEBIAN_X86_TEST_GL_TAG: "2023-04-25-vvl" DEBIAN_X86_TEST_VK_TAG: "2023-04-24-deqp" ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" FEDORA_X86_BUILD_TAG: "2023-03-13-procps-ng" - KERNEL_ROOTFS_TAG: "2023-04-25-a660-firmware" + KERNEL_ROOTFS_TAG: "2023-04-25-vvl" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib" diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-validation-settings.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-validation-settings.txt index ddd1a33..6a64eda 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-validation-settings.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-validation-settings.txt @@ -1,6 +1,6 @@ # Please include a comment with the log message and a testcase triggering each # VUID at the bottom of the file. -khronos_validation.message_id_filter = UNASSIGNED-CoreValidation-Shader-InconsistentSpirv,VUID-vkDestroyDevice-device-00378,VUID-VkShaderModuleCreateInfo-pCode-01377,VUID-vkCmdDrawMultiIndexedEXT-None-02699,VUID-RuntimeSpirv-Location-06272,VUID-VkGraphicsPipelineCreateInfo-renderPass-06590,VUID-VkGraphicsPipelineCreateInfo-Geometry-07725,VUID-vkCmdDrawMultiIndexedEXT-format-07753,UNASSIGNED-CoreValidation-Shader-InterfaceTypeMismatch +khronos_validation.message_id_filter = UNASSIGNED-CoreValidation-Shader-InconsistentSpirv,VUID-vkDestroyDevice-device-00378,VUID-VkShaderModuleCreateInfo-pCode-01377,VUID-vkCmdDrawMultiIndexedEXT-None-02699,VUID-RuntimeSpirv-Location-06272,VUID-VkGraphicsPipelineCreateInfo-renderPass-06590,VUID-VkGraphicsPipelineCreateInfo-Geometry-07725,VUID-vkCmdDrawMultiIndexedEXT-format-07753,UNASSIGNED-CoreValidation-Shader-InterfaceTypeMismatch,VUID-RuntimeSpirv-OpEntryPoint-07754,VUID-VkShaderModuleCreateInfo-pCode-01379,VUID-RuntimeSpirv-OpEntryPoint-08743 khronos_validation.report_flags = error khronos_validation.debug_action = VK_DBG_LAYER_ACTION_LOG_MSG,VK_DBG_LAYER_ACTION_BREAK VK_LAYER_ENABLES=VK_VALIDATION_FEATURE_ENABLE_DEBUG_PRINTF_EXT @@ -92,3 +92,38 @@ khronos_validation.log_filename = stdout # 0xb6cf33fe | Type mismatch on location 0.0, between geometry shader and fragment # shader: 'ptr to Output vec2 of uint64' vs 'ptr to Input struct of (vec4 of # float32, vec4 of float32)' + +# KHR-Single-GL46.enhanced_layouts.varying_locations +# [ VUID-RuntimeSpirv-OpEntryPoint-07754 ] +# vkCreateGraphicsPipelines(): pCreateInfos[0] Type mismatch on Location 0 Component 0, between +# VK_SHADER_STAGE_GEOMETRY_BIT stage: +# pointer to Output -> +# vec2 of uint64 +# VK_SHADER_STAGE_FRAGMENT_BIT stage: +# pointer to Input -> +# struct of { +# vec4 of float32 +# vec4 of float32 +# } +# The Vulkan spec states: Any user-defined variables between the OpEntryPoint +# of two shader stages must have the same type and width for each Component +# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-RuntimeSpirv-OpEntryPoint-07754) + +# KHR-Single-GL46.enhanced_layouts.xfb_struct_explicit_location +# [ VUID-VkShaderModuleCreateInfo-pCode-01379 ] +# SPIR-V module not valid: The Component Type of Vector 1 must be the same as ResultType. +# %142 = OpVectorShuffle %v2uint %141 %141 0 1 + +# KHR-Single-GL46.enhanced_layouts.varying_locations +# +# VUID-RuntimeSpirv-OpEntryPoint-08743(ERROR / SPEC): msgNum: -1986897773 - +# Validation Error: [ VUID-RuntimeSpirv-OpEntryPoint-08743 ] +# vkCreateGraphicsPipelines(): pCreateInfos[0] VK_SHADER_STAGE_FRAGMENT_BIT declared input at +# Location 1 Comonent 2 but it is not an Output declared in VK_SHADER_STAGE_VERTEX_BIT +# The Vulkan spec states: Any user-defined variables shared between the OpEntryPoint of two shader stages, +# and declared with Input as its {StorageClass} for the subsequent shader stage, +# must have all Location slots and Component words declared in the preceding shader stage's +# OpEntryPoint with Output as the {StorageClass} +# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-RuntimeSpirv-OpEntryPoint-08743) +# +# VVL bug https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/5735 diff --git a/src/gallium/drivers/zink/ci/zink-lvp-validation-settings.txt b/src/gallium/drivers/zink/ci/zink-lvp-validation-settings.txt index 2b3680d..1dce929 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-validation-settings.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-validation-settings.txt @@ -1,6 +1,6 @@ # Please include a comment with the log message and a testcase triggering each # VUID at the bottom of the file. -khronos_validation.message_id_filter = VUID-vkCmdDrawMultiEXT-colorAttachmentCount-06188,VUID-VkGraphicsPipelineCreateInfo-Geometry-07725,VUID-VkShaderModuleCreateInfo-pCode-01091,VUID-vkCmdCopyImage-srcImage-07743,VUID-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiEXT-None-02699,VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext +khronos_validation.message_id_filter = VUID-vkCmdDrawMultiEXT-colorAttachmentCount-06188,VUID-VkGraphicsPipelineCreateInfo-Geometry-07725,VUID-VkShaderModuleCreateInfo-pCode-01091,VUID-vkCmdCopyImage-srcImage-07743,VUID-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiEXT-None-02699,VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,VUID-VkShaderModuleCreateInfo-pCode-01091,VUID-VkShaderModuleCreateInfo-pCode-08740,VUID-RuntimeSpirv-OpEntryPoint-08743 khronos_validation.report_flags = error khronos_validation.debug_action = VK_DBG_LAYER_ACTION_LOG_MSG,VK_DBG_LAYER_ACTION_BREAK VK_LAYER_ENABLES=VK_VALIDATION_FEATURE_ENABLE_DEBUG_PRINTF_EXT @@ -96,6 +96,46 @@ khronos_validation.log_filename = stdout # Input and Output Locations # (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-RuntimeSpirv-Location-06272) +# KHR-GL46.shading_language_420pack.binding_image_array +# +# VUID-VkShaderModuleCreateInfo-pCode-01091(ERROR / SPEC): msgNum: -1480880714 - +# Validation Error: [ VUID-VkShaderModuleCreateInfo-pCode-01091 ] +# vkCreateShaderModule(): The SPIR-V Capability (StorageImageArrayDynamicIndexing) was declared, +# but none of the requirements were met to use it. +# The Vulkan spec states: If pCode declares any of the capabilities listed in the +# SPIR-V Environment appendix, one of the corresponding requirements must be satisfied +# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkShaderModuleCreateInfo-pCode-01091) +# +# VUID-VkShaderModuleCreateInfo-pCode-08740(ERROR / SPEC): msgNum: 115483881 - +# Validation Error: [ VUID-VkShaderModuleCreateInfo-pCode-08740 ] +# vkCreateShaderModule(): The SPIR-V Capability (StorageImageArrayDynamicIndexing) +# was declared, but none of the requirements were met to use it. +# The Vulkan spec states: If pname:codeType is ename:VK_SHADER_CODE_TYPE_SPIRV_EXT, +# and pCode declares any of the capabilities listed in the SPIR-V Environment appendix, +# one of the corresponding requirements must be satisfied +# (https://www.khronos.org/registry/vulkan/specs/1.3-khr-extensions/html/vkspec.html#VUID-VkShaderModuleCreateInfo-pCode-08740) +# +# needs lavapipe features + +# dEQP-GLES31.functional.separate_shader.random.69 +# +# UNASSIGNED-CoreValidation-Shader-MissingOutput(ERROR / SPEC): msgNum: 1086655814 - +# Validation Error: [ UNASSIGNED-CoreValidation-Shader-MissingOutput ] +# vkCreateGraphicsPipelines(): pCreateInfos[0] VK_SHADER_STAGE_FRAGMENT_BIT declared input at Location 0 +# Comonent 2 but it is not an Output declared in VK_SHADER_STAGE_VERTEX_BIT +# +# VUID-RuntimeSpirv-OpEntryPoint-08743(ERROR / SPEC): msgNum: -1986897773 - +# Validation Error: [ VUID-RuntimeSpirv-OpEntryPoint-08743 ] +# vkCreateGraphicsPipelines(): pCreateInfos[0] VK_SHADER_STAGE_FRAGMENT_BIT declared input at +# Location 1 Comonent 2 but it is not an Output declared in VK_SHADER_STAGE_VERTEX_BIT +# The Vulkan spec states: Any user-defined variables shared between the OpEntryPoint of two shader stages, +# and declared with Input as its {StorageClass} for the subsequent shader stage, +# must have all Location slots and Component words declared in the preceding shader stage's +# OpEntryPoint with Output as the {StorageClass} +# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-RuntimeSpirv-OpEntryPoint-08743) +# +# VVL bug https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/5735 + # VUID-VkPhysicalDeviceProperties2-pNext-pNext # VUID-VkDeviceCreateInfo-pNext-pNext -- 2.7.4