From 6fe6dd18ac06eee4c8129cdea618fe7036a8cbc2 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Tue, 26 Oct 2010 16:05:00 +0100
Subject: [PATCH] buffer: BufferBindTarget + BufferUsageHint enum renaming
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".
---
cogl/cogl-buffer-private.h | 5 +++--
cogl/cogl-buffer.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cogl/cogl-buffer-private.h b/cogl/cogl-buffer-private.h
index a4b6e89bb..cf913cf67 100644
--- a/cogl/cogl-buffer-private.h
+++ b/cogl/cogl-buffer-private.h
@@ -63,14 +63,15 @@ typedef enum _CoglBufferFlags
typedef enum {
COGL_BUFFER_USAGE_HINT_TEXTURE,
- COGL_BUFFER_USAGE_HINT_VERTICES
+ COGL_BUFFER_USAGE_HINT_VERTEX_ARRAY,
+ COGL_BUFFER_USAGE_HINT_INDEX_ARRAY
} CoglBufferUsageHint;
typedef enum {
COGL_BUFFER_BIND_TARGET_PIXEL_PACK,
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
COGL_BUFFER_BIND_TARGET_VERTEX_ARRAY,
- COGL_BUFFER_BIND_TARGET_VERTEX_INDICES_ARRAY,
+ COGL_BUFFER_BIND_TARGET_INDEX_ARRAY,
COGL_BUFFER_BIND_TARGET_COUNT
} CoglBufferBindTarget;
diff --git a/cogl/cogl-buffer.c b/cogl/cogl-buffer.c
index 2c2baedf0..5ed466a15 100644
--- a/cogl/cogl-buffer.c
+++ b/cogl/cogl-buffer.c
@@ -123,7 +123,7 @@ convert_bind_target_to_gl_target (CoglBufferBindTarget target)
return GL_PIXEL_UNPACK_BUFFER;
case COGL_BUFFER_BIND_TARGET_VERTEX_ARRAY:
return GL_ARRAY_BUFFER;
- case COGL_BUFFER_BIND_TARGET_VERTEX_INDICES_ARRAY:
+ case COGL_BUFFER_BIND_TARGET_INDEX_ARRAY:
return GL_ELEMENT_ARRAY_BUFFER;
default:
g_return_val_if_reached (COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK);