isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

buffer: explicitly relate buffers to a context

Browse Source 
All CoglBuffer constructors now take an explicit CoglContext
constructor. This is part of the on going effort to adapt to Cogl API so
it no longer depends on a global, default context.

Reviewed-by: Neil Roberts <neil@linux.intel.com>
This commit is contained in:
Robert Bragg
2012-02-06 17:08:58 +00:00
parent 269878217f
commit 3ea6acc072
26 changed files with 214 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cogl/cogl-pixel-buffer.c
View File

@ -68,21 +68,20 @@ _cogl_pixel_buffer_free (CoglPixelBuffer *buffer);
COGL_BUFFER_DEFINE (PixelBuffer, pixel_buffer)
static CoglPixelBuffer *
_cogl_pixel_buffer_new (unsigned int size)
_cogl_pixel_buffer_new (CoglContext *context, unsigned int size)
{
CoglPixelBuffer *pixel_buffer = g_slice_new0 (CoglPixelBuffer);
CoglBuffer *buffer = COGL_BUFFER (pixel_buffer);
gboolean use_malloc;
_COGL_GET_CONTEXT (ctx, COGL_INVALID_HANDLE);
if (!(ctx->private_feature_flags & COGL_PRIVATE_FEATURE_PBOS))
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_PBOS))
use_malloc = TRUE;
else
use_malloc = FALSE;
/* parent's constructor */
_cogl_buffer_initialize (buffer,
context,
size,
use_malloc,
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
@ -94,7 +93,8 @@ _cogl_pixel_buffer_new (unsigned int size)
}
CoglPixelBuffer *
cogl_pixel_buffer_new_with_size (unsigned int width,
cogl_pixel_buffer_new_with_size (CoglContext *context,
unsigned int width,
unsigned int height,
CoglPixelFormat format,
unsigned int *rowstride)
@ -113,7 +113,7 @@ cogl_pixel_buffer_new_with_size (unsigned int width,
if (rowstride)
*rowstride = stride;
buffer = _cogl_pixel_buffer_new (height * stride);
buffer = _cogl_pixel_buffer_new (context, height * stride);
if (G_UNLIKELY (buffer == COGL_INVALID_HANDLE))
return COGL_INVALID_HANDLE;
@ -129,8 +129,6 @@ cogl_pixel_buffer_new_with_size (unsigned int width,
static void
_cogl_pixel_buffer_free (CoglPixelBuffer *buffer)
{
_COGL_GET_CONTEXT (ctx, NO_RETVAL);
/* parent's destructor */
_cogl_buffer_fini (COGL_BUFFER (buffer));