cogl/buffer: Use set_data helper
That ignores the error param, which is the behaviour we always had. Changing that to propagate the error would make the API ugly, so it is fine to remove? Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3910>
This commit is contained in:
parent
beb9ecdbc4
commit
2d25b114e6
5 changed files with 28 additions and 65 deletions
|
@ -86,11 +86,10 @@ cogl_attribute_buffer_new (CoglContext *context,
|
||||||
/* XXX: NB: for Cogl 2.0 we don't allow NULL data here but we can't
|
/* XXX: NB: for Cogl 2.0 we don't allow NULL data here but we can't
|
||||||
* break the api for 1.x and so we keep the check for now. */
|
* break the api for 1.x and so we keep the check for now. */
|
||||||
if (data)
|
if (data)
|
||||||
_cogl_buffer_set_data (COGL_BUFFER (buffer),
|
cogl_buffer_set_data (COGL_BUFFER (buffer),
|
||||||
0,
|
0,
|
||||||
data,
|
data,
|
||||||
bytes,
|
bytes);
|
||||||
NULL);
|
|
||||||
|
|
||||||
return buffer;
|
return buffer;
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,13 +90,6 @@ struct _CoglBufferClass
|
||||||
GObjectClass parent_class;
|
GObjectClass parent_class;
|
||||||
};
|
};
|
||||||
|
|
||||||
gboolean
|
|
||||||
_cogl_buffer_set_data (CoglBuffer *buffer,
|
|
||||||
size_t offset,
|
|
||||||
const void *data,
|
|
||||||
size_t size,
|
|
||||||
GError **error);
|
|
||||||
|
|
||||||
void *
|
void *
|
||||||
_cogl_buffer_map (CoglBuffer *buffer,
|
_cogl_buffer_map (CoglBuffer *buffer,
|
||||||
CoglBufferAccess access,
|
CoglBufferAccess access,
|
||||||
|
|
|
@ -365,11 +365,10 @@ _cogl_buffer_unmap_for_fill_or_fallback (CoglBuffer *buffer)
|
||||||
* smaller buffers, though that would probably not help for
|
* smaller buffers, though that would probably not help for
|
||||||
* deferred renderers.
|
* deferred renderers.
|
||||||
*/
|
*/
|
||||||
_cogl_buffer_set_data (buffer,
|
cogl_buffer_set_data (buffer,
|
||||||
ctx->buffer_map_fallback_offset,
|
ctx->buffer_map_fallback_offset,
|
||||||
ctx->buffer_map_fallback_array->data,
|
ctx->buffer_map_fallback_array->data,
|
||||||
ctx->buffer_map_fallback_array->len,
|
ctx->buffer_map_fallback_array->len);
|
||||||
NULL);
|
|
||||||
buffer->flags &= ~COGL_BUFFER_FLAG_MAPPED_FALLBACK;
|
buffer->flags &= ~COGL_BUFFER_FLAG_MAPPED_FALLBACK;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -377,27 +376,19 @@ _cogl_buffer_unmap_for_fill_or_fallback (CoglBuffer *buffer)
|
||||||
}
|
}
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
_cogl_buffer_set_data (CoglBuffer *buffer,
|
cogl_buffer_set_data (CoglBuffer *buffer,
|
||||||
size_t offset,
|
size_t offset,
|
||||||
const void *data,
|
const void *data,
|
||||||
size_t size,
|
size_t size)
|
||||||
GError **error)
|
|
||||||
{
|
{
|
||||||
|
GError *ignore_error = NULL;
|
||||||
|
gboolean status;
|
||||||
|
|
||||||
g_return_val_if_fail (COGL_IS_BUFFER (buffer), FALSE);
|
g_return_val_if_fail (COGL_IS_BUFFER (buffer), FALSE);
|
||||||
g_return_val_if_fail ((offset + size) <= buffer->size, FALSE);
|
g_return_val_if_fail ((offset + size) <= buffer->size, FALSE);
|
||||||
|
|
||||||
return buffer->set_data (buffer, offset, data, size, error);
|
status = buffer->set_data (buffer, offset, data, size, &ignore_error);
|
||||||
}
|
|
||||||
|
|
||||||
gboolean
|
|
||||||
cogl_buffer_set_data (CoglBuffer *buffer,
|
|
||||||
size_t offset,
|
|
||||||
const void *data,
|
|
||||||
size_t size)
|
|
||||||
{
|
|
||||||
GError *ignore_error = NULL;
|
|
||||||
gboolean status =
|
|
||||||
_cogl_buffer_set_data (buffer, offset, data, size, &ignore_error);
|
|
||||||
g_clear_error (&ignore_error);
|
g_clear_error (&ignore_error);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
|
@ -107,16 +107,12 @@ cogl_indices_new (CoglContext *context,
|
||||||
CoglIndexBuffer *index_buffer = cogl_index_buffer_new (context, buffer_bytes);
|
CoglIndexBuffer *index_buffer = cogl_index_buffer_new (context, buffer_bytes);
|
||||||
CoglBuffer *buffer = COGL_BUFFER (index_buffer);
|
CoglBuffer *buffer = COGL_BUFFER (index_buffer);
|
||||||
CoglIndices *indices;
|
CoglIndices *indices;
|
||||||
GError *ignore_error = NULL;
|
|
||||||
|
|
||||||
_cogl_buffer_set_data (buffer,
|
if (!cogl_buffer_set_data (buffer,
|
||||||
0,
|
0,
|
||||||
indices_data,
|
indices_data,
|
||||||
buffer_bytes,
|
buffer_bytes))
|
||||||
&ignore_error);
|
|
||||||
if (ignore_error)
|
|
||||||
{
|
{
|
||||||
g_error_free (ignore_error);
|
|
||||||
g_object_unref (index_buffer);
|
g_object_unref (index_buffer);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -240,4 +236,3 @@ cogl_get_rectangle_indices (CoglContext *ctx, int n_rectangles)
|
||||||
return ctx->rectangle_short_indices;
|
return ctx->rectangle_short_indices;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -61,11 +61,10 @@ cogl_pixel_buffer_init (CoglPixelBuffer *buffer)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
static CoglPixelBuffer *
|
CoglPixelBuffer *
|
||||||
_cogl_pixel_buffer_new (CoglContext *context,
|
cogl_pixel_buffer_new (CoglContext *context,
|
||||||
size_t size,
|
size_t size,
|
||||||
const void *data,
|
const void *data)
|
||||||
GError **error)
|
|
||||||
{
|
{
|
||||||
CoglPixelBuffer *pixel_buffer;
|
CoglPixelBuffer *pixel_buffer;
|
||||||
|
|
||||||
|
@ -78,11 +77,10 @@ _cogl_pixel_buffer_new (CoglContext *context,
|
||||||
|
|
||||||
if (data)
|
if (data)
|
||||||
{
|
{
|
||||||
if (!_cogl_buffer_set_data (COGL_BUFFER (pixel_buffer),
|
if (!cogl_buffer_set_data (COGL_BUFFER (pixel_buffer),
|
||||||
0,
|
0,
|
||||||
data,
|
data,
|
||||||
size,
|
size))
|
||||||
error))
|
|
||||||
{
|
{
|
||||||
g_object_unref (pixel_buffer);
|
g_object_unref (pixel_buffer);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -91,16 +89,3 @@ _cogl_pixel_buffer_new (CoglContext *context,
|
||||||
|
|
||||||
return pixel_buffer;
|
return pixel_buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
CoglPixelBuffer *
|
|
||||||
cogl_pixel_buffer_new (CoglContext *context,
|
|
||||||
size_t size,
|
|
||||||
const void *data)
|
|
||||||
{
|
|
||||||
GError *ignore_error = NULL;
|
|
||||||
CoglPixelBuffer *buffer =
|
|
||||||
_cogl_pixel_buffer_new (context, size, data, &ignore_error);
|
|
||||||
|
|
||||||
g_clear_error (&ignore_error);
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue