radeonsi: merge two ifs setting WD_SWITCH_ON_EOP

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index 396200375c27e9412aab58a01e7ee14587751350..e58e474e320390be42113d54450ff95312902217 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -276,7 +276,8 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
                    prim == PIPE_PRIM_LINE_LOOP ||
                    prim == PIPE_PRIM_TRIANGLE_FAN ||
                    prim == PIPE_PRIM_TRIANGLE_STRIP_ADJACENCY ||
-                   info->primitive_restart)
+                   info->primitive_restart ||
+                   info->count_from_stream_output)
                        wd_switch_on_eop = true;
 
                /* Hawaii hangs if instancing is enabled and WD_SWITCH_ON_EOP is 0.
@@ -286,10 +287,6 @@ static unsigned si_get_ia_multi_vgt_param(struct si_context *sctx,
                    (info->indirect || info->instance_count > 1))
                        wd_switch_on_eop = true;
 
-               /* USE_OPAQUE doesn't work when WD_SWITCH_ON_EOP is 0. */
-               if (info->count_from_stream_output)
-                       wd_switch_on_eop = true;
-
                /* Required on CIK and later. */
                if (sctx->b.screen->info.max_se > 2 && !wd_switch_on_eop)
                        ia_switch_on_eoi = true;