Rendering API clean-up

Change-Id: I57d7e78ae42a19e2a0fa1246a8b6fdb6e79f0c56

diff --git a/adaptors/common/object-profiler.cpp b/adaptors/common/object-profiler.cpp
index 9903b79..d8a57c5 100644 (file)
--- a/adaptors/common/object-profiler.cpp
+++ b/adaptors/common/object-profiler.cpp
@@ -172,7 +172,7 @@ int ObjectProfiler::GetMemorySize(const std::string& name, int count)
       { "Renderer", RENDERER_MEMORY_SIZE },
       { "Geometry", GEOMETRY_MEMORY_SIZE },
       { "PropertyBuffer", PROPERTY_BUFFER_MEMORY_SIZE },
-      { "Material", MATERIAL_MEMORY_SIZE },
+      { "TextureSet", TEXTURE_SET_MEMORY_SIZE },
       { "Sampler", SAMPLER_MEMORY_SIZE },
       { "Shader", SHADER_MEMORY_SIZE },
     };

diff --git a/adaptors/ecore/common/ecore-indicator-impl.cpp b/adaptors/ecore/common/ecore-indicator-impl.cpp
index a3e7b5f..90ed05a 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.cpp
+++ b/adaptors/ecore/common/ecore-indicator-impl.cpp
@@ -492,13 +492,13 @@ void Indicator::SetOpacityMode( Dali::Window::IndicatorBgOpacity mode )
     }
     else
     {
-      if( !mBackgroundMaterial )
+      if( !mBackgroundShader )
       {
-        Dali::Shader shader = Dali::Shader::New( BACKGROUND_VERTEX_SHADER, BACKGROUND_FRAGMENT_SHADER, Dali::Shader::HINT_OUTPUT_IS_TRANSPARENT );
-        mBackgroundMaterial = Dali::Material::New( shader );
+        mBackgroundShader = Dali::Shader::New( BACKGROUND_VERTEX_SHADER, BACKGROUND_FRAGMENT_SHADER, Dali::Shader::HINT_OUTPUT_IS_TRANSPARENT );
       }
 
-      Dali::Renderer renderer = Dali::Renderer::New( geometry, mBackgroundMaterial );
+
+      Dali::Renderer renderer = Dali::Renderer::New( geometry, mBackgroundShader );
 
       mBackgroundActor.AddRenderer( renderer );
     }

diff --git a/adaptors/ecore/common/ecore-indicator-impl.h b/adaptors/ecore/common/ecore-indicator-impl.h
index 5f2b9be..fafe5fc 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.h
+++ b/adaptors/ecore/common/ecore-indicator-impl.h
@@ -380,7 +380,7 @@ private:
 
   Dali::Geometry                   mTranslucentGeometry; ///< Geometry used for rendering the translucent background
   Dali::Geometry                   mSolidGeometry;       ///< Geometry used for rendering the opaque background
-  Dali::Material                   mBackgroundMaterial;  ///< Material used for rendering the background
+  Dali::Shader                     mBackgroundShader;    ///< Shader used for rendering the background
 
   IndicatorBufferPtr               mIndicatorBuffer;     ///< class which handles indicator rendering
   PixmapId                         mPixmap;              ///< Pixmap including indicator content

diff --git a/adaptors/emscripten/wrappers/dali-wrapper.cpp b/adaptors/emscripten/wrappers/dali-wrapper.cpp
index 2f4760d..3d105a8 100644 (file)
--- a/adaptors/emscripten/wrappers/dali-wrapper.cpp
+++ b/adaptors/emscripten/wrappers/dali-wrapper.cpp
@@ -24,7 +24,7 @@
 #include <dali/devel-api/rendering/geometry.h>
 #include <dali/devel-api/rendering/shader.h>
 #include <dali/devel-api/rendering/sampler.h>
-#include <dali/devel-api/rendering/material.h>
+#include <dali/devel-api/rendering/texture-set.h>
 #include <dali/devel-api/rendering/renderer.h>
 #include "emscripten/emscripten.h"
 #include "emscripten/bind.h"
@@ -1179,21 +1179,21 @@ EMSCRIPTEN_BINDINGS(dali_wrapper)
     .constructor<>(&Dali::Shader::New)
 ;
 
-  class_<Dali::Material, base<Dali::Handle>>("Material")
-    .constructor<>(&Dali::Material::New)
-    .function("setShader", &Dali::Material::SetShader)
-    .function("getShader", &Dali::Material::GetShader)
-    .function("addTexture", &Dali::Material::AddTexture)
-    .function("getNumberOfTextures", &Dali::Material::GetNumberOfTextures)
-    .function("removeTexture", &Dali::Material::RemoveTexture)
+  class_<Dali::TextureSet, base<Dali::Handle>>("TextureSet")
+    .constructor<>(&Dali::TextureSet::New)
+    .function("setShader", &Dali::TextureSet::SetShader)
+    .function("getShader", &Dali::TextureSet::GetShader)
+    .function("addTexture", &Dali::TextureSet::AddTexture)
+    .function("getNumberOfTextures", &Dali::TextureSet::GetNumberOfTextures)
+    .function("removeTexture", &Dali::TextureSet::RemoveTexture)
 ;
 
   class_<Dali::Renderer, base<Dali::Handle>>("Renderer")
     .constructor<>(&Dali::Renderer::New)
     .function("setGeometry", &Dali::Renderer::SetGeometry)
     .function("getGeometry", &Dali::Renderer::GetGeometry)
-    .function("setMaterial", &Dali::Renderer::SetMaterial)
-    .function("getMaterial", &Dali::Renderer::GetMaterial)
+    .function("SetTextures", &Dali::Renderer::SetTextures)
+    .function("SetTextures", &Dali::Renderer::SetTextures)
 ;
 
   class_<Dali::ShaderEffect, base<Dali::Handle>>("ShaderEffect")