cogl-atlas-texture: Don't disable atlas if can't read texture data

Previously atlasing would be disabled if the GL driver does not
support reading back texture data. This meant that atlasing would not
happen on GLES. However we also require that the driver support FBOs
and the texture data is only read back as a fallback if the FBO
fails. Therefore the atlas should be ok on GLES 2 which has FBO
support in core.

diff --git a/clutter/cogl/cogl/cogl-atlas-texture.c b/clutter/cogl/cogl/cogl-atlas-texture.c
index e9b4e6b..51b2ad4 100644 (file)
--- a/clutter/cogl/cogl/cogl-atlas-texture.c
+++ b/clutter/cogl/cogl/cogl-atlas-texture.c
@@ -552,11 +552,9 @@ _cogl_atlas_texture_new_from_bitmap (CoglBitmap      *bmp,
   if (bmp_width < 1 || bmp_height < 1)
     return COGL_INVALID_HANDLE;
 
-  /* If we can't use FBOs or we can't read back texture data then it
-     will be too slow to migrate textures and we shouldn't use the
-     atlas */
-  if (!cogl_features_available (COGL_FEATURE_TEXTURE_READ_PIXELS) ||
-      !cogl_features_available (COGL_FEATURE_OFFSCREEN))
+  /* If we can't use FBOs then it will be too slow to migrate textures
+     and we shouldn't use the atlas */
+  if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
     return COGL_INVALID_HANDLE;
 
   COGL_NOTE (ATLAS, "Adding texture of size %ix%i", bmp_width, bmp_height);