suhyung Eom [Fri, 24 Jun 2016 08:57:31 +0000 (17:57 +0900)]
Differentiate public header files according to profile
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I96ccf3c8c0ff2f5175a8a792f1b7ca5f5f8cdd50
suhyung Eom [Fri, 24 Jun 2016 02:16:52 +0000 (11:16 +0900)]
Separate watch-application.h into wearable.h
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I770055531db9615f6dc5281dc9cb90ce301c7a42
Seoyeon Kim [Thu, 23 Jun 2016 13:40:49 +0000 (06:40 -0700)]
Merge "[3.0] Fix Svace warning issue" into tizen
suhyung Eom [Thu, 23 Jun 2016 04:16:10 +0000 (13:16 +0900)]
Temporary implement copy/paste text
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Ia340ea9d4279d2172551c372ee2337870ce754d7
Seoyeon Kim [Tue, 21 Jun 2016 07:22:48 +0000 (16:22 +0900)]
[3.0] Fix Svace warning issue
- Initialized local variable at tizen-video-player.cpp
- prevention of Null pointer dereference at seat.cpp
Change-Id: Id68f057e0b8bc9b78da435d7809374f2c21a2726
taeyoon [Sat, 18 Jun 2016 04:53:25 +0000 (13:53 +0900)]
[3.0] Fix ivi build error
Change-Id: I988153a5b44b2cfefcf28e0163b983f13b555646
taeyoon [Sat, 18 Jun 2016 04:52:24 +0000 (13:52 +0900)]
[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update
Change-Id: Ib10d90b25ef30f6d6aabfcfc5f92b844d8f9b293
taeyoon [Sat, 18 Jun 2016 04:51:13 +0000 (13:51 +0900)]
[3.0] Fix common profile build error
Change-Id: I412668211a583de294a3c9d99170b8a57146ac0d
taeyoon [Sat, 18 Jun 2016 04:43:25 +0000 (13:43 +0900)]
Merge branch 'devel/master(1.1.39)' into tizen
Change-Id: I2da3fdb58440d3fca36c414482d4b0f1ee50a771
taeyoon [Sat, 18 Jun 2016 04:42:15 +0000 (13:42 +0900)]
Revert "[3.0] Fix common profile build error"
This reverts commit
a5ab388fa009bed5a5b64a687d85431976edbd34.
Change-Id: I34bf9cfa992a8b12de37fb062f3e9792bc5d9d78
taeyoon [Sat, 18 Jun 2016 04:41:38 +0000 (13:41 +0900)]
Revert "[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update"
This reverts commit
480a40ae2243a2d3dc50d92d6e17e717d174625c.
Change-Id: I8af3889a43b79d8b689ed8d5b4e5ddbaa5055afb
taeyoon [Sat, 18 Jun 2016 04:41:00 +0000 (13:41 +0900)]
Revert "[3.0] Fix ivi build error"
This reverts commit
e429fdf3d93b8614931f0dd28e9438b1907ee2c3.
Change-Id: I2adf1687253a9bc497ca0eee8ea59c3ebeeb6aa8
taeyoon [Sat, 18 Jun 2016 04:39:31 +0000 (13:39 +0900)]
Revert "[3.0] build error fix : chaged wayland api of wl_text_input_set_surrounding_text()"
This reverts commit
30b93313b5665979118e2fd5bc52778f7e395af4.
Change-Id: I2bcd4410893978636b1a4b1975bbea238345d04d
taeyoon [Sat, 18 Jun 2016 04:36:53 +0000 (13:36 +0900)]
Revert "[3.0] temporary fix for build error"
This reverts commit
8211986425e3db4eed2d4e6e6354c80f0f6aa730.
Change-Id: I3907342f9d5d813310a939cf22bd91bd89e8cd13
Adeel Kazmi [Fri, 17 Jun 2016 10:43:17 +0000 (11:43 +0100)]
DALi Version 1.1.39
Change-Id: I7b467dee478f138cafabf5475fafe70c83c64082
Adeel Kazmi [Thu, 16 Jun 2016 07:47:37 +0000 (08:47 +0100)]
(Touch) Add Pressure, radius & angle information
Change-Id: I9b86385cd3da84719d39ba60841c4e7540c7fa01
Adeel Kazmi [Thu, 16 Jun 2016 18:14:35 +0000 (11:14 -0700)]
Merge "Temporary fix of build break. wl_text_input_set_surrounding_text() is deprecated wrongly and proper guide will be come later. before that patch, this needs to be commented out" into devel/master
taeyoon [Wed, 16 Mar 2016 07:45:31 +0000 (16:45 +0900)]
Video player plugin for video view control
Add plugin for video playback in tizen wayland
Change-Id: Ifaf9d3cf016bcfe7f2f9f37bbaf86aad73480acd
dongsug.song [Tue, 14 Jun 2016 11:59:26 +0000 (20:59 +0900)]
Temporary fix of build break. wl_text_input_set_surrounding_text() is deprecated wrongly and proper guide will be come later. before that patch, this needs to be commented out
Change-Id: Id3d1b3737139ca2fcb1c54fd7aa9e10fe124f678
dongsug.song [Tue, 14 Jun 2016 11:26:54 +0000 (20:26 +0900)]
[3.0] temporary fix for build error
Change-Id: Id511fd3914866c1b6f758199616c269d0770d86c
dongsug.song [Tue, 14 Jun 2016 06:10:28 +0000 (15:10 +0900)]
[3.0] build error fix : chaged wayland api of wl_text_input_set_surrounding_text()
Change-Id: I0bbccd7afcafcf065161956d79ce391b80b87a41
Paul Wisbey [Mon, 13 Jun 2016 10:19:22 +0000 (03:19 -0700)]
Merge "Removed HasRendered() queries. They were stopping from calling PostRender() and preventing finalizing the rendering operations per frame in case there were no renderables to draw." into devel/master
Xiangyin Ma [Fri, 10 Jun 2016 10:47:58 +0000 (11:47 +0100)]
DALi Version 1.1.38
Change-Id: I37e5dd74ade1b4a963c50b31b6504769e0eaedb6
adam.b [Thu, 9 Jun 2016 17:38:19 +0000 (18:38 +0100)]
Removed HasRendered() queries.
They were stopping from calling PostRender() and preventing
finalizing the rendering operations per frame in case there were no renderables to draw.
Change-Id: I80f1e17fba7c6bad9a7255673f6be90ad1420367
suhyung Eom [Wed, 8 Jun 2016 06:51:41 +0000 (15:51 +0900)]
Change API version number of WatchApplication class
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I193bb14e5a9f42b6e2187185fbc40fdde88e2bda
Kimmo Hoikka [Fri, 3 Jun 2016 16:12:08 +0000 (09:12 -0700)]
Merge "Update BitmapLoader following the PixelData change" into devel/master
Paul Wisbey [Fri, 3 Jun 2016 14:20:25 +0000 (07:20 -0700)]
Merge "DALi Version 1.1.37" into devel/master
Tom Robinson [Fri, 3 Jun 2016 13:33:32 +0000 (14:33 +0100)]
DALi Version 1.1.37
Change-Id: Ib397544c05b88d7154e73fcf1e8df7b48f957157
Xiangyin Ma [Wed, 25 May 2016 16:31:30 +0000 (17:31 +0100)]
Update BitmapLoader following the PixelData change
Change-Id: I392825bc6915530faf475cfae635f892c8ea4d60
suhyung Eom [Thu, 2 Jun 2016 05:57:01 +0000 (14:57 +0900)]
Add WatchApplication UTC
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I9ec9fa3c942d159d315c4e88264ef17916d73104
suhyung Eom [Thu, 28 Apr 2016 07:28:44 +0000 (16:28 +0900)]
Implement WatchApplication class
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: Ic18e12302823303adff8faaa14a36f063ac6d0f6
suhyung Eom [Tue, 31 May 2016 08:36:39 +0000 (17:36 +0900)]
[3.0] Fix ivi build error
This reverts commit
901332b474189296509bd74b7aff42fa991e385c.
Change-Id: Ia579962f9024a3153ef19027d1a20885d588b063
suhyung Eom [Tue, 31 May 2016 08:35:32 +0000 (17:35 +0900)]
[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update
This reverts commit
24335d78c280ada77a3bc2c0d0cdddf7d6bd06b5.
Change-Id: I7ca7ccf1e1b5d4ce44b19d13547c56408f1d4c6b
suhyung Eom [Tue, 31 May 2016 08:25:17 +0000 (17:25 +0900)]
[3.0] Fix common profile build error
This reverts commit
21418fbb5705a766419036d62f4758b41ebf6a9e.
Change-Id: Iae78b72fc5d0bd34e0b8e25c57c5648d677f81f0
suhyung Eom [Tue, 31 May 2016 07:47:35 +0000 (16:47 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ie305c6368f8c98123674cd53ef22886d79a8e6ad
suhyung Eom [Tue, 31 May 2016 07:45:23 +0000 (16:45 +0900)]
Revert "[3.0] Fix build error according to updating Khronos header"
This reverts commit
e81b3e459ae24ac23a3e24decfd889246359241f.
Change-Id: I0aadb42cb6b349427f956cbf6793eae93c87077a
suhyung Eom [Tue, 31 May 2016 07:44:48 +0000 (16:44 +0900)]
Revert "[3.0] TC fail because of tbm surface is not supporting specific color depth"
This reverts commit
27493811a37274fa58201ea6f01ab17a124f3324.
Change-Id: Ibfdfa9691c7a13accd69a670d6eda1d46135f0bf
suhyung Eom [Tue, 31 May 2016 07:43:56 +0000 (16:43 +0900)]
Revert "[3.0] Fix common profile build error"
This reverts commit
c0b4657fea8974fc24b30f031b7fb9aa2d9655b5.
Change-Id: I24c72d91dfd1f70df72e245125bc8f498dd355d9
suhyung Eom [Tue, 31 May 2016 07:43:19 +0000 (16:43 +0900)]
Revert "[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update"
This reverts commit
58313d39ed008b408eedbddfae6f162518a747f3.
Change-Id: I841356bf75fbd6302754b078e2265372d03d8ffc
suhyung Eom [Tue, 31 May 2016 07:42:43 +0000 (16:42 +0900)]
Revert "[3.0] Fix ivi build error"
This reverts commit
c559c8528b110e0aac6f2bac8305e0cc6b19b0c7.
Change-Id: I656e7a5099241474db926db6d6311abffcfb54ed
suhyung Eom [Tue, 31 May 2016 07:41:56 +0000 (16:41 +0900)]
Revert "[3.0] Enable render notification after DALi renders (ecore Wayland)"
This reverts commit
052e3ff12ac17b8307e55f77facdfbd668e6d9be.
Change-Id: Ida14959510ae3502b91c4436493032d7153b4dac
Adeel Kazmi [Fri, 27 May 2016 12:35:07 +0000 (05:35 -0700)]
Merge "DALi Version 1.1.36" into devel/master
Richard Huang [Fri, 27 May 2016 11:20:32 +0000 (12:20 +0100)]
DALi Version 1.1.36
Change-Id: Ia36dcd4c5e53ab9f07e58ee872c708769fafb79b
Seoyeon Kim [Fri, 27 May 2016 05:39:39 +0000 (14:39 +0900)]
[3.0] Prevention of NULL pointer dereference at EventHandler
Change-Id: Ic5149f3b71da300add2922ad916d2b4b1ecb8094
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Seoyeon Kim [Fri, 27 May 2016 05:39:39 +0000 (14:39 +0900)]
Prevention of NULL pointer dereference at EventHandler
Change-Id: Ic5149f3b71da300add2922ad916d2b4b1ecb8094
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Tom Robinson [Tue, 24 May 2016 14:58:01 +0000 (15:58 +0100)]
Allows debug builds to be enabled for GBS builds
You can now enable a debug build of DALi via GBS by adding the following to your GBS build line:
--define "%enable_debug 1"
Details in README file.
Change-Id: Ibcbda7cd9840bf1c121eb272e0c64e8ea8d3c967
Heeyong Song [Thu, 19 May 2016 03:07:59 +0000 (12:07 +0900)]
Fix build error according to updating Khronos header
Change-Id: I32b25111f5bf3f876a3169acc5f41422bc6197b3
minho.sun [Tue, 24 May 2016 01:48:34 +0000 (18:48 -0700)]
Merge changes Ia421f3c7,I555ac3f0,Iee1db45f,Id3ad58a2,I1c06e8df, ... into tizen
* changes:
[3.0] Enable render notification after DALi renders (ecore Wayland)
[3.0] Fix ivi build error
[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update
[3.0] Fix common profile build error
Merge branch 'devel/master' into tizen
Revert "[3.0] Fix common profile build error"
minho.sun [Tue, 24 May 2016 01:46:52 +0000 (18:46 -0700)]
Merge "Revert "[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update"" into tizen
minho.sun [Tue, 24 May 2016 01:46:44 +0000 (18:46 -0700)]
Merge "Revert "[3.0] Fix ivi build error"" into tizen
minho.sun [Tue, 24 May 2016 01:46:36 +0000 (18:46 -0700)]
Merge "Revert "[3.0] Enable render notification after DALi renders (ecore Wayland)"" into tizen
Heeyong Song [Mon, 23 May 2016 05:18:03 +0000 (14:18 +0900)]
Fix size error in wbmp loader
Change-Id: Ie90a734ed84d785e5d22e8d09a8004aec6354a5d
Nick Holland [Fri, 20 May 2016 10:17:24 +0000 (11:17 +0100)]
DALi Version 1.1.35
Change-Id: I4fe653b0c7c47e5a6cb11f63273190452d25d34d
dongsug.song [Tue, 17 May 2016 02:21:16 +0000 (11:21 +0900)]
[3.0] TC fail because of tbm surface is not supporting specific color depth
- Add "IsSupportedColorDepth()" method to check which color depth is supported on a specific HW
- change the API name of "IsSupportedColorDepth()" to "IsColorDepthSupported()"
IsSupportedColorDepth
- fix Dali server build error
Change-Id: Ie2fb36bca91962a6ecd5c5054daf17ce5efea0f2
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
dongsug.song [Tue, 17 May 2016 02:21:16 +0000 (11:21 +0900)]
TC fail because of tbm surface is not supporting specific color depth
- Add "IsSupportedColorDepth()" method to check which color depth is supported on a specific HW
- change the API name of "IsSupportedColorDepth()" to "IsColorDepthSupported()"
IsSupportedColorDepth
- fix Dali server build error
Change-Id: Ie2fb36bca91962a6ecd5c5054daf17ce5efea0f2
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Heeyong Song [Thu, 19 May 2016 03:07:59 +0000 (12:07 +0900)]
[3.0] Fix build error according to updating Khronos header
Change-Id: I32b25111f5bf3f876a3169acc5f41422bc6197b3
minho.sun [Wed, 18 May 2016 02:12:26 +0000 (11:12 +0900)]
[3.0] Enable render notification after DALi renders (ecore Wayland)
This reverts commit
eaa5ad52f5eb3b7669c9f86134c735f120090648.
Change-Id: Ia421f3c7cbf524f7d45c380d8853320940e09425
minho.sun [Wed, 18 May 2016 02:12:09 +0000 (11:12 +0900)]
[3.0] Fix ivi build error
This reverts commit
9b9782b0e03c0ea47e1c30f6fb4614fa03b0a62a.
Change-Id: I555ac3f0c6b170c06f2fc2b0718bde8ca9f6f01b
minho.sun [Wed, 18 May 2016 02:11:50 +0000 (11:11 +0900)]
[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update
This reverts commit
9db18bd5ca159026775ddc068a5aec8a38716be4.
Change-Id: Iee1db45f92e42f9ea7e824923d142e9e5dd4b2ff
minho.sun [Wed, 18 May 2016 02:11:36 +0000 (11:11 +0900)]
[3.0] Fix common profile build error
This reverts commit
3ef3ecf4ada46e2b495b669df2ec1de9091a04bb.
Change-Id: Id3ad58a233be9696b34e550c993ad6fdc8682f70
minho.sun [Wed, 18 May 2016 02:11:24 +0000 (11:11 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I1c06e8df2d83d0d12c528d1f88ad258789bc0bae
minho.sun [Wed, 18 May 2016 02:11:08 +0000 (11:11 +0900)]
Revert "[3.0] Fix common profile build error"
This reverts commit
61332461462bc2a25550c75049cbb66bff79599f.
Change-Id: I3a187feaadd4a0c55e06916188b452b1855ad39b
minho.sun [Wed, 18 May 2016 02:10:53 +0000 (11:10 +0900)]
Revert "[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update"
This reverts commit
e1c261746b376544921d6e253ac64496e0efe033.
Change-Id: I042b155f129c3a6fde2f470923efb78bff37b148
minho.sun [Wed, 18 May 2016 02:10:44 +0000 (11:10 +0900)]
Revert "[3.0] Fix ivi build error"
This reverts commit
d120d7a02ab209a4b5347eb59727a509bb655958.
Change-Id: Ib412cefdecb727da0d84348c9426753c995ec114
minho.sun [Wed, 18 May 2016 02:10:34 +0000 (11:10 +0900)]
Revert "[3.0] Enable render notification after DALi renders (ecore Wayland)"
This reverts commit
567921dc8a8f1354d4d5f58e0be027bc9f35635e.
Change-Id: I18ac12d60279af658f97003b407afb0ffbd75175
Adeel Kazmi [Tue, 17 May 2016 14:07:16 +0000 (07:07 -0700)]
Merge "Remove ImageActor from ObjectProfiler and Emscripten" into devel/master
Adeel Kazmi [Tue, 17 May 2016 13:33:21 +0000 (06:33 -0700)]
Merge "Enable render notification after DALi renders (ecore Wayland)" into devel/master
Adeel Kazmi [Tue, 17 May 2016 11:40:28 +0000 (04:40 -0700)]
Merge "Wayland IMF support" into devel/master
Heeyong Song [Tue, 17 May 2016 08:35:22 +0000 (01:35 -0700)]
Merge "[3.0] Enable render notification after DALi renders (ecore Wayland)" into tizen
Nick Holland [Mon, 16 May 2016 13:27:04 +0000 (14:27 +0100)]
Enable render notification after DALi renders (ecore Wayland)
Change-Id: I7812667a3fcace7dabb24740534c61a20a3d040b
Heeyong Song [Tue, 17 May 2016 06:01:52 +0000 (15:01 +0900)]
[3.0] Enable render notification after DALi renders (ecore Wayland)
Change-Id: Ib93bf2641787e3e80e8fb331ea0a2175d336314b
Adeel Kazmi [Mon, 16 May 2016 17:25:55 +0000 (10:25 -0700)]
Merge "Use Geometry::QUAD() in UTC" into devel/master
Adeel Kazmi [Mon, 16 May 2016 16:17:28 +0000 (17:17 +0100)]
Updates following vector-wrapper include changes in core.
Change-Id: I767de4fbc03d09f2f17b62aecb7c88e8fb0b777f
Xiangyin Ma [Mon, 16 May 2016 16:12:46 +0000 (17:12 +0100)]
Use Geometry::QUAD() in UTC
Change-Id: I1c3931f987cabec0cdb5dede53baf4eee29c9b30
Xiangyin Ma [Wed, 11 May 2016 16:19:27 +0000 (17:19 +0100)]
Remove ImageActor from ObjectProfiler and Emscripten
Change-Id: I97b5f8f3ee862f3e61373455c4e32abf5b141a62
Adeel Kazmi [Mon, 16 May 2016 14:13:40 +0000 (07:13 -0700)]
Merge "Remove the usage of ImageActor from Indicator" into devel/master
Nick Holland [Wed, 11 May 2016 10:27:07 +0000 (11:27 +0100)]
Wayland IMF support
Pure Wayland Implementation for Wayland Tizen text protocol text.xml protocol. It Does not use ecore_wl wrapper API.
Tested on Tizen 3 TV image
Note: the Tizen Text protocol is still in development
so this may need updating in the future.
See the repo for the text protocol:
https://review.tizen.org/gerrit/#/q/project:platform/core/uifw/wayland-extension
Change-Id: Ib3cad5caa5ba7fa1b0876b07b111ce2e84943c25
Xiangyin Ma [Mon, 9 May 2016 16:56:06 +0000 (17:56 +0100)]
Remove the usage of ImageActor from Indicator
Change-Id: I361758c9ce3a75e6ef39c4f1e55945ca1599472c
Heeyong Song [Thu, 12 May 2016 05:45:42 +0000 (14:45 +0900)]
Remove abort handler registration and change terminate callback
Change-Id: I73c221c5a97cbba1fd38cd7629f10e1659f523aa
Ferran Sole [Fri, 13 May 2016 10:54:45 +0000 (11:54 +0100)]
DALi Version 1.1.34
Change-Id: I21ac34d1beb34bbd17e4674b33fc54ca39b1230f
Adeel Kazmi [Thu, 12 May 2016 14:06:06 +0000 (07:06 -0700)]
Merge "Ensured correct display of performance marker times" into devel/master
David Steele [Thu, 12 May 2016 13:50:02 +0000 (14:50 +0100)]
Ensured correct display of performance marker times
Float granularity is too low for performance markers - too many markers
were showing the same time. Upgraded it to a double - this allows the
multiplication to generate the right markers in the network client
Change-Id: I73a4eece36878c6d0cc5c5d320585dea28481ba9
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Thu, 12 May 2016 13:21:42 +0000 (14:21 +0100)]
(NetworkServer) Fix crash and deadlock on exit
- mListeningSocket was being dereferenced without checking if it was NULL.
- There was a dead lock when trying to stop the clients as both the main thread and the client thread
had mClientListMutex locked. The solution was to not join the client threads at all as it's not
required and allows the main thead to unlock the mutex.
Change-Id: Ibee9d6c775f0dfd4b1553b1594bf198b7cf56e92
Nick Holland [Tue, 26 Apr 2016 09:05:09 +0000 (10:05 +0100)]
Updated Wayland TextInput to match latest system changes
Change-Id: Ife9920178b8fb1f147c8964b1bdc8b3c6b83c0c0
Adeel Kazmi [Fri, 6 May 2016 14:51:31 +0000 (07:51 -0700)]
Merge "DALi Version 1.1.33" into devel/master
David Steele [Fri, 6 May 2016 14:47:26 +0000 (15:47 +0100)]
DALi Version 1.1.33
Change-Id: I42095b695b268b26fab49212643960bfcde558d5
Adeel Kazmi [Thu, 5 May 2016 19:22:31 +0000 (20:22 +0100)]
(Automated Tests) Platform Abstraction now handles multiple resource requests
Also synchronized some dali-test-suite-utils.h/cpp with toolkit.
Change-Id: Ie9b33de65cfad6456fd5bd8fc128db6e1cc9f2a5
Adeel Kazmi [Thu, 5 May 2016 14:29:51 +0000 (15:29 +0100)]
Build UBUNTU profile & for OpenGL ES 2.0 by default
This is overridden in the spec files for targets anyway so a completely unnecessary step for
UBUNTU users.
Change-Id: I1d19584737eceb42b4a5b0bd0d35b806f13e8124
Victor Cebollada [Thu, 5 May 2016 06:38:21 +0000 (07:38 +0100)]
Svace issues.
* Add undefined and private copy constructors and assignment operators to avoid copies.
Change-Id: I7ff0665f11f5b557ddb76e15b016ebda6eaaa808
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
dongsug.song [Wed, 4 May 2016 00:02:40 +0000 (09:02 +0900)]
[3.0] Fix ivi build error
This reverts commit
2b51c67d373974d8103d99c5a98654f28976a1b8.
Change-Id: Iac166cf82f6bae9aff8258ed3e27ebbd6218ef7c
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
dongsug.song [Wed, 4 May 2016 00:01:16 +0000 (09:01 +0900)]
[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update
This reverts commit
da4a7c3eed00a4e0d72f212ddca7e127ba267fcd.
Change-Id: I1da0885bc318599fa3b1d1c102d8c26ae76daff0
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
dongsug.song [Tue, 3 May 2016 23:58:35 +0000 (08:58 +0900)]
[3.0] Fix common profile build error
This reverts commit
785246af146fd39c2c5bad773fa363c9b4151e64.
Change-Id: Ibf8b62f6563a09ea631cb69c9fdfeaa65a4eb7b8
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
dongsug.song [Tue, 3 May 2016 23:56:48 +0000 (08:56 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I94011d7de3626e3645e0c0227556432ba988b051
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
dongsug.song [Tue, 3 May 2016 23:54:58 +0000 (08:54 +0900)]
Revert "[3.0] Fix common profile build error"
This reverts commit
4baa42b24c35ec2a9d77b3dde14ab4aa1c0f8f73.
Change-Id: Ieb784d8d446ecba5ac6aedab460b296c95255bc5
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
dongsug.song [Tue, 3 May 2016 23:54:27 +0000 (08:54 +0900)]
Revert "[3.0] Fix common, wearable profile build errors at dali-1.1.22 version update"
This reverts commit
79f1544f03d3ca0207c0b20f587cc048a843df00.
Change-Id: Id792ce1d7dca6e097bb449851027a0122d5b8ec7
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
dongsug.song [Tue, 3 May 2016 23:53:53 +0000 (08:53 +0900)]
Revert "[3.0] Fix ivi build error"
This reverts commit
9df67ab02259b7979a19ad229c620c7622fe154c.
Change-Id: I019d171d213d15ae47e0a998ecc9bd733eb60326
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Paul Wisbey [Tue, 3 May 2016 09:19:30 +0000 (10:19 +0100)]
Blending enum clean-up
We were previously using a mixture of BLEND and BLENDING in enums.
The order of the BLEND_FACTOR enums & string names was also inconsistent.
As a rule of thumb always use Blend & BLEND for namespaces & enums/constants
(not Blending or BLENDING)
Change-Id: I63f7b59cf7c5c234eda979d55213a2994e90860a
Kimmo Hoikka [Fri, 29 Apr 2016 15:01:35 +0000 (08:01 -0700)]
Merge "Changes following "Remove API to set if a geometry requires writing to the depth buffer"" into devel/master
Ferran Sole [Wed, 27 Apr 2016 07:19:05 +0000 (08:19 +0100)]
Changes following "Remove API to set if a geometry requires writing to the depth buffer"
Change-Id: I4739a7d9aa6e1b65a55761fda0166e7004cb1761
Agnelo Vaz [Fri, 29 Apr 2016 08:10:10 +0000 (09:10 +0100)]
DALi Version 1.1.32
Change-Id: I4b6b65e084bffe999d78abaab8794ef87c3b0b09
projects / platform / core / uifw / dali-adaptor.git / log