From: Victor Cebollada Date: Fri, 23 Jun 2017 09:44:26 +0000 (+0100) Subject: [dali_1.2.45] Merge branch 'devel/master' X-Git-Tag: submit/trunk/20181001.110911~64 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=654883a2444be217daca83df32c411bb0628bf4a;hp=68376524a0f3362fa7f0a52ffb005f611fdf3175;p=platform%2Fcore%2Fuifw%2Fdali-core.git [dali_1.2.45] Merge branch 'devel/master' Change-Id: Idccb346c015cf2b49c1f44a4287df614e12fe644 --- diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp index 34ef21c..0fa0347 100644 --- a/automated-tests/src/dali/utc-Dali-Actor.cpp +++ b/automated-tests/src/dali/utc-Dali-Actor.cpp @@ -4218,6 +4218,98 @@ int UtcDaliActorPropertyClippingNestedChildren(void) END_TEST; } +int UtcDaliActorPropertyClippingActorDrawOrder(void) +{ + // This test checks that a hierarchy of actors are drawn in the correct order when clipping is enabled. + tet_infoline( "Testing Actor::Property::CLIPPING_MODE draw order" ); + TestApplication application; + TestGlAbstraction& glAbstraction = application.GetGlAbstraction(); + TraceCallStack& enabledDisableTrace = glAbstraction.GetEnableDisableTrace(); + + /* We create a small tree of actors as follows: + + A + / \ + Clipping enabled -> B D + | | + C E + + The correct draw order is "ABCDE" (the same as if clipping was not enabled). + */ + Actor actors[5]; + for( int i = 0; i < 5; ++i ) + { + BufferImage image = BufferImage::New( 16u, 16u ); + Actor actor = CreateRenderableActor( image ); + + // Setup dimensions and position so actor is not skipped by culling. + actor.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); + actor.SetSize( 16.0f, 16.0f ); + + if( i == 0 ) + { + actor.SetParentOrigin( ParentOrigin::CENTER ); + } + else + { + float b = i > 2 ? 1.0f : -1.0f; + actor.SetParentOrigin( Vector3( 0.5 + ( 0.2f * b ), 0.8f, 0.8f ) ); + } + + actors[i] = actor; + } + + // Enable clipping on the actor at the top of the left branch. + actors[1].SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); + + // Build the scene graph. + Stage::GetCurrent().Add( actors[0] ); + + // Left branch: + actors[0].Add( actors[1] ); + actors[1].Add( actors[2] ); + + // Right branch: + actors[0].Add( actors[3] ); + actors[3].Add( actors[4] ); + + // Gather the call trace. + enabledDisableTrace.Reset(); + enabledDisableTrace.Enable( true ); + application.SendNotification(); + application.Render(); + enabledDisableTrace.Enable( false ); + + /* Check stencil is enabled and disabled again (as right-hand branch of tree is drawn). + + Note: Correct enable call trace: StackTrace: Index:0, Function:Enable, ParamList:3042 StackTrace: Index:1, Function:Enable, ParamList:2960 StackTrace: Index:2, Function:Disable, ParamList:2960 + Incorrect enable call trace: StackTrace: Index:0, Function:Enable, ParamList:3042 StackTrace: Index:1, Function:Enable, ParamList:2960 + */ + size_t startIndex = 0u; + DALI_TEST_CHECK( enabledDisableTrace.FindMethodAndParamsFromStartIndex( "Enable", "3042", startIndex ) ); + DALI_TEST_CHECK( enabledDisableTrace.FindMethodAndParamsFromStartIndex( "Enable", "2960", startIndex ) ); // 2960 is GL_STENCIL_TEST + DALI_TEST_CHECK( enabledDisableTrace.FindMethodAndParamsFromStartIndex( "Disable", "2960", startIndex ) ); + + // Swap the clipping actor from top of left branch to top of right branch. + actors[1].SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::DISABLED ); + actors[3].SetProperty( Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_CHILDREN ); + + // Gather the call trace. + enabledDisableTrace.Reset(); + enabledDisableTrace.Enable( true ); + application.SendNotification(); + application.Render(); + enabledDisableTrace.Enable( false ); + + // Check stencil is enabled but NOT disabled again (as right-hand branch of tree is drawn). + // This proves the draw order has remained the same. + startIndex = 0u; + DALI_TEST_CHECK( enabledDisableTrace.FindMethodAndParamsFromStartIndex( "Enable", "2960", startIndex ) ); + DALI_TEST_CHECK( !enabledDisableTrace.FindMethodAndParamsFromStartIndex( "Disable", "2960", startIndex ) ); + + END_TEST; +} + int UtcDaliActorPropertyClippingActorWithRendererOverride(void) { // This test checks that an actor with clipping will be ignored if overridden by the Renderer properties. diff --git a/automated-tests/src/dali/utc-Dali-CustomActor.cpp b/automated-tests/src/dali/utc-Dali-CustomActor.cpp index 0449f34..34392ad 100644 --- a/automated-tests/src/dali/utc-Dali-CustomActor.cpp +++ b/automated-tests/src/dali/utc-Dali-CustomActor.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -1329,3 +1330,18 @@ int UtcDaliCustomActorSetGetProperty(void) END_TEST; } + + +int utcDaliActorGetTypeInfo(void) +{ + TestApplication application; + tet_infoline( "Get the type info of a derived actor" ); + + Test::TestCustomActor customActor = Test::TestCustomActor::New(); + + Dali::TypeInfo typeInfo = Dali::DevelCustomActor::GetTypeInfo( customActor ); + + DALI_TEST_EQUALS( typeInfo.GetName(), std::string("TestCustomActor"), TEST_LOCATION ); + + END_TEST; +} diff --git a/dali/devel-api/actors/custom-actor-devel.cpp b/dali/devel-api/actors/custom-actor-devel.cpp new file mode 100644 index 0000000..3c1d7bb --- /dev/null +++ b/dali/devel-api/actors/custom-actor-devel.cpp @@ -0,0 +1,37 @@ +/* + * 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. + * 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 +#include +#include +#include + +namespace Dali +{ + +namespace DevelCustomActor +{ + +const Dali::TypeInfo GetTypeInfo( CustomActor actor ) +{ + return actor.GetImplementation().GetOwner()->GetTypeInfo(); +} + +} // namespace DevelCustomActor + +} // namespace Dali diff --git a/dali/devel-api/actors/custom-actor-devel.h b/dali/devel-api/actors/custom-actor-devel.h new file mode 100644 index 0000000..f5906af --- /dev/null +++ b/dali/devel-api/actors/custom-actor-devel.h @@ -0,0 +1,43 @@ +#ifndef DALI_CUSTOM_ACTOR_DEVEL_H +#define DALI_CUSTOM_ACTOR_DEVEL_H + +/* + * 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. + * 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 + +namespace Dali +{ + +namespace DevelCustomActor +{ + +/** + * Get the type info for the CustomActor. + * This is useful when the type information has been set via + * DevelHandle::SetTypeInfo() for this object. + * @param[in] actor The custom actor of which to get the type information + * @return the TypeInfo of this actor + */ +DALI_IMPORT_API const Dali::TypeInfo GetTypeInfo( CustomActor actor ); + +} // namespace DevelCustomActor + +} // namespace Dali + +#endif // DALI_CUSTOM_ACTOR_DEVEL_H diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list index baab797..6d8abde 100644 --- a/dali/devel-api/file.list +++ b/dali/devel-api/file.list @@ -1,6 +1,7 @@ # Add devel source files here for DALi internal developer files used by Adaptor & Toolkit devel_api_src_files = \ $(devel_api_src_dir)/actors/actor-devel.cpp \ + $(devel_api_src_dir)/actors/custom-actor-devel.cpp \ $(devel_api_src_dir)/animation/animation-data.cpp \ $(devel_api_src_dir)/animation/animation-devel.cpp \ $(devel_api_src_dir)/animation/path-constrainer.cpp \ @@ -25,6 +26,7 @@ devel_api_src_files = \ devel_api_core_actors_header_files = \ $(devel_api_src_dir)/actors/actor-devel.h \ + $(devel_api_src_dir)/actors/custom-actor-devel.h \ $(devel_api_src_dir)/actors/layer-devel.h devel_api_core_animation_header_files = \ diff --git a/dali/internal/event/actors/custom-actor-internal.cpp b/dali/internal/event/actors/custom-actor-internal.cpp index acfd82c..0ff93f9 100644 --- a/dali/internal/event/actors/custom-actor-internal.cpp +++ b/dali/internal/event/actors/custom-actor-internal.cpp @@ -17,6 +17,7 @@ // CLASS HEADER #include +#include namespace Dali { @@ -49,6 +50,12 @@ CustomActor::~CustomActor() { } +Dali::TypeInfo CustomActor::GetTypeInfo() +{ + Dali::TypeInfo handle ( const_cast(Object::GetTypeInfo()) ); + return handle; +} + } // namespace Internal } // namespace Dali diff --git a/dali/internal/event/actors/custom-actor-internal.h b/dali/internal/event/actors/custom-actor-internal.h index f4bef9f..259b785 100644 --- a/dali/internal/event/actors/custom-actor-internal.h +++ b/dali/internal/event/actors/custom-actor-internal.h @@ -58,6 +58,13 @@ public: return *mImpl; } + /** + * Get the type info associated with this object. + * + * @return The type info + */ + Dali::TypeInfo GetTypeInfo(); + protected: /** diff --git a/dali/internal/render/common/render-algorithms.cpp b/dali/internal/render/common/render-algorithms.cpp index 660a9a6..0c50ce4 100644 --- a/dali/internal/render/common/render-algorithms.cpp +++ b/dali/internal/render/common/render-algorithms.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -123,12 +123,13 @@ inline void SetupClipping( const RenderItem& item, Context& context, uint32_t& l context.StencilMask( 0xff ); context.Clear( GL_STENCIL_BUFFER_BIT, Context::CHECK_CACHED_VALUES ); } - else if( ( currentStencilDepth < lastStencilDepth ) || ( clippingId != lastClippingId ) ) + else if( ( currentStencilDepth < lastStencilDepth ) || + ( ( currentStencilDepth == lastStencilDepth ) && ( clippingId > lastClippingId ) ) ) { // The above if() statement tests if we need to clear some (not all) stencil bit-planes. // We need to do this if either of the following are true: - // 1) We traverse up the scene-graph to a previous stencil - // 2) We are at the same stencil depth but the clipping Id has changed. + // 1) We traverse up the scene-graph to a previous stencil depth + // 2) We are at the same stencil depth but the clipping Id has increased. // // This calculation takes the new depth to move to, and creates an inverse-mask of that number of consecutive bits. // This has the effect of clearing everything except the bit-planes up to (and including) our current depth. diff --git a/dali/internal/update/manager/render-instruction-processor.cpp b/dali/internal/update/manager/render-instruction-processor.cpp index 3cc4027..edb03f0 100644 --- a/dali/internal/update/manager/render-instruction-processor.cpp +++ b/dali/internal/update/manager/render-instruction-processor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -59,8 +59,8 @@ namespace * @param[in] rhs Right hand side item * @return True if left item is greater than right */ -bool PartialCompareItems( const RenderInstructionProcessor::SortAttributes& lhs, - const RenderInstructionProcessor::SortAttributes& rhs ) +inline bool PartialCompareItems( const RenderInstructionProcessor::SortAttributes& lhs, + const RenderInstructionProcessor::SortAttributes& rhs ) { if( lhs.shader == rhs.shader ) { @@ -86,30 +86,12 @@ bool CompareItems( const RenderInstructionProcessor::SortAttributes& lhs, const // encapsulates the same data (e.g. the middle-order bits of the ptrs). if( lhs.renderItem->mDepthIndex == rhs.renderItem->mDepthIndex ) { - return PartialCompareItems(lhs, rhs); + return PartialCompareItems( lhs, rhs ); } return lhs.renderItem->mDepthIndex < rhs.renderItem->mDepthIndex; } /** - * Function which sorts render items by clipping hierarchy, then depth index and instance - * ptrs of shader/geometry/material. - * @param[in] lhs Left hand side item - * @param[in] rhs Right hand side item - * @return True if left item is greater than right - */ -bool CompareItemsWithClipping( const RenderInstructionProcessor::SortAttributes& lhs, const RenderInstructionProcessor::SortAttributes& rhs ) -{ - // Items must be sorted in order of clipping first, otherwise incorrect clipping regions could be used. - if( lhs.renderItem->mNode->mClippingSortModifier == rhs.renderItem->mNode->mClippingSortModifier ) - { - return CompareItems( lhs, rhs ); - } - - return lhs.renderItem->mNode->mClippingSortModifier < rhs.renderItem->mNode->mClippingSortModifier; -} - -/** * Function which sorts the render items by Z function, then * by instance ptrs of shader / geometry / material. * @param[in] lhs Left hand side item @@ -118,7 +100,7 @@ bool CompareItemsWithClipping( const RenderInstructionProcessor::SortAttributes& */ bool CompareItems3D( const RenderInstructionProcessor::SortAttributes& lhs, const RenderInstructionProcessor::SortAttributes& rhs ) { - bool lhsIsOpaque = lhs.renderItem->mIsOpaque; + const bool lhsIsOpaque = lhs.renderItem->mIsOpaque; if( lhsIsOpaque == rhs.renderItem->mIsOpaque ) { if( lhsIsOpaque ) @@ -307,10 +289,9 @@ RenderInstructionProcessor::RenderInstructionProcessor() : mSortingHelper() { // Set up a container of comparators for fast run-time selection. - mSortComparitors.Reserve( 4u ); + mSortComparitors.Reserve( 3u ); mSortComparitors.PushBack( CompareItems ); - mSortComparitors.PushBack( CompareItemsWithClipping ); mSortComparitors.PushBack( CompareItems3D ); mSortComparitors.PushBack( CompareItems3DWithClipping ); } @@ -378,12 +359,11 @@ inline void RenderInstructionProcessor::SortRenderItems( BufferIndex bufferIndex } } - // Here we detemine which comparitor (of the 4) to use. - // The comparitors work like a bitmask. - // 1 << 0 is added to select a clipping comparitor. - // 1 << 1 is added for 3D comparitors. - const unsigned int comparitorIndex = ( respectClippingOrder ? ( 1u << 0u ) : 0u ) | - ( layer.GetBehavior() == Dali::Layer::LAYER_3D ? ( 1u << 1u ) : 0u ); + // Here we determine which comparitor (of the 3) to use. + // 0 is LAYER_UI + // 1 is LAYER_3D + // 2 is LAYER_3D + Clipping + const unsigned int comparitorIndex = layer.GetBehavior() == Dali::Layer::LAYER_3D ? respectClippingOrder ? 2u : 1u : 0u; std::stable_sort( mSortingHelper.begin(), mSortingHelper.end(), mSortComparitors[ comparitorIndex ] ); diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp index 7f69b8e..cd5e166 100644 --- a/dali/public-api/dali-core-version.cpp +++ b/dali/public-api/dali-core-version.cpp @@ -28,7 +28,7 @@ namespace Dali const unsigned int CORE_MAJOR_VERSION = 1; const unsigned int CORE_MINOR_VERSION = 2; -const unsigned int CORE_MICRO_VERSION = 44; +const unsigned int CORE_MICRO_VERSION = 45; const char * const CORE_BUILD_DATE = __DATE__ " " __TIME__; #ifndef EMSCRIPTEN diff --git a/packaging/dali.spec b/packaging/dali.spec index deddbe2..f374f37 100644 --- a/packaging/dali.spec +++ b/packaging/dali.spec @@ -1,6 +1,6 @@ Name: dali Summary: The OpenGLES Canvas Core Library -Version: 1.2.44 +Version: 1.2.45 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT