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

radv: Remove num_viewports from radv_skip_ngg_culling.

Browse source 
NGG culling is not compiled into shaders that can use multiple
viewports, so it's not necessary to check it here.

Fixes: 9a95f5487f
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11910>
(cherry picked from commit d07e5bde75)
This commit is contained in:
Timur Kristóf 2021-07-15 17:19:56 +02:00 • committed by Dylan Baker
parent c511014205
commit a63d23c4c2
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -193,7 +193,7 @@
"description": "radv: Remove num_viewports from radv_skip_ngg_culling.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "9a95f5487f5ab83fa44bea12afa30cf1a25fc9db"
},

10
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -5664,17 +5664,15 @@ enum {
ALWAYS_INLINE static bool
radv_skip_ngg_culling(bool has_tess, const unsigned vtx_cnt,
bool indirect, unsigned num_viewports)
bool indirect)
{
/* If we have to draw only a few vertices, we get better latency if
* we disable NGG culling.
*
* When tessellation is used, what matters is the number of tessellated
* vertices, so let's always assume it's not a small draw.
*
* TODO: Figure out how to do culling with multiple viewports efficiently.
*/
return !has_tess && !indirect && vtx_cnt < 512 && num_viewports == 1;
return !has_tess && !indirect && vtx_cnt < 512;
}
ALWAYS_INLINE static uint32_t
@ -5757,9 +5755,7 @@ radv_emit_ngg_culling_state(struct radv_cmd_buffer *cmd_buffer, const struct rad
* For small draw calls, we disable culling by setting the SGPR to 0.
*/
const bool skip =
radv_skip_ngg_culling(
stage == MESA_SHADER_TESS_EVAL, draw_info->count, draw_info->indirect,
cmd_buffer->state.dynamic.viewport.count);
radv_skip_ngg_culling(stage == MESA_SHADER_TESS_EVAL, draw_info->count, draw_info->indirect);
/* See if anything changed. */
if (!dirty && skip == cmd_buffer->state.last_nggc_skip)