isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

buffer: BufferBindTarget + BufferUsageHint enum renaming

Browse Source 
This renames the BufferBindTarget + BufferUsageHint enums to match the
anticipated new APIs for "index arrays" and "vertex arrays" as opposed
to using the terms "vertices" or "indices".
This commit is contained in:
Robert Bragg 2010-10-26 16:05:00 +01:00
parent 525504f9bf
commit 6fe6dd18ac
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,14 +63,15 @@ typedef enum _CoglBufferFlags
typedef enum { typedef enum {
COGL_BUFFER_USAGE_HINT_TEXTURE, COGL_BUFFER_USAGE_HINT_TEXTURE,
COGL_BUFFER_USAGE_HINT_VERTICES COGL_BUFFER_USAGE_HINT_VERTEX_ARRAY,
COGL_BUFFER_USAGE_HINT_INDEX_ARRAY
} CoglBufferUsageHint; } CoglBufferUsageHint;
typedef enum { typedef enum {
COGL_BUFFER_BIND_TARGET_PIXEL_PACK, COGL_BUFFER_BIND_TARGET_PIXEL_PACK,
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK, COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
COGL_BUFFER_BIND_TARGET_VERTEX_ARRAY, COGL_BUFFER_BIND_TARGET_VERTEX_ARRAY,
COGL_BUFFER_BIND_TARGET_VERTEX_INDICES_ARRAY, COGL_BUFFER_BIND_TARGET_INDEX_ARRAY,
COGL_BUFFER_BIND_TARGET_COUNT COGL_BUFFER_BIND_TARGET_COUNT
} CoglBufferBindTarget; } CoglBufferBindTarget;

2
cogl/cogl-buffer.c
View File

@ -123,7 +123,7 @@ convert_bind_target_to_gl_target (CoglBufferBindTarget target)
return GL_PIXEL_UNPACK_BUFFER; return GL_PIXEL_UNPACK_BUFFER;
case COGL_BUFFER_BIND_TARGET_VERTEX_ARRAY: case COGL_BUFFER_BIND_TARGET_VERTEX_ARRAY:
return GL_ARRAY_BUFFER; return GL_ARRAY_BUFFER;
case COGL_BUFFER_BIND_TARGET_VERTEX_INDICES_ARRAY: case COGL_BUFFER_BIND_TARGET_INDEX_ARRAY:
return GL_ELEMENT_ARRAY_BUFFER; return GL_ELEMENT_ARRAY_BUFFER;
default: default:
g_return_val_if_reached (COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK); g_return_val_if_reached (COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK);