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.
This commit is contained in:
Robert Bragg
parent
6fe6dd18ac
commit
812dd1d83d
@ -465,6 +465,54 @@ typedef enum { /*< prefix=COGL_ERROR >*/
|
|||||||
GQuark
|
GQuark
|
||||||
_cogl_error_quark (void);
|
_cogl_error_quark (void);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CoglVerticesMode:
|
||||||
|
* @COGL_VERTICES_MODE_POINTS: FIXME, equivalent to %GL_POINTS
|
||||||
|
* @COGL_VERTICES_MODE_LINES: FIXME, equivalent to %GL_LINES
|
||||||
|
* @COGL_VERTICES_MODE_LINE_LOOP: FIXME, equivalent to %GL_LINE_LOOP
|
||||||
|
* @COGL_VERTICES_MODE_LINE_STRIP: FIXME, equivalent to %GL_LINE_STRIP
|
||||||
|
* @COGL_VERTICES_MODE_TRIANGLES: FIXME, equivalent to %GL_TRIANGLES
|
||||||
|
* @COGL_VERTICES_MODE_TRIANGLE_STRIP: FIXME, equivalent to %GL_TRIANGLE_STRIP
|
||||||
|
* @COGL_VERTICES_MODE_TRIANGLE_FAN: FIXME, equivalent to %GL_TRIANGLE_FAN
|
||||||
|
*
|
||||||
|
* Different ways of interpreting vertices when drawing.
|
||||||
|
*
|
||||||
|
* Since: 1.0
|
||||||
|
*/
|
||||||
|
typedef enum {
|
||||||
|
COGL_VERTICES_MODE_POINTS = 0x0000,
|
||||||
|
COGL_VERTICES_MODE_LINES = 0x0001,
|
||||||
|
COGL_VERTICES_MODE_LINE_LOOP = 0x0002,
|
||||||
|
COGL_VERTICES_MODE_LINE_STRIP = 0x0003,
|
||||||
|
COGL_VERTICES_MODE_TRIANGLES = 0x0004,
|
||||||
|
COGL_VERTICES_MODE_TRIANGLE_STRIP = 0x0005,
|
||||||
|
COGL_VERTICES_MODE_TRIANGLE_FAN = 0x0006
|
||||||
|
} CoglVerticesMode;
|
||||||
|
|
||||||
|
/* NB: The above definitions are taken from gl.h equivalents */
|
||||||
|
|
||||||
G_END_DECLS
|
G_END_DECLS
|
||||||
|
|
||||||
#endif /* __COGL_TYPES_H__ */
|
#endif /* __COGL_TYPES_H__ */
|
||||||
|
|||||||
@ -253,31 +253,6 @@ void
|
|||||||
cogl_vertex_buffer_enable (CoglHandle handle,
|
cogl_vertex_buffer_enable (CoglHandle handle,
|
||||||
const char *attribute_name);
|
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:
|
* cogl_vertex_buffer_draw:
|
||||||
* @handle: A vertex buffer handle
|
* @handle: A vertex buffer handle
|
||||||
@ -298,28 +273,6 @@ cogl_vertex_buffer_draw (CoglHandle handle,
|
|||||||
int first,
|
int first,
|
||||||
int count);
|
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:
|
* cogl_vertex_buffer_indices_new:
|
||||||
* @indices_type: a #CoglIndicesType specifying the data type used for
|
* @indices_type: a #CoglIndicesType specifying the data type used for
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user