isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

vertex-buffer: port to CoglVertexAttributes + CoglPrimitive

Browse Source 
As part of an ongoing effort to reduce the number of draw paths we have
in Cogl this re-works CoglVertexBuffer to use the CoglVertexAttribute
and CoglPrimitive APIs instead of using raw GL.
This commit is contained in:
Robert Bragg 2010-10-12 12:55:23 +01:00
parent 69b1f756d1
commit 670ea32dbd
2 changed files with 376 additions and 816 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,8 @@
#include "cogl-handle.h" #include "cogl-handle.h"
#include "cogl-primitive.h"
#include <glib.h> #include <glib.h>
/* Note we put quite a bit into the flags here to help keep /* Note we put quite a bit into the flags here to help keep
@ -78,17 +80,6 @@ typedef enum _CoglVertexBufferAttribFlags
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_CUSTOM_ARRAY \ | COGL_VERTEX_BUFFER_ATTRIB_FLAG_CUSTOM_ARRAY \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_INVALID) | COGL_VERTEX_BUFFER_ATTRIB_FLAG_INVALID)
#define COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_MASK \
(COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_BYTE \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_BYTE \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_SHORT \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_SHORT \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_INT \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_UNSIGNED_INT \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_FLOAT \
| COGL_VERTEX_BUFFER_ATTRIB_FLAG_GL_TYPE_DOUBLE)
typedef struct _CoglVertexBufferAttrib typedef struct _CoglVertexBufferAttrib
{ {
/* TODO: look at breaking up the flags into seperate /* TODO: look at breaking up the flags into seperate
@ -96,16 +87,21 @@ typedef struct _CoglVertexBufferAttrib
CoglVertexBufferAttribFlags flags:24; CoglVertexBufferAttribFlags flags:24;
guint8 id; guint8 id;
GQuark name; GQuark name;
char *name_without_detail;
union _u union _u
{ {
const void *pointer; const void *pointer;
size_t vbo_offset; size_t vbo_offset;
} u; } u;
CoglVertexAttributeType type;
size_t span_bytes; size_t span_bytes;
guint16 stride; guint16 stride;
guint8 n_components; guint8 n_components;
guint8 texture_unit; guint8 texture_unit;
int attribute_first;
CoglVertexAttribute *attribute;
} CoglVertexBufferAttrib; } CoglVertexBufferAttrib;
typedef enum _CoglVertexBufferVBOFlags typedef enum _CoglVertexBufferVBOFlags
@ -128,11 +124,9 @@ typedef struct _CoglVertexBufferVBO
{ {
CoglVertexBufferVBOFlags flags; CoglVertexBufferVBOFlags flags;
/* Note: this is a pointer to handle fallbacks. It normally holds CoglVertexArray *array;
* a GLuint VBO name, but when the driver doesn't support VBOs then size_t array_bytes;
* this simply points to an malloc'd buffer. */
void *vbo_name; /*!< The name of the corresponding buffer object */
gsize vbo_bytes; /*!< The lengh of the allocated buffer object in bytes */
GList *attributes; GList *attributes;
} CoglVertexBufferVBO; } CoglVertexBufferVBO;
@ -140,11 +134,7 @@ typedef struct _CoglVertexBufferIndices
{ {
CoglHandleObject _parent; CoglHandleObject _parent;
/* Note: this is a pointer to handle fallbacks. It normally holds CoglIndices *indices;
* a GLuint VBO name, but when the driver doesn't support VBOs then
* this simply points to an malloc'd buffer. */
void *vbo_name;
GLenum type;
} CoglVertexBufferIndices; } CoglVertexBufferIndices;
typedef struct _CoglVertexBuffer typedef struct _CoglVertexBuffer
@ -158,11 +148,17 @@ typedef struct _CoglVertexBuffer
* modifying a buffer. */ * modifying a buffer. */
GList *new_attributes; /*!< attributes pending submission */ GList *new_attributes; /*!< attributes pending submission */
gboolean dirty_attributes;
CoglPrimitive *primitive;
} CoglVertexBuffer; } CoglVertexBuffer;
CoglVertexBuffer *_cogl_vertex_buffer_pointer_from_handle (CoglHandle handle); CoglVertexBuffer *
_cogl_vertex_buffer_pointer_from_handle (CoglHandle handle);
CoglVertexBufferIndices * CoglVertexBufferIndices *
_cogl_vertex_buffer_indices_pointer_from_handle (CoglHandle handle); _cogl_vertex_buffer_indices_pointer_from_handle (CoglHandle handle);
#endif /* __COGL_VERTEX_BUFFER_H */ #endif /* __COGL_VERTEX_BUFFER_H */

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

File diff suppressed because it is too large Load Diff