fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: determine radv_vgt_shader_key::has_ngg_xxx with the last VGT shader

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28151>
This commit is contained in:
Samuel Pitoiset 2024-03-13 12:29:50 +01:00 • committed by Marge Bot
parent 9ccbd459c6
commit c6485f560d
2 changed files with 5 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/amd/vulkan/radv_pipeline_graphics.c
View file

@ -102,16 +102,6 @@ radv_pipeline_has_ngg(const struct radv_graphics_pipeline *pipeline)
return shader->info.is_ngg;
}
bool
radv_pipeline_has_ngg_passthrough(const struct radv_graphics_pipeline *pipeline)
{
assert(radv_pipeline_has_ngg(pipeline));
struct radv_shader *shader = pipeline->base.shaders[pipeline->last_vgt_api_stage];
return shader->info.is_ngg_passthrough;
}
bool
radv_pipeline_has_gs_copy_shader(const struct radv_pipeline *pipeline)
{
@ -3580,6 +3570,7 @@ radv_emit_vgt_vertex_reuse(const struct radv_device *device, struct radeon_cmdbu
static struct radv_vgt_shader_key
radv_pipeline_generate_vgt_shader_key(const struct radv_device *device, const struct radv_graphics_pipeline *pipeline)
{
const struct radv_shader *last_vgt_shader = radv_get_last_vgt_shader(pipeline);
uint8_t hs_size = 64, gs_size = 64, vs_size = 64;
struct radv_vgt_shader_key key;
@ -3599,17 +3590,17 @@ radv_pipeline_generate_vgt_shader_key(const struct radv_device *device, const st
else if (pipeline->base.shaders[MESA_SHADER_MESH])
vs_size = gs_size = pipeline->base.shaders[MESA_SHADER_MESH]->info.wave_size;
if (radv_pipeline_has_ngg(pipeline)) {
if (last_vgt_shader->info.is_ngg) {
assert(!radv_pipeline_has_gs_copy_shader(&pipeline->base));
gs_size = vs_size;
}
key.tess = radv_pipeline_has_stage(pipeline, MESA_SHADER_TESS_CTRL);
key.gs = radv_pipeline_has_stage(pipeline, MESA_SHADER_GEOMETRY);
if (radv_pipeline_has_ngg(pipeline)) {
if (last_vgt_shader->info.is_ngg) {
key.ngg = 1;
key.ngg_passthrough = radv_pipeline_has_ngg_passthrough(pipeline);
key.ngg_streamout = !!pipeline->streamout_shader;
key.ngg_passthrough = last_vgt_shader->info.is_ngg_passthrough;
key.ngg_streamout = last_vgt_shader->info.so.num_outputs > 0;
}
if (radv_pipeline_has_stage(pipeline, MESA_SHADER_MESH)) {
key.mesh = 1;
@ -3898,20 +3889,6 @@ radv_pipeline_init_vertex_input_state(const struct radv_device *device, struct r
}
}
static struct radv_shader *
radv_pipeline_get_streamout_shader(struct radv_graphics_pipeline *pipeline)
{
int i;
for (i = MESA_SHADER_GEOMETRY; i >= MESA_SHADER_VERTEX; i--) {
struct radv_shader *shader = radv_get_shader(pipeline->base.shaders, i);
if (shader && shader->info.so.num_outputs > 0)
return shader;
}
return NULL;
}
static void
radv_pipeline_init_shader_stages_state(const struct radv_device *device, struct radv_graphics_pipeline *pipeline)
{
@ -4158,9 +4135,6 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv
radv_pipeline_init_shader_stages_state(device, pipeline);
/* Find the last vertex shader stage that eventually uses streamout. */
pipeline->streamout_shader = radv_pipeline_get_streamout_shader(pipeline);
pipeline->is_ngg = radv_pipeline_has_ngg(pipeline);
pipeline->has_ngg_culling =
pipeline->is_ngg && pipeline->base.shaders[pipeline->last_vgt_api_stage]->info.has_ngg_culling;

5
src/amd/vulkan/radv_private.h
View file

@ -2326,9 +2326,6 @@ struct radv_graphics_pipeline {
/* Last pre-PS API stage */
gl_shader_stage last_vgt_api_stage;
/* Not NULL if graphics pipeline uses streamout. */
struct radv_shader *streamout_shader;
unsigned rast_prim;
/* For vk_graphics_pipeline_state */
@ -2521,8 +2518,6 @@ radv_pipeline_has_stage(const struct radv_graphics_pipeline *pipeline, gl_shader
return pipeline->base.shaders[stage];
}
bool radv_pipeline_has_ngg_passthrough(const struct radv_graphics_pipeline *pipeline);
bool radv_pipeline_has_gs_copy_shader(const struct radv_pipeline *pipeline);
const struct radv_userdata_info *radv_get_user_sgpr(const struct radv_shader *shader, int idx);