Deleted stray scene graph shader SetProgram() using resource id.

Change-Id: Idcfecd861b6f25b05739dbcfd42e7bddc2eb5786
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>

diff --git a/dali/internal/render/shaders/scene-graph-shader.cpp b/dali/internal/render/shaders/scene-graph-shader.cpp
index e9b5c1437927cdb5bcf5c834d1f264ecb5d7a0e9..3a078cea56d167c803f4c14e1562adac04af19ef 100644 (file)
--- a/dali/internal/render/shaders/scene-graph-shader.cpp
+++ b/dali/internal/render/shaders/scene-graph-shader.cpp
@@ -203,17 +203,6 @@ void Shader::SetCoordinateTypeInRender( unsigned int index, Dali::ShaderEffect::
   mUniformMetadata[ index ]->SetCoordinateType( type );
 }
 
-void Shader::SetProgram( Integration::ResourceId resourceId,
-                         Integration::ShaderDataPtr shaderData,
-                         ProgramCache* programCache,
-                         bool modifiesGeometry )
-{
-  DALI_LOG_TRACE_METHOD_FMT(Debug::Filter::gShader, "%d\n", resourceId);
-
-  mProgram = Program::New( *programCache, shaderData, modifiesGeometry );
-  // The program cache owns the Program object so we don't need to worry here.
-}
-
 void Shader::SetProgram( Integration::ShaderDataPtr shaderData,
                          ProgramCache* programCache,
                          bool modifiesGeometry )

diff --git a/dali/internal/render/shaders/scene-graph-shader.h b/dali/internal/render/shaders/scene-graph-shader.h
index 7a21a714e1253c5f2a5e4a311b8ee7270d3ce51d..1dcb0e04acc6dd9ed6c5ae8b9fcca226c78f8be9 100644 (file)
--- a/dali/internal/render/shaders/scene-graph-shader.h
+++ b/dali/internal/render/shaders/scene-graph-shader.h
@@ -236,19 +236,6 @@ public:
    */
   void SetCoordinateTypeInRender( unsigned int index, Dali::ShaderEffect::UniformCoordinateType type );
 
-  /**
-   * @brief Set the program for this shader.
-   * @param[in] resourceId        The resource ID for the program.
-   * @param[in] shaderData        The program's vertex/fragment source and optionally precompiled shader binary.
-   * @param[in] programCache      Owner of the Programs.
-   * @param[in] modifiesGeometry  True if the vertex shader changes the positions of vertexes such that
-   * they might exceed the bounding box of vertexes passing through the default transformation.
-   */
-  void SetProgram( Integration::ResourceId resourceId,
-                   Integration::ShaderDataPtr shaderData,
-                   ProgramCache* programCache,
-                   bool modifiesGeometry );
-
   /**
    * @brief Set the program for this shader.
    * @param[in] shaderData        The program's vertex/fragment source and optionally precompiled shader binary.