summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2021-01-09 21:08:48 -0500
committerMarge Bot <eric+marge@anholt.net>2021-01-22 16:45:30 +0000
commit5fabeb49d82c2faf34134f9e1e8597c5b0c1622d (patch)
treeb8efc8f7d942f4dd7bf71604e4179bf5c7c5ed80
parentcd42ed34b0259c0597597715ef0ad07fc9df2698 (diff)
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-prayer@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8653>
-rw-r--r--src/gallium/drivers/radeonsi/si_state_draw.cpp3
1 files changed, 1 insertions, 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;
}