X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fintegration-api%2Fprofiling.cpp;h=8c1c74f7d2e3ef336b719f414bbfbccf15de2d4e;hb=59c5a2a875be13f5eef55c1bd5bdd5745407e45f;hp=bd3e6f2fc3f109c50182b8794ca2e498b6cd09e4;hpb=5bfcdb0ce73c06082873659d5bc3335f10d10d96;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/integration-api/profiling.cpp b/dali/integration-api/profiling.cpp
index bd3e6f2..8c1c74f 100644
--- a/dali/integration-api/profiling.cpp
+++ b/dali/integration-api/profiling.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,51 +26,28 @@
 
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/actors/camera-actor-impl.h>
-#include <dali/internal/event/actors/image-actor-impl.h>
-#include <dali/internal/event/actors/mesh-actor-impl.h>
 #include <dali/internal/event/actors/layer-impl.h>
 
-#include <dali/internal/event/actor-attachments/actor-attachment-impl.h>
-#include <dali/internal/event/actor-attachments/camera-attachment-impl.h>
-#include <dali/internal/event/actor-attachments/image-attachment-impl.h>
-#include <dali/internal/event/actor-attachments/mesh-attachment-impl.h>
-
 #include <dali/internal/event/animation/animation-impl.h>
 #include <dali/internal/event/animation/animator-connector.h>
 #include <dali/internal/event/animation/constraint-impl.h>
-#include <dali/internal/event/animation/active-constraint-impl.h>
 #include <dali/internal/update/animation/property-accessor.h>
 #include <dali/internal/update/animation/scene-graph-animation.h>
 #include <dali/internal/update/animation/scene-graph-constraint.h>
 
 
 #include <dali/internal/event/images/image-impl.h>
-#include <dali/internal/event/images/image-factory-cache.h>
-#include <dali/internal/event/modeling/mesh-impl.h>
-#include <dali/internal/event/modeling/material-impl.h>
-
-#include <dali/internal/event/resources/resource-ticket.h>
-#include <dali/internal/event/resources/image-ticket.h>
 
 #include <dali/internal/update/nodes/node.h>
 #include <dali/internal/update/nodes/scene-graph-layer.h>
-#include <dali/internal/update/modeling/internal-mesh-data.h>
-#include <dali/internal/update/modeling/scene-graph-animatable-mesh.h>
-#include <dali/internal/update/modeling/scene-graph-material.h>
-#include <dali/internal/update/modeling/scene-graph-mesh.h>
-
-#include <dali/internal/update/node-attachments/node-attachment.h>
-#include <dali/internal/update/node-attachments/scene-graph-camera-attachment.h>
-#include <dali/internal/update/node-attachments/scene-graph-image-attachment.h>
-#include <dali/internal/update/node-attachments/scene-graph-mesh-attachment.h>
 
-#include <dali/internal/update/resources/bitmap-metadata.h>
+#include <dali/internal/update/rendering/scene-graph-renderer.h>
 
-#include <dali/internal/render/gl-resources/bitmap-texture.h>
-
-#include <dali/internal/render/renderers/render-material.h>
-#include <dali/internal/render/renderers/scene-graph-image-renderer.h>
-#include <dali/internal/render/renderers/scene-graph-mesh-renderer.h>
+#include <dali/internal/render/renderers/render-geometry.h>
+#include <dali/internal/render/renderers/render-property-buffer.h>
+#include <dali/internal/render/renderers/render-renderer.h>
+#include <dali/internal/render/renderers/render-sampler.h>
+#include <dali/internal/update/render-tasks/scene-graph-camera.h>
 
 using Dali::Internal::GestureEventProcessor;
 using Dali::Internal::ThreadLocalStorage;
@@ -90,11 +67,11 @@ void EnableProfiling( ProfilingType type )
     case PROFILING_TYPE_PAN_GESTURE:
     {
       eventProcessor.EnablePanGestureProfiling();
+      break;
     }
-
-    default:
+    case PROFILING_TYPE_END:
     {
-      // Do nothing
+      // nothing to do
       break;
     }
   }
@@ -108,52 +85,40 @@ const int ANIMATION_MEMORY_SIZE(
   sizeof( Internal::AnimatorConnector<float> ) +
   sizeof( Internal::SceneGraph::Animation ) );
 const int CONSTRAINT_MEMORY_SIZE(
-  sizeof( Internal::Constraint ) +
-  sizeof( Internal::SceneGraph::Constraint<float, Internal::PropertyAccessor<float> > ) +
-  sizeof( Internal::ActiveConstraint<float> ) );
+  sizeof( Internal::Constraint<float> ) +
+  sizeof( Internal::SceneGraph::Constraint<float, Internal::PropertyAccessor<float> > ) );
 const int ACTOR_MEMORY_SIZE(
   sizeof( Internal::Actor ) +
-  sizeof( Internal::ActorAttachment ) +
-  sizeof( Internal::SceneGraph::Node ) +
-  sizeof( Internal::SceneGraph::NodeAttachment ));
+  sizeof( Internal::SceneGraph::Node ) );
 const int CAMERA_ACTOR_MEMORY_SIZE(
   sizeof( Internal::CameraActor ) +
-  sizeof( Internal::CameraAttachment ) +
-  sizeof( Internal::SceneGraph::Node ) +
-  sizeof( Internal::SceneGraph::CameraAttachment ) );
-const int MESH_ACTOR_MEMORY_SIZE(
-  sizeof( Internal::MeshActor ) +
-  sizeof( Internal::MeshAttachment ) +
-  sizeof( Internal::SceneGraph::Node ) +
-  sizeof( Internal::SceneGraph::MeshAttachment ) +
-  sizeof( Internal::SceneGraph::MeshRenderer ) );
-const int IMAGE_ACTOR_MEMORY_SIZE(
-  sizeof( Internal::ImageActor ) +
-  sizeof( Internal::ImageAttachment ) +
   sizeof( Internal::SceneGraph::Node ) +
-  sizeof( Internal::SceneGraph::ImageAttachment ) +
-  sizeof( Internal::SceneGraph::ImageRenderer ));
+  sizeof( Internal::SceneGraph::Camera ) );
 const int LAYER_MEMORY_SIZE(
   sizeof( Internal::Layer ) +
-  sizeof( Internal::ActorAttachment ) +
-  sizeof( Internal::SceneGraph::Layer ) +
-  sizeof( Internal::SceneGraph::NodeAttachment ) );
+  sizeof( Internal::SceneGraph::Layer ) );
 const int IMAGE_MEMORY_SIZE(
   sizeof( Internal::Image ) +
-  sizeof( Internal::ImageFactoryCache::Request ) +
-  sizeof( Integration::Bitmap ) +
-  sizeof( Internal::BitmapMetadata ) +
-  sizeof( Internal::BitmapTexture ) +
-  sizeof( Internal::ImageTicket ) );
-const int MESH_MEMORY_SIZE(
-  sizeof( Internal::Mesh ) +
-  sizeof( Internal::MeshData ) +
-  sizeof( Internal::SceneGraph::Mesh ) +
-  sizeof( Internal::ResourceTicket ) );
-const int MATERIAL_MEMORY_SIZE(
-  sizeof( Internal::Material ) +
-  sizeof( Internal::SceneGraph::Material ) +
-  sizeof( Internal::SceneGraph::RenderMaterial ) );
+  sizeof( Integration::Bitmap ) );
+const int RENDERER_MEMORY_SIZE(
+  sizeof( Internal::Renderer ) +
+  sizeof( Internal::SceneGraph::Renderer ) +
+  sizeof( Internal::Render::Renderer ) );
+const int GEOMETRY_MEMORY_SIZE(
+  sizeof( Internal::Geometry ) +
+  sizeof( Internal::Render::Geometry) );
+const int PROPERTY_BUFFER_MEMORY_SIZE(
+  sizeof( Internal::PropertyBuffer ) +
+  sizeof( Internal::Render::PropertyBuffer ) );
+const int TEXTURE_SET_MEMORY_SIZE(
+  sizeof( Internal::TextureSet ) +
+  sizeof( Internal::SceneGraph::TextureSet ) );
+const int SAMPLER_MEMORY_SIZE(
+  sizeof( Internal::Sampler ) +
+  sizeof( Internal::Render::Sampler ) );
+const int SHADER_MEMORY_SIZE(
+  sizeof( Internal::Shader ) +
+  sizeof( Internal::SceneGraph::Shader ) );
 
 } // namespace Profiling