diff options
author | Robert Bragg <robert@linux.intel.com> | 2010-10-12 12:53:44 +0100 |
---|---|---|
committer | Robert Bragg <robert@linux.intel.com> | 2010-10-26 17:25:33 +0100 |
commit | 812dd1d83ded5936dd0bc1985856efd8746e8e47 (patch) | |
tree | 35f1c1fe58f98d62a3e5d7db48095dec041296e0 /cogl/cogl-vertex-buffer.h | |
parent | 6fe6dd18ac06eee4c8129cdea618fe7036a8cbc2 (diff) | |
download | cogl-812dd1d83ded5936dd0bc1985856efd8746e8e47.tar.gz |
Move IndicesType and VerticesMode typedefs to cogl-types.h
This moves the CoglIndicesType and CoglVerticesMode typedefs from
cogl-vertex-buffer.h to cogl-types.h so they can be shared with the
anticipated cogl vertex attribute API.
Diffstat (limited to 'cogl/cogl-vertex-buffer.h')
-rw-r--r-- | cogl/cogl-vertex-buffer.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/cogl/cogl-vertex-buffer.h b/cogl/cogl-vertex-buffer.h index 38307712..a2093bb9 100644 --- a/cogl/cogl-vertex-buffer.h +++ b/cogl/cogl-vertex-buffer.h @@ -254,31 +254,6 @@ cogl_vertex_buffer_enable (CoglHandle handle, const char *attribute_name); /** - * CoglVerticesMode: - * @COGL_VERTICES_MODE_POINTS: FIXME, equivalent to %GL_POINTS - * @COGL_VERTICES_MODE_LINE_STRIP: FIXME, equivalent to %GL_LINE_STRIP - * @COGL_VERTICES_MODE_LINE_LOOP: FIXME, equivalent to %GL_LINE_LOOP - * @COGL_VERTICES_MODE_LINES: FIXME, equivalent to %GL_LINES - * @COGL_VERTICES_MODE_TRIANGLE_STRIP: FIXME, equivalent to %GL_TRIANGLE_STRIP - * @COGL_VERTICES_MODE_TRIANGLE_FAN: FIXME, equivalent to %GL_TRIANGLE_FAN - * @COGL_VERTICES_MODE_TRIANGLES: FIXME, equivalent to %GL_TRIANGLES - * - * How vertices passed to cogl_vertex_buffer_draw() and - * cogl_vertex_buffer_draw_elements() should be interpreted - * - * Since: 1.0 - */ -typedef enum { - COGL_VERTICES_MODE_POINTS = GL_POINTS, - COGL_VERTICES_MODE_LINE_STRIP = GL_LINE_STRIP, - COGL_VERTICES_MODE_LINE_LOOP = GL_LINE_LOOP, - COGL_VERTICES_MODE_LINES = GL_LINES, - COGL_VERTICES_MODE_TRIANGLE_STRIP = GL_TRIANGLE_STRIP, - COGL_VERTICES_MODE_TRIANGLE_FAN = GL_TRIANGLE_FAN, - COGL_VERTICES_MODE_TRIANGLES = GL_TRIANGLES -} CoglVerticesMode; - -/** * cogl_vertex_buffer_draw: * @handle: A vertex buffer handle * @mode: A #CoglVerticesMode specifying how the vertices should be @@ -299,28 +274,6 @@ cogl_vertex_buffer_draw (CoglHandle handle, int count); /** - * CoglIndicesType: - * @COGL_INDICES_TYPE_UNSIGNED_BYTE: Your indices are unsigned bytes - * @COGL_INDICES_TYPE_UNSIGNED_SHORT: Your indices are unsigned shorts - * @COGL_INDICES_TYPE_UNSIGNED_INT: Your indices are unsigned ints - * - * You should aim to use the smallest data type that gives you enough - * range, since it reduces the size of your index array and can help - * reduce the demand on memory bandwidth. - * - * Note that %COGL_INDICES_TYPE_UNSIGNED_INT is only supported if the - * %COGL_FEATURE_UNSIGNED_INT_INDICES feature is available. This - * should always be available on OpenGL but on OpenGL ES it will only - * be available if the GL_OES_element_index_uint extension is - * advertized. - */ -typedef enum { - COGL_INDICES_TYPE_UNSIGNED_BYTE, - COGL_INDICES_TYPE_UNSIGNED_SHORT, - COGL_INDICES_TYPE_UNSIGNED_INT -} CoglIndicesType; - -/** * cogl_vertex_buffer_indices_new: * @indices_type: a #CoglIndicesType specifying the data type used for * the indices. |