Merge "Remove old pipeline caches" into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / render / renderers / shader-cache.cpp

diff --git a/dali/internal/render/renderers/shader-cache.cpp b/dali/internal/render/renderers/shader-cache.cpp
index 9b9468e..d4f5f16 100644 (file)
--- a/dali/internal/render/renderers/shader-cache.cpp
+++ b/dali/internal/render/renderers/shader-cache.cpp
@@ -28,7 +28,7 @@ ShaderCache::ShaderCache(Dali::Graphics::Controller& controller)
 {
 }
 
-Dali::Graphics::Shader& ShaderCache::GetShader(const std::vector<char> shaderCode, Graphics::PipelineStage stage, Graphics::ShaderSourceMode type)
+Dali::Graphics::Shader& ShaderCache::GetShader(const std::vector<char>& shaderCode, Graphics::PipelineStage stage, Graphics::ShaderSourceMode type)
 {
   for(auto&& item : mItems)
   {
@@ -44,16 +44,10 @@ Dali::Graphics::Shader& ShaderCache::GetShader(const std::vector<char> shaderCod
   shaderCreateInfo.SetSourceSize(shaderCode.size());
   shaderCreateInfo.SetSourceMode(type);
 
-  auto shader = mController.CreateShader(shaderCreateInfo, nullptr);
+  Graphics::UniquePtr<Graphics::Shader> shader = mController.CreateShader(shaderCreateInfo, nullptr);
 
-  auto retval = shader.get();
   mItems.emplace_back(std::move(shader), shaderCode, stage, type);
-  return *retval;
-}
-
-void ShaderCache::DestroyGraphicsObjects()
-{
-  mItems.clear();
+  return *mItems.back().shader.get();
 }
 
 } // namespace Render