Merge "Reserved Visual properties on renderer creation" into devel/master

diff --combined dali-toolkit/internal/visuals/text/text-visual.cpp
index b8d848d,fc4db67..5d523a4
--- 1/dali-toolkit/internal/visuals/text/text-visual.cpp
--- 2/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@@ -1,5 -1,5 +1,5 @@@
  /*
-  * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+  * Copyright (c) 2022 Samsung Electronics Co., Ltd.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
@@@ -49,6 -49,8 +49,8 @@@ namespace Interna
  {
  namespace
  {
+ const int CUSTOM_PROPERTY_COUNT(10); // 5 transform properties + anim,premul,size,offset,multicol
+ 
  const Vector4 FULL_TEXTURE_RECT(0.f, 0.f, 1.f, 1.f);
  
  /**
@@@ -257,6 -259,7 +259,7 @@@ void TextVisual::OnInitialize(
    Shader   shader   = GetTextShader(mFactoryCache, TextType::SINGLE_COLOR_TEXT, TextType::NO_EMOJI, TextType::NO_STYLES);
  
    mImpl->mRenderer = Renderer::New(geometry, shader);
+   mImpl->mRenderer.ReserveCustomProperties(CUSTOM_PROPERTY_COUNT);
  }
  
  void TextVisual::DoSetProperties(const Property::Map& propertyMap)
@@@ -555,7 -558,7 +558,7 @@@ void TextVisual::UpdateRenderer(
        const bool markupProcessorEnabled = mController->IsMarkupProcessorEnabled();
        const bool strikethroughEnabled   = mController->GetTextModel()->IsStrikethroughEnabled();
  
-       const bool styleEnabled = (shadowEnabled || underlineEnabled || outlineEnabled || backgroundEnabled || markupProcessorEnabled || strikethroughEnabled);
+       const bool styleEnabled   = (shadowEnabled || underlineEnabled || outlineEnabled || backgroundEnabled || markupProcessorEnabled || strikethroughEnabled);
        const bool isOverlayStyle = underlineEnabled || strikethroughEnabled;
  
        AddRenderer(control, relayoutSize, hasMultipleTextColors, containsColorGlyph, styleEnabled, isOverlayStyle);
@@@ -614,7 -617,7 +617,7 @@@ void TextVisual::CreateTextureSet(Tilin
      ++textureSetIndex;
    }
  
 -  if(styleEnabled && isOverlayStyle)
 +  if(styleEnabled && isOverlayStyle && info.styleBuffer)
    {
      PixelData overlayStyleData = ConvertToPixelData(info.styleBuffer, info.width, info.height, info.offsetPosition, Pixel::RGBA8888);
      AddTexture(textureSet, overlayStyleData, sampler, textureSetIndex);
@@@ -875,4 -878,4 +878,4 @@@ Shader TextVisual::GetTextShader(Visual
  
  } // namespace Toolkit
  
- } // namespace Dali
+ } // namespace Dali