AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: add GS copy shader BO to the cmdbuf BO list at bind time

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28965>
This commit is contained in:
Samuel Pitoiset
2024-04-29 14:32:43 +02:00
committed by Marge Bot
parent 2664e058de
commit 42dc4b463b
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1972,10 +1972,6 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer)
radv_cs_add_buffer(device->ws, cmd_buffer->cs, shader->bo);
}
if (cmd_buffer->state.gs_copy_shader) {
radv_cs_add_buffer(device->ws, cmd_buffer->cs, cmd_buffer->state.gs_copy_shader->bo);
}
struct radv_shader *task_shader = cmd_buffer->state.shaders[MESA_SHADER_TASK];
if (task_shader) {
radv_emit_compute_shader(pdev, cmd_buffer->gang.cs, task_shader);
@@ -6818,10 +6814,15 @@ radv_bind_geometry_shader(struct radv_cmd_buffer *cmd_buffer, const struct radv_
static void
radv_bind_gs_copy_shader(struct radv_cmd_buffer *cmd_buffer, struct radv_shader *gs_copy_shader)
{
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
cmd_buffer->state.gs_copy_shader = gs_copy_shader;
if (gs_copy_shader)
if (gs_copy_shader) {
cmd_buffer->shader_upload_seq = MAX2(cmd_buffer->shader_upload_seq, gs_copy_shader->upload_seq);
radv_cs_add_buffer(device->ws, cmd_buffer->cs, gs_copy_shader->bo);
}
}
static void
@@ -9693,10 +9694,6 @@ radv_bind_graphics_shaders(struct radv_cmd_buffer *cmd_buffer)
radv_bind_gs_copy_shader(cmd_buffer, gs_copy_shader);
if (cmd_buffer->state.gs_copy_shader) {
radv_cs_add_buffer(device->ws, cmd_buffer->cs, cmd_buffer->state.gs_copy_shader->bo);
}
/* Determine NGG GS info. */
if (cmd_buffer->state.shaders[MESA_SHADER_GEOMETRY] &&
cmd_buffer->state.shaders[MESA_SHADER_GEOMETRY]->info.is_ngg &&