* Keith Whitwell <keithw@vmware.com>
*/
-#include "main/imports.h"
#include "main/mtypes.h"
-#include "main/api_arrayelt.h"
#include "main/bufferobj.h"
#include "math/m_eval.h"
+#include "main/vtxfmt.h"
+#include "main/api_arrayelt.h"
#include "vbo.h"
-#include "vbo_context.h"
+#include "vbo_private.h"
-#define NR_MAT_ATTRIBS 12
-static GLuint check_size( const GLfloat *attr )
+static GLuint
+check_size(const GLfloat *attr)
{
- if (attr[3] != 1.0F) return 4;
- if (attr[2] != 0.0F) return 3;
- if (attr[1] != 0.0F) return 2;
- return 1;
+ if (attr[3] != 1.0F)
+ return 4;
+ if (attr[2] != 0.0F)
+ return 3;
+ if (attr[1] != 0.0F)
+ return 2;
+ return 1;
}
-static void init_legacy_currval(struct gl_context *ctx)
+/**
+ * Helper for initializing a vertex array.
+ */
+static void
+init_array(struct gl_context *ctx, struct gl_vertex_array *array,
+ unsigned size, const void *pointer)
+{
+ memset(array, 0, sizeof(*array));
+
+ array->Size = size;
+ array->Type = GL_FLOAT;
+ array->Format = GL_RGBA;
+ array->StrideB = 0;
+ array->_ElementSize = array->Size * sizeof(GLfloat);
+ array->Ptr = pointer;
+
+ _mesa_reference_buffer_object(ctx, &array->BufferObj,
+ ctx->Shared->NullBufferObj);
+}
+
+
+/**
+ * Set up the vbo->currval arrays to point at the context's current
+ * vertex attributes (with strides = 0).
+ */
+static void
+init_legacy_currval(struct gl_context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
- struct gl_client_array *arrays = &vbo->currval[VBO_ATTRIB_POS];
GLuint i;
- memset(arrays, 0, sizeof(*arrays) * VERT_ATTRIB_FF_MAX);
-
/* Set up a constant (StrideB == 0) array for each current
* attribute:
*/
for (i = 0; i < VERT_ATTRIB_FF_MAX; i++) {
- struct gl_client_array *cl = &arrays[i];
+ struct gl_vertex_array *array = &vbo->currval[VERT_ATTRIB_FF(i)];
- /* Size will have to be determined at runtime:
- */
- cl->Size = check_size(ctx->Current.Attrib[i]);
- cl->Stride = 0;
- cl->StrideB = 0;
- cl->Enabled = 1;
- cl->Type = GL_FLOAT;
- cl->Format = GL_RGBA;
- cl->Ptr = (const void *)ctx->Current.Attrib[i];
- cl->_ElementSize = cl->Size * sizeof(GLfloat);
- _mesa_reference_buffer_object(ctx, &cl->BufferObj,
- ctx->Shared->NullBufferObj);
+ init_array(ctx, array,
+ check_size(ctx->Current.Attrib[i]),
+ ctx->Current.Attrib[i]);
}
}
-static void init_generic_currval(struct gl_context *ctx)
+static void
+init_generic_currval(struct gl_context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
- struct gl_client_array *arrays = &vbo->currval[VBO_ATTRIB_GENERIC0];
GLuint i;
- memset(arrays, 0, sizeof(*arrays) * VERT_ATTRIB_GENERIC_MAX);
-
for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; i++) {
- struct gl_client_array *cl = &arrays[i];
+ struct gl_vertex_array *array = &vbo->currval[VBO_ATTRIB_GENERIC0 + i];
- /* This will have to be determined at runtime:
- */
- cl->Size = 1;
- cl->Type = GL_FLOAT;
- cl->Format = GL_RGBA;
- cl->Ptr = (const void *)ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i];
- cl->Stride = 0;
- cl->StrideB = 0;
- cl->Enabled = 1;
- cl->_ElementSize = cl->Size * sizeof(GLfloat);
- _mesa_reference_buffer_object(ctx, &cl->BufferObj,
- ctx->Shared->NullBufferObj);
+ init_array(ctx, array, 1, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i]);
}
}
-static void init_mat_currval(struct gl_context *ctx)
+static void
+init_mat_currval(struct gl_context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
- struct gl_client_array *arrays =
- &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT];
GLuint i;
- assert(NR_MAT_ATTRIBS == MAT_ATTRIB_MAX);
-
- memset(arrays, 0, sizeof(*arrays) * NR_MAT_ATTRIBS);
-
/* Set up a constant (StrideB == 0) array for each current
* attribute:
*/
- for (i = 0; i < NR_MAT_ATTRIBS; i++) {
- struct gl_client_array *cl = &arrays[i];
+ for (i = 0; i < MAT_ATTRIB_MAX; i++) {
+ struct gl_vertex_array *array =
+ &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT + i];
+ unsigned size;
/* Size is fixed for the material attributes, for others will
* be determined at runtime:
*/
- switch (i - VERT_ATTRIB_GENERIC0) {
+ switch (i) {
case MAT_ATTRIB_FRONT_SHININESS:
case MAT_ATTRIB_BACK_SHININESS:
- cl->Size = 1;
- break;
+ size = 1;
+ break;
case MAT_ATTRIB_FRONT_INDEXES:
case MAT_ATTRIB_BACK_INDEXES:
- cl->Size = 3;
- break;
+ size = 3;
+ break;
default:
- cl->Size = 4;
- break;
+ size = 4;
+ break;
}
- cl->Ptr = (const void *)ctx->Light.Material.Attrib[i];
- cl->Type = GL_FLOAT;
- cl->Format = GL_RGBA;
- cl->Stride = 0;
- cl->StrideB = 0;
- cl->Enabled = 1;
- cl->_ElementSize = cl->Size * sizeof(GLfloat);
- _mesa_reference_buffer_object(ctx, &cl->BufferObj,
- ctx->Shared->NullBufferObj);
+ init_array(ctx, array, 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);
}
-GLboolean _vbo_CreateContext( struct gl_context *ctx )
+void
+_vbo_install_exec_vtxfmt(struct gl_context *ctx)
+{
+ struct vbo_context *vbo = vbo_context(ctx);
+
+ _mesa_install_exec_vtxfmt(ctx, &vbo->exec.vtxfmt);
+}
+
+
+void
+vbo_exec_invalidate_state(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;
+}
+
+
+GLboolean
+_vbo_CreateContext(struct gl_context *ctx)
{
struct vbo_context *vbo = CALLOC_STRUCT(vbo_context);
/* Initialize the arrayelt helper
*/
if (!ctx->aelt_context &&
- !_ae_create_context( ctx )) {
+ !_ae_create_context(ctx)) {
return GL_FALSE;
}
- init_legacy_currval( ctx );
- init_generic_currval( ctx );
- init_mat_currval( ctx );
+ 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;
+ 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 < NR_MAT_ATTRIBS; i++)
- vbo->map_vp_none[VERT_ATTRIB_GENERIC(i)]
+ 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;
+ vbo->map_vp_arb[i] = i;
}
* will pretty much be permanently installed, which means that the
* vtxfmt mechanism can be removed now.
*/
- vbo_exec_init( ctx );
+ vbo_exec_init(ctx);
if (ctx->API == API_OPENGL_COMPAT)
- vbo_save_init( ctx );
+ vbo_save_init(ctx);
_math_init_eval();
}
-void _vbo_InvalidateState( struct gl_context *ctx, GLuint new_state )
-{
- vbo_exec_invalidate_state(ctx, new_state);
-}
-
-
-void _vbo_DestroyContext( struct gl_context *ctx )
+void
+_vbo_DestroyContext(struct gl_context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);
if (ctx->aelt_context) {
- _ae_destroy_context( ctx );
+ _ae_destroy_context(ctx);
ctx->aelt_context = NULL;
}
}
-void vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func)
+void
+vbo_set_draw_func(struct gl_context *ctx, vbo_draw_func func)
{
struct vbo_context *vbo = vbo_context(ctx);
vbo->draw_prims = func;
}
+
+void
+vbo_set_indirect_draw_func(struct gl_context *ctx,
+ vbo_indirect_draw_func func)
+{
+ struct vbo_context *vbo = vbo_context(ctx);
+ vbo->draw_indirect_prims = func;
+}
projects / mesa.git / blobdiff