brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vertex-buffer: remove the unstrided CBO type

Browse Source 
When we come to submitting the users given attributes we sort them into
different types of buffers. Previously we had three types; strided,
unstrided and multi-pack. Really though unstrided was just a limited
form of multi-pack buffer and didn't imply any hind of special
optimization so this patch consolidates some code by reducing to just
two types; strided and multi-pack.
This commit is contained in:
Robert Bragg 2010-08-01 16:07:38 +01:00
parent 94e0619785
commit 32ae904d81
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clutter/cogl/cogl/cogl-vertex-buffer-private.h
View File

@ -110,9 +110,8 @@ typedef struct _CoglVertexBufferAttrib
typedef enum _CoglVertexBufferVBOFlags typedef enum _CoglVertexBufferVBOFlags
{ {
COGL_VERTEX_BUFFER_VBO_FLAG_UNSTRIDED = 1<<0, COGL_VERTEX_BUFFER_VBO_FLAG_STRIDED = 1<<0,
COGL_VERTEX_BUFFER_VBO_FLAG_STRIDED = 1<<1, COGL_VERTEX_BUFFER_VBO_FLAG_MULTIPACK = 1<<1,
COGL_VERTEX_BUFFER_VBO_FLAG_MULTIPACK = 1<<2,
/* FIXME - flatten into one flag, since its used as a boolean */ /* FIXME - flatten into one flag, since its used as a boolean */
COGL_VERTEX_BUFFER_VBO_FLAG_INFREQUENT_RESUBMIT = 1<<3, COGL_VERTEX_BUFFER_VBO_FLAG_INFREQUENT_RESUBMIT = 1<<3,

33
clutter/cogl/cogl/cogl-vertex-buffer.c
View File

@ -1088,7 +1088,7 @@ upload_gl_vbo (CoglVertexBufferVBO *cogl_vbo)
else else
memcpy (cogl_vbo->vbo_name, pointer, cogl_vbo->vbo_bytes); memcpy (cogl_vbo->vbo_name, pointer, cogl_vbo->vbo_bytes);
} }
else if (cogl_vbo->flags & COGL_VERTEX_BUFFER_VBO_FLAG_MULTIPACK) else /* MULTIPACK */
{ {
/* First we make it obvious to the driver that we want to update the /* First we make it obvious to the driver that we want to update the
* whole buffer (without this, the driver is more likley to block * whole buffer (without this, the driver is more likley to block
@ -1111,24 +1111,6 @@ upload_gl_vbo (CoglVertexBufferVBO *cogl_vbo)
if (!upload_multipack_vbo_via_map_buffer (cogl_vbo)) if (!upload_multipack_vbo_via_map_buffer (cogl_vbo))
upload_multipack_vbo_via_buffer_sub_data (cogl_vbo); upload_multipack_vbo_via_buffer_sub_data (cogl_vbo);
} }
else
{
CoglVertexBufferAttrib *attribute = cogl_vbo->attributes->data;
if (!fallback)
{
GE (glBufferData (GL_ARRAY_BUFFER,
cogl_vbo->vbo_bytes,
attribute->u.pointer,
usage));
}
else
memcpy (cogl_vbo->vbo_name, attribute->u.pointer, cogl_vbo->vbo_bytes);
/* We forget this pointer now since the client will be free
* to re-use this memory */
attribute->u.pointer = NULL;
attribute->flags |= COGL_VERTEX_BUFFER_ATTRIB_FLAG_SUBMITTED;
}
cogl_vbo->flags |= COGL_VERTEX_BUFFER_VBO_FLAG_SUBMITTED; cogl_vbo->flags |= COGL_VERTEX_BUFFER_VBO_FLAG_SUBMITTED;
@ -1247,15 +1229,12 @@ cogl_vertex_buffer_submit_real (CoglVertexBuffer *buffer)
* be re-used) to determine what other CBOs can be re-used, due to being * be re-used) to determine what other CBOs can be re-used, due to being
* superseded, and what new GL VBOs need to be created. * superseded, and what new GL VBOs need to be created.
* *
* We have three kinds of CBOs: * We have two kinds of CBOs:
* - Unstrided CBOs * - Multi Pack CBOs
* These contain a single tightly packed attribute * These contain multiple attributes tightly packed back to back)
* These are currently the only ones ever marked as FREQUENT_SUBMIT
* - Strided CBOs * - Strided CBOs
* These typically contain multiple interleved sets of attributes, * These typically contain multiple interleved sets of attributes,
* though they can contain just one attribute with a stride * though they can contain just one attribute with a stride
* - Multi Pack CBOs
* These contain multiple attributes tightly packed back to back)
* *
* First create a new-CBOs entry "new-multipack-CBO" * First create a new-CBOs entry "new-multipack-CBO"
* Tag "new-multipack-CBO" as MULTIPACK + INFREQUENT_RESUBMIT * Tag "new-multipack-CBO" as MULTIPACK + INFREQUENT_RESUBMIT
@ -1280,7 +1259,7 @@ cogl_vertex_buffer_submit_real (CoglVertexBuffer *buffer)
* else if not found: * else if not found:
* create a new-CBOs entry tagged STRIDED + INFREQUENT_RESUBMIT * create a new-CBOs entry tagged STRIDED + INFREQUENT_RESUBMIT
* else if unstrided && tagged with FREQUENT_RESUBMIT: * else if unstrided && tagged with FREQUENT_RESUBMIT:
* create a new-CBOs entry tagged UNSTRIDED + FREQUENT_RESUBMIT * create a new-CBOs entry tagged MULTIPACK + FREQUENT_RESUBMIT
* else * else
* add to the new-multipack-CBO * add to the new-multipack-CBO
* free list of unsorted-attribs * free list of unsorted-attribs
@ -1403,7 +1382,7 @@ cogl_vertex_buffer_submit_real (CoglVertexBuffer *buffer)
cogl_vbo->vbo_name = NULL; cogl_vbo->vbo_name = NULL;
cogl_vbo->flags = cogl_vbo->flags =
COGL_VERTEX_BUFFER_VBO_FLAG_UNSTRIDED COGL_VERTEX_BUFFER_VBO_FLAG_MULTIPACK
| COGL_VERTEX_BUFFER_VBO_FLAG_FREQUENT_RESUBMIT; | COGL_VERTEX_BUFFER_VBO_FLAG_FREQUENT_RESUBMIT;
cogl_vbo->attributes = NULL; cogl_vbo->attributes = NULL;
cogl_vbo->attributes = g_list_prepend (cogl_vbo->attributes, cogl_vbo->attributes = g_list_prepend (cogl_vbo->attributes,