xf86-video-intel: src/sna/gen4_vertex.c src/sna/gen8_vertex.c

[Chris Wilson]

 src/sna/gen4_vertex.c |    1 -
 src/sna/gen8_vertex.c |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit f350a1369b3bd39ba0db8639f036864fe5df2f98
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 12 16:49:02 2013 +0000

    sna/gen4+: Drop new assertion that we only finish a vbo after use in this batch
    
    A full vbo might not be discarded and so upon first use in the following
    batch we decided to finish the old vbo and allocate a new. This can
    happen before we even emit any relocations and so the assert is bogus.
    
    Reported-by: Jiri Slaby <jirislaby at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen4_vertex.c b/src/sna/gen4_vertex.c
index 1ea10b0..38f4cf3 100644
--- a/src/sna/gen4_vertex.c
+++ b/src/sna/gen4_vertex.c
@@ -88,7 +88,6 @@ int gen4_vertex_finish(struct sna *sna)
 	assert(sna->render.vertex_offset == 0);
 	assert(sna->render.vertex_used);
 	assert(sna->render.vertex_used <= sna->render.vertex_size);
-	assert(sna->render.nvertex_reloc);
 
 	sna_vertex_wait__locked(&sna->render);
 
diff --git a/src/sna/gen8_vertex.c b/src/sna/gen8_vertex.c
index dcafcd1..dfa4cce 100644
--- a/src/sna/gen8_vertex.c
+++ b/src/sna/gen8_vertex.c
@@ -84,7 +84,6 @@ int gen8_vertex_finish(struct sna *sna)
 	assert(sna->render.vertex_offset == 0);
 	assert(sna->render.vertex_used);
 	assert(sna->render.vertex_used <= sna->render.vertex_size);
-	assert(sna->render.nvertex_reloc);
 
 	sna_vertex_wait__locked(&sna->render);