[PATCH 2/4] glamor: Move 'glyph caches realized' check to glamor_realize_glyph_caches

[Michel Dänzer]

From: Michel Dänzer <michel.daenzer at amd.com>

And rename the boolean to reflect what it's about.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 glamor/glamor_glyphs.c | 15 ++++++---------
 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 f570d75..b491768 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 385c027..6ebb7b3 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];
-- 
2.1.0