Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Chris Wilson 2014-11-05 20:11:54 +00:00
parent ba408bf21c
commit 0532a3313a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sna/gen8_render.c
View File

@ -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;
}