[freetype2-demos] master ab1788c: [graph] Do not preset blending cache.

[Alexei Podtelezhnikov]

branch: master
commit ab1788c5f99b38cc8db9168b22a7c2db5a7aadc6
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    [graph] Do not preset blending cache.
    
    * graph/gblender.c (gblender_init, gblender_use_channels):
    Use `gblender_clear' instead of...
    (gblender_reset): Removed.
---
 ChangeLog        |  8 +++++++
 graph/gblender.c | 69 ++++++++------------------------------------------------
 2 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24690a6..8b5bd91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-01-11  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+       [graph] Do not preset blending cache.
+
+       * graph/gblender.c (gblender_init, gblender_use_channels):
+       Use `gblender_clear' instead of...
+       (gblender_reset): Removed.
+
 2021-01-07  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        [graph/win32] Use faster Set/GetWindowLongPtr.
diff --git a/graph/gblender.c b/graph/gblender.c
index 1347030..6c171c3 100644
--- a/graph/gblender.c
+++ b/graph/gblender.c
@@ -154,46 +154,6 @@ gblender_clear( GBlender  blender )
 }
 
 GBLENDER_APIDEF( void )
-gblender_reset( GBlender  blender )
-{
-  gblender_clear( blender );
-
-  if ( blender->channels )
-  {
-    blender->cache_r_back  = 0;
-    blender->cache_r_fore  = 0xFFFFFF;
-    blender->cache_r_cells = gblender_lookup_channel( blender,
-                                                      blender->cache_r_back,
-                                                      blender->cache_r_fore );
-    blender->cache_g_back  = 0;
-    blender->cache_g_fore  = 0xFFFFFF;
-    blender->cache_g_cells = gblender_lookup_channel( blender,
-                                                      blender->cache_g_back,
-                                                      blender->cache_g_fore );
-    blender->cache_b_back  = 0;
-    blender->cache_b_fore  = 0xFFFFFF;
-    blender->cache_b_cells = gblender_lookup_channel( blender,
-                                                      blender->cache_b_back,
-                                                      blender->cache_b_fore );
-  }
-  else
-  {
-    blender->cache_back  = 0;
-    blender->cache_fore  = 0xFFFFFF;
-    blender->cache_cells = gblender_lookup( blender,
-                                            blender->cache_back,
-                                            blender->cache_fore );
-  }
-
-#ifdef GBLENDER_STATS
-  blender->stat_hits    = 0;
-  blender->stat_lookups = 0;
-  blender->stat_keys    = 0;
-  blender->stat_clears  = 0;
-#endif
-}
-
-GBLENDER_APIDEF( void )
 gblender_init( GBlender   blender,
                double     gamma_value )
 {
@@ -203,7 +163,14 @@ gblender_init( GBlender   blender,
                              blender->gamma_ramp,
                              blender->gamma_ramp_inv );
 
-  gblender_reset( blender );
+  gblender_clear( blender );
+
+#ifdef GBLENDER_STATS
+  blender->stat_hits    = 0;
+  blender->stat_lookups = 0;
+  blender->stat_keys    = 0;
+  blender->stat_clears  = 0;
+#endif
 }
 
 
@@ -216,7 +183,7 @@ gblender_use_channels( GBlender  blender,
   if ( blender->channels != channels )
   {
     blender->channels = channels;
-    gblender_reset( blender );
+    gblender_clear( blender );
   }
 }
 
@@ -307,15 +274,6 @@ gblender_lookup( GBlender       blender,
   blender->stat_lookups++;
 #endif
 
-#if 0
-  if ( blender->channels )
-  {
-    /* set to normal mode */
-    blender->channels = 0;
-    gblender_reset( blender );
-  }
-#endif
-
   idx0 = ( background + foreground*63 ) & (GBLENDER_KEY_COUNT-1);
   idx  = idx0;
   do
@@ -410,15 +368,6 @@ gblender_lookup_channel( GBlender      blender,
   blender->stat_lookups++;
 #endif
 
-#if 0
-  if ( !blender->channels )
-  {
-    /* set to normal mode */
-    blender->channels = 1;
-    gblender_reset( blender );
-  }
-#endif
-
   idx0 = ( background + foreground*17 ) & (GBLENDER_KEY_COUNT-1);
   idx  = idx0;
   do