Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / integration-api / profiling.h

diff --git a/dali/integration-api/profiling.h b/dali/integration-api/profiling.h
index f05722b..d828e78 100644 (file)
--- a/dali/integration-api/profiling.h
+++ b/dali/integration-api/profiling.h
@@ -2,7 +2,7 @@
 #define __DALI_INTEGRATION_PROFILING_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -44,22 +44,6 @@ enum ProfilingType
  */
 DALI_IMPORT_API void EnableProfiling( ProfilingType type );
 
-/**
- * @brief Called by adaptor to set the pan gesture prediction mode from
- * an environment variable
- *
- * @pre Should be called after Core creation.
- * @param mode The pan gesture prediction mode.
- */
-DALI_IMPORT_API void SetPanGesturePredictionMode( int mode );
-
-/**
- * @brief Called by adaptor to set the prediction amount of the pan gesture from an environment variable
- *
- * @param[in] amount The prediction amount, 0.0f being next vsync and each 1.0f on top is another vsync ahead, can be divisions of (0.5f)
- */
-DALI_IMPORT_API void SetPanGesturePredictionAmount(float amount);
-
 
 namespace Profiling
 {
@@ -68,13 +52,16 @@ DALI_IMPORT_API extern const int ANIMATION_MEMORY_SIZE;    ///< Total size of an
 DALI_IMPORT_API extern const int CONSTRAINT_MEMORY_SIZE;   ///< Total size of constraint and associated internal objects
 DALI_IMPORT_API extern const int ACTOR_MEMORY_SIZE;        ///< Total size of actor and associated internal objects
 DALI_IMPORT_API extern const int CAMERA_ACTOR_MEMORY_SIZE; ///< Total size of camera actor and associated internal objects
-DALI_IMPORT_API extern const int TEXT_ACTOR_MEMORY_SIZE;   ///< Total size of text actor and associated internal objects
-DALI_IMPORT_API extern const int MESH_ACTOR_MEMORY_SIZE;   ///< Total size of mesh actor and associated internal objects
 DALI_IMPORT_API extern const int IMAGE_ACTOR_MEMORY_SIZE;  ///< Total size of image actor and associated internal objects
 DALI_IMPORT_API extern const int LAYER_MEMORY_SIZE;        ///< Total size of layer and associated internal objects
 DALI_IMPORT_API extern const int IMAGE_MEMORY_SIZE;        ///< Total size of image and associated internal objects
-DALI_IMPORT_API extern const int MESH_MEMORY_SIZE;         ///< Total size of mesh and associated internal objects
-DALI_IMPORT_API extern const int MATERIAL_MEMORY_SIZE;     ///< Total size of material and associated internal objects
+
+DALI_IMPORT_API extern const int RENDERER_MEMORY_SIZE;     ///< Total size of renderer and associated internal objects
+DALI_IMPORT_API extern const int GEOMETRY_MEMORY_SIZE;     ///< Total size of geometry and associated internal objects
+DALI_IMPORT_API extern const int PROPERTY_BUFFER_MEMORY_SIZE;     ///< Total size of property-0buffer and associated internal objects
+DALI_IMPORT_API extern const int TEXTURE_SET_MEMORY_SIZE;     ///< Total size of TextureSet and associated internal objects
+DALI_IMPORT_API extern const int SAMPLER_MEMORY_SIZE;     ///< Total size of Sampler and associated internal objects
+DALI_IMPORT_API extern const int SHADER_MEMORY_SIZE;     ///< Total size of shader and associated internal objects
 } // namespace Profiling
 
 } // namespace Integration