Lee Morgan [Mon, 2 Nov 2015 14:28:08 +0000 (14:28 +0000)]
Implemented shader program property
Change-Id: Ibf7dcc9051d481e322f0f47ab2b35fd6e15b202c
Adeel Kazmi [Wed, 9 Dec 2015 10:35:24 +0000 (02:35 -0800)]
Merge "Removed unnecessary code from Uint16Pair UTC" 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
Tom Robinson [Tue, 8 Dec 2015 13:37:36 +0000 (13:37 +0000)]
Removed unnecessary code from Uint16Pair UTC
Change-Id: I6fc087c19f208d4479d958810a02260c70007892
Kimmo Hoikka [Tue, 8 Dec 2015 13:17:02 +0000 (05:17 -0800)]
Merge "Remove Node::ResolveVisibilty()" into devel/master
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
Tom Robinson [Thu, 26 Nov 2015 17:23:09 +0000 (17:23 +0000)]
Implement image fitting modes
Change-Id: I5153fdbe4538090c471771d57e170f21dcf3543e
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
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
Xiangyin Ma [Fri, 4 Dec 2015 11:02:26 +0000 (11:02 +0000)]
DALi Version 1.1.13
Change-Id: Ib4ecf33672d8020bfea4fa980194a376a17174b4
Adeel Kazmi [Thu, 3 Dec 2015 15:40:03 +0000 (07:40 -0800)]
Merge "Added RenderTask WorldToViewport coordinates" into devel/master
Lee Morgan [Tue, 3 Nov 2015 17:17:20 +0000 (17:17 +0000)]
Added RenderTask WorldToViewport coordinates
Change-Id: I80b12b21be3395d6b026a4007c867deac14e8e42
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
Adeel Kazmi [Thu, 3 Dec 2015 09:45:00 +0000 (01:45 -0800)]
Merge "Add macros to provide branch prediction information" into devel/master
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
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
Kimmo Hoikka [Tue, 1 Dec 2015 11:17:27 +0000 (03:17 -0800)]
Merge "fix buffer GpuBuffer" into devel/master
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
Adeel Kazmi [Fri, 27 Nov 2015 10:16:57 +0000 (10:16 +0000)]
DALi Version 1.1.12
Change-Id: I8db53d55716039edb6f6cf13221ea32af6f2e9f7
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
Adeel Kazmi [Thu, 26 Nov 2015 17:40:10 +0000 (09:40 -0800)]
Merge "Fix invalid read in render property buffer" into devel/master
Nick Holland [Thu, 26 Nov 2015 09:30:30 +0000 (09:30 +0000)]
Fix invalid read in render property buffer
Change-Id: Ifb27e48a1470d0e128f598aa4c6664cb4046d9a8
Lee Morgan [Thu, 26 Nov 2015 10:48:53 +0000 (10:48 +0000)]
fix buffer GpuBuffer
Change-Id: I6dc1a9c1b9ac3f7222af14645255e5080696175e
Lee Morgan [Fri, 6 Nov 2015 16:37:47 +0000 (16:37 +0000)]
Added or'd enums to scripting
Change-Id: I2ccbf1a549d49ff3acfef9f59c1dd59967bb751a
Kimmo Hoikka [Tue, 24 Nov 2015 16:02:18 +0000 (08:02 -0800)]
Merge "(AutomatedTests) Ensure warnings are shown as errors" into devel/master
Adeel Kazmi [Mon, 23 Nov 2015 10:04:10 +0000 (10:04 +0000)]
(AutomatedTests) Ensure warnings are shown as errors
Change-Id: Ie6a00887bae20953dcb9a3c1234a75aae79fbbc8
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
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
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
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
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
Adeel Kazmi [Fri, 20 Nov 2015 12:20:23 +0000 (12:20 +0000)]
Fix minor klocwork issue
Change-Id: Ice601bac01869245bed2a29033483162b67094e2
Richard Huang [Fri, 20 Nov 2015 10:57:59 +0000 (10:57 +0000)]
DALi Version 1.1.11
Change-Id: I0928c312faae339bb2a9b010075b4d040956e42e
Adeel Kazmi [Thu, 19 Nov 2015 17:36:23 +0000 (09:36 -0800)]
Merge "Guard against GestureEventProcessor access after Core destruction" into devel/master
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
Kimmo Hoikka [Thu, 19 Nov 2015 14:01:50 +0000 (06:01 -0800)]
Merge "Removed some junk from Makefile.am" into devel/master
Paul Wisbey [Wed, 18 Nov 2015 11:16:03 +0000 (11:16 +0000)]
Guard against GestureEventProcessor access after Core destruction
Change-Id: Ie7222a335e455c4bc8e10534c214995bf05c8bc3
taeyoon [Wed, 18 Nov 2015 08:06:50 +0000 (17:06 +0900)]
Fix UTC prevent issue
Change-Id: I363185dac06354e7e3a3490dbbc6719798c51699
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.
Kimmo Hoikka [Tue, 17 Nov 2015 15:17:00 +0000 (07:17 -0800)]
Merge "fix property buffer gl initialization" into devel/master
Paul Wisbey [Tue, 17 Nov 2015 11:47:52 +0000 (11:47 +0000)]
Removed some junk from Makefile.am
Change-Id: I1c137f3f6545c6266e831b7a11201fb863caca3c
Adeel Kazmi [Fri, 13 Nov 2015 16:40:44 +0000 (08:40 -0800)]
Merge "DALi Version 1.1.10" into devel/master
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
Adeel Kazmi [Fri, 13 Nov 2015 16:33:15 +0000 (16:33 +0000)]
DALi Version 1.1.10
Change-Id: I3eecf14ad424a4daaaf3e2ed529949c6f47b5e9c
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
Chu Hoang [Thu, 5 Nov 2015 14:03:06 +0000 (14:03 +0000)]
Added an Material::GetTexture method.
Change-Id: I63b556cb1b60f62f29c42316e097c5962677f97c
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
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
Chu Hoang [Wed, 28 Oct 2015 11:18:40 +0000 (11:18 +0000)]
Implemented face culling for SceneGraph::Material
Change-Id: I37ae9229e7723c0c2194d96b297fb9eec8465601
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
Adeel Kazmi [Wed, 11 Nov 2015 15:35:04 +0000 (15:35 +0000)]
Fix Klocwork errors in ConditionalWait, Mutex & ImageAttributes
Change-Id: Ib4423ab2670d8825cd41f0a9e6c696cd9f97582b
Adeel Kazmi [Tue, 10 Nov 2015 16:55:01 +0000 (16:55 +0000)]
Fix various klocwork issues
Change-Id: I252b73514ab3053e48e979b889f8ab48468294bb
Adeel Kazmi [Mon, 9 Nov 2015 12:34:07 +0000 (12:34 +0000)]
(PlatformAbstraction) Remove unrequired time getter
Change-Id: I008b59ee33fc7d6d2019ba6695a94420baf0d0fc
Lee Morgan [Fri, 6 Nov 2015 12:59:15 +0000 (12:59 +0000)]
fix property buffer gl initialization
Change-Id: I08f045b9afbc0256ee995cba231e741a79c6deaf
Kimmo Hoikka [Fri, 6 Nov 2015 13:58:44 +0000 (05:58 -0800)]
Merge "(Platform Abstraction) Replace GetMicroSeconds with GetNanoseconds" into devel/master
Tom Robinson [Fri, 6 Nov 2015 10:36:52 +0000 (10:36 +0000)]
DALi Version 1.1.9
Change-Id: I64f139bf7f6aaaeaf47fd364c85b776874fbbbc3
Adeel Kazmi [Thu, 5 Nov 2015 15:19:12 +0000 (15:19 +0000)]
(Platform Abstraction) Replace GetMicroSeconds with GetNanoseconds
Change-Id: Ice276d5ff236f7988e100845895db82694ca8661
Kimmo Hoikka [Wed, 4 Nov 2015 11:18:23 +0000 (03:18 -0800)]
Merge "Changed all property & signal names to lowerCamelCase" into devel/master
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
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
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
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
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
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
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
Nick Holland [Thu, 29 Oct 2015 10:31:36 +0000 (10:31 +0000)]
DALi Version 1.1.8
Change-Id: I7505ace39ca6335bfb33116fa2168c6385bcf8bc
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
Kimmo Hoikka [Mon, 26 Oct 2015 16:53:13 +0000 (16:53 +0000)]
Remove dead/duplicate enum values
Change-Id: I993c72813f60dff6f7eb553ac943a31d1a5e3951
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
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
Lee Morgan [Thu, 22 Oct 2015 15:37:30 +0000 (16:37 +0100)]
Prevent assert during path animation
Change-Id: I131e8e79a9e965eed2b8a56f2d177abdd5bd2199
Kimmo Hoikka [Mon, 26 Oct 2015 18:20:00 +0000 (11:20 -0700)]
Merge "Remove some ancient dead code, Vertex3d" into devel/master
Adeel Kazmi [Mon, 26 Oct 2015 18:18:13 +0000 (11:18 -0700)]
Merge "Removed redundant type field" 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
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
Kimmo Hoikka [Mon, 26 Oct 2015 16:40:45 +0000 (16:40 +0000)]
Remove some ancient dead code, Vertex3d
Change-Id: I9fb9c9ca87969863e2521488446507b0424aaa46
Adeel Kazmi [Mon, 26 Oct 2015 10:44:39 +0000 (03:44 -0700)]
Merge "Added WeakHandleBase::Reset method." 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
Chu Hoang [Thu, 15 Oct 2015 10:15:45 +0000 (11:15 +0100)]
Added WeakHandleBase::Reset method.
Change-Id: I8dc3606b7fb23b20897a33366520f9405bf5f9d5
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
Lee Morgan [Fri, 23 Oct 2015 12:51:32 +0000 (13:51 +0100)]
Removed redundant type field
Change-Id: Ibf4681ba76d685a620e6c149a487dbf8644540a5
Adeel Kazmi [Fri, 23 Oct 2015 14:19:05 +0000 (07:19 -0700)]
Merge "DALi Version 1.1.7" into devel/master
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
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
Lee Morgan [Fri, 23 Oct 2015 12:38:18 +0000 (13:38 +0100)]
Path registration with type registry
Change-Id: I7d8c34e8a7822dc76129e0da008c99b0b27094c3
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
Lee Morgan [Fri, 23 Oct 2015 10:00:22 +0000 (11:00 +0100)]
DALi Version 1.1.7
Change-Id: I48afab8d3fdaf983d4154cea54b5621ea7127e54
Xiangyin Ma [Wed, 21 Oct 2015 15:14:35 +0000 (16:14 +0100)]
Added Thread abstract class
Change-Id: Id9be6082ef416bf2ea619bd3be7327a4f2c46f73
Kimmo Hoikka [Wed, 21 Oct 2015 15:41:27 +0000 (08:41 -0700)]
Merge "Remove scene graph property buffer" into devel/master
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
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
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
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
Kimmo Hoikka [Tue, 20 Oct 2015 10:29:54 +0000 (11:29 +0100)]
Minor cleanup of commented out headers and @todos
Change-Id: I1f07eb55544df502f74c0063cd1d3be304fc4850
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
Kimmo Hoikka [Fri, 16 Oct 2015 10:45:57 +0000 (03:45 -0700)]
Merge "BufferImage Fix for multiple area updates." into devel/master
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>
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
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
Kimmo Hoikka [Tue, 13 Oct 2015 09:34:03 +0000 (02:34 -0700)]
Merge "Avoid constraint suicide during ObjectDestroyed callbacks" into devel/master