summaryrefslogtreecommitdiff
path: root/cogl/cogl-bitmap.c
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2012-09-19 21:59:19 +0100
committerRobert Bragg <robert@linux.intel.com>2013-01-22 17:47:59 +0000
commitbcf6a61d0b23a8ca6b1038cd54c8595306d3a34c (patch)
tree214acd8735f99b60350af77106866f2471d86deb /cogl/cogl-bitmap.c
parent91a02e9107993e5e947f71d2af79d6bf9080a549 (diff)
downloadcogl-bcf6a61d0b23a8ca6b1038cd54c8595306d3a34c.tar.gz
Give buffer/bitmap bind functions gl infix
The buffer and bitmap _bind() functions are GL specific so to clarify that, this patch adds a _gl infix to these functions, though it doesn't yet move the implementations out into gl specific files. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 6371fbb9637d88ff187dfb6c4bcd18468ba44d19)
Diffstat (limited to 'cogl/cogl-bitmap.c')
-rw-r--r--cogl/cogl-bitmap.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/cogl/cogl-bitmap.c b/cogl/cogl-bitmap.c
index 1be193a8..a39307e4 100644
--- a/cogl/cogl-bitmap.c
+++ b/cogl/cogl-bitmap.c
@@ -411,15 +411,15 @@ _cogl_bitmap_unmap (CoglBitmap *bitmap)
}
uint8_t *
-_cogl_bitmap_bind (CoglBitmap *bitmap,
- CoglBufferAccess access,
- CoglBufferMapHint hints)
+_cogl_bitmap_gl_bind (CoglBitmap *bitmap,
+ CoglBufferAccess access,
+ CoglBufferMapHint hints)
{
uint8_t *ptr;
/* Divert to another bitmap if this data is shared */
if (bitmap->shared_bmp)
- return _cogl_bitmap_bind (bitmap->shared_bmp, access, hints);
+ return _cogl_bitmap_gl_bind (bitmap->shared_bmp, access, hints);
g_assert (!bitmap->bound);
@@ -436,11 +436,11 @@ _cogl_bitmap_bind (CoglBitmap *bitmap,
bitmap->bound = TRUE;
if (access == COGL_BUFFER_ACCESS_READ)
- ptr = _cogl_buffer_bind (bitmap->buffer,
- COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK);
+ ptr = _cogl_buffer_gl_bind (bitmap->buffer,
+ COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK);
else if (access == COGL_BUFFER_ACCESS_WRITE)
- ptr = _cogl_buffer_bind (bitmap->buffer,
- COGL_BUFFER_BIND_TARGET_PIXEL_PACK);
+ ptr = _cogl_buffer_gl_bind (bitmap->buffer,
+ COGL_BUFFER_BIND_TARGET_PIXEL_PACK);
else
g_assert_not_reached ();
@@ -449,12 +449,12 @@ _cogl_bitmap_bind (CoglBitmap *bitmap,
}
void
-_cogl_bitmap_unbind (CoglBitmap *bitmap)
+_cogl_bitmap_gl_unbind (CoglBitmap *bitmap)
{
/* Divert to another bitmap if this data is shared */
if (bitmap->shared_bmp)
{
- _cogl_bitmap_unbind (bitmap->shared_bmp);
+ _cogl_bitmap_gl_unbind (bitmap->shared_bmp);
return;
}
@@ -464,7 +464,7 @@ _cogl_bitmap_unbind (CoglBitmap *bitmap)
/* If the bitmap wasn't created from a pixel array then the
implementation of unbind is the same as unmap */
if (bitmap->buffer)
- _cogl_buffer_unbind (bitmap->buffer);
+ _cogl_buffer_gl_unbind (bitmap->buffer);
else
_cogl_bitmap_unmap (bitmap);
}