xf86-video-intel: src/sna/gen3_render.c src/sna/gen4_vertex.c
Chris Wilson
ickle at kemper.freedesktop.org
Sun Jan 20 09:38:45 PST 2013
src/sna/gen3_render.c | 11 ++++++-----
src/sna/gen4_vertex.c | 1 -
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e6a64f872bfd026aa1ba1bd44b1298918c819849
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sun Jan 20 16:59:58 2013 +0000
sna/gen3+: Remove bogus assertion that the vbo in included before finish
If we are carrying over a nearly full vbo from one batch to the next, we
may indeed finish it prior to writing any new primitives and so the
assert is truly bogus.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 3a06fed..01c0aee 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -1617,18 +1617,19 @@ static int gen3_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.vertex_reloc[0]);
bo = sna->render.vbo;
if (bo) {
DBG(("%s: reloc = %d\n", __FUNCTION__,
sna->render.vertex_reloc[0]));
- sna->kgem.batch[sna->render.vertex_reloc[0]] =
- kgem_add_reloc(&sna->kgem, sna->render.vertex_reloc[0],
- bo, I915_GEM_DOMAIN_VERTEX << 16, 0);
+ if (sna->render.vertex_reloc[0]) {
+ sna->kgem.batch[sna->render.vertex_reloc[0]] =
+ kgem_add_reloc(&sna->kgem, sna->render.vertex_reloc[0],
+ bo, I915_GEM_DOMAIN_VERTEX << 16, 0);
- sna->render.vertex_reloc[0] = 0;
+ sna->render.vertex_reloc[0] = 0;
+ }
sna->render.vertex_used = 0;
sna->render.vertex_index = 0;
sna->render.vbo = NULL;
diff --git a/src/sna/gen4_vertex.c b/src/sna/gen4_vertex.c
index d34d0d8..4e40467 100644
--- a/src/sna/gen4_vertex.c
+++ b/src/sna/gen4_vertex.c
@@ -57,7 +57,6 @@ int gen4_vertex_finish(struct sna *sna)
sna->render.vertex_used, sna->render.vertex_size));
assert(sna->render.vertex_offset == 0);
assert(sna->render.vertex_used);
- assert(sna->render.nvertex_reloc);
/* Note: we only need dword alignment (currently) */
More information about the xorg-commit
mailing list