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

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

diff --git a/dali/internal/event/rendering/sampler-impl.cpp b/dali/internal/event/rendering/sampler-impl.cpp
index 1787179..616e4b5 100644 (file)
--- a/dali/internal/event/rendering/sampler-impl.cpp
+++ b/dali/internal/event/rendering/sampler-impl.cpp
@@ -68,6 +68,11 @@ void Sampler::SetTextureUnitUniformName( const std::string& name )
   SetTextureUnitUniformNameMessage( GetEventThreadServices(), *mSceneObject, name);
 }
 
+const std::string& Sampler::GetTextureUnitUniformName() const
+{
+  return mSceneObject->GetTextureUnitUniformName();
+}
+
 void Sampler::SetImage( ImagePtr& image )
 {
   // Keep a reference to the image object
@@ -118,6 +123,11 @@ const SceneGraph::Sampler* Sampler::GetSamplerSceneObject() const
   return mSceneObject;
 }
 
+SceneGraph::Sampler* Sampler::GetSamplerSceneObject()
+{
+  return mSceneObject;
+}
+
 unsigned int Sampler::GetDefaultPropertyCount() const
 {
   return SAMPLER_IMPL.GetDefaultPropertyCount();