* Keith Whitwell <keithw@vmware.com>
*/
-#include "main/mtypes.h"
+#include "main/errors.h"
#include "main/bufferobj.h"
#include "math/m_eval.h"
#include "main/vtxfmt.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"
* Helper for initializing a vertex array.
*/
static void
-init_array(struct gl_context *ctx, struct gl_vertex_array *cl,
+init_array(struct gl_context *ctx, struct gl_array_attributes *attrib,
unsigned size, const void *pointer)
{
- memset(cl, 0, sizeof(*cl));
+ memset(attrib, 0, sizeof(*attrib));
- cl->Size = size;
- cl->Type = GL_FLOAT;
- cl->Format = GL_RGBA;
- cl->StrideB = 0;
- cl->_ElementSize = cl->Size * sizeof(GLfloat);
- cl->Ptr = pointer;
-
- _mesa_reference_buffer_object(ctx, &cl->BufferObj,
- ctx->Shared->NullBufferObj);
+ vbo_set_vertex_format(&attrib->Format, size, GL_FLOAT);
+ attrib->Stride = 0;
+ attrib->Ptr = pointer;
}
struct vbo_context *vbo = vbo_context(ctx);
GLuint i;
- /* Set up a constant (StrideB == 0) array for each current
+ /* Set up a constant (Stride == 0) array for each current
* attribute:
*/
for (i = 0; i < VERT_ATTRIB_FF_MAX; i++) {
- struct gl_vertex_array *cl = &vbo->currval[VERT_ATTRIB_FF(i)];
+ const unsigned attr = VERT_ATTRIB_FF(i);
+ struct gl_array_attributes *attrib = &vbo->current[attr];
- init_array(ctx, cl,
- check_size(ctx->Current.Attrib[i]),
- ctx->Current.Attrib[i]);
+ init_array(ctx, attrib, check_size(ctx->Current.Attrib[attr]),
+ ctx->Current.Attrib[attr]);
}
}
GLuint i;
for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; i++) {
- struct gl_vertex_array *cl = &vbo->currval[VBO_ATTRIB_GENERIC0 + i];
+ const unsigned attr = VBO_ATTRIB_GENERIC0 + i;
+ struct gl_array_attributes *attrib = &vbo->current[attr];
- init_array(ctx, cl, 1, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i]);
+ init_array(ctx, attrib, 1, ctx->Current.Attrib[attr]);
}
}
* attribute:
*/
for (i = 0; i < MAT_ATTRIB_MAX; i++) {
- struct gl_vertex_array *cl =
- &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT + i];
+ const unsigned attr = VBO_ATTRIB_MAT_FRONT_AMBIENT + i;
+ struct gl_array_attributes *attrib = &vbo->current[attr];
unsigned size;
/* Size is fixed for the material attributes, for others will
break;
}
- init_array(ctx, cl, size, ctx->Light.Material.Attrib[i]);
+ init_array(ctx, attrib, size, ctx->Light.Material.Attrib[i]);
}
}
-static void
-vbo_draw_indirect_prims(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_params,
- GLsizeiptr indirect_params_offset,
- const struct _mesa_index_buffer *ib)
-{
- struct vbo_context *vbo = vbo_context(ctx);
- struct _mesa_prim *prim;
- GLsizei i;
-
- prim = calloc(draw_count, sizeof(*prim));
- if (prim == NULL) {
- _mesa_error(ctx, GL_OUT_OF_MEMORY, "gl%sDraw%sIndirect%s",
- (draw_count > 1) ? "Multi" : "",
- ib ? "Elements" : "Arrays",
- indirect_params ? "CountARB" : "");
- return;
- }
-
- prim[0].begin = 1;
- prim[draw_count - 1].end = 1;
- for (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;
- }
-
- vbo->draw_prims(ctx, prim, draw_count,
- ib, false, 0, ~0,
- NULL, 0,
- ctx->DrawIndirectBuffer);
-
- free(prim);
-}
-
void
_vbo_install_exec_vtxfmt(struct gl_context *ctx)
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_PROGRAM | _NEW_ARRAY)) {
- if (!exec->validating)
- exec->array.recalculate_inputs = GL_TRUE;
-
- _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);
+ struct vbo_context *vbo = &ctx->vbo_context;
- ctx->vbo_context = vbo;
+ memset(vbo, 0, sizeof(*vbo));
- /* Initialize the arrayelt helper
- */
- if (!ctx->aelt_context &&
- !_ae_create_context(ctx)) {
- return GL_FALSE;
- }
+ vbo->binding.Offset = 0;
+ vbo->binding.Stride = 0;
+ vbo->binding.InstanceDivisor = 0;
init_legacy_currval(ctx);
init_generic_currval(ctx);
init_mat_currval(ctx);
- vbo_set_indirect_draw_func(ctx, vbo_draw_indirect_prims);
-
- /* Build mappings from VERT_ATTRIB -> VBO_ATTRIB depending on type
- * of vertex program active.
- */
- {
- GLuint i;
-
- /* make sure all VBO_ATTRIB_ values can fit in an unsigned byte */
- STATIC_ASSERT(VBO_ATTRIB_MAX <= 255);
-
- /* identity mapping */
- for (i = 0; i < ARRAY_SIZE(vbo->map_vp_none); i++)
- vbo->map_vp_none[i] = i;
- /* map material attribs to generic slots */
- for (i = 0; i < MAT_ATTRIB_MAX; i++)
- vbo->map_vp_none[VERT_ATTRIB_GENERIC(i)]
- = VBO_ATTRIB_MAT_FRONT_AMBIENT + i;
-
- for (i = 0; i < ARRAY_SIZE(vbo->map_vp_arb); i++)
- vbo->map_vp_arb[i] = i;
- }
+ /* make sure all VBO_ATTRIB_ values can fit in an unsigned byte */
+ STATIC_ASSERT(VBO_ATTRIB_MAX <= 255);
/* Hook our functions into exec and compile dispatch tables. These
* 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);
+ vbo->VAO = _mesa_new_vao(ctx, ~((GLuint)0));
+ /* The exec VAO assumes to have all arributes bound to binding 0 */
+ for (unsigned i = 0; i < VERT_ATTRIB_MAX; ++i)
+ _mesa_vertex_attrib_binding(ctx, vbo->VAO, i, 0);
+
_math_init_eval();
return GL_TRUE;
{
struct vbo_context *vbo = vbo_context(ctx);
- if (ctx->aelt_context) {
- _ae_destroy_context(ctx);
- ctx->aelt_context = NULL;
- }
-
if (vbo) {
- GLuint i;
-
- for (i = 0; i < VBO_ATTRIB_MAX; i++) {
- _mesa_reference_buffer_object(ctx, &vbo->currval[i].BufferObj, NULL);
- }
+ _mesa_reference_buffer_object(ctx, &vbo->binding.BufferObj, NULL);
vbo_exec_destroy(ctx);
if (ctx->API == API_OPENGL_COMPAT)
vbo_save_destroy(ctx);
- free(vbo);
- ctx->vbo_context = NULL;
+ _mesa_reference_vao(ctx, &vbo->VAO, NULL);
}
}
-void
-vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func)
+const struct gl_array_attributes *
+_vbo_current_attrib(const struct gl_context *ctx, gl_vert_attrib attr)
{
- struct vbo_context *vbo = vbo_context(ctx);
- vbo->draw_prims = func;
+ const struct vbo_context *vbo = vbo_context_const(ctx);
+ const gl_vertex_processing_mode vmp = ctx->VertexProgram._VPMode;
+ return &vbo->current[_vbo_attribute_alias_map[vmp][attr]];
}
-void
-vbo_set_indirect_draw_func(struct gl_context *ctx,
- vbo_indirect_draw_func func)
+const struct gl_vertex_buffer_binding *
+_vbo_current_binding(const struct gl_context *ctx)
{
- struct vbo_context *vbo = vbo_context(ctx);
- vbo->draw_indirect_prims = func;
+ const struct vbo_context *vbo = vbo_context_const(ctx);
+ return &vbo->binding;
}
projects / mesa.git / blobdiff