Module: Mesa Branch: main Commit: f2fb2df6a38693777c0b9451a454d6fcb7490df3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f2fb2df6a38693777c0b9451a454d6fcb7490df3
Author: Mike Blumenkrantz <[email protected]> Date: Thu Oct 26 10:13:15 2023 -0400 ci: bump VVL to 1.3.269 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25914> --- .gitlab-ci/container/build-vulkan-validation.sh | 2 +- .gitlab-ci/image-tags.yml | 4 ++-- .../zink/ci/zink-anv-tgl-validation-settings.txt | 6 +++++- .../drivers/zink/ci/zink-lvp-validation-settings.txt | 20 +++++++++++++++++++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/container/build-vulkan-validation.sh b/.gitlab-ci/container/build-vulkan-validation.sh index c93a44d3b38..66313ab4d03 100644 --- a/.gitlab-ci/container/build-vulkan-validation.sh +++ b/.gitlab-ci/container/build-vulkan-validation.sh @@ -7,7 +7,7 @@ set -ex -VALIDATION_TAG="v1.3.263" +VALIDATION_TAG="v1.3.269" 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 4ad57a4d541..a3a1e3adfad 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -22,13 +22,13 @@ variables: DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_X86_64_TEST_ANDROID_TAG: "2023-10-15-deqp" - DEBIAN_X86_64_TEST_GL_TAG: "2023-10-15-deqp" + DEBIAN_X86_64_TEST_GL_TAG: "2023-10-26-vvl" DEBIAN_X86_64_TEST_VK_TAG: "2023-10-15-deqp" ALPINE_X86_64_BUILD_TAG: "2023-10-04-ephemeral" ALPINE_X86_64_LAVA_SSH_TAG: "2023-06-26-first-version" FEDORA_X86_64_BUILD_TAG: "2023-08-04-shader-db" - KERNEL_ROOTFS_TAG: "2023-10-13-deqp" + KERNEL_ROOTFS_TAG: "2023-10-26-vvl" KERNEL_TAG: "v6.4.12-for-mesa-ci-f6b4ad45f48d" WINDOWS_X64_VS_PATH: "windows/x64_vs" 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 4b2d76d129b..ff47200242b 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 = VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,UNASSIGNED-CoreValidation-Shader-InconsistentSpirv,VUID-vkDestroyDevice-device-00378,VUID-VkShaderModuleCreateInfo-pCode-01377,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,VUID-VkGraphicsPipelineCreateInfo-topology-00737,VUID-VkGraphicsPipelineCreateInfo-pStages-00736,VUID-vkCmdCopyImage-srcImage-07743,VUID-vkCmdDrawMultiIndexedEXT-format-07753,VUID-vkCmdDrawMultiEXT-pDepthAttachment-06181,VUID-vkCmdDrawMultiEXT-pStencilAttachment-06182,VUID-vkCmdDrawMultiIndexedEXT-pDepthAttachment-06181,VUID-vkCmdDrawMultiIndexedEXT-pStencilAttachment-06182 +khronos_validation.message_id_filter = VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,UNASSIGNED-CoreValidation-Shader-InconsistentSpirv,VUID-vkDestroyDevice-device-00378,VUID-VkShaderModuleCreateInfo-pCode-01377,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,VUID-VkGraphicsPipelineCreateInfo-topology-00737,VUID-VkGraphicsPipelineCreateInfo-pStages-00736,VUID-vkCmdCopyImage-srcImage-07743,VUID-vkCmdDrawMultiIndexedEXT-format-07753,VUID-vkCmdDrawMultiEXT-pDepthAttachment-06181,VUID-vkCmdDrawMultiEXT-pStencilAttachment-06182,VUID-vkCmdDrawMultiIndexedEXT-pDepthAttachment-06181,VUID-vkCmdDrawMultiIndexedEXT-pStencilAttachment-06182,VUID-vkDestroyDevice-devic e-05137 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 @@ -138,3 +138,7 @@ khronos_validation.log_filename = stdout # VUID-vkCmdDrawMultiIndexedEXT-pDepthAttachment-06181 # VUID-vkCmdDrawMultiIndexedEXT-pStencilAttachment-06182 # spec issue + + +# VUID-vkDestroyDevice-device-05137 +# some kind of bug 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 67175de2033..c424cfda6a0 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-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,VUID-VkGraphicsPipelineCreateInfo-Geometry-07725,VUID-VkShaderModuleCreateInfo-pCode-01091,VUID-vkCmdCopyImage-srcImage-07743,VUID-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiEXT-None-02699,VUID-VkShaderModuleCreateInfo-pCode-01091,VUID-VkShaderModuleCreateInfo-pCode-08740,VUID-RuntimeSpirv-OpEntryPoint-08743 +khronos_validation.message_id_filter = VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,VUID-VkGraphicsPipelineCreateInfo-Geometry-07725,VUID-VkShaderModuleCreateInfo-pCode-01091,VUID-vkCmdCopyImage-srcImage-07743,VUID-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiEXT-None-02699,VUID-VkShaderModuleCreateInfo-pCode-01091,VUID-VkShaderModuleCreateInfo-pCode-08740,VUID-RuntimeSpirv-OpEntryPoint-08743,VUID-vkCmdDrawMultiEXT-rasterizationSamples-07471,VUID-vkCmdDrawMultiIndexedEXT-rasterizationSamples-07471 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 @@ -117,3 +117,21 @@ khronos_validation.log_filename = stdout # (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 + + +# dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.multisample_texture_4 +# +# VUID-vkCmdDrawMultiEXT-rasterizationSamples-07471(ERROR / SPEC): msgNum: 1182038117 - +# Validation Error: [ VUID-vkCmdDrawMultiEXT-rasterizationSamples-07471 ] +# Object 0: handle = 0x868e960, type = VK_OBJECT_TYPE_COMMAND_BUFFER; Object 1: handle = 0x74ea280000000054, +# type = VK_OBJECT_TYPE_PIPELINE; | MessageID = 0x46747865 | +# vkCmdDrawMultiEXT(): VkPhysicalDeviceFeatures::variableMultisampleRate is VK_FALSE and the +# rasterizationSamples set with vkCmdSetRasterizationSamplesEXT() were VK_SAMPLE_COUNT_1_BIT +# but a previous draw used rasterization samples 4.. +# The Vulkan spec states: If the bound graphics pipeline state was created with the +# VK_DYNAMIC_STATE_RASTERIZATION_SAMPLES_EXT state enabled, and the current subpass does +# not use any color and/or depth/stencil attachments, then the rasterizationSamples +# in the last call to vkCmdSetRasterizationSamplesEXT must follow the rules for a zero-attachment subpass +# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDrawMultiEXT-rasterizationSamples-07471) +# +# VVL bug dEQP-GLES31.functional.shaders.sample_variables.sample_pos.correctness.multisample_texture_4
