platform/core/uifw/dali-core.git
8 years agoCleanup, fix incorrect comment and removal of dead code related with old culling... 18/53518/5
Kimmo Hoikka [Mon, 7 Dec 2015 11:36:09 +0000 (11:36 +0000)]
Cleanup, fix incorrect comment and removal of dead code related with old culling mechanism

Change-Id: I9fb4807b6b09828ab78ceae0a706517a38d34f89

8 years ago(dali_env) Fix setenv output 04/53504/5
Adeel Kazmi [Mon, 7 Dec 2015 10:45:46 +0000 (10:45 +0000)]
(dali_env) Fix setenv output

Problem:  Running "dali_env -s" does not output the correct setenv information.
Solution: This happened because we were doing a string inequality check using "!=".
          We should use "ne" instead.
          Additionally, ensure we only look for "dali-env" as our root dir explicitly, i.e.
          it should not be dali-env-blah. In that case, a dali-env subdirectory should be used
          as the root.
          Also ensuring that we do not create a new dali-env folder if it already exist in the
          current working directory root path.

Change-Id: Ic7b3897996d318439ab3cb6a001917519155ebd7

8 years agoDALi Version 1.1.13 86/53386/1 dali_1.1.13
Xiangyin Ma [Fri, 4 Dec 2015 11:02:26 +0000 (11:02 +0000)]
DALi Version 1.1.13

Change-Id: Ib4ecf33672d8020bfea4fa980194a376a17174b4

8 years agoMerge "Added RenderTask WorldToViewport coordinates" into devel/master
Adeel Kazmi [Thu, 3 Dec 2015 15:40:03 +0000 (07:40 -0800)]
Merge "Added RenderTask WorldToViewport coordinates" into devel/master

8 years agoAdded RenderTask WorldToViewport coordinates 44/51444/4
Lee Morgan [Tue, 3 Nov 2015 17:17:20 +0000 (17:17 +0000)]
Added RenderTask WorldToViewport coordinates

Change-Id: I80b12b21be3395d6b026a4007c867deac14e8e42

8 years agoMerge "Add macros to provide branch prediction information" into devel/master
Adeel Kazmi [Thu, 3 Dec 2015 09:45:00 +0000 (01:45 -0800)]
Merge "Add macros to provide branch prediction information" into devel/master

8 years agoFrustum culling optimization 63/53163/7
Ferran Sole [Wed, 2 Dec 2015 08:26:45 +0000 (08:26 +0000)]
Frustum culling optimization

- Faster AABB-Frustum collision detection
- Re-enabled flag in Layer to enable/disable frustum culling
- Removed old code which was no longer used
- Removed call to Node::ResolveVisibilty. Now size and color checks are done when culling

Change-Id: Iab1f47db508a2723e43c4c40b0f212481002e963

8 years agoAdd macros to provide branch prediction information 06/53206/1
Kimmo Hoikka [Wed, 2 Dec 2015 14:04:11 +0000 (14:04 +0000)]
Add macros to provide branch prediction information

take into use in assert and root node handling

Change-Id: Ieacd3801f89a9b4da9910dde7d3c95972c2975e5

8 years agoMerge "fix buffer GpuBuffer" into devel/master
Kimmo Hoikka [Tue, 1 Dec 2015 11:17:27 +0000 (03:17 -0800)]
Merge "fix buffer GpuBuffer" into devel/master

8 years agoCleaning up and optimizing scene-graph-material and scene-graph-renderer 03/51303/20
Kimmo Hoikka [Fri, 6 Nov 2015 09:51:09 +0000 (09:51 +0000)]
Cleaning up and optimizing scene-graph-material and scene-graph-renderer

Previously we would update each materials status through renderers.
This means that if same material was used by 10 renderers, it would be processed and prepared 10 times

This patch changes the following:
- Materials are prepared as a separate update step
- Renderer asks its material for ready (=can be rendered) and complete (=has finished resouce loading) status
- CompleteStatusManager is removed
- Resource manager handles status of loaded images and whether FBOs have been rendered to (i.e. they can be considerer "loaded")
- GL Trackers are only used for NativeImages as GL guarantees the sync of texture FBOs, they are synchronized as soon as they are bound as texture
- glSyncAbstraction no longer passed to update, Render tasks create sync object if & when needed and RenderManager initiliazes them
- BitmapMetadata changed to simpler POD so Dali::Vector can be used
- Deleted lots of unnecessary containers of trackers and complicated logic to handle them

Change-Id: I654b9d16cd0a225eabd0897441c5e8dd4b8b0398

8 years agoDALi Version 1.1.12 84/52884/1 dali_1.1.12
Adeel Kazmi [Fri, 27 Nov 2015 10:16:57 +0000 (10:16 +0000)]
DALi Version 1.1.12

Change-Id: I8db53d55716039edb6f6cf13221ea32af6f2e9f7

8 years agoInitialize vertex attribute and 2d texture caches 47/52847/3
Ferran Sole [Thu, 26 Nov 2015 14:20:26 +0000 (14:20 +0000)]
Initialize vertex attribute and 2d texture caches

Vertex attribute cache and bounded 2d texture caches were not being properly initialized

Change-Id: I45aa9c005d950c6acbcc355945d03175c24e6656

8 years agoMerge "Fix invalid read in render property buffer" into devel/master
Adeel Kazmi [Thu, 26 Nov 2015 17:40:10 +0000 (09:40 -0800)]
Merge "Fix invalid read in render property buffer" into devel/master

8 years agoFix invalid read in render property buffer 34/52734/3
Nick Holland [Thu, 26 Nov 2015 09:30:30 +0000 (09:30 +0000)]
Fix invalid read in render property buffer

Change-Id: Ifb27e48a1470d0e128f598aa4c6664cb4046d9a8

8 years agofix buffer GpuBuffer 44/52744/1
Lee Morgan [Thu, 26 Nov 2015 10:48:53 +0000 (10:48 +0000)]
fix buffer GpuBuffer

Change-Id: I6dc1a9c1b9ac3f7222af14645255e5080696175e

8 years agoAdded or'd enums to scripting 33/51333/15
Lee Morgan [Fri, 6 Nov 2015 16:37:47 +0000 (16:37 +0000)]
Added or'd enums to scripting

Change-Id: I2ccbf1a549d49ff3acfef9f59c1dd59967bb751a

8 years agoMerge "(AutomatedTests) Ensure warnings are shown as errors" into devel/master
Kimmo Hoikka [Tue, 24 Nov 2015 16:02:18 +0000 (08:02 -0800)]
Merge "(AutomatedTests) Ensure warnings are shown as errors" into devel/master

8 years ago(AutomatedTests) Ensure warnings are shown as errors 26/52426/5
Adeel Kazmi [Mon, 23 Nov 2015 10:04:10 +0000 (10:04 +0000)]
(AutomatedTests) Ensure warnings are shown as errors

Change-Id: Ie6a00887bae20953dcb9a3c1234a75aae79fbbc8

8 years agoModify ShaderEffect to be the wrapper class of Shader 08/52308/3
Xiangyin Ma [Fri, 20 Nov 2015 14:35:29 +0000 (14:35 +0000)]
Modify ShaderEffect to be the wrapper class of Shader

Change-Id: Ie146bf2b2670ebbbca879edbcc90f6ca0ff29ad9

8 years agoCleaning up some dead code with geometry scaling, rendering type declarations and... 14/52314/3
Kimmo Hoikka [Fri, 20 Nov 2015 18:44:39 +0000 (18:44 +0000)]
Cleaning up some dead code with geometry scaling, rendering type declarations and texture mapping code

Change-Id: I7c23afaa5f9a8a98c0fc925166883225c239d1bc

8 years agoMerge "Changed ResetGLState to only set GL state which is different from default...
Kimmo Hoikka [Fri, 20 Nov 2015 17:39:47 +0000 (09:39 -0800)]
Merge "Changed ResetGLState to only set GL state which is different from default" into devel/master

8 years agoRemoval of renderable attachment 47/52047/7
Ferran Sole [Wed, 18 Nov 2015 12:01:09 +0000 (12:01 +0000)]
Removal of renderable attachment

-Removed old renderable attachment code
-Unified Render::Renderer and Render::NewRenderer

Change-Id: I2cd39311014c592a3215e8ec87e66eda84039298

8 years agoFixed some issues with dali_env script 07/52307/2
Adeel Kazmi [Fri, 20 Nov 2015 14:24:09 +0000 (14:24 +0000)]
Fixed some issues with dali_env script

- It can now be run in directories that begin with "dali-env..." (before it just used to get stuck in a loop).
- Display the newly installed dali_env path on output rather than just "dali_env" alone as that may reference an already installed one.

Change-Id: I0364cc2fd4731c1d7727df2ca1c19ee615b1d3e0

8 years agoFix minor klocwork issue 92/52292/1
Adeel Kazmi [Fri, 20 Nov 2015 12:20:23 +0000 (12:20 +0000)]
Fix minor klocwork issue

Change-Id: Ice601bac01869245bed2a29033483162b67094e2

8 years agoDALi Version 1.1.11 78/52278/1 dali_1.1.11
Richard Huang [Fri, 20 Nov 2015 10:57:59 +0000 (10:57 +0000)]
DALi Version 1.1.11

Change-Id: I0928c312faae339bb2a9b010075b4d040956e42e

8 years agoMerge "Guard against GestureEventProcessor access after Core destruction" into devel...
Adeel Kazmi [Thu, 19 Nov 2015 17:36:23 +0000 (09:36 -0800)]
Merge "Guard against GestureEventProcessor access after Core destruction" into devel/master

8 years agoChanged ResetGLState to only set GL state which is different from default 52/51952/4
Ferran Sole [Tue, 17 Nov 2015 12:07:45 +0000 (12:07 +0000)]
Changed ResetGLState to only set GL state which is different from default

Change-Id: I4884e507bba2c1ee6541fa30b5d7601bfff668e4

8 years agoMerge "Removed some junk from Makefile.am" into devel/master
Kimmo Hoikka [Thu, 19 Nov 2015 14:01:50 +0000 (06:01 -0800)]
Merge "Removed some junk from Makefile.am" into devel/master

8 years agoGuard against GestureEventProcessor access after Core destruction 40/52040/3
Paul Wisbey [Wed, 18 Nov 2015 11:16:03 +0000 (11:16 +0000)]
Guard against GestureEventProcessor access after Core destruction

Change-Id: Ie7222a335e455c4bc8e10534c214995bf05c8bc3

8 years agoFix UTC prevent issue 14/52014/1
taeyoon [Wed, 18 Nov 2015 08:06:50 +0000 (17:06 +0900)]
Fix UTC prevent issue

Change-Id: I363185dac06354e7e3a3490dbbc6719798c51699

8 years agoMerge changes I0cbfe8d4,I63b556cb into devel/master
Kimmo Hoikka [Tue, 17 Nov 2015 18:17:20 +0000 (10:17 -0800)]
Merge changes I0cbfe8d4,I63b556cb into devel/master

* changes:
  Changed ImageActor and to use new renderers and removed ImageAttachement.
  Added an Material::GetTexture method.

8 years agoMerge "fix property buffer gl initialization" into devel/master
Kimmo Hoikka [Tue, 17 Nov 2015 15:17:00 +0000 (07:17 -0800)]
Merge "fix property buffer gl initialization" into devel/master

8 years agoRemoved some junk from Makefile.am 50/51950/1
Paul Wisbey [Tue, 17 Nov 2015 11:47:52 +0000 (11:47 +0000)]
Removed some junk from Makefile.am

Change-Id: I1c137f3f6545c6266e831b7a11201fb863caca3c

8 years agoMerge "DALi Version 1.1.10" into devel/master
Adeel Kazmi [Fri, 13 Nov 2015 16:40:44 +0000 (08:40 -0800)]
Merge "DALi Version 1.1.10" into devel/master

8 years agoMerge "Avoid constant in header, use enum instead for initial hash value" into devel...
Kimmo Hoikka [Fri, 13 Nov 2015 16:38:41 +0000 (08:38 -0800)]
Merge "Avoid constant in header, use enum instead for initial hash value" into devel/master

8 years agoDALi Version 1.1.10 69/51769/1 dali_1.1.10
Adeel Kazmi [Fri, 13 Nov 2015 16:33:15 +0000 (16:33 +0000)]
DALi Version 1.1.10

Change-Id: I3eecf14ad424a4daaaf3e2ed529949c6f47b5e9c

8 years agoChanged ImageActor and to use new renderers and removed ImageAttachement. 42/51642/3
Chu Hoang [Wed, 11 Nov 2015 15:36:24 +0000 (15:36 +0000)]
Changed ImageActor and to use new renderers and removed ImageAttachement.

Added Material::GetTextureSampler and Material::GetTexture methods.
Removed DerivedType::RENDERABLE and changed Actor::IsRenderable() method to check the mRenderers instead since ImageActor was the last Actor type to use RENDERABLE.

Change-Id: I0cbfe8d47592a77d06ebf720851fe26d2496eb01

8 years agoAdded an Material::GetTexture method. 37/51237/6
Chu Hoang [Thu, 5 Nov 2015 14:03:06 +0000 (14:03 +0000)]
Added an Material::GetTexture method.

Change-Id: I63b556cb1b60f62f29c42316e097c5962677f97c

8 years agoAvoid constant in header, use enum instead for initial hash value 62/51762/2
Kimmo Hoikka [Fri, 13 Nov 2015 14:05:14 +0000 (14:05 +0000)]
Avoid constant in header, use enum instead for initial hash value

Change-Id: I489ba20d2b5add09646cf2fac4cad7157d40c5c2

8 years agoRemoved assert from PropertyOwner::RemoveConstraint so we dont assert when attempting... 68/51168/5
Chu Hoang [Wed, 4 Nov 2015 16:29:32 +0000 (16:29 +0000)]
Removed assert from PropertyOwner::RemoveConstraint so we dont assert when attempting to remove an already removed constraint.

It is possible that a constraint has already been removed (e.g. from DisconnectFromSceneGraph) before the RemoveConstraint message is processed, so we shouldn't assert that this is an invalid state to be in.

Change-Id: I83c722d83f29bc6458d4f1a4d8754b5b16ba3a38

8 years agoImplemented face culling for SceneGraph::Material 23/50423/10
Chu Hoang [Wed, 28 Oct 2015 11:18:40 +0000 (11:18 +0000)]
Implemented face culling for SceneGraph::Material

Change-Id: I37ae9229e7723c0c2194d96b297fb9eec8465601

8 years ago(Object) RegisterProperty just sets the property if a property with the requested... 51/51651/2
Adeel Kazmi [Wed, 11 Nov 2015 17:58:06 +0000 (17:58 +0000)]
(Object) RegisterProperty just sets the property if a property with the requested name already exists

Change-Id: Ia993ddedfb9597cca4981bf792ef5c69dec753fe

9 years agoFix Klocwork errors in ConditionalWait, Mutex & ImageAttributes 40/51640/1
Adeel Kazmi [Wed, 11 Nov 2015 15:35:04 +0000 (15:35 +0000)]
Fix Klocwork errors in ConditionalWait, Mutex & ImageAttributes

Change-Id: Ib4423ab2670d8825cd41f0a9e6c696cd9f97582b

9 years agoFix various klocwork issues 67/51567/2
Adeel Kazmi [Tue, 10 Nov 2015 16:55:01 +0000 (16:55 +0000)]
Fix various klocwork issues

Change-Id: I252b73514ab3053e48e979b889f8ab48468294bb

9 years ago(PlatformAbstraction) Remove unrequired time getter 31/51431/2
Adeel Kazmi [Mon, 9 Nov 2015 12:34:07 +0000 (12:34 +0000)]
(PlatformAbstraction) Remove unrequired time getter

Change-Id: I008b59ee33fc7d6d2019ba6695a94420baf0d0fc

9 years agofix property buffer gl initialization 23/51323/2
Lee Morgan [Fri, 6 Nov 2015 12:59:15 +0000 (12:59 +0000)]
fix property buffer gl initialization

Change-Id: I08f045b9afbc0256ee995cba231e741a79c6deaf

9 years agoMerge "(Platform Abstraction) Replace GetMicroSeconds with GetNanoseconds" into devel...
Kimmo Hoikka [Fri, 6 Nov 2015 13:58:44 +0000 (05:58 -0800)]
Merge "(Platform Abstraction) Replace GetMicroSeconds with GetNanoseconds" into devel/master

9 years agoDALi Version 1.1.9 06/51306/1 dali_1.1.9
Tom Robinson [Fri, 6 Nov 2015 10:36:52 +0000 (10:36 +0000)]
DALi Version 1.1.9

Change-Id: I64f139bf7f6aaaeaf47fd364c85b776874fbbbc3

9 years ago(Platform Abstraction) Replace GetMicroSeconds with GetNanoseconds 42/51242/2
Adeel Kazmi [Thu, 5 Nov 2015 15:19:12 +0000 (15:19 +0000)]
(Platform Abstraction) Replace GetMicroSeconds with GetNanoseconds

Change-Id: Ice276d5ff236f7988e100845895db82694ca8661

9 years agoMerge "Changed all property & signal names to lowerCamelCase" into devel/master
Kimmo Hoikka [Wed, 4 Nov 2015 11:18:23 +0000 (03:18 -0800)]
Merge "Changed all property & signal names to lowerCamelCase" into devel/master

9 years agoFixed bug when adding first renderer to an on stage actor 33/50933/1
Ferran Sole [Tue, 3 Nov 2015 14:41:46 +0000 (14:41 +0000)]
Fixed bug when adding first renderer to an on stage actor

World matrix was not being updated when the first renderer was added to an
on stage actor.

Change-Id: I7d8f4758db5ad4bf0038bf2847a5588e0db0b5ee

9 years agoChanged all property & signal names to lowerCamelCase 34/50834/4
Adeel Kazmi [Mon, 2 Nov 2015 18:02:02 +0000 (18:02 +0000)]
Changed all property & signal names to lowerCamelCase

e.g. anchor-point-x --> anchorPointX

Change-Id: I0ef19e68f8c9ca7d74860aa4cbb28d3bff1b03b8

9 years ago(ConditionalWait) Added a Notify method which takes in a ScopedLock 21/50821/3
Adeel Kazmi [Mon, 2 Nov 2015 12:24:12 +0000 (12:24 +0000)]
(ConditionalWait) Added a Notify method which takes in a ScopedLock

Avoids calling code to release a lock before calling Notify where we'd just take another lock again,
which was the case previously.

Change-Id: I94ca6ac457685e541af113e288152b3f0504c383

9 years ago(Atlas) Upload pixel data & Allow the difference in pixel format 02/50302/10
Xiangyin Ma [Tue, 27 Oct 2015 15:45:26 +0000 (15:45 +0000)]
(Atlas) Upload pixel data & Allow the difference in pixel format

Change-Id: I09b649817d506a779379bd9c3ae10d1874f750c8

9 years agoOptimize blending requirement resolution 56/50756/3
Kimmo Hoikka [Fri, 30 Oct 2015 15:36:12 +0000 (15:36 +0000)]
Optimize blending requirement resolution

- dont iterate through list of textures but store one bool per material
- stop copying bitmap metadata objects

Change-Id: I1a55a3be1cabafec68b75f3d65704c52616d6ea0

9 years agoRemove AffectsOpacity as it slows down 99.9% of use-cases and isnot even needed for... 39/50739/3
Kimmo Hoikka [Fri, 30 Oct 2015 11:51:17 +0000 (11:51 +0000)]
Remove AffectsOpacity as it slows down 99.9% of use-cases and isnot even needed for the 0.01% of marginal use-cases

Change-Id: I0b82e83fbbaed86c800f75876a0967a712bd9e82

9 years agoRemove obsolete and unnecessary animated and double buffered values from material 35/50435/6
Kimmo Hoikka [Wed, 28 Oct 2015 16:17:30 +0000 (16:17 +0000)]
Remove obsolete and unnecessary animated and double buffered values from material

- material color removed since actor color will always override if (because we can use same renderer with multiple actors)
- blend color changed to pointer in scene graph and non animateable
- blending options cached in event thread and not double buffered in update as they are almost never ever changed

Change-Id: Iec99b52f1bd5ce2d38cd2fa8888117a326383fe4

9 years agoDALi Version 1.1.8 07/50507/1 dali_1.1.8
Nick Holland [Thu, 29 Oct 2015 10:31:36 +0000 (10:31 +0000)]
DALi Version 1.1.8

Change-Id: I7505ace39ca6335bfb33116fa2168c6385bcf8bc

9 years agoMerge "Remove render thread culling as its not used for new mesh" into devel/master
Paul Wisbey [Wed, 28 Oct 2015 16:10:26 +0000 (09:10 -0700)]
Merge "Remove render thread culling as its not used for new mesh" into devel/master

9 years agoRemove dead/duplicate enum values 93/50193/4
Kimmo Hoikka [Mon, 26 Oct 2015 16:53:13 +0000 (16:53 +0000)]
Remove dead/duplicate enum values

Change-Id: I993c72813f60dff6f7eb553ac943a31d1a5e3951

9 years agoRemove render thread culling as its not used for new mesh 01/50301/2
Kimmo Hoikka [Tue, 27 Oct 2015 15:43:26 +0000 (15:43 +0000)]
Remove render thread culling as its not used for new mesh

- stop calling dynamic cast per renderer per frame
- remove render thread culling as new mesh culling is done in update

Change-Id: I9e0ce9d60022e09a67b412f0c03f04c9f648d1db

9 years agoMerge "Add UniformNameCache to keep track of unique uniform ids to avoid calculating...
Kimmo Hoikka [Tue, 27 Oct 2015 15:44:44 +0000 (08:44 -0700)]
Merge "Add UniformNameCache to keep track of unique uniform ids to avoid calculating hash values every frame" into devel/master

9 years agoPrevent assert during path animation 07/50007/5
Lee Morgan [Thu, 22 Oct 2015 15:37:30 +0000 (16:37 +0100)]
Prevent assert during path animation

Change-Id: I131e8e79a9e965eed2b8a56f2d177abdd5bd2199

9 years agoMerge "Remove some ancient dead code, Vertex3d" into devel/master
Kimmo Hoikka [Mon, 26 Oct 2015 18:20:00 +0000 (11:20 -0700)]
Merge "Remove some ancient dead code, Vertex3d" into devel/master

9 years agoMerge "Removed redundant type field" into devel/master
Adeel Kazmi [Mon, 26 Oct 2015 18:18:13 +0000 (11:18 -0700)]
Merge "Removed redundant type field" into devel/master

9 years agoMerge "Path registration with type registry" into devel/master
Adeel Kazmi [Mon, 26 Oct 2015 17:28:24 +0000 (10:28 -0700)]
Merge "Path registration with type registry" into devel/master

9 years agoAdd UniformNameCache to keep track of unique uniform ids to avoid calculating hash... 21/50121/6
Kimmo Hoikka [Fri, 23 Oct 2015 17:39:22 +0000 (18:39 +0100)]
Add UniformNameCache to keep track of unique uniform ids to avoid calculating hash values every frame

currently for dali demo we calculate hash value for sampler 32 times per frame

Change-Id: I94becba96e6c48dd732949e971e242d108e852c8

9 years agoRemove some ancient dead code, Vertex3d 92/50192/2
Kimmo Hoikka [Mon, 26 Oct 2015 16:40:45 +0000 (16:40 +0000)]
Remove some ancient dead code, Vertex3d

Change-Id: I9fb9c9ca87969863e2521488446507b0424aaa46

9 years agoMerge "Added WeakHandleBase::Reset method." into devel/master
Adeel Kazmi [Mon, 26 Oct 2015 10:44:39 +0000 (03:44 -0700)]
Merge "Added WeakHandleBase::Reset method." into devel/master

9 years agoMerge "Remove double-buffered properties from SceneGraph::Geometry" into devel/master
Kimmo Hoikka [Fri, 23 Oct 2015 16:49:31 +0000 (09:49 -0700)]
Merge "Remove double-buffered properties from SceneGraph::Geometry" into devel/master

9 years agoAdded WeakHandleBase::Reset method. 03/49603/2
Chu Hoang [Thu, 15 Oct 2015 10:15:45 +0000 (11:15 +0100)]
Added WeakHandleBase::Reset method.

Change-Id: I8dc3606b7fb23b20897a33366520f9405bf5f9d5

9 years agoCache setUniform2f values as its used quite a lot by text and 9 patch renderers 16/50116/1
Kimmo Hoikka [Fri, 23 Oct 2015 15:40:43 +0000 (16:40 +0100)]
Cache setUniform2f values as its used quite a lot by text and 9 patch renderers

Change-Id: I567105fe6d86cdb71592caad4a228af4817b4df0

9 years agoRemoved redundant type field 06/50106/3
Lee Morgan [Fri, 23 Oct 2015 12:51:32 +0000 (13:51 +0100)]
Removed redundant type field

Change-Id: Ibf4681ba76d685a620e6c149a487dbf8644540a5

9 years agoMerge "DALi Version 1.1.7" into devel/master
Adeel Kazmi [Fri, 23 Oct 2015 14:19:05 +0000 (07:19 -0700)]
Merge "DALi Version 1.1.7" into devel/master

9 years agoMerge "Stop calculating default filter and wrap modes every frame for every sampler...
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

9 years agoRemove double-buffered properties from SceneGraph::Geometry 02/50002/10
Ferran Sole [Thu, 22 Oct 2015 13:56:11 +0000 (14:56 +0100)]
Remove double-buffered properties from SceneGraph::Geometry

-Removed mCenter, mGeometryType and mRequiresDepthTest double buffered properties from SceneGraph::Geometry
-Added those properties to RenderGeometry
-When any of those properties change, RenderGeometry is updated via message to RenderManager
-Fixed RequiresDepthTest which wasn't being considered when rendering

Change-Id: Idb70db083ef9c51005a442e7cde158a13994a7f5

9 years agoPath registration with type registry 04/50104/2
Lee Morgan [Fri, 23 Oct 2015 12:38:18 +0000 (13:38 +0100)]
Path registration with type registry

Change-Id: I7d8c34e8a7822dc76129e0da008c99b0b27094c3

9 years agoStop calculating default filter and wrap modes every frame for every sampler 47/50047/3
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

9 years agoDALi Version 1.1.7 33/50033/1 dali_1.1.7
Lee Morgan [Fri, 23 Oct 2015 10:00:22 +0000 (11:00 +0100)]
DALi Version 1.1.7

Change-Id: I48afab8d3fdaf983d4154cea54b5621ea7127e54

9 years agoAdded Thread abstract class 27/49927/5
Xiangyin Ma [Wed, 21 Oct 2015 15:14:35 +0000 (16:14 +0100)]
Added Thread abstract class

Change-Id: Id9be6082ef416bf2ea619bd3be7327a4f2c46f73

9 years agoMerge "Remove scene graph property buffer" into devel/master
Kimmo Hoikka [Wed, 21 Oct 2015 15:41:27 +0000 (08:41 -0700)]
Merge "Remove scene graph property buffer" into devel/master

9 years agoRemove unused constants and move to exports to reduce the bloat from constants 05/49905/3
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

9 years agoRemove scene graph property buffer 04/49704/13
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

9 years agoRemove 20k of unnecessary binary bloat by removing dummy constant property values 97/49897/1
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

9 years agoStop creating string for sampler name every frame for every program 48/49848/1
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

9 years agoMinor cleanup of commented out headers and @todos 99/49799/1
Kimmo Hoikka [Tue, 20 Oct 2015 10:29:54 +0000 (11:29 +0100)]
Minor cleanup of commented out headers and @todos

Change-Id: I1f07eb55544df502f74c0063cd1d3be304fc4850

9 years agoFixed bug on SetTextureUniformName 13/49613/5
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

9 years agoMerge "BufferImage Fix for multiple area updates." into devel/master
Kimmo Hoikka [Fri, 16 Oct 2015 10:45:57 +0000 (03:45 -0700)]
Merge "BufferImage Fix for multiple area updates." into devel/master

9 years agoBufferImage Fix for multiple area updates. 15/49115/7
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>
9 years agoRemove some dead and non-thread safe internal uniforms 45/49545/1
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

9 years agoRemove Sampler scene object 80/49080/19
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

9 years agoMerge "Avoid constraint suicide during ObjectDestroyed callbacks" into devel/master
Kimmo Hoikka [Tue, 13 Oct 2015 09:34:03 +0000 (02:34 -0700)]
Merge "Avoid constraint suicide during ObjectDestroyed callbacks" into devel/master

9 years agoAvoid constraint suicide during ObjectDestroyed callbacks 29/49329/4
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

9 years agoMoved INITIAL_HASH_VALUE from hash.cpp to hash.h 28/49328/1
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

9 years agoMerge "Moved OwnerContainer from internal to devel-api." into devel/master
Kimmo Hoikka [Fri, 9 Oct 2015 17:17:31 +0000 (10:17 -0700)]
Merge "Moved OwnerContainer from internal to devel-api." into devel/master

9 years agoMerge "Changed WeakHandle::GetHandle() method to use a DownCast<T> instead of a reint...
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

9 years agoChanged WeakHandle::GetHandle() method to use a DownCast<T> instead of a reinterpret_... 42/49242/2
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

9 years agoMoved OwnerContainer from internal to devel-api. 37/49237/1
Chu Hoang [Fri, 9 Oct 2015 11:04:48 +0000 (12:04 +0100)]
Moved OwnerContainer from internal to devel-api.

Change-Id: I9d47ec9e11e2f44d884a758e79f402711018ed3e

9 years agoDALi Version 1.1.6 29/49229/1 dali_1.1.6
Tom Robinson [Fri, 9 Oct 2015 09:48:14 +0000 (10:48 +0100)]
DALi Version 1.1.6

Change-Id: Id025f65d0fd6e424345a43e5ab92132f7784c0ff

9 years agoMerge "Revert "Fix thread contention issues in messages and pan gestures."" into...
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