/*
- * 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.
#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/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/renderer-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/images/image-impl.h>
-#include <dali/internal/event/images/image-factory-cache.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/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-renderer-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/scene-graph-image-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;
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 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 ) );
+ sizeof( Integration::Bitmap ) );
const int RENDERER_MEMORY_SIZE(
sizeof( Internal::Renderer ) +
- sizeof( Internal::RendererAttachment ) +
- sizeof( Internal::SceneGraph::RendererAttachment ) +
sizeof( Internal::SceneGraph::Renderer ) +
- sizeof( Internal::SceneGraph::NewRenderer ) );
+ sizeof( Internal::Render::Renderer ) );
const int GEOMETRY_MEMORY_SIZE(
sizeof( Internal::Geometry ) +
- sizeof( Internal::SceneGraph::Geometry ) );
+ sizeof( Internal::Render::Geometry) );
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::SceneGraph::Sampler ) );
+ sizeof( Internal::Render::Sampler ) );
const int SHADER_MEMORY_SIZE(
sizeof( Internal::Shader ) +
sizeof( Internal::SceneGraph::Shader ) );