Stop creating string for sampler name every frame for every program

Change-Id: Ic5da8308fd6e51ecce7173a159956488b83766cf

diff --git a/dali/internal/render/renderers/render-new-renderer.cpp b/dali/internal/render/renderers/render-new-renderer.cpp
index ded4957..4a32245 100644 (file)
--- a/dali/internal/render/renderers/render-new-renderer.cpp
+++ b/dali/internal/render/renderers/render-new-renderer.cpp
@@ -328,7 +328,7 @@ void NewRenderer::BindTextures(
   }
 }
 
-unsigned int NewRenderer::GetTextureUniformIndex( Program& program, std::string uniformName )
+unsigned int NewRenderer::GetTextureUniformIndex( Program& program, const std::string& uniformName )
 {
   unsigned int uniformIndex = 0;
   bool found = false;

diff --git a/dali/internal/render/renderers/render-new-renderer.h b/dali/internal/render/renderers/render-new-renderer.h
index d5e6061..84a5ed6 100644 (file)
--- a/dali/internal/render/renderers/render-new-renderer.h
+++ b/dali/internal/render/renderers/render-new-renderer.h
@@ -179,7 +179,7 @@ private:
    * @param[in] sampler The sampler holding a texture unit uniform name to search for
    * @return The texture uniform index in the program
    */
-  unsigned int GetTextureUniformIndex( Program& program, std::string uniformName );
+  unsigned int GetTextureUniformIndex( Program& program, const std::string& uniformName );
 
 
 public: //@todo MESH_REWORK make private after merge with SceneGraph::Renderer

diff --git a/dali/internal/render/renderers/render-texture.h b/dali/internal/render/renderers/render-texture.h
index 83c82f8..bb79d83 100644 (file)
--- a/dali/internal/render/renderers/render-texture.h
+++ b/dali/internal/render/renderers/render-texture.h
@@ -71,9 +71,9 @@ public: // SamplerDataProvider interface - called from RenderThread
    * Get the texture unit uniform name
    * @return the name of the texture unit uniform
    */
-  inline const char* GetUniformName() const
+  inline const std::string& GetUniformName() const
   {
-    return mUniformName.c_str();
+    return mUniformName;
   }
 
   /**