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

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

Browse Source 
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.
This commit is contained in:
Neil Roberts 2011-01-12 16:56:52 +00:00
parent a74050554a
commit 6e14b72284
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogl/cogl-atlas-texture.c
View File

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