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 c16c99c8341..e3e3c5546df 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-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiEXT-None-02699,VUID-RuntimeSpirv-OpEntryPoint-08743 +khronos_validation.message_id_filter = VUID-VkPhysicalDeviceProperties2-pNext-pNext,VUID-VkDeviceCreateInfo-pNext-pNext,VUID-RuntimeSpirv-Location-06272,VUID-vkCmdDrawMultiEXT-None-02699,VUID-RuntimeSpirv-OpEntryPoint-08743,VUID-vkCmdPipelineBarrier2-shaderTileImageColorReadAccess-08718,VUID-VkGraphicsPipelineCreateInfo-flags-06482,VUID-vkCmdPipelineBarrier2-None-08719 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 @@ -55,3 +55,8 @@ 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 + +# VVL missing support for KHR_dynamic_rendering_local_read +# VUID-vkCmdPipelineBarrier2-shaderTileImageColorReadAccess-08718 +# VUID-VkGraphicsPipelineCreateInfo-flags-06482 +# VUID-vkCmdPipelineBarrier2-None-08719 diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index f38b32ed171..4556e1dea38 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -2972,7 +2972,8 @@ zink_batch_rp(struct zink_context *ctx) * - dynamic rendering doesn't have input attachments */ if (!zink_screen(ctx->base.screen)->info.have_KHR_dynamic_rendering || - (ctx->transient_attachments && !zink_screen(ctx->base.screen)->info.have_EXT_multisampled_render_to_single_sampled) || ctx->fbfetch_outputs) + (ctx->transient_attachments && !zink_screen(ctx->base.screen)->info.have_EXT_multisampled_render_to_single_sampled) || + (ctx->fbfetch_outputs && !zink_screen(ctx->base.screen)->info.have_KHR_dynamic_rendering_local_read)) clear_buffers = zink_begin_render_pass(ctx); else clear_buffers = begin_rendering(ctx);