Merge branch '7.8'

[mesa.git] / src / gallium / drivers / nvfx / nvfx_vbo.c

diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
index 54369f9b64eef1a0ae8856586252bd2e29c2e4b8..c26536b0e77ca7ed824491068834d6c0599077ef 100644 (file)
--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
@@ -473,7 +473,7 @@ nvfx_draw_elements(struct pipe_context *pipe,
 
        idxbuf = nvfx_vbo_set_idxbuf(nvfx, indexBuffer, indexSize);
        if (nvfx_force_swtnl(nvfx) || !nvfx_state_validate(nvfx)) {
-               nvfx_draw_elements_swtnl(pipe, NULL, 0,
+               nvfx_draw_elements_swtnl(pipe, indexBuffer, indexSize,
                                            mode, start, count);
                return;
        }
@@ -495,7 +495,7 @@ nvfx_vbo_validate(struct nvfx_context *nvfx)
        struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
        struct pipe_buffer *ib = nvfx->idxbuf;
        unsigned ib_format = nvfx->idxbuf_format;
-       unsigned vb_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD;
+       unsigned vb_flags = nvfx->screen->vertex_buffer_flags | NOUVEAU_BO_RD;
        int hw;
 
        vtxbuf = so_new(3, 17, 18);