brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buffer: move choice about using malloc closer to driver

Browse Source 
This moves the decision about whether a buffer should be allocated using
malloc or not into cogl-buffer.c closer to the driver since it seem
there could be other driver specific factors that might also influence
this choice that we don't currently consider.

Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit 06d46f10bf755d3009c28904e616a0adb4586cf5)
This commit is contained in:
Robert Bragg 2012-09-19 21:34:24 +01:00
parent ffd2cf8ef8
commit 91a02e9107
5 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cogl/cogl-attribute-buffer.c
View File

@ -44,18 +44,11 @@ cogl_attribute_buffer_new (CoglContext *context,
const void *data) const void *data)
{ {
CoglAttributeBuffer *array = g_slice_new (CoglAttributeBuffer); CoglAttributeBuffer *array = g_slice_new (CoglAttributeBuffer);
CoglBool use_malloc;
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_VBOS))
use_malloc = TRUE;
else
use_malloc = FALSE;
/* parent's constructor */ /* parent's constructor */
_cogl_buffer_initialize (COGL_BUFFER (array), _cogl_buffer_initialize (COGL_BUFFER (array),
context, context,
bytes, bytes,
use_malloc,
COGL_BUFFER_BIND_TARGET_ATTRIBUTE_BUFFER, COGL_BUFFER_BIND_TARGET_ATTRIBUTE_BUFFER,
COGL_BUFFER_USAGE_HINT_ATTRIBUTE_BUFFER, COGL_BUFFER_USAGE_HINT_ATTRIBUTE_BUFFER,
COGL_BUFFER_UPDATE_HINT_STATIC); COGL_BUFFER_UPDATE_HINT_STATIC);

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

@ -113,12 +113,11 @@ _cogl_buffer_register_buffer_type (const CoglObjectClass *klass);
_cogl_buffer_register_buffer_type (&_cogl_##type_name##_class)) _cogl_buffer_register_buffer_type (&_cogl_##type_name##_class))
void void
_cogl_buffer_initialize (CoglBuffer *buffer, _cogl_buffer_initialize (CoglBuffer *buffer,
CoglContext *context, CoglContext *context,
unsigned int size, size_t size,
CoglBool use_malloc,
CoglBufferBindTarget default_target, CoglBufferBindTarget default_target,
CoglBufferUsageHint usage_hint, CoglBufferUsageHint usage_hint,
CoglBufferUpdateHint update_hint); CoglBufferUpdateHint update_hint);
void void

28
cogl/cogl-buffer.c
View File

@ -292,14 +292,15 @@ malloc_set_data (CoglBuffer *buffer,
} }
void void
_cogl_buffer_initialize (CoglBuffer *buffer, _cogl_buffer_initialize (CoglBuffer *buffer,
CoglContext *context, CoglContext *context,
unsigned int size, size_t size,
CoglBool use_malloc, CoglBufferBindTarget default_target,
CoglBufferBindTarget default_target, CoglBufferUsageHint usage_hint,
CoglBufferUsageHint usage_hint, CoglBufferUpdateHint update_hint)
CoglBufferUpdateHint update_hint)
{ {
CoglBool use_malloc = FALSE;
buffer->context = context; buffer->context = context;
buffer->flags = COGL_BUFFER_FLAG_NONE; buffer->flags = COGL_BUFFER_FLAG_NONE;
buffer->store_created = FALSE; buffer->store_created = FALSE;
@ -310,6 +311,19 @@ _cogl_buffer_initialize (CoglBuffer *buffer,
buffer->data = NULL; buffer->data = NULL;
buffer->immutable_ref = 0; buffer->immutable_ref = 0;
if (default_target == COGL_BUFFER_BIND_TARGET_PIXEL_PACK ||
default_target == COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK)
{
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_PBOS))
use_malloc = TRUE;
}
else if (default_target == COGL_BUFFER_BIND_TARGET_ATTRIBUTE_BUFFER ||
default_target == COGL_BUFFER_BIND_TARGET_INDEX_BUFFER)
{
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_VBOS))
use_malloc = TRUE;
}
if (use_malloc) if (use_malloc)
{ {
buffer->vtable.map = malloc_map; buffer->vtable.map = malloc_map;

7
cogl/cogl-index-buffer.c
View File

@ -45,18 +45,11 @@ CoglIndexBuffer *
cogl_index_buffer_new (CoglContext *context, size_t bytes) cogl_index_buffer_new (CoglContext *context, size_t bytes)
{ {
CoglIndexBuffer *indices = g_slice_new (CoglIndexBuffer); CoglIndexBuffer *indices = g_slice_new (CoglIndexBuffer);
CoglBool use_malloc;
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_VBOS))
use_malloc = TRUE;
else
use_malloc = FALSE;
/* parent's constructor */ /* parent's constructor */
_cogl_buffer_initialize (COGL_BUFFER (indices), _cogl_buffer_initialize (COGL_BUFFER (indices),
context, context,
bytes, bytes,
use_malloc,
COGL_BUFFER_BIND_TARGET_INDEX_BUFFER, COGL_BUFFER_BIND_TARGET_INDEX_BUFFER,
COGL_BUFFER_USAGE_HINT_INDEX_BUFFER, COGL_BUFFER_USAGE_HINT_INDEX_BUFFER,
COGL_BUFFER_UPDATE_HINT_STATIC); COGL_BUFFER_UPDATE_HINT_STATIC);

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

@ -73,18 +73,11 @@ cogl_pixel_buffer_new (CoglContext *context,
{ {
CoglPixelBuffer *pixel_buffer = g_slice_new0 (CoglPixelBuffer); CoglPixelBuffer *pixel_buffer = g_slice_new0 (CoglPixelBuffer);
CoglBuffer *buffer = COGL_BUFFER (pixel_buffer); CoglBuffer *buffer = COGL_BUFFER (pixel_buffer);
CoglBool use_malloc;
if (!(context->private_feature_flags & COGL_PRIVATE_FEATURE_PBOS))
use_malloc = TRUE;
else
use_malloc = FALSE;
/* parent's constructor */ /* parent's constructor */
_cogl_buffer_initialize (buffer, _cogl_buffer_initialize (buffer,
context, context,
size, size,
use_malloc,
COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK, COGL_BUFFER_BIND_TARGET_PIXEL_UNPACK,
COGL_BUFFER_USAGE_HINT_TEXTURE, COGL_BUFFER_USAGE_HINT_TEXTURE,
COGL_BUFFER_UPDATE_HINT_STATIC); COGL_BUFFER_UPDATE_HINT_STATIC);