Philippe Coval [Fri, 9 Jan 2015 09:10:53 +0000 (10:10 +0100)]
platform-abstractions: png: include cstring to use memcpy
This was needed after libpng upgrade
Change-Id: Iba011c7c6671f778f1f87420767ddd273cbeffee
Bug-Tizen: TC-1841/related
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
taeyoon [Wed, 7 Jan 2015 05:41:25 +0000 (14:41 +0900)]
change --enable-gles = 30 to 20 and removal of sec_product_feature_graphics_gpu_info in spec
- gles 30 to 20 in mobile and wearable.spec
- removal of %if "%{?sec_product_feature_graphics_gpu_info}" == "adreno330" in tv.spec
Change-Id: I2ce96cd9f8d733e1598a6abee2b12ac1efb7da89
Kimmo Hoikka [Thu, 8 Jan 2015 17:18:05 +0000 (09:18 -0800)]
Merge "Image scaling operations - FilterMode::Box implemented for all pixel formats" into tizen
Lee Morgan [Thu, 8 Jan 2015 14:28:15 +0000 (14:28 +0000)]
DALi Version 1.0.24
Change-Id: I9013cee23b888f33bc3652abd67292978cf89ef1
Andrew Cox [Tue, 2 Dec 2014 11:52:51 +0000 (11:52 +0000)]
Image scaling operations - FilterMode::Box implemented for all pixel formats
RGB888, RGBA8888, RGB565, and 2-byte and 1-byte per pixel box
filters with unit tests. Plumbed-in to image loading pipeline to
implement the Box FilterMode.
Change-Id: I815d04299e77953d57ea2f122fb4ab9d086e29d5
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
taeyoon [Wed, 7 Jan 2015 01:20:45 +0000 (10:20 +0900)]
Revert "Core API compatibility"
- Unknown merged
This reverts commit
7f3b2a9231c5f8a19cb0648d6d1604e15a6e7267.
Change-Id: Ib16f7112426630759c09fb07621054455a455f1c
taeyoon0.lee [Tue, 21 Oct 2014 00:27:20 +0000 (09:27 +0900)]
Core API compatibility
addition of "under_tizen_2_3_capi_enable" for version under tizen 2.3 core api
Change-Id: Ic9b62d0abc047dd792513f8bba09d118d2d496a3
HyunJu Shin [Mon, 5 Jan 2015 12:46:33 +0000 (04:46 -0800)]
Merge "Revert "recover PixmapImage::GetPixmap() without any parameter"" into tizen
Yoonsang Lee [Mon, 5 Jan 2015 12:29:51 +0000 (04:29 -0800)]
Revert "recover PixmapImage::GetPixmap() without any parameter"
This reverts commit
df7703c49db2bee2adea2bbfa7515882b3ced370.
Change-Id: I3c4a792f6db39b7799871e037a574ae4bb802ab5
HyunJu Shin [Mon, 5 Jan 2015 06:03:45 +0000 (22:03 -0800)]
Merge "add IndicatorVisibilityChangedSignal" into tizen
Taeyoon Lee [Mon, 5 Jan 2015 04:50:34 +0000 (20:50 -0800)]
Merge "recover PixmapImage::GetPixmap() without any parameter" into tizen
Adeel Kazmi [Wed, 24 Dec 2014 10:43:53 +0000 (10:43 +0000)]
DALi Version 1.0.23
Change-Id: I71c8238a1bf484057da63ac4c6a586b2feb6bab1
Yoonsang Lee [Fri, 19 Dec 2014 06:16:38 +0000 (15:16 +0900)]
add IndicatorVisibilityChangedSignal
Change-Id: Ib6279516bac7b1215f7576ea472100757ad9fcfc
add IndicatorVisibilityChangedSignal
Change-Id: I3e7dff4c6775cd57de0c47a51470b5ef77798f0a
Yoonsang Lee [Tue, 23 Dec 2014 02:22:28 +0000 (11:22 +0900)]
modify wrong license comment
Change-Id: Ic018ecae74848489119bf95dc4f96fe2e2821670
Adeel Kazmi [Fri, 19 Dec 2014 15:05:06 +0000 (07:05 -0800)]
Merge "Raise SceneCreated signal with stage." into tizen
taeyoon [Fri, 19 Dec 2014 08:50:43 +0000 (17:50 +0900)]
Removal of Ecore_Wl_Display from ecore-wl-render-surface.cpp:SetDisplay
- Ecore_Wl_Display was removed from Ecore_Wayland.h
Change-Id: Id84820d80e7f0219558cded70ed9505ac02470a4
Yoonsang Lee [Fri, 19 Dec 2014 06:15:15 +0000 (15:15 +0900)]
recover PixmapImage::GetPixmap() without any parameter
Change-Id: Iae97934376eb91ba1cc511fe751a6479aad80075
Kimmo Hoikka [Wed, 17 Dec 2014 13:10:46 +0000 (13:10 +0000)]
Saving a bit of memory by using pretty function instead of full file name
Change-Id: I2c8f1f0724afb2c9aa6e281f15c0d623a4f0fc83
Kingsley Stephens [Tue, 16 Dec 2014 16:41:18 +0000 (16:41 +0000)]
Raise SceneCreated signal with stage.
Change-Id: I9bcee196bfebbb4ebb7ad35c65a27abd98763a95
Kingsley Stephens [Thu, 18 Dec 2014 10:09:40 +0000 (10:09 +0000)]
DALi Version 1.0.22
Change-Id: Ia749ba6104db1ed8658a93db80b436c13d4582eb
Kimmo Hoikka [Tue, 16 Dec 2014 16:57:35 +0000 (08:57 -0800)]
Merge "Expose custom performance timers" into tizen
Andrew Cox [Fri, 12 Dec 2014 15:02:03 +0000 (15:02 +0000)]
Removed Boost Scoped Pointer
Replaced with our own one in Dali Core.
Change-Id: I597e396c7397db2846b9d973e4994a5513bc10ce
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kingsley Stephens [Mon, 10 Nov 2014 17:24:58 +0000 (17:24 +0000)]
Expose custom performance timers
Change-Id: I4e11fc2a4d82a6a2b5ea3366067ff033a76ff219
Adeel Kazmi [Fri, 12 Dec 2014 16:30:23 +0000 (08:30 -0800)]
Merge "Fixed some README comments" into tizen
Paul Wisbey [Fri, 12 Dec 2014 15:22:58 +0000 (15:22 +0000)]
Fixed some README comments
dali_env is in build/scripts, not build.
To get a summary.xml for the automated tests use this command: ./execute.sh -s
Change-Id: Iaf4d7f970517a0f566b604049df23e08a8479690
Stéphane Desneux (sdx) [Fri, 12 Dec 2014 09:22:52 +0000 (01:22 -0800)]
Merge "resource-loader: include scoped_ptr header" into tizen
Adeel Kazmi [Fri, 12 Dec 2014 08:34:23 +0000 (00:34 -0800)]
Merge "Lifecycle controller" into tizen
Chanho Park [Fri, 12 Dec 2014 04:28:40 +0000 (13:28 +0900)]
resource-loader: include scoped_ptr header
Since boost version 1.56, scoped_ptr should be included explicitly.
You'll need below to use the latest boost.
#include <boost/scoped_ptr.hpp>
Change-Id: Id4f4503047bc47d44b4e71253de9db458543382a
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Adeel Kazmi [Thu, 11 Dec 2014 15:19:36 +0000 (07:19 -0800)]
Merge "ImfManager - Typo fix SetRestoreAferFocusLost typo fixed -> SetRestoreAfterFocusLost" into tizen
Nick Holland [Thu, 11 Dec 2014 15:02:52 +0000 (15:02 +0000)]
[dali_1.0.21] Merge branch 'tizen'
Change-Id: Iff95c116eb84e0a9b700fe96a1ba3547be0b26e4
Nick Holland [Thu, 11 Dec 2014 15:02:31 +0000 (15:02 +0000)]
DALi Version 1.0.21
Change-Id: I5ed36cf825257ff7cde3b648b25e23932ed1917a
Victor Cebollada [Mon, 8 Dec 2014 15:27:42 +0000 (15:27 +0000)]
ImfManager - Typo fix
SetRestoreAferFocusLost typo fixed -> SetRestoreAfterFocusLost
Change-Id: I53445289875efccca7673cd17f7aa5c5ecdec9d6
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Kingsley Stephens [Wed, 3 Dec 2014 13:27:09 +0000 (13:27 +0000)]
Lifecycle controller
Change-Id: Idb04be73b0a7060ef302507723850c23c71875dc
Kimmo Hoikka [Wed, 10 Dec 2014 21:48:10 +0000 (13:48 -0800)]
Merge "(PixmapImage) Removed dependency on Adaptor" into tizen
Adeel Kazmi [Wed, 3 Dec 2014 16:50:23 +0000 (16:50 +0000)]
(PixmapImage) Removed dependency on Adaptor
Change-Id: I314ff515b7c2e04aa1d0ebb222dd270f16c54a70
José Bollo [Wed, 10 Dec 2014 08:06:24 +0000 (09:06 +0100)]
packaging: Add use of pkgconfig for vconf
Using pkgconfig is much better!
It greatly improves the modularity of the whole project.
Change-Id: I18af30d53749171bb71960f6f793360e939f05a2
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>
David Steele [Thu, 4 Dec 2014 14:48:15 +0000 (14:48 +0000)]
Updated test harness
See https://review.tizen.org/gerrit/#/c/31222/ for details
Change-Id: I405793d2f2833f8ea6d3a3f75f3915dec8572ff0
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Andrew Cox [Tue, 2 Dec 2014 22:21:25 +0000 (22:21 +0000)]
Parallelize PlatformAbstraction image loading tests
Broke them into three test cases so they can run in parallel.
Sped them up a bit individually.
Made all three test harness apps work with a number of test cases < the
parallel batch size.
Change-Id: Iafdb26772f35154e4ade092650b3fc23cc168cd6
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Adeel Kazmi [Wed, 3 Dec 2014 17:06:24 +0000 (09:06 -0800)]
Merge "DALi Version 1.0.20" into tizen
Lee Morgan [Wed, 3 Dec 2014 12:35:04 +0000 (12:35 +0000)]
[dali_1.0.20] Merge branch 'tizen'
Change-Id: I5f4224f62416f8c0cf7a462394816fb00cabee9c
Lee Morgan [Wed, 3 Dec 2014 12:23:12 +0000 (12:23 +0000)]
DALi Version 1.0.20
Change-Id: Ie5bc1cc45cfaac64070fee8dea2a587ea5f0c28e
Adeel Kazmi [Wed, 3 Dec 2014 11:22:01 +0000 (11:22 +0000)]
(AutomatedTests) Fix for command-line-options test, reset optind to 0 before running the test
Change-Id: I11c9aeffa8e56ee0aea1f5e490005f4a90bc5274
Kimmo Hoikka [Tue, 2 Dec 2014 12:01:48 +0000 (04:01 -0800)]
Merge "Remove utilX dependency from test cases." into tizen
David Steele [Mon, 1 Dec 2014 12:53:56 +0000 (12:53 +0000)]
Parallelized test case execution.
Changed test case build script to stop on error
Change-Id: I9ee82cefae5c33670e99cebd64297cbb58901af9
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Francisco Santos [Tue, 2 Dec 2014 11:04:18 +0000 (11:04 +0000)]
Remove utilX dependency from test cases.
Change-Id: I6f3ef178568d15a0f1bfc64b76f82c1437916021
Adeel Kazmi [Mon, 1 Dec 2014 18:08:26 +0000 (10:08 -0800)]
Merge "Only make indicator visible when its actually needed" into tizen
Andrew Cox [Mon, 1 Dec 2014 16:03:50 +0000 (16:03 +0000)]
Added correct license to ICO loader
Change-Id: Ic291dcc13cab9d0b5f98d345d8e548365a7f6b11
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kimmo Hoikka [Thu, 27 Nov 2014 12:56:08 +0000 (04:56 -0800)]
Merge "Added public API to get native window handle from Window" into tizen
Kingsley Stephens [Thu, 27 Nov 2014 11:34:34 +0000 (11:34 +0000)]
[dali_1.0.19] Merge branch 'release19'
Change-Id: Ib112c33acd0a1445e7a842c69389f7678b104ce7
Kingsley Stephens [Thu, 27 Nov 2014 11:26:41 +0000 (11:26 +0000)]
DALi Version 1.0.19
Change-Id: Ia10e6afdbc3d44c828a35e2ecf4df71c760c3331
Richard Huang [Tue, 25 Nov 2014 15:20:48 +0000 (15:20 +0000)]
Added public API to get native window handle from Window
Change-Id: Ib4aca5cd77d84710ce6d7f37f77104e6596ad555
Kimmo Hoikka [Mon, 24 Nov 2014 13:49:36 +0000 (13:49 +0000)]
Shader & Program cleanup, Part 1: Remove cyclic dependency between programs and context, remove shader from binary saving path
Change-Id: I745b0d72fc8df6a781c61501633a8cc4aba45ff3
Kimmo Hoikka [Wed, 19 Nov 2014 18:45:00 +0000 (18:45 +0000)]
Only make indicator visible when its actually needed
Change-Id: I64975cc0e59b1f6ab5c6d4af9bff7dda3045382c
Kimmo Hoikka [Thu, 20 Nov 2014 15:10:43 +0000 (07:10 -0800)]
Merge "Track ActiveTexture calls" into tizen
Xiangyin Ma [Thu, 20 Nov 2014 13:14:04 +0000 (13:14 +0000)]
[dali_1.0.18] Merger branch 'tizen'
Change-Id: I84bbac2d34d178c840c3e585f4db81428e2a7ab1
Xiangyin Ma [Thu, 20 Nov 2014 13:00:35 +0000 (13:00 +0000)]
DALi Version 1.0.18
Change-Id: Ib9df5d8b87d142ee37cc26930af910ad3a729ce6
Kimmo Hoikka [Fri, 14 Nov 2014 16:29:42 +0000 (16:29 +0000)]
Track ActiveTexture calls
Change-Id: Ia362ddb179274d02c432a149560c73cfb24b6413
Kimmo Hoikka [Thu, 13 Nov 2014 17:02:45 +0000 (09:02 -0800)]
Merge "Removed unintentional linkage to Assimp" into tizen
Nick Holland [Thu, 13 Nov 2014 11:36:20 +0000 (11:36 +0000)]
[dali_1.0.17] Merge branch 'tizen'
Change-Id: I4b2d1135980b2eba55404b4414dc07996157e62e
Nick Holland [Thu, 13 Nov 2014 11:23:43 +0000 (11:23 +0000)]
DALi Version 1.0.17
Change-Id: Ifa113216a7630f54fdfc55b3c36f4bb757bf2cd5
David Steele [Wed, 12 Nov 2014 18:46:17 +0000 (18:46 +0000)]
Removed unintentional linkage to Assimp
Change-Id: I046aaa3a83800b67c75f075811aadef9290670a1
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Adeel Kazmi [Tue, 11 Nov 2014 15:51:32 +0000 (15:51 +0000)]
Updates after the use of const refs in gesture callbacks
Change-Id: I57d0f94bb619b964462def1506177cf84c96763b
David Steele [Fri, 7 Nov 2014 13:38:52 +0000 (13:38 +0000)]
Updated the tests README to the latest instructions
Change-Id: I124987cc47128048dbc5ab7832aea497cf8dc044
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Nick Holland [Mon, 10 Nov 2014 11:11:05 +0000 (11:11 +0000)]
Disable assimp for Tizen TV
Change-Id: I26a02a39c92f134c1f52c38007ea4f961f7a28bc
Kimmo Hoikka [Mon, 10 Nov 2014 11:52:27 +0000 (03:52 -0800)]
Merge "(TapGesture) Process evens immediately in timer callback" into tizen
Adeel Kazmi [Mon, 10 Nov 2014 10:12:41 +0000 (10:12 +0000)]
(TapGesture) Process evens immediately in timer callback
[problem] Sometimes, the tap-gesture is delayed.
[cause] Using timers when multiple taps are required. In the timer callback we did not process
the events.
[solution] Process the event after queuing.
Change-Id: I3b6616d79115b01da9c915f83850970f19385c4f
Kimmo Hoikka [Fri, 7 Nov 2014 17:20:40 +0000 (17:20 +0000)]
removing use of using namespace std;
Change-Id: I1cc0061ecab48bbd895694589a230d386fb8198e
David Steele [Thu, 6 Nov 2014 15:57:56 +0000 (15:57 +0000)]
Updated mesh geometry type name
Change-Id: I9e4dc4ec3428792e4d4936af673f4324b1f4b05f
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Xiangyin Ma [Wed, 5 Nov 2014 19:25:21 +0000 (19:25 +0000)]
Adaptor: Fix Klocwork issues
[Problem] Klocwork issues
[Cause] 1. Data member not initialized in the constructor or non-used data member
2. Floating point expression is test for equality
3. Constant condition in conditional expression
4. Memory leak
5. syntax shortcuts: variable used twice in one expression where one usage is subject to side-effects
6. Unreachable code
[Solution]
Change-Id: I815b8d9ae73c6bc08b807d898e197db90c6c08a4
Kimmo Hoikka [Thu, 6 Nov 2014 09:39:01 +0000 (01:39 -0800)]
Merge "Remove handle::operator=(NULL) as it is duplicating handle.Reset() functionality and thus redundant" into tizen
Adeel Kazmi [Thu, 6 Nov 2014 08:20:54 +0000 (08:20 +0000)]
[dali_1.0.16] Merge branch 'tizen'
Change-Id: I30d51cf954a3e263620b9cdc9829d1dc7400b8e2
Adeel Kazmi [Thu, 6 Nov 2014 08:19:21 +0000 (08:19 +0000)]
DALi Version 1.0.16
Change-Id: Ieb72ee27d4f07331dfbb8acfcc8998dfffa5ffd0
Kimmo Hoikka [Wed, 5 Nov 2014 18:37:49 +0000 (18:37 +0000)]
Remove handle::operator=(NULL) as it is duplicating handle.Reset() functionality and thus redundant
Change-Id: Iabc6220d316a3bdca55fa1edab6ff4733fb36532
David Steele [Thu, 11 Sep 2014 18:01:07 +0000 (19:01 +0100)]
Add handling for context loss and regain behaviour
[Problem] Dali doesn't handle context loss
[Cause] Never tested.
[Solution]
Fixed ReplaceSurface handling for window surface case. Fixed window destructor to ensure
indicator is correctly removed.
Added new application policy for dealing with context loss. If the application
doesn't support context loss, then Dali must instead retain resource data or have
some means to re-load it.
Added a new data retention policy to PlatformAbstraction. This allows Core to query
what to do with bitmap data and mesh data on context loss / resume.
Change-Id: Ic98d04ada6915eaa600490c1e9465232b3ed6b64
Signed-off-by: David Steele <david.steele@partner.samsung.com>
David Steele [Tue, 9 Sep 2014 12:28:30 +0000 (13:28 +0100)]
Removed mutex locking in render thread.
Communication is now through the UpdateRenderSync object, which has a single mutex.
[Problem]
Need to add new interface onto render thread without using messages.
Current mechanism for ReplaceSurface API uses a mutex lock around a
double buffered data store.
Adding new interface using this method with a different mutex around a
different data-store could easily lead to deadlock.
[Solution]
Remove all mutexs from within RenderThread. There are 2 communication
points in RenderThread from UpdateRenderSync: RenderSyncWithUpdate(),
which triggers the start of the render, and RenderFinished(), which
informs that the render has finished.
Utilize RenderSyncWithUpdate to pass requests from UpdateRenderSync
into render thread. Any responses should be written back into these
requests.
Modify UpdateRenderController to talk with UpdateRenderSync rather
than directly to RenderThread. Event requests will block until the
next render pass, it is UpdateRenderSync's responsibility to ensure
that the update/render threads are awake and available to process.
Change-Id: Ib187d895cce5c4b4860dfb3af31dbd9402112dca
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Adeel Kazmi [Wed, 5 Nov 2014 11:36:12 +0000 (03:36 -0800)]
Merge "fix unsafe multithreaded boolean read/write" into tizen
Kimmo Hoikka [Wed, 5 Nov 2014 11:29:54 +0000 (03:29 -0800)]
Merge "Removed unnecessary mutex lock" into tizen
Kimmo Hoikka [Fri, 17 Oct 2014 17:00:34 +0000 (18:00 +0100)]
fix unsafe multithreaded boolean read/write
Change-Id: I60d6263ea9b0740fcce2a19e83a0398424cd0784
Kimmo Hoikka [Tue, 4 Nov 2014 13:45:43 +0000 (13:45 +0000)]
Dont keep update unnecessarily running when even thread notifications are being processed (requires Adaptor patch as well)
Change-Id: I6fb6fc3a5b1f0406ef7180193eb01f4debab1959
Nick Holland [Tue, 4 Nov 2014 10:14:05 +0000 (10:14 +0000)]
Removed unnecessary mutex lock
Profiler flagged this function up.
For dali-demo it gets called over 2500 times on start-up ( by reserve message
slot).
As it's only ever called from a single thread the mutex is not needed.
Change-Id: I3e6784aa62d118360244891684c4e09d0896b3ef
Kimmo Hoikka [Fri, 31 Oct 2014 17:42:05 +0000 (17:42 +0000)]
moving of COMPILE_TIME_ASSERT to common
Change-Id: Ibdb4d7bc6bf9f1779875f6ed8aeb9ed11b740ef3
Adeel Kazmi [Thu, 30 Oct 2014 15:28:20 +0000 (15:28 +0000)]
Stop exporting internal symbols
Change-Id: I11baf0831b4faca59ecf94030593f2f84431f5d0
Adeel Kazmi [Thu, 30 Oct 2014 10:13:08 +0000 (10:13 +0000)]
[dali_1.0.15] Merge branch 'tizen'
Change-Id: Ia80069a7933bdbb49c791662f539937a3049c963
Adeel Kazmi [Thu, 30 Oct 2014 10:11:04 +0000 (03:11 -0700)]
Merge "DALi Version 1.0.15" into tizen
Adeel Kazmi [Thu, 30 Oct 2014 10:07:01 +0000 (10:07 +0000)]
DALi Version 1.0.15
Change-Id: Ia44ae18a89802345f3f425fd12a6c7b35417307b
Nick Holland [Mon, 27 Oct 2014 12:06:28 +0000 (12:06 +0000)]
Removed unnecessary use of osstream and ofstream
saves 1KB from dali-adaptor library on ARM
Change-Id: I07677bbaee9c7a7075818c5297074bfdffb06770
Kimmo Hoikka [Mon, 27 Oct 2014 16:09:45 +0000 (16:09 +0000)]
moving the environment options to Adaptor (where they are handled)
Change-Id: I953fcbf66c9da2da18f817a24a3868506fea254c
Adeel Kazmi [Tue, 28 Oct 2014 10:48:15 +0000 (10:48 +0000)]
Add required headers when these files are included individually
Change-Id: Icff2a20f0d91630bead981e3a55ca3a880928387
David Steele [Tue, 21 Oct 2014 11:41:02 +0000 (12:41 +0100)]
Cleaned up handling for optional Assimp package.
The only place that needs to change if assimp is required or not is configure.ac.
Change-Id: Ifd47dfe39e4da7f0cd8876e0e3c848e9a35b4ea2
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Jonghyun Ho [Tue, 21 Oct 2014 06:16:58 +0000 (15:16 +0900)]
Add support for glProgramBinary extension in GLES 2.0
[problem] glProgramBinary is disabled at the moment
[cause] Missing implementation
[solution] Add support for glProgramBinary extension in GLES 2.0
Change-Id: I1fc798009f9cbc6a933258db2d9209d70dc0fd56
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
Adeel Kazmi [Fri, 24 Oct 2014 09:58:04 +0000 (02:58 -0700)]
Merge "add missing update keep updating reasons to logging" into tizen
Kimmo Hoikka [Wed, 22 Oct 2014 11:11:48 +0000 (12:11 +0100)]
add missing update keep updating reasons to logging
Change-Id: Idf7f68f6462f8c2ce75eaa15fe10dfcc34941991
Lee Morgan [Wed, 22 Oct 2014 11:05:43 +0000 (12:05 +0100)]
[dali_1.0.14] Merge branch 'tizen'
Change-Id: I477121b578e10d2d71adb1e3fdf85168240030f9
Lee Morgan [Wed, 22 Oct 2014 10:54:31 +0000 (11:54 +0100)]
DALi Version 1.0.14
Change-Id: I6956e055641c846769674094b46b7041cc396636
Adeel Kazmi [Fri, 17 Oct 2014 17:17:27 +0000 (18:17 +0100)]
Use vector wrapper
Also Use map directly in automated tests
Change-Id: Id52c1fb676842270d53fff92fa9fb63423943cb1
Kimmo Hoikka [Fri, 17 Oct 2014 10:15:44 +0000 (11:15 +0100)]
make frametime state flags properly atomic read/write
Change-Id: I8b3f1680c6ef88e52cc6598904afc21e42b2b942
Kingsley Stephens [Wed, 15 Oct 2014 13:16:19 +0000 (14:16 +0100)]
[dali_1.0.13] Merge branch 'tizen'
Change-Id: Id6a176017a73ec185c94ce2d67f5b67e80953463
Kingsley Stephens [Wed, 15 Oct 2014 13:08:04 +0000 (14:08 +0100)]
DALi Version 1.0.13
Change-Id: Iab9b1e9317c7b6cbcdfa0f5d212c86e892005ee3
Adeel Kazmi [Thu, 9 Oct 2014 15:27:06 +0000 (08:27 -0700)]
Merge "(ImfManager) Initialise ImfManager only when required rather than at startup" into tizen
Adeel Kazmi [Thu, 9 Oct 2014 11:14:16 +0000 (12:14 +0100)]
(Build) Ensure efl-assist is not used in UBUNTU profile
Change-Id: I73ad523c199509ac3f26ddf70cba5a92757b61ef