platform/core/uifw/dali-core.git
7 years agoRevert "[Tizen] Remove erroneous assert, pointers to references cannot be null." 80/113780/1
minho.sun [Thu, 9 Feb 2017 01:42:41 +0000 (10:42 +0900)]
Revert "[Tizen] Remove erroneous assert, pointers to references cannot be null."

This reverts commit b1125400bd445bee630f6067c175224e00d3239d.

Change-Id: If23776bd5848880a8e76234887162a2aecbb29f7

7 years agoRevert "[Tizen] Fix undefined behaviour due to strict-aliasing." 79/113779/1
minho.sun [Thu, 9 Feb 2017 01:25:47 +0000 (10:25 +0900)]
Revert "[Tizen] Fix undefined behaviour due to strict-aliasing."

This reverts commit abfc79dfe46291b4a66333135634d202bd6c7711.

Change-Id: I714cd8c2288886962b84a2891fa314e34a805ef3

7 years agoMerge "[Tizen] Fix undefined behaviour due to strict-aliasing." into tizen accepted/tizen/common/20170123.182536 accepted/tizen/ivi/20170120.082229 accepted/tizen/mobile/20170120.081947 accepted/tizen/tv/20170120.082054 accepted/tizen/wearable/20170120.082140 submit/tizen/20170120.063242 submit/tizen_common/20170123.022625
Seoyeon Kim [Fri, 20 Jan 2017 05:00:59 +0000 (21:00 -0800)]
Merge "[Tizen] Fix undefined behaviour due to strict-aliasing." into tizen

7 years agoMerge "[Tizen] Remove erroneous assert, pointers to references cannot be null." into...
Seoyeon Kim [Fri, 20 Jan 2017 05:00:47 +0000 (21:00 -0800)]
Merge "[Tizen] Remove erroneous assert, pointers to references cannot be null." into tizen

7 years agoMerge branch 'devel/master' into tizen 87/111187/1
Seoyeon Kim [Fri, 20 Jan 2017 02:12:30 +0000 (11:12 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ib2838e05e48e681a2230e00fc5c18f747111b045

7 years ago[Tizen] Fix undefined behaviour due to strict-aliasing. 60/110960/1
Francisco Santos [Wed, 18 Jan 2017 17:38:32 +0000 (17:38 +0000)]
[Tizen] Fix undefined behaviour due to strict-aliasing.

- This patch is cherry-picked from devel/master branch.
  After DALi Integration (version up) to 1.2.23, this patch can be reverted.

Change-Id: I5b69e86a01d8f4dd720f685222ce2424aa664d9b

7 years ago[Tizen] Remove erroneous assert, pointers to references cannot be null. 81/110781/1
Francisco Santos [Fri, 13 Jan 2017 14:25:52 +0000 (14:25 +0000)]
[Tizen] Remove erroneous assert, pointers to references cannot be null.

- This patch is cherry-picked from devel/master branch.
  After DALi Integration (version up) to 1.2.23, this patch can be reverted.

Change-Id: I1556faec4cf03b5bd272230e232e1492a9616e28

7 years agoDALi Version 1.2.22 91/110291/1 dali_1.2.22
David Steele [Fri, 13 Jan 2017 14:35:14 +0000 (14:35 +0000)]
DALi Version 1.2.22

Change-Id: I50eca844edc5031109806fe8a865b071de4f2369

7 years agoRemove left over references to ImageActor & ShaderEffect 60/109060/1
Adeel Kazmi [Fri, 6 Jan 2017 17:35:42 +0000 (17:35 +0000)]
Remove left over references to ImageActor & ShaderEffect

Change-Id: Ied2e62c240ffdf563879a54a2b53ed027038606e

7 years agoMerge "DALi Version 1.2.21" into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 14:18:30 +0000 (06:18 -0800)]
Merge "DALi Version 1.2.21" into devel/master

7 years agoDALi Version 1.2.21 42/109042/1 dali_1.2.21
Agnelo Vaz [Fri, 6 Jan 2017 14:00:24 +0000 (14:00 +0000)]
DALi Version 1.2.21

Change-Id: Ia6031e55868f8a9c27df50fc232a5b97ee378990

7 years agoEnsure clipping gets disabled properly when previously enabled 65/108965/1
Adeel Kazmi [Fri, 6 Jan 2017 09:39:03 +0000 (09:39 +0000)]
Ensure clipping gets disabled properly when previously enabled

The clipping sort modifier is used to retrieve the clipping ID but is not cleared when we disable clipping.

Change-Id: Icfea7d7115fe24574edd5a058d65229621e75ae8

7 years ago(Actor) Add enumeration setting support to various properties 09/108509/1
Adeel Kazmi [Wed, 4 Jan 2017 18:07:41 +0000 (18:07 +0000)]
(Actor) Add enumeration setting support to various properties

Before, you could only set these enumeration value properties as strings which is quite annoying from code.

Change-Id: I566bd962c1bbcc43abdf15786e5c06065969ce60

7 years agoMerge branch 'devel/master' into tizen 10/108310/1
Seoyeon Kim [Wed, 4 Jan 2017 04:48:37 +0000 (13:48 +0900)]
Merge branch 'devel/master' into tizen

- Integration 1.2.18 -> 1.2.20 (Version up)

Change-Id: Idd92c6e584021ef3c75d5b587cb42d1e5baac8a7

7 years agoDALi Version 1.2.20 dali_1.2.20
Adeel Kazmi [Fri, 30 Dec 2016 10:44:48 +0000 (10:44 +0000)]
DALi Version 1.2.20

Change-Id: Ia0568f0964f6e8e72d91b9a1d3016d3055159ab8

8 years agoRemove deprecation warnings from TouchEvent 91/106891/1
Adeel Kazmi [Fri, 23 Dec 2016 10:50:13 +0000 (10:50 +0000)]
Remove deprecation warnings from TouchEvent

This pollutes the log for general touch as it's used by the TouchEventProcessor for backwards compatability
and, thus, the log is always shown even if applications are not using it.

Change-Id: Ied028740a3007914a6c68c0ffa3a66ad6ef840c9

8 years agoMerge changes I822c3044,I9e0f12e7,Ibab0e11e,Icb145e7b,Ib68aba7f, ... into devel/master
Adeel Kazmi [Tue, 20 Dec 2016 16:21:21 +0000 (08:21 -0800)]
Merge changes I822c3044,I9e0f12e7,Ibab0e11e,Icb145e7b,Ib68aba7f, ... into devel/master

* changes:
  Redundant assignments.
  Simplify logic, avoid storing raw pointer
  DaliException should be captured by reference.
  Redundant assignments and unread values.
  Members not set in assignment constructor.
  Comparison between boolean and integer.
  Redundant break, default being used in switch statement.
  Incorrect signature of assignment operator.

8 years agoMove virtual destructor same position as 2.4 64/105864/1
suhyung Eom [Tue, 20 Dec 2016 01:14:17 +0000 (10:14 +0900)]
Move virtual destructor same position as 2.4

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Iafcc02d8c24c298a19eca37e951c6827fc6c9d65

8 years agoMove virutal method's position to its original 67/105567/1
suhyung Eom [Sun, 18 Dec 2016 23:11:44 +0000 (08:11 +0900)]
Move virutal method's position to its original

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Iff71613b617b26d11553ccbec4ddfb3a7bb514bb

8 years agoRedundant assignments. 42/102842/4
Francisco Santos [Tue, 6 Dec 2016 14:37:32 +0000 (14:37 +0000)]
Redundant assignments.

Change-Id: I822c304423985c56150047576dfb2e442a68b10d

8 years agoSimplify logic, avoid storing raw pointer 81/102781/3
Francisco Santos [Tue, 6 Dec 2016 11:21:52 +0000 (11:21 +0000)]
Simplify logic, avoid storing raw pointer

Change-Id: I9e0f12e72ec49312080a073afca7db835c5b8006

8 years agoDaliException should be captured by reference. 80/102780/3
Francisco Santos [Tue, 6 Dec 2016 10:56:22 +0000 (10:56 +0000)]
DaliException should be captured by reference.

Change-Id: Ibab0e11ed2290f979c525b0f7c6d0dc16ce4425e

8 years agoRedundant assignments and unread values. 79/102779/3
Francisco Santos [Tue, 6 Dec 2016 10:53:54 +0000 (10:53 +0000)]
Redundant assignments and unread values.

Change-Id: Icb145e7b40cde869279ce5cd6d66a22a91b33df9

8 years agoMembers not set in assignment constructor. 78/102778/3
Francisco Santos [Tue, 6 Dec 2016 10:31:50 +0000 (10:31 +0000)]
Members not set in assignment constructor.

Change-Id: Ib68aba7f7c2208e496f3b64aef0caa122236f7fb

8 years agoComparison between boolean and integer. 77/102777/3
Francisco Santos [Tue, 6 Dec 2016 10:29:01 +0000 (10:29 +0000)]
Comparison between boolean and integer.

Change-Id: I565aee867965ab67bd8d5c97e3ac620a893f4925

8 years agoRedundant break, default being used in switch statement. 76/102776/3
Francisco Santos [Tue, 6 Dec 2016 10:27:42 +0000 (10:27 +0000)]
Redundant break, default being used in switch statement.

Change-Id: I1c9d532eec75571074b65fd110bbfd49f8ffbb30

8 years agoIncorrect signature of assignment operator. 75/102775/3
Francisco Santos [Tue, 6 Dec 2016 10:26:52 +0000 (10:26 +0000)]
Incorrect signature of assignment operator.

Change-Id: I5742daf33fd44d4d25a679c9d5684cdff6374ae7

8 years agoDALi Version 1.2.19 44/105444/1 dali_1.2.19
Francisco Santos [Fri, 16 Dec 2016 13:19:26 +0000 (13:19 +0000)]
DALi Version 1.2.19

Change-Id: Icb57b6cbd45320778be963cb4750eba7f79636ef

8 years agoMerge "Enabling animation of Renderer properties when offstage" into devel/master
Adeel Kazmi [Thu, 15 Dec 2016 16:01:23 +0000 (08:01 -0800)]
Merge "Enabling animation of Renderer properties when offstage" into devel/master

8 years agoType registry changed C# callback signatures 32/101932/6
Nick Holland [Fri, 2 Dec 2016 11:02:29 +0000 (11:02 +0000)]
Type registry changed C# callback signatures

To save memory / simplicity we now use just 3 C# delegates to
connect between C# and C++ type registry. Previously it was
3 delegates per custom control ( Create, Property Set, Property Get).

Change-Id: I91a1da13014449f2589b6f5f5f3cea6308a4c582

8 years agoEnabling animation of Renderer properties when offstage 18/101318/2
David Steele [Wed, 30 Nov 2016 19:21:54 +0000 (19:21 +0000)]
Enabling animation of Renderer properties when offstage

If the renderer exists, but hasn't been staged yet, then the scene
graph object also exists, but cannot be accessed because of a spurious
check for OnStage().

Removing the OnStage check to allow animations to run on Renderers
that haven't 'quite' been staged but are very likely to in the near
future.

Change-Id: I219cca9e08ebb6c7c5b2b8e7f33fd8bbb24b47ae
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoFix bug binding native image textures 77/104577/4
Ferran Sole [Tue, 13 Dec 2016 14:29:36 +0000 (14:29 +0000)]
Fix bug binding native image textures

NewTexture was always binding native image textures to GL_TEXTURE_2D binding point
even if textures required a different binding point

Change-Id: If01f8d33a92ed993b19818d6ba4b804f21b67253

8 years agoMerge branch 'devel/master (1.2.18)' into tizen 24/104424/2
suhyung Eom [Tue, 13 Dec 2016 08:15:00 +0000 (17:15 +0900)]
Merge branch 'devel/master (1.2.18)' into tizen

Change-Id: I55cf919c48083b2e7359c041b749230be1594b40

8 years agoApply deprecate macro and LOG 91/96791/13
suhyung Eom [Thu, 10 Nov 2016 07:51:50 +0000 (16:51 +0900)]
Apply deprecate macro and LOG

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: If9e0583d52cab9a036da0a93dd924c8a02bec999

8 years agoMerge "Adding Devel Property Registration macro" into devel/master
Adeel Kazmi [Fri, 9 Dec 2016 18:02:23 +0000 (10:02 -0800)]
Merge "Adding Devel Property Registration macro" into devel/master

8 years agoDALi Version 1.2.18 35/103835/1 dali_1.2.18
Ferran Sole [Fri, 9 Dec 2016 14:34:00 +0000 (14:34 +0000)]
DALi Version 1.2.18

Change-Id: Idecbcc614e7857fc300971bed885c0ff74dad31e

8 years agoAdding Devel Property Registration macro 14/102914/3
David Steele [Tue, 6 Dec 2016 18:52:16 +0000 (18:52 +0000)]
Adding Devel Property Registration macro

And missing test cases.

Change-Id: I47626b6dd9ef2eca4fbbfb482c3c6073612b7f5b

8 years agoMerge "Remove some dead typedefs from progress-value.h" into devel/master
Adeel Kazmi [Thu, 8 Dec 2016 18:30:34 +0000 (10:30 -0800)]
Merge "Remove some dead typedefs from progress-value.h" into devel/master

8 years agoMerge "Changed log message to inform number of textures != than active sampler from...
Adeel Kazmi [Wed, 7 Dec 2016 08:46:04 +0000 (00:46 -0800)]
Merge "Changed log message to inform number of textures != than active sampler from ERROR to WARNING" into devel/master

8 years agoMerge "Added sibling order property to the actor's property table" into devel/master
Kimmo Hoikka [Tue, 6 Dec 2016 17:04:26 +0000 (09:04 -0800)]
Merge "Added sibling order property to the actor's property table" into devel/master

8 years agoStop calling destroy methods of texture and FrameBuffers on RenderManager destructor 72/102672/5
Ferran Sole [Tue, 6 Dec 2016 09:33:51 +0000 (09:33 +0000)]
Stop calling destroy methods of texture and FrameBuffers on RenderManager destructor

Textures and FrameBuffers GL resources where being destroyed on RenderManager destructor
which is called from event thread causing crashes on some GL drivers.

Removed destruction of texture and framebuffer resources since they will be cleaned up
automatically when the GL context is destroyed

Change-Id: I8bd4d79399554179819e091e662ea0c9a6e0bc5f

8 years agoAdded sibling order property to the actor's property table 85/102785/3
Ferran Sole [Tue, 6 Dec 2016 12:22:34 +0000 (12:22 +0000)]
Added sibling order property to the actor's property table

Added a check in GetDefaultProperty to return a null Value if index
is greater or equal to number of default properties

Change-Id: Ie92a96f26fba7cdbd27395ca1c0f664eaf4b3c97

8 years agoRemove some dead typedefs from progress-value.h 53/101953/2
Kimmo Hoikka [Fri, 2 Dec 2016 12:30:44 +0000 (12:30 +0000)]
Remove some dead typedefs from progress-value.h

Change-Id: Ia67e7802aa6f6940705bb30bbcd83fd190e79361

8 years agoChanged log message to inform number of textures != than active sampler from ERROR... 78/100878/2
Ferran Sole [Tue, 29 Nov 2016 12:12:46 +0000 (12:12 +0000)]
Changed log message to inform number of textures != than active sampler from ERROR to WARNING

Caused false error for SVG visual which creates a renderer but doesn't add it to an actor
until the actual texture is created

Change-Id: I7dec2873e6bb49bc36418ecad1d038d72334ce34

8 years agoMerge "Prevent API generate warning log" into devel/master
Adeel Kazmi [Mon, 5 Dec 2016 11:28:38 +0000 (03:28 -0800)]
Merge "Prevent API generate warning log" into devel/master

8 years agoDALi Version 1.2.17 77/101977/1 dali_1.2.17
adam.b [Fri, 2 Dec 2016 14:07:06 +0000 (14:07 +0000)]
DALi Version 1.2.17

Change-Id: I98d020cea446af271a5c5c287e014a082759d3be

8 years agoMerge "Remove dead code from tests." into devel/master
David Steele [Thu, 1 Dec 2016 17:42:05 +0000 (09:42 -0800)]
Merge "Remove dead code from tests." into devel/master

8 years agoMerge "Add missing includes." into devel/master
David Steele [Thu, 1 Dec 2016 17:41:46 +0000 (09:41 -0800)]
Merge "Add missing includes." into devel/master

8 years agoMerge "Removed ShaderEffect" into devel/master
Kimmo Hoikka [Thu, 1 Dec 2016 17:36:40 +0000 (09:36 -0800)]
Merge "Removed ShaderEffect" into devel/master

8 years agoRemoved ShaderEffect 08/101608/3
Adeel Kazmi [Thu, 1 Dec 2016 14:11:14 +0000 (14:11 +0000)]
Removed ShaderEffect

Change-Id: I428f525da8b70c98dc55795f6a67be56bd8ddaa8

8 years agoRemove dead code from tests. 07/101607/3
Francisco Santos [Thu, 1 Dec 2016 15:06:11 +0000 (15:06 +0000)]
Remove dead code from tests.

Change-Id: I11c0c9f49fe9cf8235e80a84b790c04f4ee9c75d

8 years agoAdd missing includes. 50/101550/4
Francisco Santos [Thu, 1 Dec 2016 11:01:40 +0000 (11:01 +0000)]
Add missing includes.

Change-Id: I31f1ecba458022e7d584d28defcf47233b54b175

8 years agoAdded sibling order property to Actor 20/100620/8
Ferran Sole [Mon, 28 Nov 2016 15:04:06 +0000 (15:04 +0000)]
Added sibling order property to Actor

- Added a sibling order to allow the user to control drawing order in LAYER_UI

Change-Id: Ife3995b46d61ebe7abbc39b6035834b7a581c674

8 years agoRemove unused custom-uniform.cpp 77/101577/1
Kimmo Hoikka [Thu, 1 Dec 2016 12:40:59 +0000 (12:40 +0000)]
Remove unused custom-uniform.cpp

Change-Id: I2235f44d83aae27492a2c2d8a49c217ff9d07f15

8 years agoRemove unused member variable in Render::Renderer 08/101508/1
Adeel Kazmi [Thu, 1 Dec 2016 08:57:18 +0000 (08:57 +0000)]
Remove unused member variable in Render::Renderer

Change-Id: I962ee97d7fbd0ccef6de11ec45e805879fc3ba2f

8 years agoMerge "Replace ASSERT_ALWAYS( false && "message ) with a more meaningful and less...
Adeel Kazmi [Thu, 1 Dec 2016 09:29:25 +0000 (01:29 -0800)]
Merge "Replace ASSERT_ALWAYS( false && "message ) with a more meaningful and less code producing DALI_ABORT" into devel/master

8 years agoReplace ASSERT_ALWAYS( false && "message ) with a more meaningful and less code produ... 68/100868/10
Kimmo Hoikka [Tue, 29 Nov 2016 11:45:29 +0000 (11:45 +0000)]
Replace ASSERT_ALWAYS( false && "message ) with a more meaningful and less code producing DALI_ABORT

Change-Id: Ic95089ea99d0e5c1a569c40ebbad9c848f87f13c

8 years agoRemove dead code (archive.cpp) 08/101208/2
Kimmo Hoikka [Wed, 30 Nov 2016 11:41:32 +0000 (11:41 +0000)]
Remove dead code (archive.cpp)

Change-Id: Iac020ffbfd0b60b790f076778625c5c33d5785d1

8 years agoRevert public API changes. Handle methods. 83/98183/4
Victor Cebollada [Wed, 16 Nov 2016 09:28:41 +0000 (09:28 +0000)]
Revert public API changes. Handle methods.

* Reverts the addition of the GetPropertyIndex() and RegisterProperty() methods
  in Handle done in public API since the Tizen 3.0 API was frozen.
  Changes have been moved to the devel API.

Change-Id: I7acd05cb8d6ed08c8d7b45f268ad1dbba71f2f57
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "Revert public API changes. BATCH property." into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 13:51:35 +0000 (05:51 -0800)]
Merge "Revert public API changes. BATCH property." into devel/master

8 years agoMerge "Added C# control / property registration to devel API" into devel/master
Kimmo Hoikka [Fri, 25 Nov 2016 11:02:53 +0000 (03:02 -0800)]
Merge "Added C# control / property registration to devel API" into devel/master

8 years agoMerge "Change CustomActorImpl destructor to protected" into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 11:00:23 +0000 (03:00 -0800)]
Merge "Change CustomActorImpl destructor to protected" into devel/master

8 years agoRevert public API changes. BATCH property. 12/98112/7
Victor Cebollada [Tue, 15 Nov 2016 16:39:44 +0000 (16:39 +0000)]
Revert public API changes. BATCH property.

* Reverts the addition of the BATCH property in Actor and Renderer
  done in public API since the Tizen 3.0 API was frozen.
  Changes have been moved to the devel API.

Change-Id: I188203376f8e3d75248f000b022c5adfce46aad3
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoDALi Version 1.2.16 37/100137/1 dali_1.2.16
Victor Cebollada [Fri, 25 Nov 2016 07:05:30 +0000 (07:05 +0000)]
DALi Version 1.2.16

Change-Id: I0c18e7191f0a35053ef104b2f91cbba2a214f717

8 years agoChange CustomActorImpl destructor to protected 19/100019/2
Adeel Kazmi [Thu, 24 Nov 2016 17:41:45 +0000 (17:41 +0000)]
Change CustomActorImpl destructor to protected

This is a ref-counted object so another non-deriving object should not be able to delete it.

Change-Id: Iacca4e57bc7871c33d0c3602051e2980037de20f

8 years agoFix comment in core-impl.cpp 18/100018/2
Adeel Kazmi [Thu, 24 Nov 2016 17:37:30 +0000 (17:37 +0000)]
Fix comment in core-impl.cpp

Change-Id: I38b5ff5c8b51e2638c0cc14e43dc5d955a63aa94

8 years agoFix incorrect comment about position and position inheritance in actor.h 97/99897/3
Kimmo Hoikka [Thu, 24 Nov 2016 10:59:04 +0000 (10:59 +0000)]
Fix incorrect comment about position and position inheritance in actor.h

Change-Id: Id72d7701f9ea393423591b18f555e43ce1688e27

8 years agoMerge "Update comment for SetParentOrigin & SetAnchorPoint" into devel/master
dongsug song [Thu, 24 Nov 2016 03:49:27 +0000 (19:49 -0800)]
Merge "Update comment for SetParentOrigin & SetAnchorPoint" into devel/master

8 years agoMerge "Update comment for Actor::SetPosition()" into devel/master
dongsug song [Thu, 24 Nov 2016 01:10:47 +0000 (17:10 -0800)]
Merge "Update comment for Actor::SetPosition()" into devel/master

8 years agoMerge "Update the doxygen comment for CameraActor " into devel/master
dongsug song [Thu, 24 Nov 2016 01:08:42 +0000 (17:08 -0800)]
Merge "Update the doxygen comment for CameraActor " into devel/master

8 years agoUpdate comment for Actor::SetPosition() 99/99699/1
Yoonsang Lee [Wed, 23 Nov 2016 23:44:19 +0000 (08:44 +0900)]
Update comment for Actor::SetPosition()

Change-Id: Iad49f543e121f518abf3840b91895dcb96cf93b2

8 years agoUpdate comment for SetParentOrigin & SetAnchorPoint 98/99698/2
Yoonsang Lee [Wed, 23 Nov 2016 23:22:16 +0000 (08:22 +0900)]
Update comment for SetParentOrigin & SetAnchorPoint

- Add figures

Change-Id: I0df2ebc099570430598a956945dbad6926667bea

8 years agoAdded C# control / property registration to devel API 15/96615/12
Nick Holland [Wed, 9 Nov 2016 11:52:44 +0000 (11:52 +0000)]
Added C# control / property registration to devel API

The function signature used by DALi for type registration
and property registration can not be used from C#.
E.g. CreateFunction (for creating controls ) returns a Handle by value. From C#
we can only return a c pointer to the handle.C# knows
nothing about DALi Handles, it just happens to have a
pointer to one, thanks to the SWIG bindings.

Also increased code coverage on type-registry to
100%

Change-Id: Ib88ab1ba48f4ea74a460d5902b740c919e3ac24d

8 years agoMerge "Update comment for Image::Image()" into devel/master
dongsug song [Wed, 23 Nov 2016 12:10:29 +0000 (04:10 -0800)]
Merge "Update comment for Image::Image()" into devel/master

8 years agoUpdate the doxygen comment Stage 14/99514/4
Yoonsang Lee [Wed, 23 Nov 2016 06:44:54 +0000 (15:44 +0900)]
Update the doxygen comment Stage

Change-Id: I71689871b25bc5a5bdcd2074c85842af54dddcba

8 years agoUpdate the doxygen comment for CameraActor 62/99062/2
Yoonsang Lee [Mon, 21 Nov 2016 22:59:17 +0000 (07:59 +0900)]
Update the doxygen comment for CameraActor

about DALi camera usage for 2D and 3D applications

Change-Id: I004a05a8ec895972c1b5dcfdcc26a0e29eb77209

8 years agoPrevent API generate warning log 04/99304/1
Seoyeon Kim [Tue, 22 Nov 2016 08:17:11 +0000 (17:17 +0900)]
Prevent API generate warning log

- The doxygen warning log said some Property enumerations of class are not documented.

Change-Id: I698f527d78557ad512e3a84d7a92142cba2a23ab
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
8 years agoMerge "Fix bug in TextureSet" into devel/master
Kimmo Hoikka [Mon, 21 Nov 2016 15:21:16 +0000 (07:21 -0800)]
Merge "Fix bug in TextureSet" into devel/master

8 years agoAdd Privilege doxygen tag to get storage image size 08/98408/3
Seoyeon Kim [Thu, 17 Nov 2016 07:28:43 +0000 (16:28 +0900)]
Add Privilege doxygen tag to get storage image size

- ResourceImage::GetImageSize() needs privileges to media storage and external storage

Change-Id: I9179a2e651611875129f9c6d7ae50f8ba7da6efa
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
8 years agoFix bug in TextureSet 73/98773/3
Ferran Sole [Fri, 18 Nov 2016 15:52:56 +0000 (15:52 +0000)]
Fix bug in TextureSet

TextureSet was resizing Image and NewTexture vectors when a new sampler
was added which wasn't the right thing to do

Change-Id: I8e2fc233e2fdbb50a8c370f32ba534397c769c3c

8 years agoMerge "DALi Version 1.2.15" into devel/master
Adeel Kazmi [Fri, 18 Nov 2016 11:36:06 +0000 (03:36 -0800)]
Merge "DALi Version 1.2.15" into devel/master

8 years ago(dali_env script) Add dimension defines to outputted setenv so it isn't fullscreen... 38/98738/1
Adeel Kazmi [Fri, 18 Nov 2016 11:16:44 +0000 (11:16 +0000)]
(dali_env script) Add dimension defines to outputted setenv so it isn't fullscreen by default

Change-Id: Ia845134f3331d1e543c3f4724afeefe06d83f0b1

8 years agoDALi Version 1.2.15 26/98726/1 dali_1.2.15
Umar [Fri, 18 Nov 2016 10:57:49 +0000 (10:57 +0000)]
DALi Version 1.2.15

Change-Id: I2f25c61ed33ebde807a783af4a9b735444074466

8 years agoUpdate comment for Image::Image() 92/98392/2
Yoonsang Lee [Thu, 17 Nov 2016 00:23:03 +0000 (09:23 +0900)]
Update comment for Image::Image()

to describe more detail information

Change-Id: If88c36a7b121d35ad4a8f3528fa01a0220c2af49

8 years agoFix various SVACE errors 07/98007/3
Adeel Kazmi [Tue, 15 Nov 2016 11:44:21 +0000 (11:44 +0000)]
Fix various SVACE errors

Change-Id: If88b8fe34844e35e43ac94a9650a8e5817f14729

8 years agoMerge "Check if number of textures match active samplers" into devel/master
Paul Wisbey [Wed, 16 Nov 2016 14:27:13 +0000 (06:27 -0800)]
Merge "Check if number of textures match active samplers" into devel/master

8 years agoFixed bug in TextureSet::GetTextureCount() 21/98221/1
Ferran Sole [Wed, 16 Nov 2016 12:07:31 +0000 (12:07 +0000)]
Fixed bug in TextureSet::GetTextureCount()

GetTextureCount() returned the number of images so it would always
return 0 if using NewTextures.

Change-Id: Ie7e1971df6d58954ad651200f04f34a076b9156e

8 years agoRemoved unused ImageData class from Integration API 09/98009/1
Adeel Kazmi [Tue, 15 Nov 2016 16:55:54 +0000 (16:55 +0000)]
Removed unused ImageData class from Integration API

Change-Id: I0015f9d99c8830dd16492c676bebb9c47aa68b29

8 years ago[3.0] Temporary change to fix homescreen issue 25/97625/2 accepted/tizen/common/20161115.200949 accepted/tizen/ivi/20161115.234649 accepted/tizen/mobile/20161115.234450 accepted/tizen/tv/20161115.234540 accepted/tizen/wearable/20161115.234615 submit/tizen/20161115.111846
dongsug.song [Mon, 14 Nov 2016 23:41:45 +0000 (08:41 +0900)]
[3.0] Temporary change to fix homescreen issue

This reverts commit 868d6556d15487c33ed6ea71aa66d13049443257.

Change-Id: I1f7d08d63f91f63cfce335e6f51ce21ef811c63c

8 years agoFix various SVACE errors 53/97253/5
Adeel Kazmi [Fri, 11 Nov 2016 16:53:47 +0000 (16:53 +0000)]
Fix various SVACE errors

Change-Id: I53d180d04995a78a1728bdf5fd740c048a7cac02

8 years agoCheck if number of textures match active samplers 01/97501/5
Ferran Sole [Mon, 14 Nov 2016 09:58:11 +0000 (09:58 +0000)]
Check if number of textures match active samplers

* Check was happening before the shader was loaded
* Removed shader lazy compilation.
  (Now, program gets compiled as soon as it is created)
* Check if number of textures match number of active samplers is done
  in Renderer::SetRenderDataProvider (Program should be already loaded
  at that point)

Change-Id: Ic110f9ee9af7cd16f8a791923fd71e391a4dd176

8 years agoMerge branch 'devel/master' into tizen 19/97619/1
dongsug.song [Mon, 14 Nov 2016 14:01:04 +0000 (23:01 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ic927e4dcb7d5b521d43e5f030d01fe62490866fd

8 years agoRevert "[3.0] Exclude internal tag module in Public API reference" 18/97618/1
dongsug.song [Mon, 14 Nov 2016 13:58:18 +0000 (22:58 +0900)]
Revert "[3.0] Exclude internal tag module in Public API reference"

This reverts commit 1e196c6efe3a7a10c7198bb729027658fbdd5b16.

Change-Id: I4cabc14d58633782c74053a5b3687177349b7665

8 years agoRevert "[3.0] Temporary change to fix homescreen issue" 17/97617/1
dongsug.song [Mon, 14 Nov 2016 13:57:51 +0000 (22:57 +0900)]
Revert "[3.0] Temporary change to fix homescreen issue"

This reverts commit 05bd848879fb2f4e85b2e0b27812439f4c7227df.

Change-Id: Id5f32cebc7338c845c33feaecc566722f74f2d9c

8 years agoRevert "[3.0] Version downgrade (1.2.0 to 1.1.45)" 16/97616/1
dongsug.song [Mon, 14 Nov 2016 13:57:16 +0000 (22:57 +0900)]
Revert "[3.0] Version downgrade (1.2.0 to 1.1.45)"

This reverts commit 22bbf88067ca1c914055b2aa91f469760f12502f.

Change-Id: I3a84bf6fa8817109ecbcda2b8e00f8212c66977f

8 years agoRevert "[3.0] Renderer Depth UTCs + test-gl-abstraction update" 15/97615/1
dongsug.song [Mon, 14 Nov 2016 13:56:55 +0000 (22:56 +0900)]
Revert "[3.0] Renderer Depth UTCs + test-gl-abstraction update"

This reverts commit be745b80c0b99df5681ae1512ac070b0bedc8232.

Change-Id: I0e53f946fdf9f9fe02310c268e66c16d2365a5d6

8 years agoRevert "[3.0] Renderer to support enum and string properties" 14/97614/1
dongsug.song [Mon, 14 Nov 2016 13:56:32 +0000 (22:56 +0900)]
Revert "[3.0] Renderer to support enum and string properties"

This reverts commit 2c01ff92c5894aa368225bdbf29a29f5220dd832.

Change-Id: Ib451c2525adf741614599ab5e13cd6fd6940c6f1

8 years agoRevert "[3.0] Added missing newline chars to logging commands" 13/97613/1
dongsug.song [Mon, 14 Nov 2016 13:56:10 +0000 (22:56 +0900)]
Revert "[3.0] Added missing newline chars to logging commands"

This reverts commit 42f84c7a9fc4182693570eb0b5c2bde428410a20.

Change-Id: I1e3a8615ad6fce13b4dd3936ec1cade09d75c7a5

8 years agoRevert "[3.0] Render textures created from NativeImages error" 12/97612/1
dongsug.song [Mon, 14 Nov 2016 13:55:31 +0000 (22:55 +0900)]
Revert "[3.0] Render textures created from NativeImages error"

This reverts commit 5b91e1278b07420f209cf0d065733539ace5961d.

Change-Id: Ia3cc795b90f5b1e6c4016f95c2f5a74709ba4e7c

8 years agoRevert "[3.0] Adding ObjectDestructionTracker to dali-test-suite-utils" 11/97611/1
dongsug.song [Mon, 14 Nov 2016 13:54:57 +0000 (22:54 +0900)]
Revert "[3.0] Adding ObjectDestructionTracker to dali-test-suite-utils"

This reverts commit 159b3f501b971a40fdcbb0239bdcc9da1afaa048.

Change-Id: I5af8aa616a39e0e6371e37e1d81ce2d0faab6724