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

radeonsi: simplify si_get_input_prim and remove incorrect TODO comment

Browse source 
u_vertices_per_prim(QUADS) is the same as TRIANGLES.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
This commit is contained in:
Marek Olšák 2019-07-19 21:12:43 -04:00
parent 16392cc3f3
commit e718f8e713
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/radeonsi/gfx10_shader_ngg.c
View file

@ -1315,10 +1315,7 @@ void gfx10_ngg_calculate_subgroup_info(struct si_shader *shader)
shader->previous_stage_sel ? shader->previous_stage_sel : gs_sel;
const enum pipe_shader_type gs_type = gs_sel->type;
const unsigned gs_num_invocations = MAX2(gs_sel->gs_num_invocations, 1);
/* TODO: Use QUADS as the worst case because of reuse, but triangles
* will always have 1 additional unoccupied vector lane. We could use
* that lane if the worst case was TRIANGLES. */
const unsigned input_prim = si_get_input_prim(gs_sel, PIPE_PRIM_QUADS);
const unsigned input_prim = si_get_input_prim(gs_sel);
const bool use_adjacency = input_prim >= PIPE_PRIM_LINES_ADJACENCY &&
input_prim <= PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY;
const unsigned max_verts_per_prim = u_vertices_per_prim(input_prim);

3
src/gallium/drivers/radeonsi/si_state.h
View file

@ -599,8 +599,7 @@ void si_shader_selector_key_vs(struct si_context *sctx,
struct si_shader_selector *vs,
struct si_shader_key *key,
struct si_vs_prolog_bits *prolog_key);
unsigned si_get_input_prim(const struct si_shader_selector *gs,
unsigned default_worst_case);
unsigned si_get_input_prim(const struct si_shader_selector *gs);
/* si_state_draw.c */
void si_emit_surface_sync(struct si_context *sctx, struct radeon_cmdbuf *cs,

8
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -1060,8 +1060,7 @@ static void si_set_ge_pc_alloc(struct si_screen *sscreen,
S_030980_NUM_PC_LINES((culling ? 256 : 128) * sscreen->info.max_se - 1));
}
unsigned si_get_input_prim(const struct si_shader_selector *gs,
unsigned default_worst_case)
unsigned si_get_input_prim(const struct si_shader_selector *gs)
{
if (gs->type == PIPE_SHADER_GEOMETRY)
return gs->info.properties[TGSI_PROPERTY_GS_INPUT_PRIM];
@ -1075,7 +1074,7 @@ unsigned si_get_input_prim(const struct si_shader_selector *gs,
}
/* TODO: Set this correctly if the primitive type is set in the shader key. */
return default_worst_case;
return PIPE_PRIM_TRIANGLES; /* worst case for all callers */
}
/**
@ -1098,8 +1097,7 @@ static void gfx10_shader_ngg(struct si_screen *sscreen, struct si_shader *shader
gs_info->properties[TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION];
bool es_enable_prim_id = shader->key.mono.u.vs_export_prim_id || es_info->uses_primid;
unsigned gs_num_invocations = MAX2(gs_sel->gs_num_invocations, 1);
/* Anything above TRIANGLES has the same effect as TRIANGLES here. */
unsigned input_prim = si_get_input_prim(gs_sel, PIPE_PRIM_TRIANGLES);
unsigned input_prim = si_get_input_prim(gs_sel);
bool break_wave_at_eoi = false;
struct si_pm4_state *pm4 = si_get_shader_pm4_state(shader);
if (!pm4)