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

radv: emit the GS copy shader outside of radv_pipeline_emit_hw_gs()

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22095>
This commit is contained in:
Samuel Pitoiset
2023-03-23 17:22:45 +01:00
committed by Marge Bot
parent d071e36851
commit 5c3c80be45
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/amd/vulkan/radv_pipeline.c
View File

@@ -4080,8 +4080,6 @@ radv_pipeline_emit_hw_gs(const struct radv_device *device, struct radeon_cmdbuf
S_00B204_SPI_SHADER_LATE_ALLOC_GS_GFX10(0), S_00B204_SPI_SHADER_LATE_ALLOC_GS_GFX10(0),
C_00B204_CU_EN_GFX10, 16, &pdevice->rad_info)); C_00B204_CU_EN_GFX10, 16, &pdevice->rad_info));
} }
radv_pipeline_emit_hw_vs(device, ctx_cs, cs, pipeline, pipeline->base.gs_copy_shader);
} }
static void static void
@@ -4095,10 +4093,12 @@ radv_pipeline_emit_geometry_shader(const struct radv_device *device, struct rade
if (!gs) if (!gs)
return; return;
if (gs->info.is_ngg) if (gs->info.is_ngg) {
radv_pipeline_emit_hw_ngg(device, ctx_cs, cs, pipeline, gs); radv_pipeline_emit_hw_ngg(device, ctx_cs, cs, pipeline, gs);
else } else {
radv_pipeline_emit_hw_gs(device, ctx_cs, cs, pipeline, gs); radv_pipeline_emit_hw_gs(device, ctx_cs, cs, pipeline, gs);
radv_pipeline_emit_hw_vs(device, ctx_cs, cs, pipeline, pipeline->base.gs_copy_shader);
}
radeon_set_context_reg(ctx_cs, R_028B38_VGT_GS_MAX_VERT_OUT, gs->info.gs.vertices_out); radeon_set_context_reg(ctx_cs, R_028B38_VGT_GS_MAX_VERT_OUT, gs->info.gs.vertices_out);
} }