projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[3.0] Remove/move experimental features
[platform/core/uifw/dali-core.git]
/
dali
/
integration-api
/
profiling.cpp
diff --git
a/dali/integration-api/profiling.cpp
b/dali/integration-api/profiling.cpp
index
5158f74
..
57a798d
100644
(file)
--- a/
dali/integration-api/profiling.cpp
+++ b/
dali/integration-api/profiling.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,13
+26,8
@@
#include <dali/internal/event/actors/actor-impl.h>
#include <dali/internal/event/actors/camera-actor-impl.h>
#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/layer-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/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/animation-impl.h>
#include <dali/internal/event/animation/animator-connector.h>
#include <dali/internal/event/animation/constraint-impl.h>
@@
-50,19
+45,15
@@
#include <dali/internal/update/nodes/node.h>
#include <dali/internal/update/nodes/scene-graph-layer.h>
#include <dali/internal/update/nodes/node.h>
#include <dali/internal/update/nodes/scene-graph-layer.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/rendering/scene-graph-renderer.h>
#include <dali/internal/update/rendering/scene-graph-renderer.h>
-#include <dali/internal/update/resources/
bitmap
-metadata.h>
+#include <dali/internal/update/resources/
texture
-metadata.h>
#include <dali/internal/render/gl-resources/bitmap-texture.h>
#include <dali/internal/render/renderers/render-geometry.h>
#include <dali/internal/render/gl-resources/bitmap-texture.h>
#include <dali/internal/render/renderers/render-geometry.h>
-#include <dali/internal/render/renderers/render-image-renderer.h>
-#include <dali/internal/render/renderers/render-new-renderer.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/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;
using Dali::Internal::GestureEventProcessor;
using Dali::Internal::ThreadLocalStorage;
@@
-104,46
+95,34
@@
const int CONSTRAINT_MEMORY_SIZE(
sizeof( Internal::SceneGraph::Constraint<float, Internal::PropertyAccessor<float> > ) );
const int ACTOR_MEMORY_SIZE(
sizeof( Internal::Actor ) +
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 ) +
const int CAMERA_ACTOR_MEMORY_SIZE(
sizeof( Internal::CameraActor ) +
- sizeof( Internal::CameraAttachment ) +
- sizeof( Internal::SceneGraph::Node ) +
- sizeof( Internal::SceneGraph::CameraAttachment ) );
-const int IMAGE_ACTOR_MEMORY_SIZE(
- sizeof( Internal::ImageActor ) +
- sizeof( Internal::ImageAttachment ) +
sizeof( Internal::SceneGraph::Node ) +
sizeof( Internal::SceneGraph::Node ) +
- sizeof( Internal::SceneGraph::ImageAttachment ) +
- sizeof( Internal::Render::ImageRenderer ));
+ sizeof( Internal::SceneGraph::Camera ) );
const int LAYER_MEMORY_SIZE(
sizeof( Internal::Layer ) +
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 ) +
const int IMAGE_MEMORY_SIZE(
sizeof( Internal::Image ) +
sizeof( Internal::ImageFactoryCache::Request ) +
sizeof( Integration::Bitmap ) +
- sizeof( Internal::
Bitmap
Metadata ) +
+ sizeof( Internal::
Texture
Metadata ) +
sizeof( Internal::BitmapTexture ) +
sizeof( Internal::ImageTicket ) );
const int RENDERER_MEMORY_SIZE(
sizeof( Internal::Renderer ) +
sizeof( Internal::SceneGraph::Renderer ) +
sizeof( Internal::BitmapTexture ) +
sizeof( Internal::ImageTicket ) );
const int RENDERER_MEMORY_SIZE(
sizeof( Internal::Renderer ) +
sizeof( Internal::SceneGraph::Renderer ) +
- sizeof( Internal::Render::
New
Renderer ) );
+ sizeof( Internal::Render::Renderer ) );
const int GEOMETRY_MEMORY_SIZE(
sizeof( Internal::Geometry ) +
const int GEOMETRY_MEMORY_SIZE(
sizeof( Internal::Geometry ) +
- sizeof( Internal::SceneGraph::Geometry ) +
- sizeof( Internal::SceneGraph::RenderGeometry) );
+ sizeof( Internal::Render::Geometry) );
const int PROPERTY_BUFFER_MEMORY_SIZE(
sizeof( Internal::PropertyBuffer ) +
const int PROPERTY_BUFFER_MEMORY_SIZE(
sizeof( Internal::PropertyBuffer ) +
- sizeof( Internal::
SceneGraph
::PropertyBuffer ) );
-const int
MATERIAL
_MEMORY_SIZE(
- sizeof( Internal::
Material
) +
- sizeof( Internal::SceneGraph::
Material
) );
+ 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 SAMPLER_MEMORY_SIZE(
sizeof( Internal::Sampler ) +
sizeof( Internal::Render::Sampler ) );