Module: Mesa Branch: main Commit: b6bfa73dc7b7825aca85b2451d446a32ebc05505 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b6bfa73dc7b7825aca85b2451d446a32ebc05505
Author: Mike Blumenkrantz <[email protected]> Date: Wed Jan 10 09:27:10 2024 -0500 vk/cmdbuf: add back deleted maint6 workgraph bits this otherwise breaks workgraph support in lavapipe Fixes: ec656e19840 ("lavapipe: maint6") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26977> --- src/vulkan/runtime/vk_command_buffer.c | 4 ++++ src/vulkan/runtime/vk_command_buffer.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/vulkan/runtime/vk_command_buffer.c b/src/vulkan/runtime/vk_command_buffer.c index 38936d997b2..f678d9bc0a1 100644 --- a/src/vulkan/runtime/vk_command_buffer.c +++ b/src/vulkan/runtime/vk_command_buffer.c @@ -200,6 +200,10 @@ VkShaderStageFlags vk_shader_stages_from_bind_point(VkPipelineBindPoint pipelineBindPoint) { switch (pipelineBindPoint) { +#ifdef VK_ENABLE_BETA_EXTENSIONS + case VK_PIPELINE_BIND_POINT_EXECUTION_GRAPH_AMDX: + return VK_SHADER_STAGE_COMPUTE_BIT | MESA_VK_SHADER_STAGE_WORKGRAPH_HACK_BIT_FIXME; +#endif case VK_PIPELINE_BIND_POINT_COMPUTE: return VK_SHADER_STAGE_COMPUTE_BIT; case VK_PIPELINE_BIND_POINT_GRAPHICS: diff --git a/src/vulkan/runtime/vk_command_buffer.h b/src/vulkan/runtime/vk_command_buffer.h index c6451ec5d06..9d2b818655c 100644 --- a/src/vulkan/runtime/vk_command_buffer.h +++ b/src/vulkan/runtime/vk_command_buffer.h @@ -98,6 +98,8 @@ enum mesa_vk_command_buffer_state { MESA_VK_COMMAND_BUFFER_STATE_PENDING, }; +/* this needs spec fixes */ +#define MESA_VK_SHADER_STAGE_WORKGRAPH_HACK_BIT_FIXME (1<<30) VkShaderStageFlags vk_shader_stages_from_bind_point(VkPipelineBindPoint pipelineBindPoint); struct vk_command_buffer {
