taeyoon [Fri, 15 Jan 2016 02:10:22 +0000 (11:10 +0900)]
Revert "[3.0] Fix license issues from the protex server"
This reverts commit
4bbbcb9f6bd3f13c38adf175de35bf5e5a642038.
Change-Id: Ib07b9b5fda06802379c0fda0b61ffdff8b416369
Taeyoon Lee [Thu, 31 Dec 2015 08:48:11 +0000 (00:48 -0800)]
Merge "[3.0] Fix license issues from the protex server" into tizen
seoyeon2.kim [Wed, 30 Dec 2015 04:49:03 +0000 (13:49 +0900)]
[3.0] Fix license issues from the protex server
- Change licence names in .spec to match SPDX identifiers
- Remove application.js which is reported as GPL licensed
Change-Id: Iee1a6f116de1aa9984d5cd95c4b0bce380cee789
taeyoon [Tue, 22 Dec 2015 10:50:10 +0000 (19:50 +0900)]
[3.0] Fix svace issue
Change-Id: I2dc389090f094e85cd0eb6285756434dcdb90617
taeyoon [Mon, 26 Oct 2015 02:58:47 +0000 (11:58 +0900)]
Revert "Revert "[3.0] Temporary change to fix homescreen issue""
This reverts commit
2b4628dc3e8997a7cd31d48abfa6482d52f44cd1.
Change-Id: I5367b1c7d9471d5d0a97237274cc2ee703a2b8c3
taeyoon [Wed, 28 Oct 2015 06:13:46 +0000 (15:13 +0900)]
Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen
Change-Id: Ie118b134b69250ba3dc3db5c3e18db1650994bbb
taeyoon [Mon, 26 Oct 2015 02:50:53 +0000 (11:50 +0900)]
Revert "[3.0] Temporary change to fix homescreen issue"
This reverts commit
08c497f7d69f1b94d114a097f5290f17fb138c5f.
Change-Id: I44cb3ea23aa6f19a539efbdbfbfdacd177747445
Adeel Kazmi [Fri, 23 Oct 2015 14:19:05 +0000 (07:19 -0700)]
Merge "DALi Version 1.1.7" into devel/master
Paul Wisbey [Fri, 23 Oct 2015 14:15:21 +0000 (07:15 -0700)]
Merge "Stop calculating default filter and wrap modes every frame for every sampler" into devel/master
Kimmo Hoikka [Fri, 23 Oct 2015 10:39:55 +0000 (11:39 +0100)]
Stop calculating default filter and wrap modes every frame for every sampler
Change-Id: I1b21ca06abc140252dbc7db6bd6b9b5959620a88
Lee Morgan [Fri, 23 Oct 2015 10:00:22 +0000 (11:00 +0100)]
DALi Version 1.1.7
Change-Id: I48afab8d3fdaf983d4154cea54b5621ea7127e54
Xiangyin Ma [Wed, 21 Oct 2015 15:14:35 +0000 (16:14 +0100)]
Added Thread abstract class
Change-Id: Id9be6082ef416bf2ea619bd3be7327a4f2c46f73
Kimmo Hoikka [Wed, 21 Oct 2015 15:41:27 +0000 (08:41 -0700)]
Merge "Remove scene graph property buffer" into devel/master
Kimmo Hoikka [Wed, 21 Oct 2015 09:45:17 +0000 (10:45 +0100)]
Remove unused constants and move to exports to reduce the bloat from constants
Change-Id: I3d278b03577763590e42e741d18b4a7782a43668
Ferran Sole [Mon, 19 Oct 2015 08:53:02 +0000 (09:53 +0100)]
Remove scene graph property buffer
-Removed scene graph copy of PropertyBuffer
-Added render thread copy of PropertyBuffer
-Send message from event to render thread when data, size or format changes
-PropertyBuffers can now be shared between multiple geometries and it is guaranteed
that there is only going to be one copy of the buffer in gpu memory
Change-Id: I67ccefb456a80ba833f870568ba7a0627d3b0182
Kimmo Hoikka [Wed, 21 Oct 2015 09:11:39 +0000 (10:11 +0100)]
Remove 20k of unnecessary binary bloat by removing dummy constant property values
Change-Id: Ic417769cb08d670ec57112e00884244db343a712
Kimmo Hoikka [Tue, 20 Oct 2015 17:10:42 +0000 (18:10 +0100)]
Stop creating string for sampler name every frame for every program
Change-Id: Ic5da8308fd6e51ecce7173a159956488b83766cf
Kimmo Hoikka [Tue, 20 Oct 2015 10:29:54 +0000 (11:29 +0100)]
Minor cleanup of commented out headers and @todos
Change-Id: I1f07eb55544df502f74c0063cd1d3be304fc4850
Ferran Sole [Thu, 15 Oct 2015 13:56:27 +0000 (14:56 +0100)]
Fixed bug on SetTextureUniformName
-The new uniform name was not properly updated in internal material
-Added test cases for new Material APIs
Change-Id: Ib87cbbb0513e731862b04d998aeeb5e0abad9805
Kimmo Hoikka [Fri, 16 Oct 2015 10:45:57 +0000 (03:45 -0700)]
Merge "BufferImage Fix for multiple area updates." into devel/master
Richard Underhill [Thu, 15 Oct 2015 09:15:27 +0000 (10:15 +0100)]
BufferImage Fix for multiple area updates.
Change-Id: I65785011e84f83c4fb11247f8c5bec49ee212247
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Kimmo Hoikka [Wed, 14 Oct 2015 15:38:22 +0000 (16:38 +0100)]
Remove some dead and non-thread safe internal uniforms
Change-Id: I70635a012f67b75d22a411ac06d7b34f27be4659
Ferran Sole [Tue, 6 Oct 2015 08:02:05 +0000 (09:02 +0100)]
Remove Sampler scene object
* Removed sampler scene object
* Created render thread sampler
* Separated samplers (specify sampling mode) from textures
* Samplers can be reused by multiple textures
* Added support for texture wrapping modes
Change-Id: I530cd6346ae828dabdeeaa2874fa9c4229b4601a
Kimmo Hoikka [Tue, 13 Oct 2015 09:34:03 +0000 (02:34 -0700)]
Merge "Avoid constraint suicide during ObjectDestroyed callbacks" into devel/master
Paul Wisbey [Mon, 12 Oct 2015 15:38:49 +0000 (16:38 +0100)]
Avoid constraint suicide during ObjectDestroyed callbacks
Valgrind reports this when the gallery grid layout terminates:
==5351== Invalid write of size 4
==5351== at 0x4F8FF32: Dali::Internal::ConstraintBase::ObjectDestroyed(Dali::Internal::Object&) (constraint-base.cpp:218)
==5351== by 0x4F962B9: Dali::Internal::Object::~Object() (object-impl.cpp:1206)
==5351== by 0x4FA810B: Dali::Internal::CustomObject::~CustomObject() (custom-object-internal.cpp:110)
The issue is that constraints commit suicide during ObjectDestroyed callbacks,
with a (dangerous) call to mTargetObject->RemoveConstraint.
Change-Id: I8da276fda1b4dfd987a8bd699ed3d908994b361e
Chu Hoang [Mon, 12 Oct 2015 14:41:15 +0000 (15:41 +0100)]
Moved INITIAL_HASH_VALUE from hash.cpp to hash.h
Change-Id: I474044a9e2ed7437d1792fc97327372e26a9dbc3
Kimmo Hoikka [Fri, 9 Oct 2015 17:17:31 +0000 (10:17 -0700)]
Merge "Moved OwnerContainer from internal to devel-api." into devel/master
Kimmo Hoikka [Fri, 9 Oct 2015 15:31:22 +0000 (08:31 -0700)]
Merge "Changed WeakHandle::GetHandle() method to use a DownCast<T> instead of a reinterpret_cast." into devel/master
Chu Hoang [Fri, 9 Oct 2015 12:47:44 +0000 (13:47 +0100)]
Changed WeakHandle::GetHandle() method to use a DownCast<T> instead of a reinterpret_cast.
This allows WeakHandle::GetHandle to be usable by non Actor/customActor derived classes.
Change-Id: I4a2f2fb143fe6d50e7555846c560ffe4aabc8bc0
Chu Hoang [Fri, 9 Oct 2015 11:04:48 +0000 (12:04 +0100)]
Moved OwnerContainer from internal to devel-api.
Change-Id: I9d47ec9e11e2f44d884a758e79f402711018ed3e
Tom Robinson [Fri, 9 Oct 2015 09:48:14 +0000 (10:48 +0100)]
DALi Version 1.1.6
Change-Id: Id025f65d0fd6e424345a43e5ab92132f7784c0ff
Adeel Kazmi [Thu, 8 Oct 2015 16:46:48 +0000 (09:46 -0700)]
Merge "Revert "Fix thread contention issues in messages and pan gestures."" into devel/master
Kimmo Hoikka [Thu, 8 Oct 2015 12:26:52 +0000 (05:26 -0700)]
Revert "Fix thread contention issues in messages and pan gestures."
This reverts commit
8be6860f402e22fa57088a25993e8340a85e812d.
Change-Id: I85d4f5ed09fff79fd790222ff41f80cb6952ea94
Kimmo Hoikka [Thu, 8 Oct 2015 12:21:43 +0000 (13:21 +0100)]
Cache size uniform as its often same for many renderers now as we are scaling geometry
Change-Id: Ic236e62c73b4c0db2c7ad2ab3fc13b4a957eaeaa
Chu Hoang [Tue, 6 Oct 2015 11:09:12 +0000 (12:09 +0100)]
Changed SceneGraph::Renderer::mOnStage flag to instead count the number of connections/disconnects and only connect/disconnect once.
This fixes a bug where multiple actors share a renderer causes multiple connections/discconections.
Change-Id: I75a14ac350fb46e72da7fcaa85ba9ec8324d9e62
Xiangyin Ma [Fri, 2 Oct 2015 14:15:19 +0000 (15:15 +0100)]
(Geometry) Allow to set index buffer when using triangle strip/fan
Change-Id: I969530bca9df4bc22a474f26cd3d8f53e8513f26
Chu Hoang [Fri, 2 Oct 2015 09:38:21 +0000 (10:38 +0100)]
DALi Version 1.1.5
Change-Id: I2fdb0e01c080846981241d2683b63f142da426bd
Chu Hoang [Thu, 1 Oct 2015 11:35:24 +0000 (12:35 +0100)]
Changed SceneGraph::CompareItems and CompareItems3D to compare the render items based on textureId instead of material.
This is to reduce the number of glBindTexture calls.
Change-Id: Iad24b18c5a42a53a85cdcf9522c5de71e3bf44a2
Agnelo Vaz [Mon, 28 Sep 2015 16:32:24 +0000 (17:32 +0100)]
Removing GetDefaultFontDescription and libXML from Platform Abstraction
* Font Client now provides this functionality
* Parsing of XML file no longer needed so libXML library dependancy removed
Change-Id: Id3de780a5c813008528efd4eade6ed83e226623a
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Adeel Kazmi [Mon, 28 Sep 2015 15:15:13 +0000 (16:15 +0100)]
Rearrange doxygen tags for recently deprecated or new APIs
Change-Id: Ib75a37dd4036dc6997f0f3f2a91fc6c34d66658e
Adeel Kazmi [Mon, 28 Sep 2015 12:47:21 +0000 (13:47 +0100)]
(Docs) Adding doxygen tag order to coding style
Change-Id: I0d3f2637b5d9e0d919f86c1f2665a34782c17b4c
Kimmo Hoikka [Fri, 25 Sep 2015 08:42:42 +0000 (01:42 -0700)]
Merge "Allow multiple renderers per Actor and sharing renderers between actors" into devel/master
Adeel Kazmi [Fri, 25 Sep 2015 07:45:40 +0000 (08:45 +0100)]
DALi Version 1.1.4
Change-Id: Ie3c75c8886fdce0f5edf3d4c527db572fa0d6677
HyunJu Shin [Fri, 25 Sep 2015 01:52:16 +0000 (18:52 -0700)]
Merge "Remove the actor from exclusive list in RenderTaskList when the actor is destroyed" into devel/master
Yoonsang Lee [Thu, 24 Sep 2015 07:46:33 +0000 (16:46 +0900)]
Modify doxygen group names
- "-" in group names causes javascript errors when used in doxygen
1.7.6.1 with GENERATE_TREEVIEW option - by which Tizen API reference
is generated (not sure for later version)
- It makes DALi items in the tree view cannot be opened.
- Replace all "-" to "_" in doxygen group names to solve the problem.
Change-Id: If61d3da158c2c3d90fe1c67fbbb114767f37e698
Adeel Kazmi [Thu, 24 Sep 2015 13:10:18 +0000 (06:10 -0700)]
Merge "Marked new API's since 1.1.4" into devel/master
Lee Morgan [Wed, 23 Sep 2015 15:04:16 +0000 (16:04 +0100)]
Marked new API's since 1.1.4
Change-Id: I36ed0f90917a19ed967948af2ae160657c02a227
Ferran Sole [Tue, 8 Sep 2015 14:37:30 +0000 (15:37 +0100)]
Allow multiple renderers per Actor and sharing renderers between actors
-Separate Renderers from NodeAttachments
-Actor has references to Renderer handles
-Node has references to SceneGraph renderers
-UpdateManager owns SceneGraph renderers
-RenderManager owns render thread renderers
-Moved render thread renderers to Render namespace
-Added support for triange strips and triangle fans
Change-Id: I854f92821b52098b59d639542b0eb1c01572c69b
Kimmo Hoikka [Thu, 24 Sep 2015 09:19:48 +0000 (02:19 -0700)]
Merge "Remove dead code: BitmapExternal; not been used for a while, not even included in the build" into devel/master
Heeyong Song [Wed, 23 Sep 2015 06:23:56 +0000 (15:23 +0900)]
Remove the actor from exclusive list in RenderTaskList when the actor is destroyed
Change-Id: Id8030de0b865d5670372f3e6d992ec8c9ba1d1cb
Kimmo Hoikka [Wed, 23 Sep 2015 16:27:07 +0000 (17:27 +0100)]
Remove dead code: BitmapExternal; not been used for a while, not even included in the build
Change-Id: I9e47e8ef7d14ee97e4aa5d037439cba0e24c0e49
Chu Hoang [Wed, 23 Sep 2015 15:04:30 +0000 (16:04 +0100)]
Changed NinePatchImage to always load images without any filtering.
This is so that the stretch borders metadata is not filtered and become incorrect.
Change-Id: I3cd4be5c8511e39938a159de5431ab2ef88c015d
Adeel Kazmi [Wed, 23 Sep 2015 09:24:43 +0000 (02:24 -0700)]
Merge "Changed NinePatchImage to support parsing of n-patches." into devel/master
Paul Wisbey [Tue, 15 Sep 2015 17:46:18 +0000 (18:46 +0100)]
Merged NativeFrameBufferTexture into FrameBufferTexture
Change-Id: I5b4b3a7b811bb56a8fb6ccee9ca54478a68f4eee
Chu Hoang [Mon, 21 Sep 2015 13:44:53 +0000 (14:44 +0100)]
Changed NinePatchImage to support parsing of n-patches.
Change-Id: Id05ea194408730460b4bd62571b1fd2f5ec814e2
Adeel Kazmi [Mon, 21 Sep 2015 10:28:05 +0000 (11:28 +0100)]
Added version when deprecated to the documentation for ShaderEffect
Change-Id: I4266f704d1e394e8119b7a8b6abf6787cb4f47ac
Xiangyin Ma [Fri, 18 Sep 2015 10:02:54 +0000 (11:02 +0100)]
DALi Version 1.1.3
Change-Id: Id93f8ab3376daee874438e7a3361b88d54475651
Kimmo Hoikka [Tue, 15 Sep 2015 13:12:21 +0000 (14:12 +0100)]
Deprecated load and resource policies as they dont work and cause more harm than benefits
Change-Id: I7927a21a8d35a27a38e620a1a0c88f8b227eeafb
Kimmo Hoikka [Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)]
Merge "Added GetUniformName to Sampler." into devel/master
Kimmo Hoikka [Tue, 15 Sep 2015 15:21:11 +0000 (08:21 -0700)]
Merge "Fixed Material::RemoveSampler not calling SceneGraph::RemoveSamplerMessage to match Material::AddSampler." into devel/master
Chu Hoang [Mon, 14 Sep 2015 15:20:50 +0000 (16:20 +0100)]
Added GetUniformName to Sampler.
Change-Id: I962305f3cdf5b19ac5d2d1c23186c3204057be6e
Chu Hoang [Fri, 11 Sep 2015 10:40:26 +0000 (11:40 +0100)]
Fixed Material::RemoveSampler not calling SceneGraph::RemoveSamplerMessage to match Material::AddSampler.
Change-Id: I2614bcb803d587a8e76486f00b9f2ac49fbb9695
Adeel Kazmi [Thu, 10 Sep 2015 08:50:46 +0000 (09:50 +0100)]
ConditionalWait moved to Core & add check for how many locks we're keeping
Option can be enabled via --enable-lock-backtrace which will show the backtrace for all locks
whenever more than 1 is held on a given thread.
Change-Id: Ib4b51f1167371922e57cee0e68909ac6bd83377f
Richard Huang [Thu, 10 Sep 2015 10:04:56 +0000 (11:04 +0100)]
DALi Version 1.1.2
Change-Id: Ifb617c7e2266e59fd117102e0e7ea70b2b520bf9
Adeel Kazmi [Wed, 9 Sep 2015 14:31:53 +0000 (07:31 -0700)]
Merge "Stability/Performance for update buffer index" into devel/master
Kimmo Hoikka [Wed, 9 Sep 2015 14:24:14 +0000 (07:24 -0700)]
Merge "BufferImage mirrors an external Pixel Buffer on creation." into devel/master
Kimmo Hoikka [Wed, 9 Sep 2015 12:10:28 +0000 (13:10 +0100)]
Stability/Performance for update buffer index
- use the same update buffer index rather than call getter function multiple times per update
- swap index as the last thing of update
Change-Id: I8507bfed16600d0b14eabf4fd052304cc0443364
Paul Wisbey [Tue, 8 Sep 2015 10:12:28 +0000 (11:12 +0100)]
Fixed Helgrind issue with SceneGraph::Animator creation
Change-Id: Ieabaf8f2c7a607cdbfeea448d03ef690174642ad
Richard Underhill [Tue, 8 Sep 2015 09:10:07 +0000 (10:10 +0100)]
BufferImage mirrors an external Pixel Buffer on creation.
BufferImage now will maintain its own internal copy of a buffer
and will not own any external buffer.
BufferImage will Update() from the external buffer and it is
the application's responsibility to not destroy that if an
Update() is required.
If there is no future Update() after the BufferImage is created
then the external buffer can be safely destroyed.
Change-Id: Idd1224a7a5d2d022455018ec23b98e8b734abe31
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Mon, 7 Sep 2015 08:36:30 +0000 (09:36 +0100)]
ScenGraph::ConstraintBase does not need to inherit from PropertyOwner
Change-Id: I37d3842a082c0eb824f8626f9d2992711f0ecea1
Richard Underhill [Fri, 4 Sep 2015 12:34:12 +0000 (13:34 +0100)]
Fix thread contention issues in messages and pan gestures.
Change-Id: I21db78ce7a8504dfc9eb2241330ab51e8007d97f
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Fri, 4 Sep 2015 12:07:09 +0000 (05:07 -0700)]
Merge "Prevents an invalid texture cache being interrogated for a texture. This 'fixes' the crash reported in gallery. An investigation of the root cause is underway." into devel/master
Adeel Kazmi [Fri, 4 Sep 2015 10:04:34 +0000 (03:04 -0700)]
Merge "Doxygen grouping" into devel/master
Richard Underhill [Wed, 2 Sep 2015 12:34:47 +0000 (13:34 +0100)]
Prevents an invalid texture cache being interrogated for a texture.
This 'fixes' the crash reported in gallery.
An investigation of the root cause is underway.
Change-Id: I30f48e33148a2399f23e81d71749c0bad6335919
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Yoonsang Lee [Thu, 23 Jul 2015 05:38:18 +0000 (14:38 +0900)]
Doxygen grouping
- Grouping using @defgroup, @ingroup, @addtogroup
- Results are shown in the "Modules" tab of the generated doxygen html
- Grouping doxygen comments are in doc/xxx_doc.h
- Install doc/xxx_doc.h as well when conducting 'make install'
Change-Id: I46830ecf57a4ad842a6cd5cb63a98968f0a23dda
Adeel Kazmi [Tue, 1 Sep 2015 13:50:08 +0000 (06:50 -0700)]
Merge changes I02677edb,If59805d2 into devel/master
* changes:
Fix VD prevent issues
Fix prevent issues
taeyoon [Thu, 20 Aug 2015 04:26:57 +0000 (13:26 +0900)]
[3.0] Temporary change to fix homescreen issue
- parent, unstaged, interrupt
Change-Id: I44f2d7c20cb2052ae284b47bee9e65fd637c967e
taeyoon [Tue, 1 Sep 2015 04:34:36 +0000 (13:34 +0900)]
Merge branch 'devel/master (1.1.1)' into tizen
Change-Id: Icdd0c24efed8a948737bb567c6eb37c5abcbbe7e
taeyoon [Tue, 1 Sep 2015 02:38:15 +0000 (11:38 +0900)]
Revert "[3.0] Temporary change to fix homescreen issue"
This reverts commit
1ea47e2a3c6616772e3cc1aec3884bc758f3ec6f.
Change-Id: Iec64b208103def81972825bcc27d8ce682f5c6d9
taeyoon [Wed, 26 Aug 2015 07:19:49 +0000 (16:19 +0900)]
Fix VD prevent issues
- Add copy constructor & assignment operator (undefined, private member)
- Add KeyFrameBaseSpec<V>& operator=(...)
Change-Id: I02677edba93b122fe59ad3d0e9ee2a4155d5b8fb
taeyoon [Tue, 25 Aug 2015 09:45:28 +0000 (18:45 +0900)]
Fix prevent issues
- Handling NULL by if()
- 451521, 451524, 451534, 453410, 453417
Change-Id: If59805d26be51c63e0b65d19d9f639f3128fa672
Richard Underhill [Wed, 19 Aug 2015 15:38:18 +0000 (16:38 +0100)]
Fix for Valgrind reporting loss from QuramBitmapFactory in MCD.
There is a delete[]/free mismatch changed Dali to use malloc/free to
help with third party libraries.
Change-Id: Ib3fbe62f9b00cea5062b44cf1169de1f6dda3bf0
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Fri, 28 Aug 2015 16:58:47 +0000 (09:58 -0700)]
Merge "Fix VD prevent issues - DIVIDE_BY_ZERO" into devel/master
Adeel Kazmi [Fri, 28 Aug 2015 16:47:13 +0000 (09:47 -0700)]
Merge "Basic pan-gesture resampling for when prediction is off" into devel/master
Kimmo Hoikka [Fri, 28 Aug 2015 14:29:49 +0000 (07:29 -0700)]
Merge "Removed default in AnimatorBase::ApplyAlphaFunction switch statement to ensure that compiler will warn if any new built in alpha functions aren't handled." into devel/master
Tom Robinson [Tue, 25 Aug 2015 17:21:26 +0000 (18:21 +0100)]
Basic pan-gesture resampling for when prediction is off
Change-Id: Ib75998b9051ac495870dc6cf6333b1536fe42c03
Signed-off-by: Tom Robinson <tom.robinson@samsung.com>
UTC pan-gesture fix
Change-Id: I24728b70c44d1f11798ee9fd7230c0987b8b686f
Signed-off-by: Tom Robinson <tom.robinson@samsung.com>
Chu Hoang [Wed, 26 Aug 2015 16:17:39 +0000 (17:17 +0100)]
Removed default in AnimatorBase::ApplyAlphaFunction switch statement to ensure that compiler will warn if any new built in alpha functions aren't handled.
Change-Id: I43682ce8b37829b00c277b4d274a1eff9d63517e
Kimmo Hoikka [Wed, 26 Aug 2015 11:39:24 +0000 (04:39 -0700)]
Merge "Fixed a potential memory corruption due to update and render potentially using the same container simultaneously" into devel/master
Lee Morgan [Wed, 26 Aug 2015 10:14:24 +0000 (11:14 +0100)]
DALi Version 1.1.1
Change-Id: Ic0a5ee8724f8a8102f5a12038ba77021d57c809d
Heeyong Song [Wed, 26 Aug 2015 07:53:01 +0000 (16:53 +0900)]
Fix VD prevent issues - DIVIDE_BY_ZERO
Change-Id: Iceb219087a98082fa36e40a4f1701b17c7105c57
Kimmo Hoikka [Tue, 25 Aug 2015 14:31:46 +0000 (15:31 +0100)]
Fixed a potential memory corruption due to update and render potentially using the same container simultaneously
Fixed by not using double buffering with index but having two separate containers
==5511== ----------------------------------------------------------------
==5511== Possible data race during read of size 4 at 0x14ECD29C by thread #4
==5511== Locks held: none
==5511== at 0x55ADFB1: Dali::Internal::SceneGraph::UpdateManager::SaveBinary(Dali::IntrusivePtr<Dali::Internal::ShaderData>) (update-manager.cpp:632)
==5511== by 0x5599DF4: Dali::Internal::ProgramController::StoreBinary(Dali::IntrusivePtr<Dali::Internal::ShaderData>) (program-controller.cpp:151)
==5511== by 0x5598CFD: Dali::Internal::Program::Load() (program.cpp:559)
==5511== by 0x5598DB4: Dali::Internal::Program::Use() (program.cpp:135)
==5511== by 0x559799C: Dali::Internal::SceneGraph::Renderer::Render(Dali::Internal::Context&, Dali::Internal::SceneGraph::TextureCache&, unsigned int, Dali::Internal::SceneGraph::Shader&, Dali::Matrix const&, Dali::Matrix const&, Dali::Matrix const&, float, bool) (scene-graph-renderer.cpp:213)
==5511== by 0x55891B2: Dali::Internal::Render::ProcessRenderInstruction(Dali::Internal::SceneGraph::RenderInstruction const&, Dali::Internal::Context&, Dali::Internal::SceneGraph::TextureCache&, Dali::Internal::SceneGraph::Shader&, unsigned int, float) (render-algorithms.cpp:146)
==5511== by 0x558BDE5: Dali::Internal::SceneGraph::RenderManager::DoRender(Dali::Internal::SceneGraph::RenderInstruction&, Dali::Internal::SceneGraph::Shader&, float) (render-manager.cpp:558)
==5511== by 0x558C423: Dali::Internal::SceneGraph::RenderManager::Render(Dali::Integration::RenderStatus&) (render-manager.cpp:430)
==5511== by 0x551D25C: Dali::Internal::Core::Render(Dali::Integration::RenderStatus&) (core-impl.cpp:278)
==5511== by 0x4E72B04: Dali::Internal::Adaptor::RenderThread::Run() (render-thread.cpp:199)
==5511== by 0x4E72B58: Dali::Internal::Adaptor::RenderThread::InternalThreadEntryFunc(void*) (render-thread.h:197)
==5511== by 0x4C30E26: ??? (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==5511==
==5511== This conflicts with a previous write of size 4 by thread #3
==5511== Locks held: none
==5511== at 0x559F1EF: Dali::Internal::SceneGraph::SceneGraphBuffers::Swap() (scene-graph-buffers.cpp:45)
==5511== by 0x55ADADA: Dali::Internal::SceneGraph::UpdateManager::Update(float, unsigned int, unsigned int) (update-manager.cpp:1121)
==5511== by 0x551D229: Dali::Internal::Core::Update(float, unsigned int, unsigned int, Dali::Integration::UpdateStatus&) (core-impl.cpp:261)
==5511== by 0x4E74438: Dali::Internal::Adaptor::UpdateThread::Run() (update-thread.cpp:119)
==5511== by 0x4E744A8: Dali::Internal::Adaptor::UpdateThread::InternalThreadEntryFunc(void*) (update-thread.h:107)
==5511== by 0x4C30E26: ??? (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==5511== by 0x908A181: start_thread (pthread_create.c:312)
==5511== by 0x5E8EFBC: clone (clone.S:111)
==5511==
==5511== Address 0x14ECD29C is 12 bytes inside a block of size 24 alloc'd
==5511== at 0x4C2C460: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==5511== by 0x551D745: Dali::Internal::Core::Core(Dali::Integration::RenderController&, Dali::Integration::PlatformAbstraction&, Dali::Integration::GlAbstraction&, Dali::Integration::GlSyncAbstraction&, Dali::Integration::GestureManager&, Dali::ResourcePolicy::DataRetention) (core-impl.cpp:149)
==5511== by 0x55BB824: Dali::Integration::Core::New(Dali::Integration::RenderController&, Dali::Integration::PlatformAbstraction&, Dali::Integration::GlAbstraction&, Dali::Integration::GlSyncAbstraction&, Dali::Integration::GestureManager&, Dali::ResourcePolicy::DataRetention) (core.cpp:37)
==5511== by 0x4E9E9E8: Dali::Internal::Adaptor::Adaptor::Initialize(Dali::Configuration::ContextLoss) (adaptor-impl.cpp:139)
==5511== by 0x4E9FC3C: Dali::Internal::Adaptor::Adaptor::New(Dali::Any, Dali::RenderSurface*, Dali::Configuration::ContextLoss, Dali::Internal::Adaptor::EnvironmentOptions*) (adaptor-impl.cpp:79)
==5511== by 0x4E9FD05: Dali::Internal::Adaptor::Adaptor::New(Dali::Window, Dali::Configuration::ContextLoss, Dali::Internal::Adaptor::EnvironmentOptions*) (adaptor-impl.cpp:89)
==5511== by 0x4EA22BB: Dali::Internal::Adaptor::Application::CreateAdaptor() (application-impl.cpp:134)
==5511== by 0x4EA2407: Dali::Internal::Adaptor::Application::OnInit() (application-impl.cpp:175)
==5511== by 0x4EB8B88: Dali::Internal::Adaptor::Framework::AppStatusHandler(int, void*) (framework-tizen.cpp:380)
==5511== by 0x7D6BC9D: app_appcore_create (app_main.c:149)
==5511== by 0x7F6E819: appcore_efl_main (appcore-efl.c:16)
==5511== by 0x7D6BDEC: app_efl_main (app_main.c:116)
==5511== ----------------------------------------------------------------
Change-Id: I1bdcfd8c00d9f37b0dd1f3f580f1bd69d4e0a20b
Kimmo Hoikka [Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)]
Merge "Changed RendererAttachment to use blend flag from RenderDataProvider rather than base class's mUseBlend flag." into devel/master
Kimmo Hoikka [Tue, 25 Aug 2015 09:19:24 +0000 (10:19 +0100)]
Remove Helgrind warning when Node flags are illegally accessed from event and update thread at the same time
Change-Id: I45c483fe5db2d3cad32144f120b7d7311867658c
Adeel Kazmi [Thu, 20 Aug 2015 16:23:19 +0000 (17:23 +0100)]
(Logging) Ensure we do not output unrequired spaces & colons when trace is not enabled
Before: No Trace:
INFO: DALI: : MyDebug
Now: No Trace:
INFO: DALI: MyDebug
Before: Trace:
INFO: DALI: Entr: MyFunction()
INFO: DALI: : MyDebug
INFO: DALI: Exit: MyFunction()
Now: Trace:
INFO: DALI: Entr: MyFunction()
INFO: DALI: : MyDebug
INFO: DALI: Exit: MyFunction()
Change-Id: I3a04b50154a4f23ca90cad5a7ad2ef26ae6cb1cf
Chu Hoang [Thu, 20 Aug 2015 12:32:56 +0000 (13:32 +0100)]
DALi Version 1.1.0
Change-Id: I5a94629a418273369cd7cf3fa79d421676519175
taeyoon [Thu, 20 Aug 2015 04:26:57 +0000 (13:26 +0900)]
[3.0] Temporary change to fix homescreen issue
- parent, unstaged, interrupt
Change-Id: Id55c105619d011c6be682f549fc90695caf07f65
taeyoon [Wed, 19 Aug 2015 07:14:29 +0000 (16:14 +0900)]
Merge branch devel/master (1.0.49) into tizen
Conflicts:
automated-tests/src/dali-devel/CMakeLists.txt
automated-tests/src/dali-devel/mesh-builder.cpp
automated-tests/src/dali-devel/mesh-builder.h
automated-tests/src/dali-devel/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp
automated-tests/src/dali-devel/utc-Dali-Material.cpp
automated-tests/src/dali-devel/utc-Dali-MeshActor.cpp
automated-tests/src/dali-devel/utc-Dali-MeshData.cpp
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
automated-tests/src/dali/utc-Dali-PropertyValue.cpp
automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
build/tizen/configure.ac
build/tizen/dali-core/Makefile.am
dali/devel-api/dynamics/dynamics-body-config.cpp
dali/devel-api/dynamics/dynamics-body.cpp
dali/devel-api/dynamics/dynamics-collision.cpp
dali/devel-api/dynamics/dynamics-joint.cpp
dali/devel-api/dynamics/dynamics-shape.cpp
dali/devel-api/dynamics/dynamics-world-config.cpp
dali/devel-api/dynamics/dynamics-world.cpp
dali/devel-api/scripting/scripting.cpp
dali/internal/event/actors/actor-impl.cpp
dali/internal/event/actors/actor-impl.h
dali/internal/event/common/property-helper.h
dali/internal/event/common/thread-local-storage.cpp
dali/internal/event/common/thread-local-storage.h
dali/internal/event/effects/shader-effect-impl.cpp
dali/internal/update/manager/update-manager.cpp
dali/internal/update/manager/update-manager.h
dali/internal/update/modeling/scene-graph-animatable-mesh.cpp
dali/internal/update/resources/resource-manager.cpp
dali/public-api/dali-core-version.cpp
dali/public-api/object/property-value.cpp
dali/public-api/object/property-value.h
packaging/dali.spec
Change-Id: I286687a5ab36da06eefa9ad6ac60743e1257e59f
Kimmo Hoikka [Fri, 14 Aug 2015 16:42:28 +0000 (09:42 -0700)]
Merge "Ensure synchronous buffer decode when using encoded buffer image." into devel/master
Kimmo Hoikka [Fri, 14 Aug 2015 16:26:01 +0000 (09:26 -0700)]
Merge "Changed drawing order for 2D and 3D layers" into devel/master
Adeel Kazmi [Fri, 14 Aug 2015 13:49:02 +0000 (14:49 +0100)]
Ensure synchronous buffer decode when using encoded buffer image.
Change-Id: Iaff725f9ee05c2c35d902849949389807689995f