diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2015-10-18 22:22:22 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2015-10-24 00:01:20 +0200 |
| commit | 0d2cb35f689675bfe00c281513547544fe46d894 (patch) | |
| tree | e2864d87b203338c73444247c43c089fb7780f11 /src/gallium/drivers/radeonsi/si_state_draw.c | |
| parent | ca18f12dbb8d7b8542b33aac70866a27bb5d89e7 (diff) | |
| download | external_mesa3d-0d2cb35f689675bfe00c281513547544fe46d894.zip external_mesa3d-0d2cb35f689675bfe00c281513547544fe46d894.tar.gz external_mesa3d-0d2cb35f689675bfe00c281513547544fe46d894.tar.bz2 | |
radeonsi: merge two ifs setting WD_SWITCH_ON_EOP
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state_draw.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 3962003..e58e474 100644 --- 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; |