diff options
Diffstat (limited to 'src/mesa/vbo/vbo_context.c')
-rw-r--r-- | src/mesa/vbo/vbo_context.c | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index cf9405df3dc..364de2c507e 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -25,7 +25,6 @@ * Keith Whitwell <[email protected]> */ -#include "c99_alloca.h" #include "main/errors.h" #include "main/bufferobj.h" #include "math/m_eval.h" @@ -249,76 +248,3 @@ _vbo_current_binding(const struct gl_context *ctx) const struct vbo_context *vbo = vbo_context_const(ctx); return &vbo->binding; } - - -/* - * Helper function for _vbo_draw_indirect below that additionally takes a zero - * initialized array of _mesa_prim scratch space memory as the last argument. - */ -static void -draw_indirect(struct gl_context *ctx, GLuint mode, - struct gl_buffer_object *indirect_data, - GLsizeiptr indirect_offset, unsigned draw_count, - unsigned stride, - struct gl_buffer_object *indirect_draw_count_buffer, - GLsizeiptr indirect_draw_count_offset, - const struct _mesa_index_buffer *ib, - struct _mesa_prim *prim) -{ - prim[0].begin = 1; - prim[draw_count - 1].end = 1; - for (unsigned i = 0; i < draw_count; ++i, indirect_offset += stride) { - prim[i].mode = mode; - prim[i].indexed = !!ib; - prim[i].indirect_offset = indirect_offset; - prim[i].is_indirect = 1; - prim[i].draw_id = i; - } - - /* This should always be true at this time */ - assert(indirect_data == ctx->DrawIndirectBuffer); - - ctx->Driver.Draw(ctx, prim, draw_count, ib, false, 0u, ~0u, - NULL, 0, indirect_data); -} - - -/* - * Function to be put into dd_function_table::DrawIndirect as fallback. - * Calls into dd_function_table::Draw past adapting call arguments. - * See dd_function_table::DrawIndirect for call argument documentation. - */ -void -_vbo_draw_indirect(struct gl_context *ctx, GLuint mode, - struct gl_buffer_object *indirect_data, - GLsizeiptr indirect_offset, unsigned draw_count, - unsigned stride, - struct gl_buffer_object *indirect_draw_count_buffer, - GLsizeiptr indirect_draw_count_offset, - const struct _mesa_index_buffer *ib) -{ - /* Use alloca for the prim space if we are somehow in bounds. */ - if (draw_count*sizeof(struct _mesa_prim) < 1024) { - struct _mesa_prim *space = alloca(draw_count*sizeof(struct _mesa_prim)); - memset(space, 0, draw_count*sizeof(struct _mesa_prim)); - - draw_indirect(ctx, mode, indirect_data, indirect_offset, draw_count, - stride, indirect_draw_count_buffer, - indirect_draw_count_offset, ib, space); - } else { - struct _mesa_prim *space = calloc(draw_count, sizeof(struct _mesa_prim)); - if (space == NULL) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "gl%sDraw%sIndirect%s", - (draw_count > 1) ? "Multi" : "", - ib ? "Elements" : "Arrays", - indirect_data ? "CountARB" : ""); - return; - } - - draw_indirect(ctx, mode, indirect_data, indirect_offset, draw_count, - stride, indirect_draw_count_buffer, - indirect_draw_count_offset, ib, space); - - free(space); - } -} |