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

radv: stop using the pipeline for emitting shaders

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:26:35 +01:00
committed by Marge Bot
parent 8f9b0088ab
commit 84faaca38a
1 changed files with 66 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3656,9 +3656,8 @@ radv_pipeline_emit_vgt_gs_mode(const struct radv_device *device, struct radeon_c
} }
static void static void
radv_pipeline_emit_hw_vs(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs, radv_emit_hw_vs(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
struct radeon_cmdbuf *cs, struct radeon_cmdbuf *cs, const struct radv_shader *shader)
const struct radv_graphics_pipeline *pipeline, const struct radv_shader *shader)
{ {
const struct radv_physical_device *pdevice = device->physical_device; const struct radv_physical_device *pdevice = device->physical_device;
uint64_t va = radv_shader_get_va(shader); uint64_t va = radv_shader_get_va(shader);
@@ -3733,8 +3732,7 @@ radv_pipeline_emit_hw_vs(const struct radv_device *device, struct radeon_cmdbuf
} }
static void static void
radv_pipeline_emit_hw_es(struct radeon_cmdbuf *cs, const struct radv_graphics_pipeline *pipeline, radv_emit_hw_es(struct radeon_cmdbuf *cs, const struct radv_shader *shader)
const struct radv_shader *shader)
{ {
uint64_t va = radv_shader_get_va(shader); uint64_t va = radv_shader_get_va(shader);
@@ -3746,8 +3744,7 @@ radv_pipeline_emit_hw_es(struct radeon_cmdbuf *cs, const struct radv_graphics_pi
} }
static void static void
radv_pipeline_emit_hw_ls(struct radeon_cmdbuf *cs, const struct radv_graphics_pipeline *pipeline, radv_emit_hw_ls(struct radeon_cmdbuf *cs, const struct radv_shader *shader)
const struct radv_shader *shader)
{ {
uint64_t va = radv_shader_get_va(shader); uint64_t va = radv_shader_get_va(shader);
@@ -3920,8 +3917,7 @@ radv_emit_hw_ngg(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
} }
static void static void
radv_pipeline_emit_hw_hs(const struct radv_device *device, struct radeon_cmdbuf *cs, radv_emit_hw_hs(const struct radv_device *device, struct radeon_cmdbuf *cs,
const struct radv_graphics_pipeline *pipeline,
const struct radv_shader *shader) const struct radv_shader *shader)
{ {
const struct radv_physical_device *pdevice = device->physical_device; const struct radv_physical_device *pdevice = device->physical_device;
@@ -3945,61 +3941,42 @@ radv_pipeline_emit_hw_hs(const struct radv_device *device, struct radeon_cmdbuf
} }
static void static void
radv_pipeline_emit_vertex_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs, radv_emit_vertex_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
struct radeon_cmdbuf *cs, struct radeon_cmdbuf *cs, const struct radv_shader *vs)
const struct radv_graphics_pipeline *pipeline)
{ {
struct radv_shader *vs;
/* Skip shaders merged into HS/GS */
vs = pipeline->base.shaders[MESA_SHADER_VERTEX];
if (!vs)
return;
if (vs->info.vs.as_ls) if (vs->info.vs.as_ls)
radv_pipeline_emit_hw_ls(cs, pipeline, vs); radv_emit_hw_ls(cs, vs);
else if (vs->info.vs.as_es) else if (vs->info.vs.as_es)
radv_pipeline_emit_hw_es(cs, pipeline, vs); radv_emit_hw_es(cs, vs);
else if (vs->info.is_ngg) else if (vs->info.is_ngg)
radv_emit_hw_ngg(device, ctx_cs, cs, NULL, vs); radv_emit_hw_ngg(device, ctx_cs, cs, NULL, vs);
else else
radv_pipeline_emit_hw_vs(device, ctx_cs, cs, pipeline, vs); radv_emit_hw_vs(device, ctx_cs, cs, vs);
} }
static void static void
radv_pipeline_emit_tess_shaders(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs, radv_emit_tess_ctrl_shader(const struct radv_device *device, struct radeon_cmdbuf *cs,
struct radeon_cmdbuf *cs, const struct radv_shader *tcs)
const struct radv_graphics_pipeline *pipeline)
{ {
const struct radv_physical_device *pdevice = device->physical_device; radv_emit_hw_hs(device, cs, tcs);
struct radv_shader *tes, *tcs; }
tcs = pipeline->base.shaders[MESA_SHADER_TESS_CTRL]; static void
tes = pipeline->base.shaders[MESA_SHADER_TESS_EVAL]; radv_emit_tess_eval_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
struct radeon_cmdbuf *cs, const struct radv_shader *tes)
if (tes) { {
if (tes->info.is_ngg) { if (tes->info.is_ngg) {
radv_emit_hw_ngg(device, ctx_cs, cs, NULL, tes); radv_emit_hw_ngg(device, ctx_cs, cs, NULL, tes);
} else if (tes->info.tes.as_es) } else if (tes->info.tes.as_es) {
radv_pipeline_emit_hw_es(cs, pipeline, tes); radv_emit_hw_es(cs, tes);
else } else {
radv_pipeline_emit_hw_vs(device, ctx_cs, cs, pipeline, tes); radv_emit_hw_vs(device, ctx_cs, cs, tes);
}
radv_pipeline_emit_hw_hs(device, cs, pipeline, tcs);
if (pdevice->rad_info.gfx_level >= GFX10 &&
!radv_pipeline_has_stage(pipeline, MESA_SHADER_GEOMETRY) && !radv_pipeline_has_ngg(pipeline)) {
radeon_set_context_reg(ctx_cs, R_028A44_VGT_GS_ONCHIP_CNTL,
S_028A44_ES_VERTS_PER_SUBGRP(250) | S_028A44_GS_PRIMS_PER_SUBGRP(126) |
S_028A44_GS_INST_PRIMS_IN_SUBGRP(126));
} }
} }
static void static void
radv_pipeline_emit_hw_gs(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs, radv_emit_hw_gs(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
struct radeon_cmdbuf *cs, const struct radv_graphics_pipeline *pipeline, struct radeon_cmdbuf *cs, const struct radv_shader *gs)
const struct radv_shader *gs)
{ {
const struct radv_physical_device *pdevice = device->physical_device; const struct radv_physical_device *pdevice = device->physical_device;
const struct radv_legacy_gs_info *gs_state = &gs->info.gs_ring_info; const struct radv_legacy_gs_info *gs_state = &gs->info.gs_ring_info;
@@ -4084,37 +4061,25 @@ radv_pipeline_emit_hw_gs(const struct radv_device *device, struct radeon_cmdbuf
} }
static void static void
radv_pipeline_emit_geometry_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs, radv_emit_geometry_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
struct radeon_cmdbuf *cs, struct radeon_cmdbuf *cs, const struct radv_shader *gs,
const struct radv_graphics_pipeline *pipeline) const struct radv_shader *es, const struct radv_shader *gs_copy_shader)
{ {
struct radv_shader *gs;
gs = pipeline->base.shaders[MESA_SHADER_GEOMETRY];
if (!gs)
return;
if (gs->info.is_ngg) { if (gs->info.is_ngg) {
const struct radv_shader *es = pipeline->base.shaders[gs->info.gs.es_type];
radv_emit_hw_ngg(device, ctx_cs, cs, es, gs); radv_emit_hw_ngg(device, ctx_cs, cs, es, gs);
} else { } else {
radv_pipeline_emit_hw_gs(device, ctx_cs, cs, pipeline, gs); radv_emit_hw_gs(device, ctx_cs, cs, gs);
radv_pipeline_emit_hw_vs(device, ctx_cs, cs, pipeline, pipeline->base.gs_copy_shader); radv_emit_hw_vs(device, ctx_cs, cs, 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);
} }
static void static void
radv_pipeline_emit_mesh_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs, radv_emit_mesh_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
struct radeon_cmdbuf *cs, struct radeon_cmdbuf *cs, const struct radv_shader *ms)
const struct radv_graphics_pipeline *pipeline)
{ {
const struct radv_physical_device *pdevice = device->physical_device; const struct radv_physical_device *pdevice = device->physical_device;
struct radv_shader *ms = pipeline->base.shaders[MESA_SHADER_MESH];
if (!ms)
return;
radv_emit_hw_ngg(device, ctx_cs, cs, NULL, ms); radv_emit_hw_ngg(device, ctx_cs, cs, NULL, ms);
radeon_set_context_reg(ctx_cs, R_028B38_VGT_GS_MAX_VERT_OUT, ms->info.workgroup_size); radeon_set_context_reg(ctx_cs, R_028B38_VGT_GS_MAX_VERT_OUT, ms->info.workgroup_size);
@@ -4256,17 +4221,13 @@ radv_emit_ps_inputs(const struct radv_device *device, struct radeon_cmdbuf *ctx_
} }
static void static void
radv_pipeline_emit_fragment_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs, radv_emit_fragment_shader(const struct radv_device *device, struct radeon_cmdbuf *ctx_cs,
struct radeon_cmdbuf *cs, struct radeon_cmdbuf *cs, const struct radv_shader *ps)
const struct radv_graphics_pipeline *pipeline)
{ {
const struct radv_physical_device *pdevice = device->physical_device; const struct radv_physical_device *pdevice = device->physical_device;
struct radv_shader *ps;
bool param_gen; bool param_gen;
uint64_t va; uint64_t va;
assert(pipeline->base.shaders[MESA_SHADER_FRAGMENT]);
ps = pipeline->base.shaders[MESA_SHADER_FRAGMENT];
va = radv_shader_get_va(ps); va = radv_shader_get_va(ps);
radeon_set_sh_reg_seq(cs, R_00B020_SPI_SHADER_PGM_LO_PS, 4); radeon_set_sh_reg_seq(cs, R_00B020_SPI_SHADER_PGM_LO_PS, 4);
@@ -4540,15 +4501,39 @@ radv_pipeline_emit_pm4(const struct radv_device *device,
radv_pipeline_emit_depth_stencil_state(ctx_cs, ds_state); radv_pipeline_emit_depth_stencil_state(ctx_cs, ds_state);
radv_pipeline_emit_blend_state(ctx_cs, pipeline, blend); radv_pipeline_emit_blend_state(ctx_cs, pipeline, blend);
radv_pipeline_emit_vgt_gs_mode(device, ctx_cs, pipeline); radv_pipeline_emit_vgt_gs_mode(device, ctx_cs, pipeline);
radv_pipeline_emit_vertex_shader(device, ctx_cs, cs, pipeline);
radv_pipeline_emit_mesh_shader(device, ctx_cs, cs, pipeline);
if (radv_pipeline_has_stage(pipeline, MESA_SHADER_TESS_CTRL)) { if (radv_pipeline_has_stage(pipeline, MESA_SHADER_VERTEX)) {
radv_pipeline_emit_tess_shaders(device, ctx_cs, cs, pipeline); radv_emit_vertex_shader(device, ctx_cs, cs, pipeline->base.shaders[MESA_SHADER_VERTEX]);
} }
radv_pipeline_emit_geometry_shader(device, ctx_cs, cs, pipeline); if (radv_pipeline_has_stage(pipeline, MESA_SHADER_MESH)) {
radv_pipeline_emit_fragment_shader(device, ctx_cs, cs, pipeline); radv_emit_mesh_shader(device, ctx_cs, cs, pipeline->base.shaders[MESA_SHADER_MESH]);
}
if (radv_pipeline_has_stage(pipeline, MESA_SHADER_TESS_CTRL)) {
radv_emit_tess_ctrl_shader(device, cs, pipeline->base.shaders[MESA_SHADER_TESS_CTRL]);
if (radv_pipeline_has_stage(pipeline, MESA_SHADER_TESS_EVAL)) {
radv_emit_tess_eval_shader(device, ctx_cs, cs,
pipeline->base.shaders[MESA_SHADER_TESS_EVAL]);
}
if (pdevice->rad_info.gfx_level >= GFX10 &&
!radv_pipeline_has_stage(pipeline, MESA_SHADER_GEOMETRY) && !radv_pipeline_has_ngg(pipeline)) {
radeon_set_context_reg(ctx_cs, R_028A44_VGT_GS_ONCHIP_CNTL,
S_028A44_ES_VERTS_PER_SUBGRP(250) | S_028A44_GS_PRIMS_PER_SUBGRP(126) |
S_028A44_GS_INST_PRIMS_IN_SUBGRP(126));
}
}
if (radv_pipeline_has_stage(pipeline, MESA_SHADER_GEOMETRY)) {
const struct radv_shader *gs = pipeline->base.shaders[MESA_SHADER_GEOMETRY];
const struct radv_shader *es = pipeline->base.shaders[gs->info.gs.es_type];
radv_emit_geometry_shader(device, ctx_cs, cs, gs, es, pipeline->base.gs_copy_shader);
}
radv_emit_fragment_shader(device, ctx_cs, cs, ps);
radv_emit_ps_inputs(device, ctx_cs, last_vgt_shader, ps); radv_emit_ps_inputs(device, ctx_cs, last_vgt_shader, ps);
radv_pipeline_emit_vgt_vertex_reuse(device, ctx_cs, pipeline); radv_pipeline_emit_vgt_vertex_reuse(device, ctx_cs, pipeline);
radv_pipeline_emit_vgt_shader_config(device, ctx_cs, pipeline); radv_pipeline_emit_vgt_shader_config(device, ctx_cs, pipeline);