diff options
| author | Eric Anholt <[email protected]> | 2018-09-13 12:54:26 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-09-17 16:35:45 -0700 |
| commit | 350cb790457a2868585a79366d130c0331b805df (patch) | |
| tree | 53f357edbc3e8a3596e11c6fa8be21977879e550 /src/gallium/drivers/v3d/v3dx_emit.c | |
| parent | 7f08bcb73f7f7dbe675b8c4cc87ef98ea4412b72 (diff) | |
v3d: Always emit a TF disable at the start of drawing on V3D 4.x.
The HW's FLUSH_ALL_STATE is not validated, so we probably shouldn't use
it, meaning that we need to reset state at the start. By doing this, we
also make ourselves more resilient to another client leaving the TF state
enabled at the end of their batch (as we now do, ourselves).
However, we still need to emit a single TF disable at the end of the
frame, for SWVC5-718.
Diffstat (limited to 'src/gallium/drivers/v3d/v3dx_emit.c')
| -rw-r--r-- | src/gallium/drivers/v3d/v3dx_emit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/v3d/v3dx_emit.c b/src/gallium/drivers/v3d/v3dx_emit.c index 537dd1ff9ae..50f9f60477d 100644 --- a/src/gallium/drivers/v3d/v3dx_emit.c +++ b/src/gallium/drivers/v3d/v3dx_emit.c @@ -701,13 +701,14 @@ v3dX(emit_state)(struct pipe_context *pctx) v3d->prog.bind_vs->tf_specs); #if V3D_VERSION >= 40 - job->tf_enabled = (v3d->prog.bind_vs->num_tf_specs != 0 && + bool tf_enabled = (v3d->prog.bind_vs->num_tf_specs != 0 && v3d->active_queries); + job->tf_enabled |= tf_enabled; cl_emit(&job->bcl, TRANSFORM_FEEDBACK_SPECS, tfe) { tfe.number_of_16_bit_output_data_specs_following = v3d->prog.bind_vs->num_tf_specs; - tfe.enable = job->tf_enabled; + tfe.enable = tf_enabled; }; #else /* V3D_VERSION < 40 */ cl_emit(&job->bcl, TRANSFORM_FEEDBACK_ENABLE, tfe) { @@ -720,12 +721,11 @@ v3dX(emit_state)(struct pipe_context *pctx) for (int i = 0; i < v3d->prog.bind_vs->num_tf_specs; i++) { cl_emit_prepacked(&job->bcl, &tf_specs[i]); } - } else if (job->tf_enabled) { + } else { #if V3D_VERSION >= 40 cl_emit(&job->bcl, TRANSFORM_FEEDBACK_SPECS, tfe) { tfe.enable = false; }; - job->tf_enabled = false; #endif /* V3D_VERSION >= 40 */ } } |