Module: Mesa Branch: master Commit: 36c9557cae78814b320768697eaccf3cf0e0ebae URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=36c9557cae78814b320768697eaccf3cf0e0ebae
Author: Brian Paul <[email protected]> Date: Tue Apr 20 09:43:45 2010 -0600 nv50: add missing idxbias param to nv50_push_elements_instanced() --- src/gallium/drivers/nv50/nv50_context.h | 3 ++- src/gallium/drivers/nv50/nv50_vbo.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h index 4875f83..61807dd 100644 --- a/src/gallium/drivers/nv50/nv50_context.h +++ b/src/gallium/drivers/nv50/nv50_context.h @@ -201,7 +201,8 @@ extern struct nouveau_stateobj *nv50_vbo_validate(struct nv50_context *nv50); /* nv50_push.c */ extern void nv50_push_elements_instanced(struct pipe_context *, struct pipe_resource *, - unsigned idxsize, unsigned mode, unsigned start, + unsigned idxsize, int idxbias, + unsigned mode, unsigned start, unsigned count, unsigned i_start, unsigned i_count); diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c index 932c1e8..911eabc 100644 --- a/src/gallium/drivers/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nv50/nv50_vbo.c @@ -189,7 +189,7 @@ nv50_draw_arrays_instanced(struct pipe_context *pipe, return; if (nv50->vbo_fifo) { - nv50_push_elements_instanced(pipe, NULL, 0, mode, start, + nv50_push_elements_instanced(pipe, NULL, 0, 0, mode, start, count, startInstance, instanceCount); return; @@ -405,8 +405,8 @@ nv50_draw_elements_instanced(struct pipe_context *pipe, if (nv50->vbo_fifo) { nv50_push_elements_instanced(pipe, indexBuffer, indexSize, - mode, start, count, startInstance, - instanceCount); + indexBias, mode, start, count, + startInstance, instanceCount); return; } else if (!(indexBuffer->bind & PIPE_BIND_INDEX_BUFFER) || indexSize == 1) { _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
