Merge branch 'devel/master' into devel/graphics

Change-Id: I9830e8fe51829e833e04e152cdfc5c661e09a924

diff --cc automated-tests/src/dali/utc-Dali-Animation.cpp
index d453600b78dc28fbce2005b1d48abdb597e8c258,1f282277a7bb9dddde6bb80641d86e1195a9acf1..af559796e6b256cdd13eb39ba85642638be89c46
--- 1/automated-tests/src/dali/utc-Dali-Animation.cpp
--- 2/automated-tests/src/dali/utc-Dali-Animation.cpp
+++ b/automated-tests/src/dali/utc-Dali-Animation.cpp
@@@ -1,5 -1,5 +1,5 @@@
  /*
-- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
++ * Copyright (c) 2021 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.
@@@ -9187,6 -9188,48 +9188,48 @@@ int UtcDaliAnimationKeyFrames07N(void
    END_TEST;
  }
  
 -  float inputTime = 0.6f;
+ int UtcDaliAnimationKeyFramesGetKeyFrameCountP(void)
+ {
+   TestApplication application;
+ 
+   KeyFrames keyFrames = KeyFrames::New();
+   keyFrames.Add(0.0f, Vector4(0.0f, 0.0f, 0.0f, 0.6f));
+   keyFrames.Add(0.6f, Vector4(0.0f, 0.0f, 0.0f, 0.3f));
+   keyFrames.Add(1.0f, Vector4(0.0f, 0.0f, 0.0f, 0.8f));
+ 
+   DALI_TEST_EQUALS(DevelKeyFrames::GetKeyFrameCount(keyFrames), 3, TEST_LOCATION);
+ 
+   END_TEST;
+ }
+ 
+ int UtcDaliAnimationKeyFramesGetKeyFrameP(void)
+ {
+   TestApplication application;
+ 
 -  float outputTime;
++  float   inputTime  = 0.6f;
+   Vector4 inputValue = Vector4(0.0f, 0.0f, 0.0f, 0.3f);
+ 
+   KeyFrames keyFrames = KeyFrames::New();
+   keyFrames.Add(0.0f, Vector4(0.0f, 0.0f, 0.0f, 0.6f));
+   keyFrames.Add(inputTime, inputValue);
+   keyFrames.Add(1.0f, Vector4(0.0f, 0.0f, 0.0f, 0.8f));
+ 
++  float           outputTime;
+   Property::Value outputValue;
+ 
+   DevelKeyFrames::GetKeyFrame(keyFrames, 3, outputTime, outputValue);
+ 
+   DALI_TEST_EQUALS(outputValue.GetType(), Property::Type::NONE, TEST_LOCATION);
+ 
+   DevelKeyFrames::GetKeyFrame(keyFrames, 1, outputTime, outputValue);
+ 
+   DALI_TEST_EQUALS(outputTime, inputTime, TEST_LOCATION);
+   DALI_TEST_EQUALS(outputValue.GetType(), Property::Type::VECTOR4, TEST_LOCATION);
+   DALI_TEST_EQUALS(outputValue.Get<Vector4>(), inputValue, TEST_LOCATION);
+ 
+   END_TEST;
+ }
+ 
  int UtcDaliAnimationAnimateBetweenActorColorAlphaP(void)
  {
    TestApplication application;
@@@ -13666,7 -13709,7 +13709,7 @@@ int UtcDaliAnimationClearPropertyValue0
    Actor actor = Actor::New();
    application.GetScene().Add(actor);
  
--  const float durationSeconds(1.0f);
++  const float   durationSeconds(1.0f);
    const Vector3 targetPosition1(10.0f, 10.0f, 10.0f);
    const Vector3 targetPosition2(20.0f, 20.0f, 20.0f);
  

diff --cc dali/devel-api/animation/key-frames-devel.cpp
index 0000000000000000000000000000000000000000,f94c6b6a9d9c224f98ba44c2d359d0472f75b1c4..ebf37877bceed5b54f3b81c9fbd84a3b0af69016
mode 000000,100644..100644
--- /dev/null
--- 2/dali/devel-api/animation/key-frames-devel.cpp
+++ b/dali/devel-api/animation/key-frames-devel.cpp
@@@ -1,0 -1,39 +1,38 @@@
 -
+ /*
+  * Copyright (c) 2021 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.
+  * You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  */
+ 
+ // INTERNAL INCLUDES
+ #include <dali/devel-api/animation/key-frames-devel.h>
+ #include <dali/internal/event/animation/key-frames-impl.h>
+ 
+ namespace Dali
+ {
+ namespace DevelKeyFrames
+ {
+ std::size_t GetKeyFrameCount(KeyFrames keyFrames)
+ {
+   return GetImplementation(keyFrames).GetKeyFrameCount();
+ }
+ 
+ void GetKeyFrame(KeyFrames keyFrames, std::size_t index, float& time, Property::Value& value)
+ {
+   GetImplementation(keyFrames).GetKeyFrame(index, time, value);
+ }
+ 
+ } // namespace DevelKeyFrames
+ 
+ } // namespace Dali

diff --cc dali/internal/render/common/render-manager.cpp
index b12019b9e5f9195bf0312547982423e5ba3e7887,ab3548d698d2d345eeb31e2f6631cc2fcc171a72..a794bec4afe22516ad961b24953b615177b5c5d8
--- 1/dali/internal/render/common/render-manager.cpp
--- 2/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@@ -247,7 -247,7 +247,7 @@@ void RenderManager::SetShaderSaver(Shad
  void RenderManager::AddRenderer(OwnerPointer<Render::Renderer>& renderer)
  {
    // Initialize the renderer as we are now in render thread
-   renderer->Initialize(mImpl->context, mImpl->graphicsController);
 -  renderer->Initialize(mImpl->context, mImpl->programController);
++  renderer->Initialize(mImpl->context, mImpl->graphicsController, mImpl->programController);
  
    mImpl->rendererContainer.PushBack(renderer.Release());
  }

diff --cc dali/internal/render/renderers/render-renderer.cpp
index 823af04791d953a83dba2c9ee7a0fddc446a892b,1ffc12f8fb334ecc5fff0aa9c113f80f7a96c4a2..2eb871188d7802f60c8667a6ff7457ffa8b9ed2c
--- 1/dali/internal/render/renderers/render-renderer.cpp
--- 2/dali/internal/render/renderers/render-renderer.cpp
+++ b/dali/internal/render/renderers/render-renderer.cpp
@@@ -194,8 -130,9 +194,9 @@@ Renderer::Renderer(SceneGraph::RenderDa
  : mRenderDataProvider(dataProvider),
    mContext(nullptr),
    mGeometry(geometry),
+   mProgramCache(nullptr),
    mUniformIndexMap(),
 -  mAttributesLocation(),
 +  mAttributeLocations(),
    mUniformsHash(),
    mStencilParameters(stencilParameters),
    mBlendingOptions(),
@@@ -218,10 -155,10 +219,11 @@@
    mBlendingOptions.SetBlendColor(blendColor);
  }
  
- void Renderer::Initialize(Context& context, Graphics::Controller& graphicsController)
 -void Renderer::Initialize(Context& context, ProgramCache& programCache)
++void Renderer::Initialize(Context& context, Graphics::Controller& graphicsController, ProgramCache& programCache)
  {
 -  mContext      = &context;
 -  mProgramCache = &programCache;
 +  mContext            = &context;
 +  mGraphicsController = &graphicsController;
++  mProgramCache       = &programCache;
  }
  
  Renderer::~Renderer() = default;

diff --cc dali/internal/render/renderers/render-renderer.h
index f3498450d9cf933f2c0947182e48c8b8ffd55efc,b62bd7840ceda0589853158485851cfd6891f022..faad59cf241d298f18b8024d9dd965ea3168f060
--- 1/dali/internal/render/renderers/render-renderer.h
--- 2/dali/internal/render/renderers/render-renderer.h
+++ b/dali/internal/render/renderers/render-renderer.h
@@@ -166,10 -165,10 +167,11 @@@ public
    /**
     * Second-phase construction.
     * This is called when the renderer is inside render thread
 -   * @param[in] context Context used by the renderer
 +   * @param[in] context Context used by the renderer (To be removed)
 +   * @param[in] graphicsController The graphics controller to use
+    * @param[in] programCache Cache of program objects
     */
-   void Initialize(Context& context, Graphics::Controller& graphicsController);
 -  void Initialize(Context& context, ProgramCache& programCache);
++  void Initialize(Context& context, Graphics::Controller& graphicsController, ProgramCache& programCache);
  
    /**
     * Destructor