ci/zink: Drop anv/lvp validation exceptions that should be fixed in the CTS.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22495>

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 9bc21ee..ddd1a33 100644 (file)
--- 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-vkCmdDispatch-viewType-07752,VUID-vkCmdDrawMultiEXT-viewType-07752,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
 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
@@ -74,33 +74,6 @@ khronos_validation.log_filename = stdout
 # enabled, a PointSize decorated variable must be written to
 # (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkGraphicsPipelineCreateInfo-Geometry-07725)
 
-# KHR-GL46.shader_image_size.advanced-nonMS-cs-uint
-# [ VUID-vkCmdDispatch-viewType-07752 ] Object 0: handle = 0x91235f000001e6d7,
-# type = VK_OBJECT_TYPE_DESCRIPTOR_SET; | MessageID = 0x6174abc7 | vkCmdDispatch:
-# Descriptor set VkDescriptorSet 0x91235f000001e6d7[] in binding #3 index 0
-# requires an image view of type VK_IMAGE_VIEW_TYPE_CUBE but got VkImageView
-# 0xf8e246000001e6c6[] which is of type VK_IMAGE_VIEW_TYPE_2D. The Vulkan spec
-# states: If a VkImageView is accessed as a result of this command, then the image
-# view's viewType must match the Dim operand of the OpTypeImage as described in
-# Instruction/Sampler/Image View Validation
-# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDispatch-viewType-07752)
-#
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4250
-
-# KHR-GL46.shader_image_size.advanced-nonMS-fs-int:
-# [ VUID-vkCmdDrawMultiEXT-viewType-07752 ] Object 0: handle =
-# 0x2a7f70000000053, type = VK_OBJECT_TYPE_DESCRIPTOR_SET; | MessageID =
-# 0xacde5967 | vkCmdDrawMultiEXT: Descriptor set VkDescriptorSet
-# 0x2a7f70000000053[] in binding #131 index 0 requires an image view of type
-# VK_IMAGE_VIEW_TYPE_CUBE but got VkImageView 0x6612e40000000041[] which is of
-# type VK_IMAGE_VIEW_TYPE_2D. The Vulkan spec states: If a VkImageView is accessed
-# as a result of this command, then the image view's viewType must match the Dim
-# operand of the OpTypeImage as described in Instruction/Sampler/Image View
-# Validation
-# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDrawMultiEXT-viewType-07752)
-#
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4250
-
 # KHR-GL46.sample_variables.mask.rgba8i.samples_8.mask_3:
 # [ VUID-vkCmdDrawMultiIndexedEXT-format-07753 ] Object 0: handle =
 # 0x535b660000000043, type = VK_OBJECT_TYPE_DESCRIPTOR_SET; | MessageID =

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 676144a..2b3680d 100644 (file)
--- 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-vkCmdDrawMultiIndexedEXT-format-07753,VUID-vkCmdDrawMultiEXT-viewType-07752,VUID-vkCmdDispatch-viewType-07752,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
 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
@@ -72,23 +72,6 @@ khronos_validation.log_filename = stdout
 # Recent VU regression:
 # https://gitlab.khronos.org/vulkan/vulkan/-/issues/3357
 
-# KHR-GL46.shader_atomic_counter_ops_tests.ShaderAtomicCounterOpsAdditionSubstractionTestCase:
-#
-# [ VUID-vkCmdDrawMultiIndexedEXT-format-07753 ] Object 0: handle =
-# 0xa952a5000000016f, type = VK_OBJECT_TYPE_DESCRIPTOR_SET; | MessageID =
-# 0xd35852d3 | vkCmdDrawMultiIndexedEXT: Descriptor set VkDescriptorSet
-# 0xa952a5000000016f[] in binding #128 index 0 requires FLOAT component
-# type, but bound descriptor format is VK_FORMAT_R32G32B32A32_UINT
-# (VkImageView 0xbf15540000000166[]). The Vulkan spec states: If a
-# VkImageView is accessed as a result of this command, then the image
-# view's format must match the numeric format from the Sampled Type
-# operand of the OpTypeImage as described in the SPIR-V Sampled Type
-# column of the Interpretation of Numeric Format table
-# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDrawMultiIndexedEXT-format-07753)
-#
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4244
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4250
-
 # KHR-GL46.shader_image_load_store.basic-allTargets-atomic:
 # [ VUID-vkCmdDrawMultiEXT-viewType-07752 ] Object 0: handle =
 # 0x5581c500000000d5, type = VK_OBJECT_TYPE_DESCRIPTOR_SET; | MessageID =
@@ -101,20 +84,6 @@ khronos_validation.log_filename = stdout
 # View Validation
 # (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDrawMultiEXT-viewType-07752)
 
-# KHR-GL46.shader_image_size.advanced-nonMS-cs-int:
-#
-# [ VUID-vkCmdDispatch-viewType-07752 ] Object 0: handle = 0xc8986900000032ed,
-# type = VK_OBJECT_TYPE_DESCRIPTOR_SET; | MessageID = 0x6174abc7 | vkCmdDispatch:
-# Descriptor set VkDescriptorSet 0xc8986900000032ed[] in binding #3 index 0
-# requires an image view of type VK_IMAGE_VIEW_TYPE_CUBE but got VkImageView
-# 0x3ce28700000032e2[] which is of type VK_IMAGE_VIEW_TYPE_2D. The Vulkan spec
-# states: If a VkImageView is accessed as a result of this command, then the image
-# view's viewType must match the Dim operand of the OpTypeImage as described in
-# Instruction/Sampler/Image View Validation
-# (https://www.khronos.org/registry/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-vkCmdDispatch-viewType-07752)
-#
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/4250
-
 #  KHR-Single-GL46.enhanced_layouts.varying_array_locations:
 #
 # [ VUID-RuntimeSpirv-Location-06272 ] Object 0: handle =