diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2014-09-10 16:20:46 +0900 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-09-11 18:30:55 -0700 |
| commit | a4e8e6dff9a0c26944a325e4017faa68d93ae5b8 (patch) | |
| tree | cbd42f05efd0f21eeaa166fe467c7f0f3f718d1b | |
| parent | 0acff6e4374340dc391014f396f190daf73d579c (diff) | |
glamor: Move 'glyph caches realized' check to glamor_realize_glyph_caches
And rename the boolean to reflect what it's about.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | glamor/glamor_glyphs.c | 15 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/glamor/glamor_glyphs.c b/glamor/glamor_glyphs.c index f570d7519..b49176852 100644 --- a/glamor/glamor_glyphs.c +++ b/glamor/glamor_glyphs.c @@ -269,7 +269,7 @@ glamor_unrealize_glyph_caches(ScreenPtr pScreen) glamor_screen_private *glamor = glamor_get_screen_private(pScreen); int i; - if (!glamor->glyph_cache_initialized) + if (!glamor->glyph_caches_realized) return; for (i = 0; i < GLAMOR_NUM_GLYPH_CACHE_FORMATS; i++) { @@ -284,7 +284,7 @@ glamor_unrealize_glyph_caches(ScreenPtr pScreen) if (mask_cache[i]) free(mask_cache[i]); } - glamor->glyph_cache_initialized = FALSE; + glamor->glyph_caches_realized = FALSE; } void @@ -314,6 +314,9 @@ glamor_realize_glyph_caches(ScreenPtr pScreen) }; int i; + if (glamor->glyph_caches_realized) + return TRUE; + memset(glamor->glyphCaches, 0, sizeof(glamor->glyphCaches)); for (i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) { @@ -359,6 +362,7 @@ glamor_realize_glyph_caches(ScreenPtr pScreen) } assert(i == GLAMOR_NUM_GLYPH_CACHE_FORMATS); + glamor->glyph_caches_realized = TRUE; return TRUE; bail: @@ -375,17 +379,10 @@ glamor_realize_glyph_caches(ScreenPtr pScreen) Bool glamor_glyphs_init(ScreenPtr pScreen) { - glamor_screen_private *glamor = glamor_get_screen_private(pScreen); - - if (glamor->glyph_cache_initialized) - return TRUE; - if (!dixRegisterPrivateKey(&glamor_glyph_key, PRIVATE_GLYPH, sizeof(struct glamor_glyph))) return FALSE; - glamor->glyph_cache_initialized = TRUE; - return TRUE; } diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 385c0279d..6ebb7b392 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -268,7 +268,7 @@ typedef struct glamor_screen_private { [SHADER_MASK_COUNT] [SHADER_IN_COUNT]; glamor_glyph_cache_t glyphCaches[GLAMOR_NUM_GLYPH_CACHE_FORMATS]; - Bool glyph_cache_initialized; + Bool glyph_caches_realized; /* shaders to restore a texture to another texture. */ GLint finish_access_prog[2]; |