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

radeonsi: use mesa_prim_has_adjacency

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Mary Guillemard <mary.guillemard@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32529>
This commit is contained in:
Alyssa Rosenzweig 2024-12-12 09:44:01 -05:00 • committed by Marge Bot
parent b7f2d480da
commit 41076b2a55
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,8 +53,7 @@ bool gfx10_ngg_calculate_subgroup_info(struct si_shader *shader)
const gl_shader_stage gs_stage = gs_sel->stage;
const unsigned gs_num_invocations = MAX2(gs_sel->info.base.gs.invocations, 1);
const unsigned input_prim = si_get_input_prim(gs_sel, &shader->key, false);
const bool use_adjacency =
input_prim >= MESA_PRIM_LINES_ADJACENCY && input_prim <= MESA_PRIM_TRIANGLE_STRIP_ADJACENCY;
const bool use_adjacency = mesa_prim_has_adjacency(input_prim);
const unsigned max_verts_per_prim = mesa_vertices_per_prim(input_prim);
const unsigned min_verts_per_prim = gs_stage == MESA_SHADER_GEOMETRY ? max_verts_per_prim : 1;

3
src/gallium/drivers/radeonsi/si_state_shaders.cpp
View file

@ -833,8 +833,7 @@ void gfx9_get_gs_info(struct si_shader_selector *es, struct si_shader_selector *
{
unsigned gs_num_invocations = MAX2(gs->info.base.gs.invocations, 1);
unsigned input_prim = gs->info.base.gs.input_primitive;
bool uses_adjacency =
input_prim >= MESA_PRIM_LINES_ADJACENCY && input_prim <= MESA_PRIM_TRIANGLE_STRIP_ADJACENCY;
bool uses_adjacency = mesa_prim_has_adjacency((enum mesa_prim)input_prim);
/* All these are in dwords: */
/* We can't allow using the whole LDS, because GS waves compete with