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

cogl-debug: Add an option to disable atlasing sharing

Browse Source 
If COGL_DEBUG contains disable-shared-atlas Cogl will not try to share
the atlas between glyphs and images.
This commit is contained in:
Neil Roberts 2011-03-30 16:39:38 +01:00
parent 77cd2ca08e
commit 6d9458debb
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/cogl/cogl/cogl-debug-options.h
View File

@ -112,6 +112,12 @@ OPT (DISABLE_ATLAS,
"disable-atlas", "disable-atlas",
"Disable texture atlasing", "Disable texture atlasing",
"Disable use of texture atlasing") "Disable use of texture atlasing")
OPT (DISABLE_SHARED_ATLAS,
"Root Cause",
"disable-shared-atlas",
"Disable sharing the texture atlas between text and images",
"When this is set the glyph cache will always use a separate texture "
"for its atlas. Otherwise it will try to share the atlas with images.")
OPT (DISABLE_TEXTURING, OPT (DISABLE_TEXTURING,
"Root Cause", "Root Cause",
"disable-texturing", "disable-texturing",

1
clutter/cogl/cogl/cogl-debug.c
View File

@ -68,6 +68,7 @@ static const GDebugKey cogl_behavioural_debug_keys[] = {
{ "disable-software-transform", COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM }, { "disable-software-transform", COGL_DEBUG_DISABLE_SOFTWARE_TRANSFORM },
{ "dump-atlas-image", COGL_DEBUG_DUMP_ATLAS_IMAGE }, { "dump-atlas-image", COGL_DEBUG_DUMP_ATLAS_IMAGE },
{ "disable-atlas", COGL_DEBUG_DISABLE_ATLAS }, { "disable-atlas", COGL_DEBUG_DISABLE_ATLAS },
{ "disable-shared-atlas", COGL_DEBUG_DISABLE_SHARED_ATLAS },
{ "disable-texturing", COGL_DEBUG_DISABLE_TEXTURING}, { "disable-texturing", COGL_DEBUG_DISABLE_TEXTURING},
{ "disable-arbfp", COGL_DEBUG_DISABLE_ARBFP}, { "disable-arbfp", COGL_DEBUG_DISABLE_ARBFP},
{ "disable-fixed", COGL_DEBUG_DISABLE_FIXED}, { "disable-fixed", COGL_DEBUG_DISABLE_FIXED},

1
clutter/cogl/cogl/cogl-debug.h
View File

@ -49,6 +49,7 @@ typedef enum {
COGL_DEBUG_ATLAS, COGL_DEBUG_ATLAS,
COGL_DEBUG_DUMP_ATLAS_IMAGE, COGL_DEBUG_DUMP_ATLAS_IMAGE,
COGL_DEBUG_DISABLE_ATLAS, COGL_DEBUG_DISABLE_ATLAS,
COGL_DEBUG_DISABLE_SHARED_ATLAS,
COGL_DEBUG_OPENGL, COGL_DEBUG_OPENGL,
COGL_DEBUG_DISABLE_TEXTURING, COGL_DEBUG_DISABLE_TEXTURING,
COGL_DEBUG_DISABLE_ARBFP, COGL_DEBUG_DISABLE_ARBFP,

3
clutter/cogl/pango/cogl-pango-glyph-cache.c
View File

@ -204,6 +204,9 @@ cogl_pango_glyph_cache_add_to_global_atlas (CoglPangoGlyphCache *cache,
{ {
CoglHandle texture; CoglHandle texture;
if (COGL_DEBUG_ENABLED (COGL_DEBUG_DISABLE_SHARED_ATLAS))
return FALSE;
/* If the cache is using mipmapping then we can't use the global /* If the cache is using mipmapping then we can't use the global
atlas because it would just get migrated back out */ atlas because it would just get migrated back out */
if (cache->use_mipmapping) if (cache->use_mipmapping)