Module: Mesa Branch: master Commit: 5fabeb49d82c2faf34134f9e1e8597c5b0c1622d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fabeb49d82c2faf34134f9e1e8597c5b0c1622d
Author: Marek Olšák <marek.ol...@amd.com> Date: Sat Jan 9 21:08:48 2021 -0500 radeonsi: don't use rasterizer_discard to validate draws, only check ps_shader Let's just say that PS can never be NULL here. Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-pra...@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8653> --- src/gallium/drivers/radeonsi/si_state_draw.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp index 6c79e703a0d..3af06fbce2b 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.cpp +++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp @@ -1665,8 +1665,7 @@ static void si_draw_vbo(struct pipe_context *ctx, struct si_shader_selector *vs = sctx->vs_shader.cso; if (unlikely(!vs || sctx->num_vertex_elements < vs->num_vs_inputs || - (!sctx->ps_shader.cso && !rs->rasterizer_discard) || - (HAS_TESS != (prim == PIPE_PRIM_PATCHES)))) { + !sctx->ps_shader.cso || (HAS_TESS != (prim == PIPE_PRIM_PATCHES)))) { assert(0); return; } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
