* Keith Whitwell <keithw@vmware.com>
*/
-#include "c99_alloca.h"
#include "main/errors.h"
#include "main/bufferobj.h"
#include "math/m_eval.h"
#include "main/api_arrayelt.h"
#include "main/arrayobj.h"
#include "main/varray.h"
+#include "util/u_memory.h"
#include "vbo.h"
#include "vbo_private.h"
{
memset(attrib, 0, sizeof(*attrib));
- attrib->Size = size;
- attrib->Type = GL_FLOAT;
- attrib->Format = GL_RGBA;
+ vbo_set_vertex_format(&attrib->Format, size, GL_FLOAT);
attrib->Stride = 0;
- attrib->_ElementSize = size * sizeof(GLfloat);
attrib->Ptr = pointer;
}
void
-vbo_exec_invalidate_state(struct gl_context *ctx)
+vbo_exec_update_eval_maps(struct gl_context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
- struct vbo_exec_context *exec = &vbo->exec;
- if (ctx->NewState & _NEW_ARRAY) {
- _ae_invalidate_state(ctx);
- }
- if (ctx->NewState & _NEW_EVAL)
- exec->eval.recalculate_maps = GL_TRUE;
+ vbo->exec.eval.recalculate_maps = GL_TRUE;
}
GLboolean
-_vbo_CreateContext(struct gl_context *ctx)
+_vbo_CreateContext(struct gl_context *ctx, bool use_buffer_objects)
{
- struct vbo_context *vbo = CALLOC_STRUCT(vbo_context);
-
- ctx->vbo_context = vbo;
+ struct vbo_context *vbo = &ctx->vbo_context;
- /* Initialize the arrayelt helper
- */
- if (!ctx->aelt_context &&
- !_ae_create_context(ctx)) {
- return GL_FALSE;
- }
+ memset(vbo, 0, sizeof(*vbo));
vbo->binding.Offset = 0;
vbo->binding.Stride = 0;
vbo->binding.InstanceDivisor = 0;
- _mesa_reference_buffer_object(ctx, &vbo->binding.BufferObj,
- ctx->Shared->NullBufferObj);
+
init_legacy_currval(ctx);
init_generic_currval(ctx);
init_mat_currval(ctx);
* will pretty much be permanently installed, which means that the
* vtxfmt mechanism can be removed now.
*/
- vbo_exec_init(ctx);
+ vbo_exec_init(ctx, use_buffer_objects);
if (ctx->API == API_OPENGL_COMPAT)
vbo_save_init(ctx);
{
struct vbo_context *vbo = vbo_context(ctx);
- if (ctx->aelt_context) {
- _ae_destroy_context(ctx);
- ctx->aelt_context = NULL;
- }
-
if (vbo) {
-
_mesa_reference_buffer_object(ctx, &vbo->binding.BufferObj, NULL);
vbo_exec_destroy(ctx);
if (ctx->API == API_OPENGL_COMPAT)
vbo_save_destroy(ctx);
_mesa_reference_vao(ctx, &vbo->VAO, NULL);
- free(vbo);
- ctx->vbo_context = NULL;
}
}
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);
- }
-}