suhyung Eom [Fri, 9 Sep 2016 01:49:56 +0000 (10:49 +0900)]
Add function to set top margin of the stage
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I93ad124f3b584976ceda8d38de12983be48aefe4
adam.b [Fri, 30 Sep 2016 14:11:25 +0000 (15:11 +0100)]
DALi Version 1.2.8
Change-Id: I63da29d555e981be0ae93568508341e7d7d85f28
taeyoon [Wed, 7 Sep 2016 10:53:03 +0000 (19:53 +0900)]
Modify texture bind for OES_EGL_image_external
Modify BindTexture part for native image source with OES_EGL_image_external
Change-Id: I4c4063d98293f833739870a7c8c42d0ab70d409c
David Steele [Fri, 23 Sep 2016 13:00:26 +0000 (06:00 -0700)]
Merge "DALi Version 1.2.7" into devel/master
David Steele [Fri, 23 Sep 2016 12:56:29 +0000 (13:56 +0100)]
DALi Version 1.2.7
Change-Id: Ie8bffad95e30ba510861f32dd122639c378facbc
David Steele [Fri, 23 Sep 2016 12:03:26 +0000 (05:03 -0700)]
Merge "Documentation cleanup." into devel/master
Andrew Poor [Thu, 22 Sep 2016 13:57:42 +0000 (14:57 +0100)]
Documentation cleanup.
Change-Id: I2f956983f5cb095274b13a6467817f061c28c7d2
Seoyeon Kim [Tue, 20 Sep 2016 00:49:37 +0000 (09:49 +0900)]
Fix license issue
- Change the license name and delete Samsung Properietary license
Change-Id: I38c879b47157e6126219a85f2c326291da55abf1
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
David Steele [Tue, 13 Sep 2016 19:57:40 +0000 (20:57 +0100)]
Added Property::Key type to properly represent keys in maps
Currently, Property::Map can have either string or integer
keys. The two methods GetPair and GetKey only allow iteration
over string keys.
Have added a single Key type that enables the retrieval of all
keys of Property::Map via the two new methods GetKeyAt and GetKeyValue
Have un-deprecated GetValue, which is still valid.
Added a new method Handle::GetPropertyIndex( Property::Key ), which
allows a lookup of a property from a property map key.
This is useful to enable property maps to be used as a property
aggregator when setting values on objects.
Have updated Scripting and PropertyBuffer to use new Property::Map
interface rather than the deprecated interface.
Change-Id: Ie2db5355fd661ed73a6f92b720d92ca1e6ab8d76
Signed-off-by: David Steele <david.steele@samsung.com>
Agnelo Vaz [Fri, 16 Sep 2016 09:55:39 +0000 (10:55 +0100)]
DALi Version 1.2.6
Change-Id: Id2ec76758fb36df2d68c6b88d7420d93ea3c857a
Kimmo Hoikka [Thu, 15 Sep 2016 17:17:29 +0000 (10:17 -0700)]
Merge "Remove/move experimental features" into devel/master
Adeel Kazmi [Thu, 15 Sep 2016 15:42:19 +0000 (08:42 -0700)]
Merge "Added new API to Property::Map to enable method chaining" into devel/master
taeyoon [Mon, 12 Sep 2016 11:39:13 +0000 (20:39 +0900)]
Remove/move experimental features
Change-Id: I22b82082a0a2bd465a28a54e3f7c5d20be8bff37
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
Adeel Kazmi [Fri, 9 Sep 2016 13:52:35 +0000 (14:52 +0100)]
Mark Clipping API as being part of the Tizen 3 version
Change-Id: I3c0be13ad6fdce174f539c7a0bc310226628c1ef
Xiangyin Ma [Fri, 9 Sep 2016 13:02:01 +0000 (14:02 +0100)]
DALi Version 1.2.5
Change-Id: I749125836d7c7eeda7e4560fe4e8275b5c51c104
Tom Robinson [Fri, 18 Mar 2016 17:05:28 +0000 (17:05 +0000)]
Clipping API feature in Actor
A clipping mode property has been added to Actor.
This property controls how the actor will clip its children against it.
Property: Actor::Property::ClippingMode / "clippingMode"
Values:
DISABLED This Actor will not clip its children.
CLIP_CHILDREN This Actor will clip all children to its contents (the actor will also be visible itself).
Change-Id: Ic96ee03bd6048b06abcbd36569db455ab8129d25
David Steele [Thu, 8 Sep 2016 14:58:17 +0000 (07:58 -0700)]
Merge "Fix WeakHandleBase::Reset()" into devel/master
Tom Robinson [Wed, 7 Sep 2016 18:17:38 +0000 (19:17 +0100)]
Combine StencilMode and WriteToColorBuffer to RenderMode
Change-Id: I989389056c9f095d11ad706948a31e21a273ac25
Xiangyin Ma [Tue, 6 Sep 2016 14:41:54 +0000 (15:41 +0100)]
Fix WeakHandleBase::Reset()
If Reset() is called somewhere, there is no way to check whether this WeakHandle is still valid. Attempts of calling GetBaseHandle() or operator ==, != will crash.
Change-Id: I161af6539f2a9ab971a55f0e1280ed890cd98715
Andrew Poor [Fri, 2 Sep 2016 09:24:53 +0000 (10:24 +0100)]
Set up the depth buffer based on per-renderer flags.
Related toolkit and demo changes:
"Removed 3D layer dependency of Model3dView and Mesh Visual."
Change-Id: Ib9b1c3110189950b0c1a9cea155eb3ca5c37bf4a
David Steele [Thu, 1 Sep 2016 16:52:50 +0000 (17:52 +0100)]
Added new API to Property::Map to enable method chaining
Property::Map map;
map.Add("key1", "value").Add("key2", "value");
Or even for anonymous handles:
Property::Map().Add("key1", value).Add("key2", value);
Change-Id: I3657587ee70bd4a6ece441693f885c634544ac42
Signed-off-by: David Steele <david.steele@samsung.com>
Victor Cebollada [Fri, 2 Sep 2016 14:01:34 +0000 (15:01 +0100)]
DALi Version 1.2.4
Change-Id: Idd212e4fcba042b09b5ef37705b96cc3bf15d4c1
Seoyeon Kim [Mon, 29 Aug 2016 06:44:08 +0000 (15:44 +0900)]
Add Privilege doxygen tags
Change-Id: Ifc8755ca6a7492974e3275605f45394d3dee9166
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Umar [Fri, 26 Aug 2016 09:26:30 +0000 (10:26 +0100)]
DALi Version 1.2.3
Change-Id: Ia8df4bfe93e504c50fa548f96e4f091c22940157
Ferran Sole [Fri, 19 Aug 2016 09:57:37 +0000 (10:57 +0100)]
DALi Version 1.2.2
Change-Id: Ie6d31529a515a09863951631034568324b8ee963
Adeel Kazmi [Thu, 18 Aug 2016 07:40:38 +0000 (00:40 -0700)]
Merge "Add descriptions and example codes" into devel/master
Seoyeon Kim [Wed, 3 Aug 2016 04:21:15 +0000 (13:21 +0900)]
Add descriptions and example codes
Change-Id: I31918f8b48745042cb3513b60fc2a4120efda8a7
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Kimmo Hoikka [Mon, 15 Aug 2016 17:47:55 +0000 (18:47 +0100)]
remove Uniform name cache as its no longer used for anything
Change-Id: Idd00992e0834e6aa919a58adefbb87f30d83a10f
Nick Holland [Fri, 12 Aug 2016 10:40:39 +0000 (11:40 +0100)]
DALi Version 1.2.1
Change-Id: Ib1996008dd192e0bf2c356dcf58322840bdcf3f0
Adeel Kazmi [Thu, 11 Aug 2016 16:59:57 +0000 (09:59 -0700)]
Merge "Added integer keys for custom properties." into devel/master
David Steele [Wed, 10 Aug 2016 14:06:49 +0000 (15:06 +0100)]
Added integer keys for custom properties.
Custom properties (those that are registered, rather than predefined
in the DEFAULT range), can now also be registered with an integer key
in addition to the name.
The key can then be used to retrieve the property index. This is of
use for renderer properties that are well specified in toolkit.
Change-Id: Ieda47070f30f5cb53514c9358843f24868a3da3e
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Wed, 10 Aug 2016 14:25:36 +0000 (07:25 -0700)]
Merge "Exclude internal tag module in Public API reference" into devel/master
Ferran Sole [Tue, 9 Aug 2016 15:07:35 +0000 (16:07 +0100)]
Bug fix in Transform manager and performance improvement
* World matrices where not reordered in the sorting pass causing the application to get the wrong value if the world matrix was queried during component sorting. This bug was causing slider handle and value to jump to an erroneous position when panning
* Minor performance improvement to reduce the number of swaps when reordering transform components
Change-Id: Ifde6ef4aaa2052c70042ef46c8909c85c407588a
Seoyeon Kim [Fri, 24 Jun 2016 06:41:19 +0000 (15:41 +0900)]
Exclude internal tag module in Public API reference
Change-Id: I1de3043ddc5adc4a1005db5ad492326a2b282cef
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
David Steele [Mon, 8 Aug 2016 18:46:43 +0000 (19:46 +0100)]
Updated patch-coverage tool to catch fewer errors
Patch coverage tool was catching coverage errors for files in
non-source tree and of non-source code, also was catching changes
that had no coverage change.
Also added mechanism to choose the right patch, or to fail
if there are changes in both the working tree and the index.
Also added html output.
One minor gotcha spotted - added test code which was in-advertently covered
because of a case fallthrough, and passed, though this then caused unchanged
code to reduce in coverage.
Change-Id: I439ce905a2ca906498e03b5c182b05e70e4f28d4
Tom Robinson [Fri, 5 Aug 2016 13:51:44 +0000 (14:51 +0100)]
DALi Version 1.2.0
Change-Id: If80150c68629411663afba2bba167569a04597be
Adeel Kazmi [Thu, 4 Aug 2016 16:32:10 +0000 (09:32 -0700)]
Merge "Preparation for minor version upgrade" into devel/master
Agnelo Vaz [Thu, 4 Aug 2016 15:35:59 +0000 (16:35 +0100)]
Adding ObjectDestructionTracker to dali-test-suite-utils for testing object destruction
Change-Id: Iaabd6c94c28cc42922cb49ab3d06fd124117d23e
Adeel Kazmi [Thu, 4 Aug 2016 15:32:00 +0000 (16:32 +0100)]
Preparation for minor version upgrade
Change-Id: I72d2a872c60a3c53165fd7f960c670efecaf1f14
Adeel Kazmi [Thu, 4 Aug 2016 15:15:32 +0000 (08:15 -0700)]
Merge "Batching clean-up Fixed property comment ( missing version number )" into devel/master
adam.b [Thu, 4 Aug 2016 13:45:04 +0000 (14:45 +0100)]
Batching clean-up
Fixed property comment ( missing version number )
Change-Id: I1a29fa8b894f6f5ed55542c9c979a588f603887a
Ferran Sole [Thu, 4 Aug 2016 09:45:19 +0000 (10:45 +0100)]
Render textures created from NativeImages where not handled correctly
* GlExtensionDestroy() was not being called on clean-up
* PrepareTexture() was not being called when binding the texture
* Error code returned from TargetTexture() was not being handled
Change-Id: Ie3e8f9d5cc973da8a72eea68838e9443a3421077
adam.b [Tue, 26 Jul 2016 17:33:21 +0000 (18:33 +0100)]
Geometry Batching
DALi support to batch geometry under certain conditions ( like using same texture atlas, shaders ).
Known limitations:
- Batching, once it's on, is immutable
- Batches update only, when something changes in the hierarchy
- Actors within a batch share the same uniforms set ( share values like opacity, color etc. ).
- Transformations applied to actors within a batch won't have any visual effect.
Change-Id: Id48aa47397b8ff9169dc044f37e4de2341a6b169
David Steele [Wed, 3 Aug 2016 13:59:17 +0000 (06:59 -0700)]
Merge "Added missing newline chars to logging commands" into devel/master
Tom Robinson [Fri, 29 Jul 2016 15:29:40 +0000 (16:29 +0100)]
Renderer to support enum and string properties
Change-Id: Ief5da875bab5aad2729dd966db27d0a7b4f8eb3a
Adeel Kazmi [Tue, 2 Aug 2016 14:13:56 +0000 (15:13 +0100)]
Added missing newline chars to logging commands
Change-Id: Iabec9a41aaead0f8fac0b0ec8c93cb2a80b54be7
Tom Robinson [Fri, 29 Jul 2016 15:35:33 +0000 (16:35 +0100)]
Renderer Depth UTCs + test-gl-abstraction update
Change-Id: I72af9d9c39114f150934038b579500ebca47f4e0
Adeel Kazmi [Fri, 29 Jul 2016 16:11:25 +0000 (17:11 +0100)]
DALi Version 1.1.45
Change-Id: If16edd8506e5aeed0b81d4b33a136b62a51f9429
Adeel Kazmi [Thu, 28 Jul 2016 14:19:37 +0000 (15:19 +0100)]
(Scripting) Helper method for bit-mask enum properties & moved enum-string macros to Devel API
Change-Id: Iec06be774d5ea9cd37db43fa7378634f0a3dee37
Adeel Kazmi [Thu, 28 Jul 2016 14:18:42 +0000 (15:18 +0100)]
(Property Map) Added method to find and return an index or equivalent string key
Change-Id: Iaf18b8eb70523b401a13eb47db4a69b65f1fb963
Adeel Kazmi [Fri, 15 Jul 2016 15:05:48 +0000 (16:05 +0100)]
Added a Max Core Property Index so that a range can be defined in toolkit
Change-Id: I75c878357b86e509083783144cc84a7f18374e16
Tom Robinson [Thu, 28 Jul 2016 13:11:57 +0000 (14:11 +0100)]
FrameBuffer::Format changed to bit-mask Attachment: Core
Change-Id: I894a703dc8de36cc052fc958693842fc33b208f8
Ferran Sole [Wed, 27 Jul 2016 16:13:10 +0000 (17:13 +0100)]
Renamed enum Geometry::GeometryType to Geometry::Type
* Renamed GeometryType enum to Type
* Renamed Geometry::SetGeometryType and Geometry::GetGeometryType to Geometry::SetType and Geometry::GetType
Change-Id: Ifcfe881ad4d9a5fa0b6750658dbea9509a6bdc57
Tom Robinson [Tue, 26 Jul 2016 14:32:53 +0000 (15:32 +0100)]
Helper method for getting enum properties as ints and strings
Change-Id: I9a1b40988f8abaff7b6f9ac02bffbdeb6dfe2516
Ferran Sole [Wed, 27 Jul 2016 12:53:13 +0000 (13:53 +0100)]
Wrapped ShaderHints enum inside a struct
Change-Id: Ib1e23fcc942a7df8a83b86599c17c517b0c1df91
Adeel Kazmi [Wed, 27 Jul 2016 10:03:55 +0000 (03:03 -0700)]
Merge "introduce LAYER_UI to replace LAYER_2D, deprecate latter" into devel/master
Kimmo Hoikka [Mon, 25 Jul 2016 17:34:21 +0000 (18:34 +0100)]
introduce LAYER_UI to replace LAYER_2D, deprecate latter
Change-Id: I6228bf0e8f3153918fdac8759b0d45e8c41027e2
Tom Robinson [Fri, 15 Jul 2016 16:57:15 +0000 (17:57 +0100)]
Rendering API Stencil Implementation
Change-Id: I802f2d0fb3a569e5f5d7159cd73d56f47874410e
Kimmo Hoikka [Fri, 22 Jul 2016 11:56:01 +0000 (12:56 +0100)]
Remove deprecated load and release policies from scripting
Change-Id: I531494e0cb039b7eae61044006d5fc1f02ab66c8
adam.b [Fri, 22 Jul 2016 16:38:36 +0000 (17:38 +0100)]
The Render::Renderer is created when SceneGraph::Renderer is added to the update manager.
Change-Id: Ifba0242122b9d651cfcec22a858cbdcc2547a43b
Adeel Kazmi [Fri, 22 Jul 2016 16:13:25 +0000 (09:13 -0700)]
Merge "Tizen Directory Migration" into devel/master
Richard Huang [Fri, 22 Jul 2016 16:00:10 +0000 (17:00 +0100)]
DALi Version 1.1.44
Change-Id: I1f34f5310555244451f25ff041f14285c6a46c7c
dongsug.song [Wed, 20 Jul 2016 02:12:33 +0000 (11:12 +0900)]
accroding to ACR-520's review, dali's related feature and dependency (openGL ES 2.0) should be represented
Signed-off-by: dongsug song <dongsug.song@samsung.com>
Change-Id: I9bc63e2f06a18a16ccd9746ebcca5ff0f8b0faf6
David Steele [Tue, 19 Jul 2016 10:27:02 +0000 (03:27 -0700)]
Merge "Added ability to build for coverage for target" into devel/master
Adeel Kazmi [Mon, 8 Jun 2015 14:55:18 +0000 (15:55 +0100)]
Added ability to build for coverage for target
Change-Id: I20b2e7909b5250969d75aa512a47814b0b892ad0
minho.sun [Mon, 4 Jul 2016 09:21:45 +0000 (18:21 +0900)]
Tizen Directory Migration
Change absolute Directories to Tizen paths
Signed-off-by: minho.sun <minho.sun@samsung.com>
Change-Id: Ib533807d3e5c2cea679174f1c6c6fd4eb686e3d3
David Steele [Tue, 12 Jul 2016 16:51:21 +0000 (17:51 +0100)]
Patch Coverage tool
Change-Id: I238054661978a27b15704e38bda496b7fabc699d
Adeel Kazmi [Fri, 15 Jul 2016 11:28:46 +0000 (12:28 +0100)]
(Renderer) Add a property range for Renderer properties
This is required so that we can distinguish between Actor and Renderer properties in toolkit.
Change-Id: Id6d37c25b11eaa156dc6fe23ecb063d2020d85bb
Adeel Kazmi [Fri, 15 Jul 2016 11:56:02 +0000 (04:56 -0700)]
Merge "100% Coverage for Rendering API" into devel/master
Adeel Kazmi [Fri, 15 Jul 2016 11:40:17 +0000 (04:40 -0700)]
Merge "DALi Version 1.1.43" into devel/master
David Steele [Fri, 15 Jul 2016 11:26:37 +0000 (12:26 +0100)]
DALi Version 1.1.43
Change-Id: I82bcab0866b0ec6d89a2360c2d51c4a4fceba169
Tom Robinson [Fri, 15 Jul 2016 11:05:38 +0000 (12:05 +0100)]
100% Coverage for Rendering API
Change-Id: I051bf96c0f1488b1a5bb9f2d8586cd981a77d83f
Adeel Kazmi [Fri, 15 Jul 2016 09:28:27 +0000 (10:28 +0100)]
(Automated Tests) Combined dali and dali-devel
Total 1907 tests, 1 less than combined total before.
This is because UtcLinearConstrainerApply was duplicated in both dali and dali-devel.
Change-Id: I52ae9e9da91d10259db0d7cc5dd1dc2ba45ecd63
Tom Robinson [Thu, 14 Jul 2016 17:30:21 +0000 (18:30 +0100)]
Moved UTC tests for public API to dali directory
Change-Id: I553bc2553cab1f281da56e4fade7385e337dcb08
Adeel Kazmi [Thu, 14 Jul 2016 15:46:34 +0000 (16:46 +0100)]
Avoid std::string crash when NULL is returned
GetDefaultPropertyName() can return NULL.
If we try to initialise a std::string with NULL, this causes an exception.
The solution is to just check that the returned value from GetDefaultPropertyName()
and return an empty std::string if it is NULL.
Change-Id: Iecf02228cade112b2922a0fbf0e9cef73a0df13d
Adeel Kazmi [Thu, 14 Jul 2016 16:23:08 +0000 (09:23 -0700)]
Merge "Removed dead code from Actor & fixed minor bugs in GestureDetector" into devel/master
Adeel Kazmi [Thu, 14 Jul 2016 14:54:49 +0000 (15:54 +0100)]
Removed dead code from Actor & fixed minor bugs in GestureDetector
Change-Id: I7c4a1ccfc909ecd9e82824e2d132e3561e7bf15d
Tom Robinson [Wed, 13 Jul 2016 10:46:47 +0000 (11:46 +0100)]
Moved Core Rendering API from devel-api to public-api
Change-Id: I8222979f89afd60137d2b148fcadc6175a41a6fe
Ferran Sole [Wed, 13 Jul 2016 15:44:31 +0000 (16:44 +0100)]
Fixed bug in Dali::Texture
- Protected texture to make sure it doesn't call into Core after it has been destroyed
Change-Id: Ie1b6dedc1d42134f8702fd907ac2b13cb8ffdf80
Xiangyin Ma [Mon, 11 Jul 2016 16:57:23 +0000 (09:57 -0700)]
Remove Geometry::QUAD() API
Change-Id: I962d0e570f3f7be3efa7b84179533ca490fda214
Tom Robinson [Mon, 11 Jul 2016 13:02:12 +0000 (14:02 +0100)]
Moved TextureSet::SetImage() to separate devel-api module
Change-Id: I44a5be3e98c76a73b6672c079e1f1d9084113994
David Steele [Fri, 8 Jul 2016 17:22:47 +0000 (10:22 -0700)]
Merge "(Automated Tests) Added coverage for SlotDelegate" into devel/master
Adeel Kazmi [Fri, 8 Jul 2016 16:52:37 +0000 (09:52 -0700)]
Merge "DALi Version 1.1.42" into devel/master
Agnelo Vaz [Fri, 8 Jul 2016 16:43:16 +0000 (17:43 +0100)]
DALi Version 1.1.42
Change-Id: I99eb0bc65e5082246509042388c590406af19f08
Adeel Kazmi [Fri, 8 Jul 2016 14:59:55 +0000 (15:59 +0100)]
(Automated Tests) Added coverage for SlotDelegate
Change-Id: I6fbf72d44b1785b0ff7d5498ca74819a64332f86
Ferran Sole [Wed, 6 Jul 2016 14:46:23 +0000 (15:46 +0100)]
Changed Texture::Upload to return a boolean to indicate whether the update can be performed
Upload will return true if the upload operation can be performed, false otherwise
Change-Id: I94d852d65bddaa5c4b59b9b26bd84fd753c8a036
Adeel Kazmi [Wed, 6 Jul 2016 16:23:19 +0000 (17:23 +0100)]
(AutomatedTests) Stop Calling Internal APIs from public tests
Change-Id: I936e65ba7de5fa142c8ccfdf9d4ad3000be05009
David Steele [Mon, 4 Jul 2016 18:42:12 +0000 (19:42 +0100)]
Added test cases for public api.
Coverage of public API methods showed that some methods had no
test cases. Have added test cases for all relevant methods.
Reminder: No C++ method coverage can be 100% complete ( compiler
generated virtual destructors cannot always be called ).
Change-Id: Ia3dc12b5e8262ea1e20c17141378d2a2f3c91b8e
Signed-off-by: David Steele <david.steele@samsung.com>
adam.b [Fri, 1 Jul 2016 13:28:12 +0000 (14:28 +0100)]
DALi Version 1.1.41
Change-Id: I3726e601f807f636bbfe6ce06414d1765ada93ed
David Steele [Thu, 30 Jun 2016 10:41:29 +0000 (11:41 +0100)]
Updated desktop test harness for easier TC debugging
Added a new "-d" option to execute.sh to invoke the debugger
on the speficied test case.
Change-Id: I7b791ff184c0b14e21a1a1c3700c82fa6cbab748
Signed-off-by: David Steele <david.steele@samsung.com>
Kimmo Hoikka [Wed, 29 Jun 2016 16:54:46 +0000 (09:54 -0700)]
Merge "Added support for compressed texture upload to Render::NewTexture" into devel/master
Ferran Sole [Tue, 28 Jun 2016 15:46:45 +0000 (16:46 +0100)]
Added support for compressed texture upload to Render::NewTexture
Change-Id: I864026078391a5b98caaa62ffa2c2d9a0db6a919
Seoyeon Kim [Tue, 28 Jun 2016 04:41:20 +0000 (13:41 +0900)]
Fix Svace issue
- Return value of a function GetMap() has to be checked for NULL at shader-impl.cpp
Change-Id: Ib28207bcb87b073eea34887233514c31958c11f1
Adeel Kazmi [Fri, 24 Jun 2016 08:02:25 +0000 (01:02 -0700)]
Merge "DALi Version 1.1.40" into devel/master
Victor Cebollada [Fri, 24 Jun 2016 07:22:57 +0000 (08:22 +0100)]
DALi Version 1.1.40
Change-Id: Ie05785cab691fdc260eaed9bf7f8f2320cad3a7e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Fri, 24 Jun 2016 07:22:57 +0000 (08:22 +0100)]
DALi Version 1.1.40
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Ferran Sole [Tue, 21 Jun 2016 15:10:41 +0000 (16:10 +0100)]
Fixed bug in texture-set
mHasAlpha was being overwritten in Prepare method when using Render::Textures ( TextureSets which only use Render::Textures
should not do anything in the Prepare method )
Change-Id: I21b8fba7f81d5c83b03dfa10d8fe281026b28489
David Steele [Mon, 20 Jun 2016 13:57:04 +0000 (14:57 +0100)]
Updated test harness to add map of named parameters to Gl traces.
As well as storing the parameter list as a single string, have added
(for GlAbstraction) a named parameter map. This should prevent changes
to the trace from breaking existing tests in the future, and also
provides a slightly easier to use method for searching for methods with
specific parameters.
Change-Id: Iab726d2e2bcae805fa39b48c0675ea5a96faa64d
Signed-off-by: David Steele <david.steele@samsung.com>
Paul Wisbey [Fri, 17 Jun 2016 16:39:41 +0000 (09:39 -0700)]
Merge "Implemented Upload methods in Texture to upload data from PixelData objects" into devel/master
Adeel Kazmi [Fri, 17 Jun 2016 10:42:56 +0000 (11:42 +0100)]
DALi Version 1.1.39
Change-Id: I6df60de02d4942e5bdf5db884f20480a0669173a