platform/core/uifw/dali-core.git
8 years agoMerge "Update Common's public header comments" into devel/master
Adeel Kazmi [Mon, 8 Feb 2016 18:27:57 +0000 (10:27 -0800)]
Merge "Update Common's public header comments" into devel/master

8 years agoMerge "Update Animation's public header comments" into devel/master
Adeel Kazmi [Mon, 8 Feb 2016 18:27:09 +0000 (10:27 -0800)]
Merge "Update Animation's public header comments" into devel/master

8 years agoMerge "Update Actors' public header comments" into devel/master
Adeel Kazmi [Mon, 8 Feb 2016 18:25:29 +0000 (10:25 -0800)]
Merge "Update Actors' public header comments" into devel/master

8 years agoMerge "Move blending and culling options from Material to Renderer" into devel/master
Kimmo Hoikka [Mon, 8 Feb 2016 12:55:52 +0000 (04:55 -0800)]
Merge "Move blending and culling options from Material to Renderer" into devel/master

8 years agoMove blending and culling options from Material to Renderer 65/57965/8
x1ma [Tue, 26 Jan 2016 10:51:59 +0000 (10:51 +0000)]
Move blending and culling options from Material to Renderer

Change-Id: I9a8ee1a658d750ed84d7cd0c044ca3b8d1bcb2b2

8 years agoAdded Animation GetState() 27/58527/9
Lee Morgan [Mon, 1 Feb 2016 15:51:33 +0000 (15:51 +0000)]
Added Animation GetState()

Change-Id: I3c8103c4752f65840ed16f8b3406279049a57912

8 years agoDALi Version 1.1.20 45/58945/1 dali_1.1.20
Xiangyin Ma [Fri, 5 Feb 2016 08:52:40 +0000 (08:52 +0000)]
DALi Version 1.1.20

Change-Id: I54d1000a06e8575ea6ef6b8576dc8da071376200

8 years agoEnsuring GL Sync is only used for RefreshOnce render tasks 59/58259/6
David Steele [Thu, 28 Jan 2016 14:37:21 +0000 (14:37 +0000)]
Ensuring GL Sync is only used for RefreshOnce render tasks

GL Sync is currently used when a framebuffer is backed with a native
image.  It is tracked using a RenderTracker, which is created in
SceneGraph::RenderTask::PrepareRenderInstruction.  In
RenderManager::DoRender, if the render tracker is available, then this
creates a sync object.  Consequently, if the render task is a
RefreshAlways task, then a sync object is created each frame.

This change ensures that a render tracker is only created for a
RefreshOnce render tracker, and that the sync object is created only
once, rather than every frame.

Change-Id: I93f5c2649c58cc3100b4ddc8546cf023cd728e5a
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoUpdate Actors' public header comments 45/58545/6
Seoyeon Kim [Tue, 2 Feb 2016 00:43:07 +0000 (09:43 +0900)]
Update Actors' public header comments

Change-Id: I4e3e80cef878265603ec85e368feb341879a2b12

8 years agoUpdate Common's public header comments 56/58556/3
Seoyeon Kim [Tue, 2 Feb 2016 01:41:50 +0000 (10:41 +0900)]
Update Common's public header comments

Change-Id: I9eaee3ab5a4eed4bc1867ff35b9ed67827c3a31f

8 years agoUpdate Animation's public header comments 55/58555/3
Seoyeon Kim [Tue, 2 Feb 2016 01:33:32 +0000 (10:33 +0900)]
Update Animation's public header comments

Change-Id: I7997fdce2be6deda51f49742264a308555566873

8 years agoFix Layer 3D documentation 02/58002/3
Nick Holland [Tue, 26 Jan 2016 15:50:18 +0000 (15:50 +0000)]
Fix Layer 3D documentation

Current description is incorrect.

Change-Id: Ia6751617149f7191688a65d30fc9c8f53e9d3afb

8 years agoMerge "NativeImageSource with tbm_surface for tizen 3.0 wayland" into devel/master
taeyoon [Tue, 2 Feb 2016 01:29:57 +0000 (17:29 -0800)]
Merge "NativeImageSource with tbm_surface for tizen 3.0 wayland" into devel/master

8 years ago(FrameBufferImage) Store ReleasePolicy to satisfy Tizen API policy 25/58525/2
Adeel Kazmi [Mon, 1 Feb 2016 15:31:41 +0000 (15:31 +0000)]
(FrameBufferImage) Store ReleasePolicy to satisfy Tizen API policy

Only store the ReleasePolicy set as it's required satisfy Tizen API policy. However, it is not
used internally.

Change-Id: I768f7871d8110476a232f794acb787ed02e3a81b

8 years agoMerge "Add @DEPRECATED to all public symbols of ImageActor & ShaderEffect" into devel...
Adeel Kazmi [Mon, 1 Feb 2016 12:48:47 +0000 (04:48 -0800)]
Merge "Add @DEPRECATED to all public symbols of ImageActor & ShaderEffect" into devel/master

8 years agoMerge "Added Animation loop count" into devel/master
Adeel Kazmi [Mon, 1 Feb 2016 12:45:03 +0000 (04:45 -0800)]
Merge "Added Animation loop count" into devel/master

8 years agoNativeImageSource with tbm_surface for tizen 3.0 wayland 76/52176/15
taeyoon [Thu, 19 Nov 2015 13:01:56 +0000 (22:01 +0900)]
NativeImageSource with tbm_surface for tizen 3.0 wayland

 - NativeImageSource uses XPixmap or Ecore Pixmap type in x windows system.
 - Tizen 3.0 wayland doesn't support the pixmap type.
 -> Replaces pixmap to tbm_surface.
 -> Adds two public-APIs to get sampler type and prefix for tbm_surface rendering
 -> Adds NativeImageInterface::Extension header as devel-api

Change-Id: I5c8cadd96f87d4d1db9e30101cd647c697e3c7ea

8 years agoAdded Animation loop count 39/56939/20
Lee Morgan [Wed, 13 Jan 2016 16:26:46 +0000 (16:26 +0000)]
Added Animation loop count

Change-Id: Ic944007d1963c22642b568f8fd7b1c78b44a4fa8

8 years agoDALi Version 1.1.19 42/58342/1 dali_1.1.19
Tom Robinson [Fri, 29 Jan 2016 11:33:11 +0000 (11:33 +0000)]
DALi Version 1.1.19

Change-Id: I2ded14e11f19e1364dcb1aa784b201266dd7a2d2

8 years agoMerge "Fixed Builder not allowing nested maps for properties" into devel/master
Adeel Kazmi [Thu, 28 Jan 2016 18:39:58 +0000 (10:39 -0800)]
Merge "Fixed Builder not allowing nested maps for properties" into devel/master

8 years agoMarked STEREO_INTERLACED as deprecated from public api 27/58127/4
Tom Robinson [Wed, 27 Jan 2016 16:55:00 +0000 (16:55 +0000)]
Marked STEREO_INTERLACED as deprecated from public api

Change-Id: I0d17d33b5a8a741987cf33cf6bc7571e55bbb16c

8 years agoFixed Builder not allowing nested maps for properties 90/57290/2
Tom Robinson [Mon, 18 Jan 2016 15:50:01 +0000 (15:50 +0000)]
Fixed Builder not allowing nested maps for properties

Change-Id: I4ff1fa3edddd0cd76310f495fbf53bf199dc768f

8 years agoAdd @DEPRECATED to all public symbols of ImageActor & ShaderEffect 31/58031/2
Yoonsang Lee [Wed, 27 Jan 2016 03:03:30 +0000 (12:03 +0900)]
Add @DEPRECATED to all public symbols of ImageActor & ShaderEffect

Change-Id: Id5e39573f38bbf94fe67b1ea0df5989b05f8ae30

8 years agoApply the new doxygen tagging rule for @DEPRECATED 12/57712/4
Yoonsang Lee [Fri, 22 Jan 2016 04:43:00 +0000 (13:43 +0900)]
Apply the new doxygen tagging rule for @DEPRECATED

- Change @deprecrated 1.x.x to @DEPRECATED_1_x.x to follow the new doxygen tagging rule.

Change-Id: Ic8b4fbc7462777cdcfcad1aad3a856bd1e21bb0c

8 years agoApply the new doxygen tagging rule for @SINCE 44/57544/9
Yoonsang Lee [Fri, 22 Jan 2016 00:13:06 +0000 (09:13 +0900)]
Apply the new doxygen tagging rule for @SINCE

- Change @since 1.1.x to @SINCE_1_1.x to follow the new doxygen tagging rule.
- Add @SINCE_1_0.0 for all symbols not having @since tag.
- Sort the order of doxygen tags as guided by the Tizen guideline.
  ('platform','deprecated','brief','details','since_tizen','privlevel',
   'privilege', 'remarks','param','return','retval','exception','pre','post',
   'note','see')

Change-Id: I99ce2a063f1d28130bc7951de212c47b5af06509

8 years agoMerge "Added @since to type-registry.h API change" into devel/master
Adeel Kazmi [Fri, 22 Jan 2016 13:35:29 +0000 (05:35 -0800)]
Merge "Added @since to type-registry.h API change" into devel/master

8 years agoMerge "DALi Version 1.1.18" into devel/master
Adeel Kazmi [Fri, 22 Jan 2016 13:31:56 +0000 (05:31 -0800)]
Merge "DALi Version 1.1.18" into devel/master

8 years agoDALi Version 1.1.18 74/57774/1 dali_1.1.18
Richard Huang [Fri, 22 Jan 2016 13:28:35 +0000 (13:28 +0000)]
DALi Version 1.1.18

Change-Id: I3a767c400bd27c7f81666fd290ae4ac17bc49f8c

8 years agoMerge changes I523a4ff5,Ic7d369c0 into devel/master
Kimmo Hoikka [Fri, 22 Jan 2016 11:31:40 +0000 (03:31 -0800)]
Merge changes I523a4ff5,Ic7d369c0 into devel/master

* changes:
  Account for rotation in frustum culling algorithm
  Fixed frustum culling when scale is applied

8 years agoAdded @since to type-registry.h API change 58/57758/1
x1ma [Fri, 22 Jan 2016 11:04:09 +0000 (11:04 +0000)]
Added @since to type-registry.h API change

Change-Id: I803903f320784ef87a719ef62174f7e7910f6279

8 years agoReporting dali version on stderr instead of stdout 05/56805/3
David Steele [Tue, 12 Jan 2016 17:33:53 +0000 (17:33 +0000)]
Reporting dali version on stderr instead of stdout

Change-Id: I3d2508c02ecd30487b5e77a9d1a202274569bddd

8 years agoMerge "Simplify javascript layer behavior enum STRING" into devel/master
Adeel Kazmi [Wed, 20 Jan 2016 15:33:35 +0000 (07:33 -0800)]
Merge "Simplify javascript layer behavior enum STRING" into devel/master

8 years agoSimplify javascript layer behavior enum STRING 33/55533/5
Nick Holland [Wed, 20 Jan 2016 10:56:39 +0000 (10:56 +0000)]
Simplify javascript layer behavior enum STRING

Fixed false utc Layer test case which would always pass.

This seems better in js code:

before: layer.behavior = "Dali::Layer::LAYER_3D";

after: layer.behavior = "LAYER_3D";

Change-Id: I84109f55d32f6cdb00f10f763439bc6420235678

8 years ago(Animatable property) default value setting and uniform mapping 64/57164/5
x1ma [Fri, 15 Jan 2016 13:58:22 +0000 (13:58 +0000)]
(Animatable property) default value setting and uniform mapping

Change-Id: I2a6413863e597c588b14ddce24f701c5a2aa64c3

8 years agoAccount for rotation in frustum culling algorithm 66/57366/2
Paul Wisbey [Tue, 19 Jan 2016 11:54:59 +0000 (11:54 +0000)]
Account for rotation in frustum culling algorithm

Change-Id: I523a4ff53376d5cf035d0a797da00dc99f946d97

8 years agoFixed frustum culling when scale is applied 94/57294/1
Paul Wisbey [Mon, 18 Jan 2016 18:21:39 +0000 (18:21 +0000)]
Fixed frustum culling when scale is applied

Change-Id: Ic7d369c05ab80d8699340d87944c38c136a0cf46

8 years agoAdded @since to pixel.h enumeration changes 52/57052/4
Tom Robinson [Thu, 14 Jan 2016 18:06:15 +0000 (18:06 +0000)]
Added @since to pixel.h enumeration changes

Change-Id: I1858e716003b10b20f021aa4a8db7c9bbf662448

8 years agoDALi Version 1.1.17 68/57168/1 dali_1.1.17
Nick Holland [Fri, 15 Jan 2016 14:40:15 +0000 (14:40 +0000)]
DALi Version 1.1.17

Change-Id: I1aecf3b4e0b253f04f0effd1dd27f6d7e1248cdd

8 years agoMerge "Added ASTC Native file format loader" into devel/master
Adeel Kazmi [Thu, 14 Jan 2016 17:32:04 +0000 (09:32 -0800)]
Merge "Added ASTC Native file format loader" into devel/master

8 years agoMerge "Sort overlay actors based on depth index" into devel/master
Paul Wisbey [Thu, 14 Jan 2016 14:18:32 +0000 (06:18 -0800)]
Merge "Sort overlay actors based on depth index" into devel/master

8 years agoAdded ASTC Native file format loader 45/56645/6
Tom Robinson [Mon, 11 Jan 2016 16:50:26 +0000 (16:50 +0000)]
Added ASTC Native file format loader

ASTC can be wrapped in a KTX file, but also has its own native file format.
This patch provides support for the native ASTC file format (.astc).

Textures can be generated using tools (Eg. Mali texture compression tool).

Note: ASTC is "OpenGL friendly" in that the textures are pre-flipped vertically.
In DALi there is currently not a differenciation between different texture compression formats in that the data (once the header is extracted) is given to the hardware as-is.
For this reason textures must currently be pre-flipped vertically (before compression) when using the native .astc file format with DALI.

An example .astc file is included as part of the unit tests.

Change-Id: I78025f11f9aed23ed9ccf369057ce9c5f3a65fca

8 years agoSort overlay actors based on depth index 50/56750/6
Ferran Sole [Tue, 12 Jan 2016 10:28:23 +0000 (10:28 +0000)]
Sort overlay actors based on depth index

Overlay actors were not ordered by depth index for rendering

* Sort overlay actors using same algorithm used by "regular" actors
* Fixed bug in hit test algorithm for overlay actors
* Added test cases to check rendering order of color and overlay actors in 2D layers

Change-Id: I004019faf74a70d3c05502d95c665162cf9f924b

8 years agoFixed target size for Actor and added script support for OnRelayoutSignal 51/56651/4
Richard Huang [Mon, 11 Jan 2016 18:15:06 +0000 (18:15 +0000)]
Fixed target size for Actor and added script support for OnRelayoutSignal

Change-Id: Iad5292fb3ac5baeca74bd66c4f1372da400fed09

8 years agoRemoved sets of connected/disconnected nodes. Brought back a vector of sorted nodes... 23/56423/7
Adam Bialogonski [Thu, 7 Jan 2016 16:51:17 +0000 (16:51 +0000)]
Removed sets of connected/disconnected nodes. Brought back a vector of sorted nodes to support better cache usage.

Change-Id: Ifb0aef63759639df77c1c58e5a9b799d7f02f8b0

8 years agoSupport for ASTC compressed textures wrapped in KTX files 75/54475/12
Tom Robinson [Tue, 15 Dec 2015 11:27:40 +0000 (11:27 +0000)]
Support for ASTC compressed textures wrapped in KTX files

ASTC is supported by OpenGL ES 3.1 and above.
To build this patch with ASTC support, a GLES 31 context must be specified.

To build for desktop with configure, the gles version must be set to 31.
Here is an example configure line:
CXXFLAGS="-g -O0 -Wno-unused-local-typedefs" CXX="ccache g++" ./configure --prefix=$DESKTOP_PREFIX --enable-debug=yes --enable-profile=UBUNTU --enable-gles=31

With GBS, add the following to your gbs build line:
--define "%target_gles_version 31"

Change-Id: I123ccac938c340ccfabf81711a2c27cd4dd43824

8 years agoDALi Version 1.1.16 94/56494/1 dali_1.1.16
Lee Morgan [Fri, 8 Jan 2016 14:32:14 +0000 (14:32 +0000)]
DALi Version 1.1.16

Change-Id: Ice376cf1f83a757bc4e84df05b72e28a08a60698

8 years agoFix license issues from the protex server 67/56367/1
Seoyeon Kim [Thu, 7 Jan 2016 05:57:44 +0000 (14:57 +0900)]
Fix license issues from the protex server

- Change licence names in .spec to match SPDX identifiers

Change-Id: I681e47c688466ef4ed9cadf0c27148849da7d118

8 years agoMerge "Renamed empty animation test function" into devel/master
Adeel Kazmi [Wed, 6 Jan 2016 17:14:41 +0000 (09:14 -0800)]
Merge "Renamed empty animation test function" into devel/master

8 years agoMerge "(ImageActor) Partially restored Get/Set Image & NinePatchBorder APIs" into...
Kimmo Hoikka [Wed, 6 Jan 2016 17:06:14 +0000 (09:06 -0800)]
Merge "(ImageActor) Partially restored Get/Set Image & NinePatchBorder APIs" into devel/master

8 years agoRenamed empty animation test function 45/56345/1
David Steele [Wed, 6 Jan 2016 14:24:04 +0000 (14:24 +0000)]
Renamed empty animation test function

Change-Id: Id7dc285ed337b109c23fb8e3da8e4dc1984ece9b

8 years agoUpdated README for test cases 36/56336/2
David Steele [Wed, 6 Jan 2016 11:25:31 +0000 (11:25 +0000)]
Updated README for test cases

Change-Id: I03c58b0eb4e25ff600e9d169997936cc9d07589a

8 years ago(ImageActor) Partially restored Get/Set Image & NinePatchBorder APIs 47/56247/2
Adeel Kazmi [Tue, 5 Jan 2016 18:10:10 +0000 (18:10 +0000)]
(ImageActor) Partially restored Get/Set Image & NinePatchBorder APIs

- The value is only stored so that it can be returned in the getter.
- Internally, we do not support any other style apart from STYLE_QUAD.

Change-Id: Ifad7dbfd60bbaa6761a8c0fe4c4e76ab1ba457c3

8 years agoFix svace issue, DEREF_AFTER_NULL case 62/56062/5
taeyoon [Tue, 22 Dec 2015 10:50:10 +0000 (19:50 +0900)]
Fix svace issue, DEREF_AFTER_NULL case

  Move 'SetTextureImage( index, imagePtr )' to if statement for checking image handle
  - If image handle is NULL, imagePtr is also NULL in SetTextureImage().

Change-Id: I2dc389090f094e85cd0eb6285756434dcdb90617

8 years agoMerge "(Degree) Restored removed angle constants" into devel/master
Kimmo Hoikka [Tue, 5 Jan 2016 16:40:41 +0000 (08:40 -0800)]
Merge "(Degree) Restored removed angle constants" into devel/master

8 years agoRemoved automated test case style folder 30/56230/1
David Steele [Tue, 5 Jan 2016 12:46:35 +0000 (12:46 +0000)]
Removed automated test case style folder

Change-Id: Ib10b7930c084ecf5fdc5fbecb8afc2d6cb6191b3

8 years ago(Degree) Restored removed angle constants 14/56114/1
Adeel Kazmi [Mon, 4 Jan 2016 12:01:53 +0000 (12:01 +0000)]
(Degree) Restored removed angle constants

- Required for binary/source compatibility.

Change-Id: Icc9bf979ec5a58b4ea6632dced162be872ed371f

8 years agoDALi Version 1.1.15 23/55423/1 dali_1.1.15
Adeel Kazmi [Wed, 23 Dec 2015 17:21:16 +0000 (17:21 +0000)]
DALi Version 1.1.15

Change-Id: I84c24982febe30c41239f35a31b234fdec57cd83

8 years agoBug fix FixedSizeMemoryPool 99/54899/1
Ferran Sole [Fri, 18 Dec 2015 11:49:03 +0000 (11:49 +0000)]
Bug fix FixedSizeMemoryPool

Change-Id: Ie94f52f2f4cee7bad19bb83025b1a059e13df39e

8 years agoUse memory pools to allocate nodes, renderers, materials and animations 99/54499/8
Ferran Sole [Tue, 15 Dec 2015 14:53:50 +0000 (14:53 +0000)]
Use memory pools to allocate nodes, renderers, materials and animations

Use global memory pools to allocate nodes, renderers material and animations
to speed up traversals.

Change-Id: Iee233169e0e40cd3206c82074b9f015f7c7e424c

8 years ago(ImageActor) resize the geometry in shader 42/53842/5
x1ma [Wed, 9 Dec 2015 15:07:42 +0000 (15:07 +0000)]
(ImageActor) resize the geometry in shader

Change-Id: Ic233e1a3c865e55b1d93cb69f4000f761b8488c2

8 years agoMerge "LLVM/Emscripten fixes" into devel/master
Adeel Kazmi [Fri, 11 Dec 2015 18:12:04 +0000 (10:12 -0800)]
Merge "LLVM/Emscripten fixes" into devel/master

8 years agoMerge "Return target size and position while retrieving default actor property value...
Adeel Kazmi [Fri, 11 Dec 2015 17:06:52 +0000 (09:06 -0800)]
Merge "Return target size and position while retrieving default actor property value" into devel/master

8 years agoDALi Version 1.1.14 30/54130/1 dali_1.1.14
David Steele [Fri, 11 Dec 2015 14:41:27 +0000 (14:41 +0000)]
DALi Version 1.1.14

Change-Id: I1c964405685bed5cbf0ef5d17c7c45cae6b9739d

8 years agoLLVM/Emscripten fixes 88/44188/19
Lee Morgan [Thu, 2 Oct 2014 12:25:23 +0000 (13:25 +0100)]
LLVM/Emscripten fixes

Change-Id: I19ad59fdc3613ac19478613ee8103f56fe8d11ca

8 years agoReturn target size and position while retrieving default actor property value 01/54001/6
Richard Huang [Thu, 10 Dec 2015 16:18:31 +0000 (16:18 +0000)]
Return target size and position while retrieving default actor property value

Change-Id: Ib8c947ce956dac73f059274a7f47db67cb6b08d9

8 years agoApply constraints when traversing the scene to update 42/53942/7
Ferran Sole [Thu, 10 Dec 2015 09:18:31 +0000 (09:18 +0000)]
Apply constraints when traversing the scene to update

Apply constraints when traversing the scene to update instead of
in a separate traversal

Change-Id: Idc24668a77a896e1b50eb738811969d7b2778086

8 years agoMerge "Implemented shader program property" into devel/master
Adeel Kazmi [Thu, 10 Dec 2015 10:33:03 +0000 (02:33 -0800)]
Merge "Implemented shader program property" into devel/master

8 years agoRemove some dead code 30/53830/6
Kimmo Hoikka [Wed, 9 Dec 2015 13:44:31 +0000 (13:44 +0000)]
Remove some dead code

- double buffered property (not used)
- property boolean (not used)

Change-Id: I4a27c94b9acf292bce26d85baf7e11ce121c4a91

8 years agoImplemented shader program property 28/50828/10
Lee Morgan [Mon, 2 Nov 2015 14:28:08 +0000 (14:28 +0000)]
Implemented shader program property

Change-Id: Ibf7dcc9051d481e322f0f47ab2b35fd6e15b202c

8 years agoMerge "Removed unnecessary code from Uint16Pair UTC" into devel/master
Adeel Kazmi [Wed, 9 Dec 2015 10:35:24 +0000 (02:35 -0800)]
Merge "Removed unnecessary code from Uint16Pair UTC" into devel/master

8 years agoMerge "Remove some redundant&dead code from node" into devel/master
Kimmo Hoikka [Tue, 8 Dec 2015 18:14:17 +0000 (10:14 -0800)]
Merge "Remove some redundant&dead code from node" into devel/master

8 years agoRemoved unnecessary code from Uint16Pair UTC 68/53668/1
Tom Robinson [Tue, 8 Dec 2015 13:37:36 +0000 (13:37 +0000)]
Removed unnecessary code from Uint16Pair UTC

Change-Id: I6fc087c19f208d4479d958810a02260c70007892

8 years agoMerge "Remove Node::ResolveVisibilty()" into devel/master
Kimmo Hoikka [Tue, 8 Dec 2015 13:17:02 +0000 (05:17 -0800)]
Merge "Remove Node::ResolveVisibilty()" into devel/master

8 years agoRemove some redundant&dead code from node 40/53640/2
Kimmo Hoikka [Tue, 8 Dec 2015 10:14:14 +0000 (10:14 +0000)]
Remove some redundant&dead code from node

+ copy previous size is no longer needed as size is not inherited
+ is fully visible is never called

Change-Id: I9c54cb3cbe7fc905f6dd827054cd55d2bdd1c542

8 years agoImplement image fitting modes 57/52857/12
Tom Robinson [Thu, 26 Nov 2015 17:23:09 +0000 (17:23 +0000)]
Implement image fitting modes

Change-Id: I5153fdbe4538090c471771d57e170f21dcf3543e

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 agoRemove Node::ResolveVisibilty() 87/53287/1
Ferran Sole [Thu, 3 Dec 2015 10:17:17 +0000 (10:17 +0000)]
Remove Node::ResolveVisibilty()

Removed Node::ResolveVisibility() as it is no longer useful

Change-Id: I7c1c89036f8cdf4324eb69735c6c08f4384cdf42

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