Mofidy codes for Dali Windows backend

Change-Id: I9b4720e0cbfb7617ae27ac86e5019ad1896fa8a3

diff --git a/dali/devel-api/images/distance-field.cpp b/dali/devel-api/images/distance-field.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 6e4346d..63a5150
--- a/dali/devel-api/images/distance-field.cpp
+++ b/dali/devel-api/images/distance-field.cpp
@@ -84,8 +84,9 @@ const float MAX_DISTANCE( 1e20 );
  */
 void DistanceTransform( float *source, float* dest, unsigned int length )
 {
-  int parabolas[length];    // Locations of parabolas in lower envelope
-  float edge[length + 1];   // Locations of boundaries between parabolas
+  std::vector<int> parabolas(length);    // Locations of parabolas in lower envelope
+  std::vector<float> edge(length + 1);   // Locations of boundaries between parabolas
+
   int rightmost(0);         // Index of rightmost parabola in lower envelope
 
   parabolas[0] = 0;

diff --git a/dali/devel-api/threading/conditional-wait.h b/dali/devel-api/threading/conditional-wait.h
old mode 100644 (file)
new mode 100755 (executable)
index 24a0874..79de016
--- a/dali/devel-api/threading/conditional-wait.h
+++ b/dali/devel-api/threading/conditional-wait.h
@@ -35,7 +35,7 @@ public:
    * @brief Allows client code to synchronize updates to its own state with the
    * internal state of a ConditionalWait object.
    */
-  class ScopedLock
+  class DALI_CORE_API ScopedLock
   {
   public:
     /**

diff --git a/dali/devel-api/threading/mutex.h b/dali/devel-api/threading/mutex.h
old mode 100644 (file)
new mode 100755 (executable)
index 26dfe11..2173edc
--- a/dali/devel-api/threading/mutex.h
+++ b/dali/devel-api/threading/mutex.h
@@ -57,7 +57,7 @@ public:
    * Note! this class *does not* prevent a deadlock in the case when same thread is
    * locking the same mutex twice.
    */
-  class ScopedLock
+  class DALI_CORE_API ScopedLock
   {
   public:
 

diff --git a/dali/integration-api/debug.h b/dali/integration-api/debug.h
old mode 100644 (file)
new mode 100755 (executable)
index 309649b..717c859
--- a/dali/integration-api/debug.h
+++ b/dali/integration-api/debug.h
@@ -111,44 +111,44 @@ DALI_CORE_API void UninstallLogFunction();
 /**
  * Provides unfiltered logging for global error level messages
  */
-#define DALI_LOG_ERROR(format, args...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugError,   "%s " format, __PRETTY_FUNCTION__, ## args)
+#define DALI_LOG_ERROR(format, ...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugError,   "%s " format, __FUNCTION__, ## __VA_ARGS__)
 
-#define DALI_LOG_ERROR_NOFN(format, args...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugError, format, ## args)
+#define DALI_LOG_ERROR_NOFN(format, ...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugError, format, ## __VA_ARGS__)
 
-#define DALI_LOG_WARNING_NOFN(format, args...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugWarning, format, ## args)
+#define DALI_LOG_WARNING_NOFN(format, ...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugWarning, format, ## __VA_ARGS__)
 
 /**
  * Provides unfiltered logging for fps monitor
  */
-#define DALI_LOG_FPS(format, args...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## args)
+#define DALI_LOG_FPS(format, ...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## __VA_ARGS__)
 
 /**
  * Provides unfiltered logging for update status
  */
-#define DALI_LOG_UPDATE_STATUS(format, args...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## args)
+#define DALI_LOG_UPDATE_STATUS(format, ...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## __VA_ARGS__)
 
 /**
  * Provides unfiltered logging for render information
  */
-#define DALI_LOG_RENDER_INFO(format, args...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## args)
+#define DALI_LOG_RENDER_INFO(format, ...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## __VA_ARGS__)
 
 /**
  * Provides unfiltered logging for release
  */
-#define DALI_LOG_RELEASE_INFO(format, args...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## args)
+#define DALI_LOG_RELEASE_INFO(format, ...)     Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugInfo, format, ## __VA_ARGS__)
 
 #ifdef DEBUG_ENABLED
 
 /**
  * Provides unfiltered logging for global warning level messages
  */
-#define DALI_LOG_WARNING(format, args...)   Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugWarning, "%s " format, __PRETTY_FUNCTION__, ## args)
+#define DALI_LOG_WARNING(format, ...)   Dali::Integration::Log::LogMessage(Dali::Integration::Log::DebugWarning, "%s " format, __PRETTY_FUNCTION__, ## __VA_ARGS__)
 
 
 #else // DEBUG_ENABLED
 
 // Don't warn on release build
-#define DALI_LOG_WARNING(format, args...)
+#define DALI_LOG_WARNING(format, ...)
 
 #endif
 
@@ -311,8 +311,8 @@ public:
 
 #ifdef DEBUG_ENABLED
 
-#define DALI_LOG_INFO(filter, level, format, args...)                        \
-  if(filter && filter->IsEnabledFor(level)) { filter->Log(level, format,  ## args); }
+#define DALI_LOG_INFO(filter, level, format, ...)                        \
+  if(filter && filter->IsEnabledFor(level)) { filter->Log(level, format,  ## __VA_ARGS__); }
 
 #define DALI_LOG_STREAM( filter, level, stream )  \
   if(filter && filter->IsEnabledFor(level))       \
@@ -324,7 +324,7 @@ public:
 
 #else // DEBUG_ENABLED
 
-#define DALI_LOG_INFO(filter, level, format, args...)
+#define DALI_LOG_INFO(filter, level, format, ...)
 #define DALI_LOG_STREAM( filter, level, stream )
 
 #endif // DEBUG_ENABLED
@@ -353,8 +353,8 @@ public:
 };
 
 
-#define DALI_LOG_TRACE_METHOD_FMT(filter, format, args...)                 \
-  Dali::Integration::Log::TraceObj debugTraceObj(filter, "%s: " format, __PRETTY_FUNCTION__, ## args)
+#define DALI_LOG_TRACE_METHOD_FMT(filter, format, ...)                 \
+  Dali::Integration::Log::TraceObj debugTraceObj(filter, "%s: " format, __PRETTY_FUNCTION__, ## __VA_ARGS__)
 
 #define DALI_LOG_TRACE_METHOD(filter)                                      \
   Dali::Integration::Log::TraceObj debugTraceObj(filter, __PRETTY_FUNCTION__)
@@ -362,7 +362,7 @@ public:
 
 #else // DEBUG_ENABLED
 
-#define DALI_LOG_TRACE_METHOD_FMT(filter, format, args...)
+#define DALI_LOG_TRACE_METHOD_FMT(filter, format, ...)
 #define DALI_LOG_TRACE_METHOD(filter)
 
 
@@ -406,7 +406,7 @@ public: \
 /**
  * Allows one object to set another object's std::string easily
  */
-#define DALI_LOG_FMT_OBJECT_STRING(object, fmt, args...) (object->mDebugString = FormatToString(fmt, ## args))
+#define DALI_LOG_FMT_OBJECT_STRING(object, fmt, ...) (object->mDebugString = FormatToString(fmt, ## __VA_ARGS__))
 
 /**
  * Allows one object to get another object's debug string
@@ -429,7 +429,7 @@ public: \
 #define DALI_LOG_OBJECT_STRING_DECLARATION
 #define DALI_LOG_ACTOR_TREE(node)
 #define DALI_LOG_SET_OBJECT_STRING(object, string)
-#define DALI_LOG_FMT_OBJECT_STRING(object, fmt, args...)
+#define DALI_LOG_FMT_OBJECT_STRING(object, fmt, ...)
 #define DALI_LOG_GET_OBJECT_STRING(object)
 #define DALI_LOG_GET_OBJECT_C_STR(object) ""
 #define DALI_LOG_OBJECT(filter, object)

diff --git a/dali/internal/common/image-attributes.cpp b/dali/internal/common/image-attributes.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 25e53b8..b13b530
--- a/dali/internal/common/image-attributes.cpp
+++ b/dali/internal/common/image-attributes.cpp
@@ -70,7 +70,7 @@ struct ImageAttributes::ImageAttributesImpl
   unsigned int  width : 16;       ///< image width in pixels
   unsigned int  height : 16;      ///< image height in pixels
   ScalingMode   scaling : 3;      ///< scaling option, ShrinkToFit is default
-  FilterMode    filtering : 3;    ///< filtering option. Box is the default
+  FilterMode    filtering : 4;    ///< filtering option. Box is the default
   bool          mOrientationCorrection : 1; ///< If true, image pixels are reordered according to orientation metadata on load.
 };
 

diff --git a/dali/internal/event/actors/actor-impl.h b/dali/internal/event/actors/actor-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index 9cd762b..672fc63
--- a/dali/internal/event/actors/actor-impl.h
+++ b/dali/internal/event/actors/actor-impl.h
@@ -2031,11 +2031,11 @@ protected:
   bool mPositionUsesAnchorPoint                    : 1; ///< Cached: Whether the position uses the anchor point or not.
   bool mVisible                                    : 1; ///< Cached: Whether the actor is visible or not.
   bool mInheritLayoutDirection                     : 1; ///< Whether the actor inherits the layout direction from parent.
-  LayoutDirection::Type mLayoutDirection  : 1; ///< Layout direction, Left to Right or Right to Left.
-  DrawMode::Type mDrawMode                         : 2; ///< Cached: How the actor and its children should be drawn
-  PositionInheritanceMode mPositionInheritanceMode : 2; ///< Cached: Determines how position is inherited
-  ColorMode mColorMode                             : 2; ///< Cached: Determines whether mWorldColor is inherited
-  ClippingMode::Type mClippingMode                 : 2; ///< Cached: Determines which clipping mode (if any) to use.
+  LayoutDirection::Type mLayoutDirection           : 2; ///< Layout direction, Left to Right or Right to Left.
+  DrawMode::Type mDrawMode                         : 3; ///< Cached: How the actor and its children should be drawn
+  PositionInheritanceMode mPositionInheritanceMode : 3; ///< Cached: Determines how position is inherited
+  ColorMode mColorMode                             : 3; ///< Cached: Determines whether mWorldColor is inherited
+  ClippingMode::Type mClippingMode                 : 3; ///< Cached: Determines which clipping mode (if any) to use.
 
 private:
 

diff --git a/dali/internal/event/rendering/renderer-impl.h b/dali/internal/event/rendering/renderer-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index e4911a2..1c83686
--- a/dali/internal/event/rendering/renderer-impl.h
+++ b/dali/internal/event/rendering/renderer-impl.h
@@ -324,12 +324,11 @@ private: // data
   BlendingOptions                     mBlendingOptions;              ///< Local copy of blending options bitmask
 
   float                               mOpacity;                      ///< Local copy of the opacity
-
-  DepthFunction::Type                 mDepthFunction:3;              ///< Local copy of the depth function
-  FaceCullingMode::Type               mFaceCullingMode:2;            ///< Local copy of the mode of face culling
-  BlendMode::Type                     mBlendMode:2;                  ///< Local copy of the mode of blending
-  DepthWriteMode::Type                mDepthWriteMode:2;             ///< Local copy of the depth write mode
-  DepthTestMode::Type                 mDepthTestMode:2;              ///< Local copy of the depth test mode
+  DepthFunction::Type                 mDepthFunction:4;              ///< Local copy of the depth function
+  FaceCullingMode::Type               mFaceCullingMode:3;            ///< Local copy of the mode of face culling
+  BlendMode::Type                     mBlendMode:3;                  ///< Local copy of the mode of blending
+  DepthWriteMode::Type                mDepthWriteMode:3;             ///< Local copy of the depth write mode
+  DepthTestMode::Type                 mDepthTestMode:3;              ///< Local copy of the depth test mode
   bool                                mPremultipledAlphaEnabled:1;   ///< Flag indicating whether the Pre-multiplied Alpha Blending is required
 };
 

diff --git a/dali/internal/render/common/render-tracker-debug.h b/dali/internal/render/common/render-tracker-debug.h
old mode 100644 (file)
new mode 100755 (executable)
index 498e8f2..78c3ef9
--- a/dali/internal/render/common/render-tracker-debug.h
+++ b/dali/internal/render/common/render-tracker-debug.h
@@ -34,11 +34,11 @@ Debug::Filter* gRenderTrackerLogFilter = Debug::Filter::New(Debug::NoLogging, fa
 #define TRACKER_LOG(level)                                              \
   DALI_LOG_INFO(gRenderTrackerLogFilter, level, "RenderTracker::%s: this:%p\n", __FUNCTION__, this)
 
-#define TRACKER_LOG_FMT(level, format, args...) \
-  DALI_LOG_INFO(gRenderTrackerLogFilter, level, "RenderTracker::%s: this:%p " format, __FUNCTION__, this, ## args)
+#define TRACKER_LOG_FMT(level, format, ...) \
+  DALI_LOG_INFO(gRenderTrackerLogFilter, level, "RenderTracker::%s: this:%p " format, __FUNCTION__, this, ## __VA_ARGS__)
 #else
 #define TRACKER_LOG(level)
-#define TRACKER_LOG_FMT(level, format, args...)
+#define TRACKER_LOG_FMT(level, format, ...)
 #endif
 
 } // Render

diff --git a/dali/internal/render/data-providers/render-data-provider.h b/dali/internal/render/data-providers/render-data-provider.h
old mode 100644 (file)
new mode 100755 (executable)
index 478718e..aae4262
--- a/dali/internal/render/data-providers/render-data-provider.h
+++ b/dali/internal/render/data-providers/render-data-provider.h
@@ -38,6 +38,7 @@ namespace SceneGraph
 {
 class PropertyBuffer;
 class Shader;
+class Renderer;
 
 /**
  * Wraps all the data providers for the renderer. This allows the

diff --git a/dali/internal/render/gl-resources/gl-call-debug.h b/dali/internal/render/gl-resources/gl-call-debug.h
old mode 100644 (file)
new mode 100755 (executable)
index 866d5ea..dcd440e
--- a/dali/internal/render/gl-resources/gl-call-debug.h
+++ b/dali/internal/render/gl-resources/gl-call-debug.h
@@ -52,8 +52,8 @@ extern Debug::Filter* gGlLogFilter;
 #endif // DEBUG_ENABLED
 
 // Don't put guards around here (LOG_INFO has it's own guards)
-#define LOG_GL(format, args...) \
-  DALI_LOG_INFO(gGlLogFilter, Debug::General, format, ## args)
+#define LOG_GL(format, ...) \
+  DALI_LOG_INFO(gGlLogFilter, Debug::General, format, ## __VA_ARGS__)
 
 }
 

diff --git a/dali/internal/render/renderers/render-renderer.h b/dali/internal/render/renderers/render-renderer.h
old mode 100644 (file)
new mode 100755 (executable)
index 6e1a1f7..55bac57
--- a/dali/internal/render/renderers/render-renderer.h
+++ b/dali/internal/render/renderers/render-renderer.h
@@ -82,11 +82,11 @@ public:
     int stencilFunctionMask;                          ///< The stencil function mask
     int stencilFunctionReference;                     ///< The stencil function reference
     int stencilMask;                                  ///< The stencil mask
-    RenderMode::Type       renderMode:3;              ///< The render mode
-    StencilFunction::Type  stencilFunction:3;         ///< The stencil function
-    StencilOperation::Type stencilOperationOnFail:3;  ///< The stencil operation for stencil test fail
-    StencilOperation::Type stencilOperationOnZFail:3; ///< The stencil operation for depth test fail
-    StencilOperation::Type stencilOperationOnZPass:3; ///< The stencil operation for depth test pass
+    RenderMode::Type       renderMode:4;              ///< The render mode
+    StencilFunction::Type  stencilFunction:4;         ///< The stencil function
+    StencilOperation::Type stencilOperationOnFail:4;  ///< The stencil operation for stencil test fail
+    StencilOperation::Type stencilOperationOnZFail:4; ///< The stencil operation for depth test fail
+    StencilOperation::Type stencilOperationOnZPass:4; ///< The stencil operation for depth test pass
   };
 
   /**
@@ -429,10 +429,10 @@ private:
   size_t                       mIndexedDrawFirstElement;    ///< Offset of first element to draw
   size_t                       mIndexedDrawElementsCount;   ///< Number of elements to draw
 
-  DepthFunction::Type          mDepthFunction:3;            ///< The depth function
-  FaceCullingMode::Type        mFaceCullingMode:2;          ///< The mode of face culling
-  DepthWriteMode::Type         mDepthWriteMode:2;           ///< The depth write mode
-  DepthTestMode::Type          mDepthTestMode:2;            ///< The depth test mode
+  DepthFunction::Type          mDepthFunction:4;            ///< The depth function
+  FaceCullingMode::Type        mFaceCullingMode:3;          ///< The mode of face culling
+  DepthWriteMode::Type         mDepthWriteMode:3;           ///< The depth write mode
+  DepthTestMode::Type          mDepthTestMode:3;            ///< The depth test mode
   bool                         mUpdateAttributesLocation:1; ///< Indicates attribute locations have changed
   bool                         mPremultipledAlphaEnabled:1; ///< Flag indicating whether the Pre-multiplied Alpha Blending is required
 

diff --git a/dali/internal/render/renderers/render-texture.h b/dali/internal/render/renderers/render-texture.h
old mode 100644 (file)
new mode 100755 (executable)
index d9192e0..771fca0
--- a/dali/internal/render/renderers/render-texture.h
+++ b/dali/internal/render/renderers/render-texture.h
@@ -155,7 +155,7 @@ private:
   uint16_t mWidth;                      ///< Width of the texture
   uint16_t mHeight;                     ///< Height of the texture
   uint16_t mMaxMipMapLevel;             ///< Maximum mipmap level
-  Type mType:2;                         ///< Type of the texture
+  Type mType:3;                         ///< Type of the texture
   bool mHasAlpha : 1;                   ///< Whether the format has an alpha channel
   bool mIsCompressed : 1;               ///< Whether the format is compressed
 

diff --git a/dali/internal/render/shaders/program.cpp b/dali/internal/render/shaders/program.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 451de0b..530b629
--- a/dali/internal/render/shaders/program.cpp
+++ b/dali/internal/render/shaders/program.cpp
@@ -248,7 +248,7 @@ void Program::GetActiveSamplerUniforms()
   mGlAbstraction.GetProgramiv( mProgramId, GL_ACTIVE_UNIFORM_MAX_LENGTH, &uniformMaxNameLength );
 
   std::vector<std::string> samplerNames;
-  char name[uniformMaxNameLength+1]; // Allow for null terminator
+  std::vector<char> name(uniformMaxNameLength + 1); // Allow for null terminator
   std::vector< LocationPosition >  samplerUniformLocations;
 
   {
@@ -259,12 +259,12 @@ void Program::GetActiveSamplerUniforms()
     for( int i=0; i<numberOfActiveUniforms; ++i )
     {
       mGlAbstraction.GetActiveUniform( mProgramId, static_cast< GLuint >( i ), uniformMaxNameLength,
-                                       &nameLength, &number, &type, name );
+                                       &nameLength, &number, &type, name.data() );
 
       if( type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE || type == GL_SAMPLER_EXTERNAL_OES )
       {
-        GLuint location = mGlAbstraction.GetUniformLocation( mProgramId, name );
-        samplerNames.push_back(name);
+        GLuint location = mGlAbstraction.GetUniformLocation( mProgramId, name.data() );
+        samplerNames.push_back( name.data() );
         samplerUniformLocations.push_back(LocationPosition(location, -1));
       }
     }

diff --git a/dali/internal/update/nodes/node.cpp b/dali/internal/update/nodes/node.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 52f443a..48feb8d
--- a/dali/internal/update/nodes/node.cpp
+++ b/dali/internal/update/nodes/node.cpp
@@ -358,22 +358,6 @@ void Node::RecursiveDisconnectFromSceneGraph( BufferIndex updateBufferIndex )
 
 } // namespace SceneGraph
 
-template <>
-void OwnerPointer<Dali::Internal::SceneGraph::Node>::Reset()
-{
-  if( mObject != NULL )
-  {
-    Dali::Internal::SceneGraph::Node::Delete( mObject );
-    mObject = NULL;
-  }
-}
-
 } // namespace Internal
 
-template <>
-void OwnerContainer<Dali::Internal::SceneGraph::Node*>::Delete(Dali::Internal::SceneGraph::Node* pointer)
-{
-  Dali::Internal::SceneGraph::Node::Delete( pointer );
-}
-
 } // namespace Dali

diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h
old mode 100644 (file)
new mode 100755 (executable)
index b7631ca..a38bda5
--- a/dali/internal/update/nodes/node.h
+++ b/dali/internal/update/nodes/node.h
@@ -890,9 +890,9 @@ protected:
   // flags, compressed to bitfield
   unsigned int                       mRegenerateUniformMap:2; ///< Indicate if the uniform map has to be regenerated this frame
   int                                mDirtyFlags:8;           ///< A composite set of flags for each of the Node properties
-  DrawMode::Type                     mDrawMode:2;             ///< How the Node and its children should be drawn
-  ColorMode                          mColorMode:2;            ///< Determines whether mWorldColor is inherited, 2 bits is enough
-  ClippingMode::Type                 mClippingMode:2;         ///< The clipping mode of this node
+  DrawMode::Type                     mDrawMode:3;             ///< How the Node and its children should be drawn
+  ColorMode                          mColorMode:3;            ///< Determines whether mWorldColor is inherited, 2 bits is enough
+  ClippingMode::Type                 mClippingMode:3;         ///< The clipping mode of this node
   bool                               mIsRoot:1;               ///< True if the node cannot have a parent
   bool                               mIsLayer:1;              ///< True if the node is a layer
   bool                               mPositionUsesAnchorPoint:1; ///< True if the node should use the anchor-point when calculating the position
@@ -1038,14 +1038,22 @@ inline void SetPositionUsesAnchorPointMessage( EventThreadServices& eventThreadS
 
 // Template specialisation for OwnerPointer<Node>, because delete is protected
 template <>
-void OwnerPointer<Dali::Internal::SceneGraph::Node>::Reset();
-
+inline void OwnerPointer<Dali::Internal::SceneGraph::Node>::Reset()
+{
+  if (mObject != NULL)
+  {
+    Dali::Internal::SceneGraph::Node::Delete(mObject);
+    mObject = NULL;
+  }
+}
 } // namespace Internal
 
 // Template specialisations for OwnerContainer<Node*>, because delete is protected
 template <>
-void OwnerContainer<Dali::Internal::SceneGraph::Node*>::Delete( Dali::Internal::SceneGraph::Node* pointer );
-
+inline void OwnerContainer<Dali::Internal::SceneGraph::Node*>::Delete( Dali::Internal::SceneGraph::Node* pointer )
+{
+  Dali::Internal::SceneGraph::Node::Delete(pointer);
+}
 } // namespace Dali
 
 #endif // DALI_INTERNAL_SCENE_GRAPH_NODE_H

diff --git a/dali/internal/update/nodes/scene-graph-layer.cpp b/dali/internal/update/nodes/scene-graph-layer.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 73709d2..db6e6f0
--- a/dali/internal/update/nodes/scene-graph-layer.cpp
+++ b/dali/internal/update/nodes/scene-graph-layer.cpp
@@ -114,15 +114,6 @@ void Layer::ClearRenderables()
 
 } // namespace SceneGraph
 
-template <>
-void OwnerPointer<Dali::Internal::SceneGraph::Layer>::Reset()
-{
-  if( mObject != NULL )
-  {
-    Dali::Internal::SceneGraph::Node::Delete( mObject );
-    mObject = NULL;
-  }
-}
 } // namespace Internal
 
 } // namespace Dali

diff --git a/dali/internal/update/nodes/scene-graph-layer.h b/dali/internal/update/nodes/scene-graph-layer.h
old mode 100644 (file)
new mode 100755 (executable)
index eec47c4..29ed244
--- a/dali/internal/update/nodes/scene-graph-layer.h
+++ b/dali/internal/update/nodes/scene-graph-layer.h
@@ -336,8 +336,14 @@ inline void SetDepthTestDisabledMessage( EventThreadServices& eventThreadService
 
 // Template specialisation for OwnerPointer<Layer>, because delete is protected
 template <>
-void OwnerPointer<Dali::Internal::SceneGraph::Layer>::Reset();
-
+inline void OwnerPointer<Dali::Internal::SceneGraph::Layer>::Reset()
+{
+  if (mObject != NULL)
+  {
+    Dali::Internal::SceneGraph::Node::Delete(mObject);
+    mObject = NULL;
+  }
+}
 } // namespace Internal
 
 } // namespace Dali

diff --git a/dali/internal/update/render-tasks/scene-graph-render-task-debug.h b/dali/internal/update/render-tasks/scene-graph-render-task-debug.h
old mode 100644 (file)
new mode 100755 (executable)
index adcaf05..655fa26
--- a/dali/internal/update/render-tasks/scene-graph-render-task-debug.h
+++ b/dali/internal/update/render-tasks/scene-graph-render-task-debug.h
@@ -30,14 +30,12 @@ Debug::Filter* gRenderTaskLogFilter = Debug::Filter::New(Debug::NoLogging, false
 
 #define TASK_LOG(level)                                              \
   DALI_LOG_INFO(gRenderTaskLogFilter, level, "SceneGraph::RenderTask::%s: this:%p\n", __FUNCTION__, this)
-#define TASK_LOG_FMT(level, format, args...) \
-  DALI_LOG_INFO(gRenderTaskLogFilter, level, "SceneGraph::RenderTask::%s: this:%p " format, __FUNCTION__, this, ## args)
-
+#define TASK_LOG_FMT(level, format, ...) \
+  DALI_LOG_INFO(gRenderTaskLogFilter, level, "SceneGraph::RenderTask::%s: this:%p " format, __FUNCTION__, this, ## __VA_ARGS__)
 #else
 
 #define TASK_LOG(level)
-#define TASK_LOG_FMT(level, format, args...)
-
+#define TASK_LOG_FMT(level, format, ...)
 #endif
 
 #endif // __DALI_INTERNAL_SCENE_GRAPH_RENDER_TASK_DEBUG_H__

diff --git a/dali/internal/update/rendering/scene-graph-renderer.h b/dali/internal/update/rendering/scene-graph-renderer.h
old mode 100644 (file)
new mode 100755 (executable)
index f1ef2a7..5865014
--- a/dali/internal/update/rendering/scene-graph-renderer.h
+++ b/dali/internal/update/rendering/scene-graph-renderer.h
@@ -451,11 +451,11 @@ private:
   unsigned int                 mRegenerateUniformMap;             ///< 2 if the map should be regenerated, 1 if it should be copied.
   unsigned int                 mResendFlag;                       ///< Indicate whether data should be resent to the renderer
 
-  DepthFunction::Type          mDepthFunction:3;                  ///< Local copy of the depth function
-  FaceCullingMode::Type        mFaceCullingMode:2;                ///< Local copy of the mode of face culling
-  BlendMode::Type              mBlendMode:2;                      ///< Local copy of the mode of blending
-  DepthWriteMode::Type         mDepthWriteMode:2;                 ///< Local copy of the depth write mode
-  DepthTestMode::Type          mDepthTestMode:2;                  ///< Local copy of the depth test mode
+  DepthFunction::Type          mDepthFunction:4;                  ///< Local copy of the depth function
+  FaceCullingMode::Type        mFaceCullingMode:3;                ///< Local copy of the mode of face culling
+  BlendMode::Type              mBlendMode:3;                      ///< Local copy of the mode of blending
+  DepthWriteMode::Type         mDepthWriteMode:3;                 ///< Local copy of the depth write mode
+  DepthTestMode::Type          mDepthTestMode:3;                  ///< Local copy of the depth test mode
 
   bool                         mUniformMapChanged[2];             ///< Records if the uniform map has been altered this frame
   bool                         mPremultipledAlphaEnabled:1;       ///< Flag indicating whether the Pre-multiplied Alpha Blending is required

diff --git a/dali/public-api/animation/alpha-function.cpp b/dali/public-api/animation/alpha-function.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 7ce7db5..21133dc
--- a/dali/public-api/animation/alpha-function.cpp
+++ b/dali/public-api/animation/alpha-function.cpp
@@ -23,6 +23,14 @@
 namespace Dali
 {
 
+namespace
+{
+constexpr unsigned int BitMaskOfN( unsigned int bits )
+{
+  return ( 1 << bits ) - 1;
+}
+} // unnamed namespace
+
 AlphaFunction::AlphaFunction()
 :mBezierControlPoints(Vector4::ZERO),
  mCustom(0),
@@ -65,12 +73,12 @@ AlphaFunctionPrototype AlphaFunction::GetCustomFunction() const
 
 AlphaFunction::BuiltinFunction AlphaFunction::GetBuiltinFunction() const
 {
-  return mBuiltin;
+  return static_cast<AlphaFunction::BuiltinFunction>( mBuiltin & BitMaskOfN( Log<COUNT>::value + 1 ) );
 }
 
 AlphaFunction::Mode AlphaFunction::GetMode() const
 {
-  return mMode;
+  return static_cast<AlphaFunction::Mode>( mMode & BitMaskOfN( 2 ) );
 }
 
 } // namespace Dali

diff --git a/dali/public-api/animation/alpha-function.h b/dali/public-api/animation/alpha-function.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/dali/public-api/common/dali-common.h b/dali/public-api/common/dali-common.h
index 4b7c4aa..cc73979 100755 (executable)
--- a/dali/public-api/common/dali-common.h
+++ b/dali/public-api/common/dali-common.h
@@ -43,12 +43,26 @@
 #    define DALI_INTERNAL   __attribute__ ((visibility ("hidden")))
 #  endif
 #else
-/** Visibility attribute to show method definitions */
+#ifdef WIN32
+ /** Visibility attribute to show declarations */
+#  define DALI_EXPORT_API __declspec(dllexport)
+
+#ifdef BUILDING_DALI_CORE
+ /** Visibility attribute to hide declarations */
+#  define DALI_CORE_API __declspec(dllexport)
+#else
+/** Visibility attribute to hide declarations */
+#  define DALI_CORE_API __declspec(dllimport)
+#endif
+
+#else
+ /** Visibility attribute to show declarations */
 #  define DALI_EXPORT_API
 /** Visibility attribute to show declarations */
 #  define DALI_IMPORT_API
 /** Visibility attribute to show declarations */
 #  define DALI_CORE_API
+#endif
 /** Visibility attribute to hide declarations */
 #  define DALI_INTERNAL
 #endif
@@ -73,8 +87,13 @@
  * DALI_UNLIKELY should be used when a branch is almost never taken.
  * @SINCE_1_0.0
  */
+#ifdef __GNUC
 #define DALI_LIKELY(expression)   __builtin_expect( !!(expression), 1 )
 #define DALI_UNLIKELY(expression) __builtin_expect( !!(expression), 0 )
+#else
+#define DALI_LIKELY(expression)   !!(expression)
+#define DALI_UNLIKELY(expression) !!(expression)
+#endif
 
 /**
  * @brief The DALi namespace.

diff --git a/dali/public-api/math/matrix.h b/dali/public-api/math/matrix.h
old mode 100644 (file)
new mode 100755 (executable)
index 91faed2..247acea
--- a/dali/public-api/math/matrix.h
+++ b/dali/public-api/math/matrix.h
@@ -60,7 +60,7 @@ class DALI_CORE_API Matrix
 {
 public:
 
-  friend std::ostream& operator<< (std::ostream& o, const Matrix& matrix);
+  friend DALI_CORE_API std::ostream& operator<< (std::ostream& o, const Matrix& matrix);
 
   /**
    * @brief Constructor.

diff --git a/dali/public-api/math/matrix3.h b/dali/public-api/math/matrix3.h
old mode 100644 (file)
new mode 100755 (executable)
index 2c3ee6c..91cf7f4
--- a/dali/public-api/math/matrix3.h
+++ b/dali/public-api/math/matrix3.h
@@ -56,7 +56,7 @@ class DALI_CORE_API Matrix3
 {
 public:
 
-  friend std::ostream& operator<< (std::ostream& o, const Matrix3& matrix);
+  friend DALI_CORE_API std::ostream& operator<< (std::ostream& o, const Matrix3& matrix);
 
   /**
    * @brief The identity matrix.

diff --git a/dali/public-api/object/property-array.h b/dali/public-api/object/property-array.h
old mode 100644 (file)
new mode 100755 (executable)
index ef47612..331d1e9
--- a/dali/public-api/object/property-array.h
+++ b/dali/public-api/object/property-array.h
@@ -200,7 +200,7 @@ public:
    * @brief Output to stream.
    * @SINCE_1_1.28
    */
-  friend std::ostream& operator<<( std::ostream& stream, const Property::Array& array );
+  friend DALI_CORE_API std::ostream& operator<<( std::ostream& stream, const Property::Array& array );
 
 private:
   struct DALI_INTERNAL Impl; ///< Private data

diff --git a/dali/public-api/object/property-map.h b/dali/public-api/object/property-map.h
old mode 100644 (file)
new mode 100755 (executable)
index 8f77396..44a132f
--- a/dali/public-api/object/property-map.h
+++ b/dali/public-api/object/property-map.h
@@ -363,7 +363,7 @@ public:
    * @brief Output to stream.
    * @SINCE_1_1.28
    */
-  friend std::ostream& operator<<( std::ostream& stream, const Property::Map& map );
+  friend DALI_CORE_API std::ostream& operator<<( std::ostream& stream, const Property::Map& map );
 
 private:
   struct DALI_INTERNAL Impl; ///< Private data

diff --git a/dali/public-api/object/property-value.h b/dali/public-api/object/property-value.h
old mode 100644 (file)
new mode 100755 (executable)
index fa66e05..4cb607e
--- a/dali/public-api/object/property-value.h
+++ b/dali/public-api/object/property-value.h
@@ -412,7 +412,7 @@ public:
    * @brief Output to stream.
    * @SINCE_1_0.0
    */
-  friend std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value );
+  friend DALI_CORE_API std::ostream& operator<<( std::ostream& ouputStream, const Property::Value& value );
 
 private:
 

diff --git a/dali/public-api/signals/base-signal.h b/dali/public-api/signals/base-signal.h
old mode 100644 (file)
new mode 100755 (executable)
index 2ea9770..159cc6e
--- a/dali/public-api/signals/base-signal.h
+++ b/dali/public-api/signals/base-signal.h
@@ -113,7 +113,7 @@ public:
    * @brief Used to guard against nested Emit() calls.
    * @SINCE_1_0.0
    */
-  struct EmitGuard
+  struct DALI_CORE_API EmitGuard
   {
     /**
      * @brief Creates the guard.