Move new mesh API to devel-api.

Change-Id: Ifaf619a6098d6f76c26cfd74eccb6c28eb345e4f

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
index bd4ae025a6b68f65b6759701bc16dbac211da678..ca864c2ccf51cc22ff44e0645e3e2e8a013c88b1 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@ -23,6 +23,7 @@
 #include <dali-toolkit-test-suite-utils.h>
 
 #include <dali.h>
+#include <dali/devel-api/rendering/renderer.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/bubble-effect/bubble-emitter.h>
 

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
index d58daa9a0e6b7155eac9d256e20815336416ab90..d1e2a6dc015ee70538e536cbb666cdfcef987119 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.cpp
@@ -20,8 +20,8 @@
 // EXTERNAL INCLUDE
 #include <iostream>
 #include <string.h>
-#include <dali/public-api/shader-effects/sampler.h>
-#include <dali/public-api/shader-effects/shader.h>
+#include <dali/devel-api/rendering/sampler.h>
+#include <dali/devel-api/rendering/shader.h>
 #include <dali/integration-api/debug.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager.h b/dali-toolkit/internal/atlas-manager/atlas-manager.h
index 2b8a122caee7fce54bed104d8453cc9f4d8b3997..f0ecc224c2c91990470ff3982cd11b73376ac45e 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager.h
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager.h
@@ -20,9 +20,9 @@
 // EXTERNAL INCLUDES
 #include <stdint.h>
 #include <dali/public-api/common/dali-vector.h>
-#include <dali/devel-api/images/atlas.h>
 #include <dali/public-api/images/buffer-image.h>
-#include <dali/public-api/shader-effects/material.h>
+#include <dali/devel-api/images/atlas.h>
+#include <dali/devel-api/rendering/material.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
index 39f6156dd789e18e2b3a82139e81b3a3656562a9..a0938f0736aea7f3dfb0d10043eee642608d718b 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.h
@@ -19,10 +19,8 @@
  */
 
 #include <dali/public-api/actors/actor.h>
-#include <dali/public-api/actors/renderer.h>
-#include <dali/public-api/object/property-buffer.h>
 #include <dali/public-api/object/property-map.h>
-#include <dali/public-api/shader-effects/material.h>
+#include <dali/devel-api/rendering/renderer.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
index c1cc9ae7cb858bd3dab5428a30ee28241eb1c011..9d0e24fb65b9f5b925b1f8090f558d2db5e04707 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-effect.h
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <sstream>
-#include <dali/public-api/shader-effects/shader.h>
+#include <dali/devel-api/rendering/shader.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
index c0169206abcd01d687ba007509b15b70a1aeb82b..91158b2f6b168ab0f1161ed38c3d72677d70a5b4 100644 (file)
--- a/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
+++ b/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h
@@ -22,11 +22,13 @@
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/common/stage.h>
-#include <dali/public-api/geometry/geometry.h>
 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/render-tasks/render-task.h>
-#include <dali/public-api/shader-effects/sampler.h>
-#include <dali/public-api/shader-effects/material.h>
+#include <dali/devel-api/object/property-buffer.h>
+#include <dali/devel-api/rendering/geometry.h>
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/rendering/sampler.h>
+#include <dali/devel-api/rendering/shader.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>

diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
index fcaaac3f3d5b7f37bc35bf11502ecafef5211942..177f92726ead83d9ee8df467aae4407282eedb15 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@ -19,13 +19,13 @@
 #include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/renderer.h>
-#include <dali/public-api/geometry/geometry.h>
 #include <dali/public-api/math/vector3.h>
-#include <dali/public-api/object/property-buffer.h>
 #include <dali/public-api/object/property-map.h>
-#include <dali/public-api/shader-effects/material.h>
-#include <dali/public-api/shader-effects/shader.h>
+#include <dali/devel-api/object/property-buffer.h>
+#include <dali/devel-api/rendering/geometry.h>
+#include <dali/devel-api/rendering/material.h>
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/rendering/shader.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
index 2f7677aa9bbb9e39b199910e299f496271d1f6cd..ae12df1ae245b002d3e5361a8eecd10b4ecf1746 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
@@ -20,9 +20,13 @@
 
 // EXTERNAL INCLUDES
 #include <dali/dali.h>
-#include <dali/integration-api/debug.h>
+#include <dali/devel-api/object/property-buffer.h>
+#include <dali/devel-api/rendering/geometry.h>
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali/devel-api/rendering/sampler.h>
+#include <dali/devel-api/rendering/shader.h>
 #include <dali/devel-api/text-abstraction/font-client.h>
-
+#include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 5d9880bf6d6a1891f142e97a5d9bd3359fafa4a9..7bcaad4ab4c67cb113e255dd3af8d30672d59f49 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -23,16 +23,13 @@
 #include <limits>
 #include <stack>
 #include <dali/public-api/actors/image-actor.h>
-#include <dali/public-api/actors/renderer.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/public-api/animation/constraints.h>
-#include <dali/public-api/geometry/geometry.h>
 #include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/size-negotiation/relayout-container.h>
 #include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/devel-api/rendering/renderer.h>
 #include <dali/devel-api/scripting/scripting.h>
-#include <dali/public-api/shader-effects/shader.h>
-#include <dali/public-api/shader-effects/material.h>
-#include <dali/public-api/size-negotiation/relayout-container.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES