Merge "Added GetUniformName to Sampler." into devel/master

[platform/core/uifw/dali-core.git] / dali / internal / event / rendering / sampler-impl.h

diff --git a/dali/internal/event/rendering/sampler-impl.h b/dali/internal/event/rendering/sampler-impl.h
index 340f140..1cfbea3 100644 (file)
--- a/dali/internal/event/rendering/sampler-impl.h
+++ b/dali/internal/event/rendering/sampler-impl.h
@@ -59,6 +59,11 @@ public:
   void SetTextureUnitUniformName( const std::string& name );
 
   /**
+   * @copydoc Dali::Sampler::GetUniformName()
+   */
+  const std::string& GetTextureUnitUniformName() const;
+
+  /**
    * @copydoc Dali::Sampler::SetImage()
    */
   void SetImage( ImagePtr& image );
@@ -90,6 +95,12 @@ public:
    */
   const SceneGraph::Sampler* GetSamplerSceneObject() const;
 
+  /**
+   * Retrieve the scene-graph sampler added by this object.
+   * @return A pointer to the sampler, or NULL if no sampler has been added to the scene-graph.
+   */
+  SceneGraph::Sampler* GetSamplerSceneObject();
+
 public: // Default property extensions from Object
 
   /**