diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-11-05 20:11:54 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-11-05 21:06:57 +0000 |
| commit | 0532a3313ad9c76a6e1d28e8a1c2ea495583fead (patch) | |
| tree | 7b8ab28c3930359558e62d0f4bec4f92311c3641 /src/sna/gen8_render.c | |
| parent | ba408bf21c4b65f19c7b581e4c88c92805184334 (diff) | |
sna/gen8: Clear instancing enabled bit between batches
gen8 sets the instancing bit relative to the vertex element, but we were
clearing it for the vertex buffer. As the maximum number of vertex
elements is fixed, just clear them all when emitting our header. Note
that VF_SGVS is not sufficient by itself to disable all side-effects of
instancing.
Thanks to Kenneth Graunke for pointing out the change from vertex buffer
to vertex element of the instancing enable bit.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=84958
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/gen8_render.c')
| -rw-r--r-- | src/sna/gen8_render.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c index d375753e..6deb6b5c 100644 --- a/src/sna/gen8_render.c +++ b/src/sna/gen8_render.c @@ -788,6 +788,8 @@ gen8_emit_cc_invariant(struct sna *sna) static void gen8_emit_vf_invariant(struct sna *sna) { + int n; + #if 1 OUT_BATCH(GEN8_3DSTATE_VF | (2 - 2)); OUT_BATCH(0); @@ -800,6 +802,12 @@ gen8_emit_vf_invariant(struct sna *sna) OUT_BATCH(RECTLIST); OUT_BATCH(GEN8_3DSTATE_VF_STATISTICS | 0); + + for (n = 1; n <= 3; n++) { + OUT_BATCH(GEN8_3DSTATE_VF_INSTANCING | (3 - 2)); + OUT_BATCH(n); + OUT_BATCH(0); + } } static void @@ -1417,10 +1425,6 @@ static void gen8_emit_vertex_buffer(struct sna *sna, OUT_BATCH64(0); OUT_BATCH(~0); /* buffer size: disabled */ - OUT_BATCH(GEN8_3DSTATE_VF_INSTANCING | (3 - 2)); - OUT_BATCH(id); - OUT_BATCH(0); - sna->render.vb_id |= 1 << id; } |