Merge remote branch 'origin/master' into gallium_draw_llvm

[mesa.git] / src / gallium / drivers / nv50 / nv50_vbo.c

diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
index 6b9c1ee231e40e47d8ee94866f24d21a7f25d40f..50472868063f5bfa32c983300e8a5f61be2d98d8 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_vbo.c
+++ b/src/gallium/drivers/nv50/nv50_vbo.c
@@ -549,6 +549,7 @@ nv50_vbo_validate(struct nv50_context *nv50)
        if (nv50->vtxbuf_nr == 0)
                return NULL;
 
+       nv50->vbo_fifo = 0;
        if (nv50->screen->force_push ||
            nv50->vertprog->cfg.edgeflag_in < 16)
                nv50->vbo_fifo = 0xffff;