Remove some dead code 30/53830/6
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Wed, 9 Dec 2015 13:44:31 +0000 (13:44 +0000)
committerKimmo Hoikka <kimmo.hoikka@samsung.com>
Wed, 9 Dec 2015 14:46:12 +0000 (06:46 -0800)
- double buffered property (not used)
- property boolean (not used)

Change-Id: I4a27c94b9acf292bce26d85baf7e11ce121c4a91

dali/internal/event/rendering/geometry-impl.cpp
dali/internal/event/rendering/renderer-impl.h
dali/internal/update/common/double-buffered-property.h [deleted file]
dali/internal/update/common/property-boolean.h [deleted file]
dali/internal/update/common/property-owner-messages.h
dali/internal/update/rendering/scene-graph-geometry.h
dali/internal/update/rendering/scene-graph-material.h
dali/internal/update/rendering/scene-graph-renderer.h

index 1ed06bb..4ee6fde 100644 (file)
@@ -23,7 +23,6 @@
 
 #include <dali/internal/event/common/object-impl-helper.h> // Dali::Internal::ObjectHelper
 #include <dali/internal/event/common/property-helper.h> // DALI_PROPERTY_TABLE_BEGIN, DALI_PROPERTY, DALI_PROPERTY_TABLE_END
-#include <dali/internal/update/common/double-buffered-property.h>
 #include <dali/internal/update/manager/update-manager.h>
 
 namespace Dali
index 50b57a8..db1e13d 100644 (file)
@@ -27,7 +27,6 @@
 #include <dali/internal/event/common/object-impl.h> // Dali::Internal::Object
 #include <dali/internal/event/rendering/material-impl.h> // Dali::Internal::Material
 #include <dali/internal/event/rendering/geometry-impl.h> // Dali::Internal::Geometry
-#include <dali/internal/update/nodes/node.h>
 
 namespace Dali
 {
diff --git a/dali/internal/update/common/double-buffered-property.h b/dali/internal/update/common/double-buffered-property.h
deleted file mode 100644 (file)
index 0b23260..0000000
+++ /dev/null
@@ -1,376 +0,0 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_PROPERTY_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_PROPERTY_H__
-
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <limits>
-
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/object/property.h>
-#include <dali/public-api/object/property-input.h>
-#include <dali/public-api/object/property-types.h>
-#include <dali/internal/common/message.h>
-#include <dali/internal/common/type-abstraction.h>
-#include <dali/internal/event/common/event-thread-services.h>
-#include <dali/internal/event/common/property-input-impl.h>
-#include <dali/internal/update/common/double-buffered.h>
-#include <dali/internal/update/common/scene-graph-buffers.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace SceneGraph
-{
-
-namespace DoubleBufferedPropertyFlags
-{
-/**
- * Dirty flags record whether a doubleBuffered property has changed.
- * In the frame following a change, the property is copied from the most recent
- * buffer to the old buffer.
- */
-static const unsigned int CLEAN_FLAG  = 0x00; ///< Indicates that the value did not change in this, or the previous frame
-static const unsigned int COPIED_FLAG = 0x01; ///< Indicates that the value was copied during the previous frame
-static const unsigned int SET_FLAG    = 0x02; ///< Indicates that the value was Set during the previous frame
-}
-
-/**
- * Base class to reduce code size from the templates.
- */
-class DoubleBufferedPropertyBase : public PropertyInputImpl
-{
-public:
-
-  /**
-   * Constructor, initialize the dirty flag
-   */
-  DoubleBufferedPropertyBase()
-  : PropertyInputImpl(),
-    mDirtyFlags( DoubleBufferedPropertyFlags::COPIED_FLAG )
-  {}
-
-  /**
-   * Virtual destructor.
-   */
-  virtual ~DoubleBufferedPropertyBase()
-  {}
-
-  /**
-   * Auto-age the property: if it was set the previous frame,
-   * then copy the value into the current frame's buffer.
-   */
-  virtual void CopyPrevious( BufferIndex updateBufferIndex ) = 0;
-
-
-protected: // for derived classes
-  /**
-   * Flag that the property has been Set during the current frame.
-   */
-  void OnSet()
-  {
-    mDirtyFlags = DoubleBufferedPropertyFlags::SET_FLAG;
-  }
-
-public: // From PropertyBase
-
-  /**
-   * @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
-   */
-  virtual bool InputChanged() const
-  {
-    return ( DoubleBufferedPropertyFlags::CLEAN_FLAG != mDirtyFlags );
-  }
-
-  /**
-   * @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
-   */
-  virtual bool InputInitialized() const
-  {
-    return true; // DoubleBuffered properties are always valid
-  }
-
-protected: // so that ResetToBaseValue can set it directly
-
-  unsigned int mDirtyFlags; ///< Flag whether value changed during previous 2 frames
-
-};
-
-/**
- * A doubleBuffered property of a scene-graph object.
- */
-template <class T>
-class DoubleBufferedPropertyImpl : public DoubleBufferedPropertyBase
-{
-public:
-  /**
-   * Create an doubleBuffered property.
-   * @param [in] initialValue The initial value of the property.
-   */
-  DoubleBufferedPropertyImpl( typename ParameterType<T>::PassingType initialValue )
-  : mValue( initialValue )
-  {
-  }
-
-  /**
-   * Virtual destructor.
-   */
-  virtual ~DoubleBufferedPropertyImpl()
-  {
-  }
-
-  /**
-   * @copydoc Dali::Internal::SceneGraph::PropertyBase::GetType()
-   */
-  virtual Dali::Property::Type GetType() const
-  {
-    return Dali::PropertyTypes::Get<T>();
-  }
-
-  /**
-   * @copydoc Dali::Internal::SceneGraph::DoubleBufferedPropertyBase::CopyPrevious()
-   */
-  virtual void CopyPrevious( BufferIndex updateBufferIndex )
-  {
-    if( DoubleBufferedPropertyFlags::SET_FLAG == mDirtyFlags)
-    {
-      mValue[ updateBufferIndex ] = mValue[ 1-updateBufferIndex ];
-      mDirtyFlags = ( mDirtyFlags >> 1 );
-    }
-  }
-
-  /**
-   * Set the property value. This will persist for the current frame, and will
-   * be copied to the other buffer next frame (unless it is set again)
-   * @param[in] bufferIndex The buffer to write.
-   * @param[in] value The new property value.
-   */
-  void Set(BufferIndex bufferIndex, typename ParameterType<T>::PassingType value )
-  {
-    // check if the value actually changed to avoid dirtying nodes unnecessarily
-    if( mValue[bufferIndex] != value )
-    {
-      mValue[bufferIndex] = value;
-
-      OnSet();
-    }
-  }
-
-  /**
-   * @copydoc Dali::SceneGraph::DoubleBufferedProperty::Get()
-   */
-  const T& Get(size_t bufferIndex) const
-  {
-    return mValue[bufferIndex];
-  }
-
-  /**
-   * Retrieve the property value.
-   * @param[in] bufferIndex The buffer to read.
-   * @return The property value.
-   */
-  const T& operator[](size_t bufferIndex) const
-  {
-    return mValue[bufferIndex];
-  }
-
-protected:
-  DoubleBuffered<T> mValue; ///< The double-buffered property value
-
-private:  // Undefined
-  DoubleBufferedPropertyImpl(const DoubleBufferedPropertyImpl& property);
-  DoubleBufferedPropertyImpl& operator=(const DoubleBufferedPropertyImpl& rhs);
-
-};
-
-template<typename T>
-class DoubleBufferedProperty;
-
-template<>
-class DoubleBufferedProperty<bool> : public DoubleBufferedPropertyImpl<bool>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( bool value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetBoolean
-   */
-  virtual const bool& GetBoolean( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<int> : public DoubleBufferedPropertyImpl<int>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( int value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetInteger
-   */
-  virtual const int& GetInteger( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<float> : public DoubleBufferedPropertyImpl<float>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( float value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetFloat
-   */
-  virtual const float& GetFloat( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<Vector2> : public DoubleBufferedPropertyImpl<Vector2>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( const Vector2& value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetVector2
-   */
-  virtual const Vector2& GetVector2( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<Vector3> : public DoubleBufferedPropertyImpl<Vector3>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( const Vector3& value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetVector3
-   */
-  virtual const Vector3& GetVector3( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<Vector4> : public DoubleBufferedPropertyImpl<Vector4>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( const Vector4& value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetVector4
-   */
-  virtual const Vector4& GetVector4( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<Quaternion> : public DoubleBufferedPropertyImpl<Quaternion>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( const Quaternion& value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetQuaternion
-   */
-  virtual const Quaternion& GetQuaternion( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<Matrix3> : public DoubleBufferedPropertyImpl<Matrix3>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( const Matrix3& value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetMatrix3
-   */
-  virtual const Matrix3& GetMatrix3( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-template<>
-class DoubleBufferedProperty<Matrix> : public DoubleBufferedPropertyImpl<Matrix>
-{
-public:
-  /**
-   * Constructor
-   */
-  DoubleBufferedProperty( const Matrix& value ) : DoubleBufferedPropertyImpl( value ) {};
-
-  /**
-   * copydoc PropertyInputImpl::GetMatrix
-   */
-  virtual const Matrix& GetMatrix( BufferIndex bufferIndex ) const
-  {
-    return mValue[bufferIndex];
-  }
-};
-
-} // namespace SceneGraph
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // __DALI_INTERNAL_SCENE_GRAPH_DOUBLE_BUFFERED_PROPERTY_H__
diff --git a/dali/internal/update/common/property-boolean.h b/dali/internal/update/common/property-boolean.h
deleted file mode 100644 (file)
index b166e83..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-#ifndef __DALI_INTERNAL_SCENE_GRAPH_BOOLEAN_PROPERTY_H__
-#define __DALI_INTERNAL_SCENE_GRAPH_BOOLEAN_PROPERTY_H__
-
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/object/property.h>
-#include <dali/public-api/object/property-input.h>
-#include <dali/public-api/object/property-types.h>
-#include <dali/internal/common/buffer-index.h>
-#include <dali/internal/event/common/property-input-impl.h>
-
-namespace Dali
-{
-
-namespace Internal
-{
-
-namespace SceneGraph
-{
-
-/**
- * A Boolean non-animatable property.
- */
-class PropertyBoolean : public PropertyInputImpl
-{
-public:
-
-  /**
-   * Create an non-animatable property.
-   * @param [in] initialValue The initial value of the property.
-   */
-  PropertyBoolean( bool initialValue )
-  : mValue( initialValue ),
-    mDirtyFlag( true )
-  {
-  }
-
-  /**
-   * Virtual destructor.
-   */
-  virtual ~PropertyBoolean()
-  {
-  }
-
-  /**
-   * Clear the dirty flag
-   */
-  void Clear()
-  {
-    mDirtyFlag = false;
-  }
-
-  /**
-   * @copydoc Dali::Internal::PropertyInputImpl::GetType()
-   */
-  virtual Dali::Property::Type GetType() const
-  {
-    return Dali::PropertyTypes::Get<bool>();
-  }
-
-  /**
-   * @copydoc Dali::Internal::PropertyInputImpl::InputInitialized()
-   */
-  virtual bool InputInitialized() const
-  {
-    return true;
-  }
-
-  /**
-   * @copydoc Dali::Internal::PropertyInputImpl::InputChanged()
-   */
-  virtual bool InputChanged() const
-  {
-    return mDirtyFlag;
-  }
-
-  /**
-   * @copydoc Dali::PropertyInput::GetBoolean()
-   */
-  virtual const bool& GetBoolean( BufferIndex bufferIndex ) const
-  {
-    return mValue;
-  }
-
-  /**
-   * Flag that the property has been Set during the current frame.
-   */
-  void OnSet()
-  {
-    mDirtyFlag = true;
-  }
-
-private:
-
-  // Undefined
-  PropertyBoolean(const PropertyBoolean& property);
-
-  // Undefined
-  PropertyBoolean& operator=(const PropertyBoolean& rhs);
-
-public:
-  bool mValue; ///< The property value
-
-private:
-  bool mDirtyFlag;
-};
-
-} // namespace SceneGraph
-
-} // namespace Internal
-
-} // namespace Dali
-
-#endif // __DALI_INTERNAL_SCENE_GRAPH_BOOLEAN_PROPERTY_H__
index 0b4e23b..c8570fb 100644 (file)
@@ -23,7 +23,6 @@
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/event/common/property-input-impl.h>
 #include <dali/internal/update/common/property-owner.h>
-#include <dali/internal/update/common/double-buffered-property.h>
 #include <dali/internal/update/animation/scene-graph-constraint-base.h>
 #include <string>
 
@@ -221,87 +220,6 @@ private:
 };
 
 
-/**
- * Template class for sending messages to double buffered properties in a PropertyOwner
- */
-template< typename P >
-class DoubleBufferedPropertyMessage : public PropertyOwnerMessageBase
-{
-public:
-
-  typedef void(DoubleBufferedProperty<P>::*MemberFunction)( BufferIndex, typename ParameterType< P >::PassingType );
-
-  /**
-   * Create a message.
-   * @note The scene object is expected to be const in the thread which sends this message.
-   * However it can be modified when Process() is called in a different thread.
-   * @param[in] eventThreadServices The object used to send messages to the scene graph
-   * @param[in] sceneObject The property owner scene object
-   * @param[in] property The property to set.
-   * @param[in] member The member function of the object.
-   * @param[in] value The new value of the property.
-   */
-  static void Send( EventThreadServices& eventThreadServices,
-                    const PropertyOwner* sceneObject,
-                    const DoubleBufferedProperty<P>* property,
-                    MemberFunction member,
-                    typename ParameterType< P >::PassingType value )
-  {
-    // Reserve some memory inside the message queue
-    unsigned int* slot = eventThreadServices.ReserveMessageSlot( sizeof( DoubleBufferedPropertyMessage ) );
-
-    // Construct message in the message queue memory; note that delete should not be called on the return value
-    new (slot) DoubleBufferedPropertyMessage( sceneObject, property, member, value );
-  }
-
-  /**
-   * Virtual destructor
-   */
-  virtual ~DoubleBufferedPropertyMessage()
-  {
-  }
-
-  /**
-   * @copydoc MessageBase::Process
-   */
-  virtual void Process( BufferIndex updateBufferIndex )
-  {
-    DALI_ASSERT_DEBUG( mProperty && "Message does not have an object" );
-    (mProperty->*mMemberFunction)( updateBufferIndex,
-                                   ParameterType< P >::PassObject( mParam ) );
-  }
-
-private:
-
-  /**
-   * Create a message.
-   * @note The property owner is expected to be const in the thread which sends this message.
-   * However it can be modified when Process() is called in a different thread.
-   * @param[in] sceneObject the property owner scene object
-   * @param[in] property The property to set.
-   * @param[in] member The member function of the object.
-   * @param[in] value The new value of the property.
-   */
-  DoubleBufferedPropertyMessage( const PropertyOwner* sceneObject,
-                                 const DoubleBufferedProperty<P>* property,
-                                 MemberFunction member,
-                                 typename ParameterType< P >::PassingType value )
-  : PropertyOwnerMessageBase(),
-    mSceneObject( const_cast< PropertyOwner* >( sceneObject ) ),
-    mProperty( const_cast< DoubleBufferedProperty<P>* >( property ) ),
-    mMemberFunction( member ),
-    mParam( value )
-  {
-  }
-
-private:
-  PropertyOwner* mSceneObject;
-  DoubleBufferedProperty<P>* mProperty;
-  MemberFunction mMemberFunction;
-  typename ParameterType< P >::HolderType mParam;
-};
-
-
 // Messages for PropertyOwner
 
 inline void InstallCustomPropertyMessage( EventThreadServices& eventThreadServices, const PropertyOwner& owner, PropertyBase* property )
index 4e58fba..b4eddac 100644 (file)
@@ -21,9 +21,7 @@
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/update/common/animatable-property.h>
 #include <dali/internal/update/common/double-buffered.h>
-#include <dali/internal/update/common/double-buffered-property.h>
 #include <dali/internal/update/common/property-owner.h>
-#include <dali/internal/update/common/property-boolean.h>
 #include <dali/internal/update/common/uniform-map.h>
 #include <dali/internal/update/common/scene-graph-connection-change-propagator.h>
 #include <dali/internal/render/data-providers/render-data-provider.h>
index f67ac52..29fa429 100644 (file)
@@ -23,7 +23,6 @@
 #include <dali/internal/common/blending-options.h>
 #include <dali/internal/event/common/event-thread-services.h>
 #include <dali/internal/update/common/animatable-property.h>
-#include <dali/internal/update/common/double-buffered-property.h>
 #include <dali/internal/update/common/property-owner.h>
 #include <dali/internal/update/common/scene-graph-connection-change-propagator.h>
 #include <dali/internal/update/common/uniform-map.h>
index 0c16aed..b2a4517 100644 (file)
 
 #include <dali/devel-api/rendering/geometry.h>
 #include <dali/internal/event/common/event-thread-services.h>
-#include <dali/internal/update/common/animatable-property.h>
-#include <dali/internal/update/common/double-buffered.h>
-#include <dali/internal/update/common/double-buffered-property.h>
 #include <dali/internal/update/common/property-owner.h>
-#include <dali/internal/update/common/property-boolean.h>
 #include <dali/internal/update/common/uniform-map.h>
 #include <dali/internal/update/common/scene-graph-connection-change-propagator.h>
 #include <dali/internal/render/data-providers/render-data-provider.h>