Allow propogation of OOM errors to apps

This allows apps to catch out-of-memory errors when allocating textures.

Textures can be pretty huge at times and so it's quite possible for an
application to try and allocate more memory than is available. It's also
very possible that the application can take some action in response to
reduce memory pressure (such as freeing up texture caches perhaps) so
we shouldn't just automatically abort like we do for trivial heap
allocations.

These public functions now take a CoglError argument so applications can
catch out of memory errors:

cogl_buffer_map
cogl_buffer_map_range
cogl_buffer_set_data
cogl_framebuffer_read_pixels_into_bitmap
cogl_pixel_buffer_new
cogl_texture_new_from_data
cogl_texture_new_from_bitmap

Note: we've been quite conservative with how many apis we let throw OOM
CoglErrors since we don't really want to put a burdon on developers to
be checking for errors with every cogl api call. So long as there is
some lower level api for apps to use that let them catch OOM errors
for everything necessary that's enough and we don't have to make more
convenient apis more awkward to use.

The main focus is on bitmaps and texture allocations since they
can be particularly large and prone to failing.

A new cogl_attribute_buffer_new_with_size() function has been added in
case developers need to catch OOM errors when allocating attribute buffers
whereby they can first use _buffer_new_with_size() (which doesn't take a
CoglError) followed by cogl_buffer_set_data() which will lazily allocate
the buffer storage and report OOM errors.

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

(cherry picked from commit f7735e141ad537a253b02afa2a8238f96340b978)

Note: since we can't break the API for Cogl 1.x then actually the main
purpose of cherry picking this patch is to keep in-line with changes
on the master branch so that we can easily cherry-pick patches.

All the api changes relating stable apis released on the 1.12 branch
have been reverted as part of cherry-picking this patch so this most
just applies all the internal plumbing changes that enable us to
correctly propagate OOM errors.

1 files changed, 21 insertions, 13 deletions

diff --git a/cogl/cogl-bitmap-conversion.c b/cogl/cogl-bitmap-conversion.c
index ca611ee5..15500ab3 100644
--- a/cogl/cogl-bitmap-conversion.c
+++ b/cogl/cogl-bitmap-conversion.c
@@ -348,7 +348,8 @@ _cogl_bitmap_needs_short_temp_buffer (CoglPixelFormat format)
 
 CoglBool
 _cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
-                                  CoglBitmap *dst_bmp)
+                                  CoglBitmap *dst_bmp,
+                                  CoglError **error)
 {
   uint8_t *src_data;
   uint8_t *dst_data;
@@ -388,19 +389,20 @@ _cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
       if (!_cogl_bitmap_copy_subregion (src_bmp, dst_bmp,
                                         0, 0, /* src_x / src_y */
                                         0, 0, /* dst_x / dst_y */
-                                        width, height))
+                                        width, height,
+                                        error))
         return FALSE;
 
       if (need_premult)
         {
           if ((dst_format & COGL_PREMULT_BIT))
             {
-              if (!_cogl_bitmap_premult (dst_bmp))
+              if (!_cogl_bitmap_premult (dst_bmp, error))
                 return FALSE;
             }
           else
             {
-              if (!_cogl_bitmap_unpremult (dst_bmp))
+              if (!_cogl_bitmap_unpremult (dst_bmp, error))
                 return FALSE;
             }
         }
@@ -408,12 +410,13 @@ _cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
       return TRUE;
     }
 
-  src_data = _cogl_bitmap_map (src_bmp, COGL_BUFFER_ACCESS_READ, 0);
+  src_data = _cogl_bitmap_map (src_bmp, COGL_BUFFER_ACCESS_READ, 0, error);
   if (src_data == NULL)
     return FALSE;
   dst_data = _cogl_bitmap_map (dst_bmp,
                                COGL_BUFFER_ACCESS_WRITE,
-                               COGL_BUFFER_MAP_HINT_DISCARD);
+                               COGL_BUFFER_MAP_HINT_DISCARD,
+                               error);
   if (dst_data == NULL)
     {
       _cogl_bitmap_unmap (src_bmp);
@@ -472,7 +475,8 @@ _cogl_bitmap_convert_into_bitmap (CoglBitmap *src_bmp,
 
 CoglBitmap *
 _cogl_bitmap_convert (CoglBitmap *src_bmp,
-                      CoglPixelFormat dst_format)
+                      CoglPixelFormat dst_format,
+                      CoglError **error)
 {
   CoglBitmap *dst_bmp;
   int width, height;
@@ -486,7 +490,7 @@ _cogl_bitmap_convert (CoglBitmap *src_bmp,
                                                  width, height,
                                                  dst_format);
 
-  if (!_cogl_bitmap_convert_into_bitmap (src_bmp, dst_bmp))
+  if (!_cogl_bitmap_convert_into_bitmap (src_bmp, dst_bmp, error))
     {
       cogl_object_unref (dst_bmp);
       return NULL;
@@ -496,7 +500,8 @@ _cogl_bitmap_convert (CoglBitmap *src_bmp,
 }
 
 CoglBool
-_cogl_bitmap_unpremult (CoglBitmap *bmp)
+_cogl_bitmap_unpremult (CoglBitmap *bmp,
+                        CoglError **error)
 {
   uint8_t *p, *data;
   uint16_t *tmp_row;
@@ -513,12 +518,13 @@ _cogl_bitmap_unpremult (CoglBitmap *bmp)
   if ((data = _cogl_bitmap_map (bmp,
                                 COGL_BUFFER_ACCESS_READ |
                                 COGL_BUFFER_ACCESS_WRITE,
-                                0)) == NULL)
+                                0,
+                                error)) == NULL)
     return FALSE;
 
   /* If we can't directly unpremult the data inline then we'll
      allocate a temporary row and unpack the data. This assumes if we
-     can fast premult then we can also fast unpremult */
+      can fast premult then we can also fast unpremult */
   if (_cogl_bitmap_can_fast_premult (format))
     tmp_row = NULL;
   else
@@ -562,7 +568,8 @@ _cogl_bitmap_unpremult (CoglBitmap *bmp)
 }
 
 CoglBool
-_cogl_bitmap_premult (CoglBitmap *bmp)
+_cogl_bitmap_premult (CoglBitmap *bmp,
+                      CoglError **error)
 {
   uint8_t *p, *data;
   uint16_t *tmp_row;
@@ -579,7 +586,8 @@ _cogl_bitmap_premult (CoglBitmap *bmp)
   if ((data = _cogl_bitmap_map (bmp,
                                 COGL_BUFFER_ACCESS_READ |
                                 COGL_BUFFER_ACCESS_WRITE,
-                                0)) == NULL)
+                                0,
+                                error)) == NULL)
     return FALSE;
 
   /* If we can't directly premult the data inline then we'll allocate