diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/draw.c | 72 | ||||
| -rw-r--r-- | src/mesa/main/draw.h | 10 |
3 files changed, 1 insertions, 83 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index bdfac61f344..e36a80f6a55 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -122,7 +122,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver) /* Draw functions */ driver->Draw = NULL; - driver->DrawIndirect = _mesa_draw_indirect; + driver->DrawIndirect = NULL; /* simple state commands */ driver->AlphaFunc = NULL; diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c index 8589c292298..9f314dadebe 100644 --- a/src/mesa/main/draw.c +++ b/src/mesa/main/draw.c @@ -2063,75 +2063,3 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count, } } } - - -/* - * Helper function for _mesa_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].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 -_mesa_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); - } -} diff --git a/src/mesa/main/draw.h b/src/mesa/main/draw.h index 5ed8b8e90bf..8fa511ef0a3 100644 --- a/src/mesa/main/draw.h +++ b/src/mesa/main/draw.h @@ -75,16 +75,6 @@ _mesa_initialize_exec_dispatch(const struct gl_context *ctx, struct _glapi_table *exec); -void -_mesa_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); - - void GLAPIENTRY _mesa_DrawArrays(GLenum mode, GLint first, GLsizei count); |