OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: determine the last VGT api stage with mesh shaders and ESO

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27237>
This commit is contained in:
Samuel Pitoiset
2024-01-19 14:20:00 +01:00
committed by Marge Bot
parent 6adea03a3e
commit 29491d36aa
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -9025,11 +9025,19 @@ radv_emit_streamout_enable_state(struct radv_cmd_buffer *cmd_buffer)
cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_STREAMOUT_ENABLE; cmd_buffer->state.dirty &= ~RADV_CMD_DIRTY_STREAMOUT_ENABLE;
} }
static gl_shader_stage
radv_cmdbuf_get_last_vgt_api_stage(const struct radv_cmd_buffer *cmd_buffer)
{
if (cmd_buffer->state.active_stages & VK_SHADER_STAGE_MESH_BIT_EXT)
return MESA_SHADER_MESH;
return util_last_bit(cmd_buffer->state.active_stages & BITFIELD_MASK(MESA_SHADER_FRAGMENT)) - 1;
}
static void static void
radv_emit_shaders(struct radv_cmd_buffer *cmd_buffer) radv_emit_shaders(struct radv_cmd_buffer *cmd_buffer)
{ {
const gl_shader_stage last_vgt_api_stage = const gl_shader_stage last_vgt_api_stage = radv_cmdbuf_get_last_vgt_api_stage(cmd_buffer);
util_last_bit(cmd_buffer->state.active_stages & BITFIELD_MASK(MESA_SHADER_FRAGMENT)) - 1;
const struct radv_shader *last_vgt_shader = cmd_buffer->state.shaders[last_vgt_api_stage]; const struct radv_shader *last_vgt_shader = cmd_buffer->state.shaders[last_vgt_api_stage];
const struct radv_dynamic_state *d = &cmd_buffer->state.dynamic; const struct radv_dynamic_state *d = &cmd_buffer->state.dynamic;
const struct radv_device *device = cmd_buffer->device; const struct radv_device *device = cmd_buffer->device;
@@ -9265,8 +9273,7 @@ radv_bind_graphics_shaders(struct radv_cmd_buffer *cmd_buffer)
} }
/* Determine the last VGT shader. */ /* Determine the last VGT shader. */
const gl_shader_stage last_vgt_api_stage = const gl_shader_stage last_vgt_api_stage = radv_cmdbuf_get_last_vgt_api_stage(cmd_buffer);
util_last_bit(cmd_buffer->state.active_stages & BITFIELD_MASK(MESA_SHADER_FRAGMENT)) - 1;
cmd_buffer->state.last_vgt_shader = cmd_buffer->state.shaders[last_vgt_api_stage]; cmd_buffer->state.last_vgt_shader = cmd_buffer->state.shaders[last_vgt_api_stage];