NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

vk/cmdbuf: add back deleted maint6 workgraph bits

Browse source 
this otherwise breaks workgraph support in lavapipe

Fixes: ec656e1984 ("lavapipe: maint6")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26977>
(cherry picked from commit b6bfa73dc7b7825aca85b2451d446a32ebc05505)
This commit is contained in:
Mike Blumenkrantz 2024-01-10 09:27:10 -05:00 • committed by Eric Engestrom
parent f1064107e9
commit ae5c0e6600
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1494,7 +1494,7 @@
"description": "vk/cmdbuf: add back deleted maint6 workgraph bits",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "ec656e198402a535a20e7ac31cea277b060ab75a",
"notes": null

4
src/vulkan/runtime/vk_command_buffer.c
View file

@ -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:

2
src/vulkan/runtime/vk_command_buffer.h
View file

@ -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 {