Module: Mesa Branch: main Commit: 42803c70ef46d19184c189f163ba8c26fc817dda URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=42803c70ef46d19184c189f163ba8c26fc817dda
Author: Samuel Pitoiset <[email protected]> Date: Thu Jul 21 17:47:32 2022 +0200 radv: simplify dynamic states uses when determining NGG culling settings Looking at the dynamic states is enough. Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17677> --- src/amd/vulkan/radv_cmd_buffer.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 5922eccc3ad..6e36fbed505 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -7327,17 +7327,13 @@ radv_get_ngg_culling_settings(struct radv_cmd_buffer *cmd_buffer, bool vp_y_inve const struct radv_dynamic_state *d = &cmd_buffer->state.dynamic; /* Cull every triangle when rasterizer discard is enabled. */ - if (d->rasterizer_discard_enable || - G_028810_DX_RASTERIZATION_KILL(cmd_buffer->state.graphics_pipeline->pa_cl_clip_cntl)) + if (d->rasterizer_discard_enable) return radv_nggc_front_face | radv_nggc_back_face; - uint32_t pa_su_sc_mode_cntl = cmd_buffer->state.graphics_pipeline->pa_su_sc_mode_cntl; uint32_t nggc_settings = radv_nggc_none; /* The culling code needs to know whether face is CW or CCW. */ - bool ccw = (pipeline->needed_dynamic_state & RADV_DYNAMIC_FRONT_FACE) - ? d->front_face == VK_FRONT_FACE_COUNTER_CLOCKWISE - : G_028814_FACE(pa_su_sc_mode_cntl) == 0; + bool ccw = d->front_face == VK_FRONT_FACE_COUNTER_CLOCKWISE; /* Take inverted viewport into account. */ ccw ^= vp_y_inverted; @@ -7346,13 +7342,9 @@ radv_get_ngg_culling_settings(struct radv_cmd_buffer *cmd_buffer, bool vp_y_inve nggc_settings |= radv_nggc_face_is_ccw; /* Face culling settings. */ - if ((pipeline->needed_dynamic_state & RADV_DYNAMIC_CULL_MODE) - ? (d->cull_mode & VK_CULL_MODE_FRONT_BIT) - : G_028814_CULL_FRONT(pa_su_sc_mode_cntl)) + if (d->cull_mode & VK_CULL_MODE_FRONT_BIT) nggc_settings |= radv_nggc_front_face; - if ((pipeline->needed_dynamic_state & RADV_DYNAMIC_CULL_MODE) - ? (d->cull_mode & VK_CULL_MODE_BACK_BIT) - : G_028814_CULL_BACK(pa_su_sc_mode_cntl)) + if (d->cull_mode & VK_CULL_MODE_BACK_BIT) nggc_settings |= radv_nggc_back_face; /* Small primitive culling is only valid when conservative overestimation is not used. It's also
