Removed spurious TODOs

Change-Id: I9ac6d35de9e207af5fcac837866ec33f7f7bf91e
Signed-off-by: David Steele <david.steele@samsung.com>

diff --git a/dali/integration-api/core.cpp b/dali/integration-api/core.cpp
index b8914d6..86e057b 100644 (file)
--- a/dali/integration-api/core.cpp
+++ b/dali/integration-api/core.cpp
@@ -49,15 +49,11 @@ ContextNotifierInterface* Core::GetContextNotifier()
   return mImpl->GetContextNotifier();
 }
 
-// @todo Rename to ResetGlContext
 void Core::ContextCreated()
 {
   mImpl->ContextCreated();
 }
 
-// @todo Replace with StopRendering that prevents RenderManager from rendering
-// until we get ResetGLContext again, change ContextCreated to reset gpu buffer cache,
-// gl texture id's
 void Core::ContextDestroyed()
 {
   mImpl->ContextDestroyed();

diff --git a/dali/integration-api/platform-abstraction.h b/dali/integration-api/platform-abstraction.h
index 3697fa1..db8bebb 100644 (file)
--- a/dali/integration-api/platform-abstraction.h
+++ b/dali/integration-api/platform-abstraction.h
@@ -2,7 +2,7 @@
 #define __DALI_INTEGRATION_PLATFORM_ABSTRACTION_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -21,7 +21,7 @@
 // INTERNAL INCLUDES
 
 #include <dali/integration-api/resource-cache.h>
-#include <dali/integration-api/bitmap.h> ///@todo Remove this include (a bunch of stuff needs to include it though)
+#include <dali/integration-api/bitmap.h>
 #include <dali/public-api/images/image-operations.h>
 #include <dali/public-api/common/dali-vector.h>
 

diff --git a/dali/internal/common/message-buffer.cpp b/dali/internal/common/message-buffer.cpp
index 869bcfc..9e89789 100644 (file)
--- a/dali/internal/common/message-buffer.cpp
+++ b/dali/internal/common/message-buffer.cpp
@@ -97,7 +97,6 @@ unsigned int* MessageBuffer::ReserveMessageSlot( std::size_t size )
   // End marker
   *mNextSlot = 0;
 
-  // @todo Remove cast & change all messages to use WordType instead
   return reinterpret_cast<unsigned int*>(slot);
 }
 

diff --git a/dali/internal/event/animation/key-frame-channel.h b/dali/internal/event/animation/key-frame-channel.h
index bba814f..548389c 100644 (file)
--- a/dali/internal/event/animation/key-frame-channel.h
+++ b/dali/internal/event/animation/key-frame-channel.h
@@ -103,7 +103,6 @@ bool KeyFrameChannel<V>::IsActive (float progress)
 
 /**
  * Use a linear search to find the interval containing progress
- * TODO: Use binary search instead
  */
 template <class V>
 bool KeyFrameChannel<V>::FindInterval(

diff --git a/dali/internal/event/animation/key-frames-impl.h b/dali/internal/event/animation/key-frames-impl.h
index cc574ff..c593b0b 100644 (file)
--- a/dali/internal/event/animation/key-frames-impl.h
+++ b/dali/internal/event/animation/key-frames-impl.h
@@ -129,7 +129,6 @@ protected:
  * The base template class for each key frame specialization. It stores a vector of
  * ProgressValue pairs in mPVs, and uses the existing interface for KeyFrameChannel
  * to point at this vector.
- * TODO: Incorporate KeyFrameChannel into this base template
  */
 template<typename V>
 class KeyFrameBaseSpec : public KeyFrameSpec
@@ -202,7 +201,6 @@ public:
    */
   void AddKeyFrame(float t, V v, AlphaFunction alpha)
   {
-    // TODO:: Support alpha
     mPVs.push_back(PV(t, v));
   }
 

diff --git a/dali/internal/event/common/object-impl-helper.h b/dali/internal/event/common/object-impl-helper.h
index 8c25056..3d7b09e 100644 (file)
--- a/dali/internal/event/common/object-impl-helper.h
+++ b/dali/internal/event/common/object-impl-helper.h
@@ -99,10 +99,6 @@ struct ObjectImplHelper
   {
     Property::Index index = Property::INVALID_INDEX;
 
-    //@todo MESH_REWORK - Are we assuming that the index into the array is the
-    // same as the enumerated property? if enumIndex in the table was no longer
-    // debug only, wouldn't need to make this assumption.
-
     // Look for name in default properties
     for( int i = 0; i < DEFAULT_PROPERTY_COUNT; ++i )
     {

diff --git a/dali/internal/event/common/object-impl.cpp b/dali/internal/event/common/object-impl.cpp
index d000227..7013a10 100644 (file)
--- a/dali/internal/event/common/object-impl.cpp
+++ b/dali/internal/event/common/object-impl.cpp
@@ -783,8 +783,6 @@ void Object::AddUniformMapping( Property::Index propertyIndex, const std::string
     }
   }
 
-  // @todo MESH_REWORK Store mappings for unstaged objects?
-
   if( propertyPtr != NULL )
   {
     const SceneGraph::PropertyOwner* sceneObject = GetPropertyOwner();
@@ -797,8 +795,6 @@ void Object::AddUniformMapping( Property::Index propertyIndex, const std::string
     }
     else
     {
-      // @todo MESH_REWORK FIXME Need to store something that can be sent to the scene
-      // object when staged.
       DALI_ASSERT_ALWAYS(0 && "MESH_REWORK - Need to store property whilst off-stage" );
     }
   }

diff --git a/dali/internal/event/rendering/shader-impl.cpp b/dali/internal/event/rendering/shader-impl.cpp
index f4ae6a6..1f5ade8 100644 (file)
--- a/dali/internal/event/rendering/shader-impl.cpp
+++ b/dali/internal/event/rendering/shader-impl.cpp
@@ -115,7 +115,6 @@ ShaderPtr Shader::New( const std::string& vertexShader,
                        const std::string& fragmentShader,
                        Dali::Shader::ShaderHints hints )
 {
-  //TODO: MESH_REWORK
   ShaderPtr shader( new Shader() );
   shader->Initialize( vertexShader, fragmentShader, hints );
   return shader;

diff --git a/dali/internal/render/common/render-instruction.h b/dali/internal/render/common/render-instruction.h
index cfe5728..a98fd53 100644 (file)
--- a/dali/internal/render/common/render-instruction.h
+++ b/dali/internal/render/common/render-instruction.h
@@ -131,7 +131,7 @@ private:
   // Undefined
   RenderInstruction& operator=(const RenderInstruction& rhs);
 
-public: // Data, TODO hide these
+public: // Data
 
   Render::RenderTracker* mRenderTracker;        ///< Pointer to an optional tracker object (not owned)
 

diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp
index ce16412..a586036 100644 (file)
--- a/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@ -199,9 +199,6 @@ void RenderManager::ContextCreated()
 
 void RenderManager::ContextDestroyed()
 {
-  // @todo Set an atomic value to prevent render manager rendering again until
-  // ContextCreated has been called.
-
   mImpl->context.GlContextDestroyed();
   mImpl->programController.GlContextDestroyed();
 

diff --git a/dali/internal/render/data-providers/render-data-provider.h b/dali/internal/render/data-providers/render-data-provider.h
index ef8a0ed..d73f70c 100644 (file)
--- a/dali/internal/render/data-providers/render-data-provider.h
+++ b/dali/internal/render/data-providers/render-data-provider.h
@@ -42,8 +42,6 @@ class Shader;
  * the current render. It essentially provides double buffering of the
  * provider accessor through the message system. It does not take ownership
  * of any objects.
- *
- * @todo - Add set of bools to state what changed (For improving performance)
  */
 class RenderDataProvider
 {

diff --git a/dali/internal/update/common/uniform-map.cpp b/dali/internal/update/common/uniform-map.cpp
index a1400e5..9d4fa6f 100644 (file)
--- a/dali/internal/update/common/uniform-map.cpp
+++ b/dali/internal/update/common/uniform-map.cpp
@@ -70,10 +70,6 @@ void UniformMap::MappingChanged()
   }
 }
 
-// @todo MESH_REWORK Benchmark and test
-// The uniform map can never grow beyond the limits of GL - so really, the
-// map size is likely to be small; if retaining an unsorted map proves to be
-// slow, then it should be changed to perform an insertion sort.
 void UniformMap::Add( UniformPropertyMapping* newMap )
 {
   UniformPropertyMapping::Hash nameHash = CalculateHash( newMap->uniformName );

diff --git a/dali/internal/update/manager/prepare-render-instructions.cpp b/dali/internal/update/manager/prepare-render-instructions.cpp
index dbaa37e..8a6a594 100644 (file)
--- a/dali/internal/update/manager/prepare-render-instructions.cpp
+++ b/dali/internal/update/manager/prepare-render-instructions.cpp
@@ -201,8 +201,6 @@ inline bool TryReuseCachedRenderers( Layer& layer,
  */
 bool CompareItems( const RendererWithSortAttributes& lhs, const RendererWithSortAttributes& rhs )
 {
-  // @todo MESH_REWORK Consider replacing all these sortAttributes with a single long int that
-  // encapsulates the same data (e.g. the middle-order bits of the ptrs)
   if( lhs.renderItem->GetDepthIndex() == rhs.renderItem->GetDepthIndex() )
   {
     if( lhs.shader == rhs.shader )

diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp
index 0d79152..acb1b4d 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -84,7 +84,6 @@ void AddMappings( Dali::Internal::SceneGraph::CollectedUniformMap& localMap, con
       const Dali::Internal::SceneGraph::UniformPropertyMapping* map = (*iter);
       localMap.PushBack( map );
     }
-    //@todo MESH_REWORK Use memcpy to copy ptrs from one array to the other
   }
 }
 

diff --git a/dali/public-api/shader-effects/shader-effect.cpp b/dali/public-api/shader-effects/shader-effect.cpp
index d8c09e0..f91ec29 100644 (file)
--- a/dali/public-api/shader-effects/shader-effect.cpp
+++ b/dali/public-api/shader-effects/shader-effect.cpp
@@ -54,7 +54,6 @@ ShaderEffect& ShaderEffect::operator=(const ShaderEffect& rhs)
 
 ShaderEffect ShaderEffect::New( const std::string& vertexShader, const std::string& fragmentShader, GeometryHints hints)
 {
-  // @todo MESH_REWORK - Assert only image geometry type is passed.
   Internal::ShaderEffectPtr internal = Internal::ShaderEffect::New( hints );
 
   internal->SetPrograms( vertexShader, fragmentShader );
@@ -68,7 +67,6 @@ ShaderEffect ShaderEffect::NewWithPrefix( const std::string& vertexShaderPrefix,
                                           const std::string& fragmentShader,
                                           GeometryHints hints)
 {
-  // @todo MESH_REWORK - Assert only image geometry type is passed.
   Internal::ShaderEffectPtr internal = Internal::ShaderEffect::New( hints );
 
   internal->SetPrograms( vertexShaderPrefix, fragmentShaderPrefix, vertexShader, fragmentShader );