Paul Wisbey [Tue, 15 Sep 2015 17:46:18 +0000 (18:46 +0100)]
Merged NativeFrameBufferTexture into FrameBufferTexture
Change-Id: I5b4b3a7b811bb56a8fb6ccee9ca54478a68f4eee
Adeel Kazmi [Mon, 21 Sep 2015 10:28:05 +0000 (11:28 +0100)]
Added version when deprecated to the documentation for ShaderEffect
Change-Id: I4266f704d1e394e8119b7a8b6abf6787cb4f47ac
Xiangyin Ma [Fri, 18 Sep 2015 10:02:54 +0000 (11:02 +0100)]
DALi Version 1.1.3
Change-Id: Id93f8ab3376daee874438e7a3361b88d54475651
Kimmo Hoikka [Tue, 15 Sep 2015 13:12:21 +0000 (14:12 +0100)]
Deprecated load and resource policies as they dont work and cause more harm than benefits
Change-Id: I7927a21a8d35a27a38e620a1a0c88f8b227eeafb
Kimmo Hoikka [Tue, 15 Sep 2015 15:21:37 +0000 (08:21 -0700)]
Merge "Added GetUniformName to Sampler." into devel/master
Kimmo Hoikka [Tue, 15 Sep 2015 15:21:11 +0000 (08:21 -0700)]
Merge "Fixed Material::RemoveSampler not calling SceneGraph::RemoveSamplerMessage to match Material::AddSampler." into devel/master
Chu Hoang [Mon, 14 Sep 2015 15:20:50 +0000 (16:20 +0100)]
Added GetUniformName to Sampler.
Change-Id: I962305f3cdf5b19ac5d2d1c23186c3204057be6e
Chu Hoang [Fri, 11 Sep 2015 10:40:26 +0000 (11:40 +0100)]
Fixed Material::RemoveSampler not calling SceneGraph::RemoveSamplerMessage to match Material::AddSampler.
Change-Id: I2614bcb803d587a8e76486f00b9f2ac49fbb9695
Adeel Kazmi [Thu, 10 Sep 2015 08:50:46 +0000 (09:50 +0100)]
ConditionalWait moved to Core & add check for how many locks we're keeping
Option can be enabled via --enable-lock-backtrace which will show the backtrace for all locks
whenever more than 1 is held on a given thread.
Change-Id: Ib4b51f1167371922e57cee0e68909ac6bd83377f
Richard Huang [Thu, 10 Sep 2015 10:04:56 +0000 (11:04 +0100)]
DALi Version 1.1.2
Change-Id: Ifb617c7e2266e59fd117102e0e7ea70b2b520bf9
Adeel Kazmi [Wed, 9 Sep 2015 14:31:53 +0000 (07:31 -0700)]
Merge "Stability/Performance for update buffer index" into devel/master
Kimmo Hoikka [Wed, 9 Sep 2015 14:24:14 +0000 (07:24 -0700)]
Merge "BufferImage mirrors an external Pixel Buffer on creation." into devel/master
Kimmo Hoikka [Wed, 9 Sep 2015 12:10:28 +0000 (13:10 +0100)]
Stability/Performance for update buffer index
- use the same update buffer index rather than call getter function multiple times per update
- swap index as the last thing of update
Change-Id: I8507bfed16600d0b14eabf4fd052304cc0443364
Paul Wisbey [Tue, 8 Sep 2015 10:12:28 +0000 (11:12 +0100)]
Fixed Helgrind issue with SceneGraph::Animator creation
Change-Id: Ieabaf8f2c7a607cdbfeea448d03ef690174642ad
Richard Underhill [Tue, 8 Sep 2015 09:10:07 +0000 (10:10 +0100)]
BufferImage mirrors an external Pixel Buffer on creation.
BufferImage now will maintain its own internal copy of a buffer
and will not own any external buffer.
BufferImage will Update() from the external buffer and it is
the application's responsibility to not destroy that if an
Update() is required.
If there is no future Update() after the BufferImage is created
then the external buffer can be safely destroyed.
Change-Id: Idd1224a7a5d2d022455018ec23b98e8b734abe31
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Mon, 7 Sep 2015 08:36:30 +0000 (09:36 +0100)]
ScenGraph::ConstraintBase does not need to inherit from PropertyOwner
Change-Id: I37d3842a082c0eb824f8626f9d2992711f0ecea1
Richard Underhill [Fri, 4 Sep 2015 12:34:12 +0000 (13:34 +0100)]
Fix thread contention issues in messages and pan gestures.
Change-Id: I21db78ce7a8504dfc9eb2241330ab51e8007d97f
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Fri, 4 Sep 2015 12:07:09 +0000 (05:07 -0700)]
Merge "Prevents an invalid texture cache being interrogated for a texture. This 'fixes' the crash reported in gallery. An investigation of the root cause is underway." into devel/master
Adeel Kazmi [Fri, 4 Sep 2015 10:04:34 +0000 (03:04 -0700)]
Merge "Doxygen grouping" into devel/master
Richard Underhill [Wed, 2 Sep 2015 12:34:47 +0000 (13:34 +0100)]
Prevents an invalid texture cache being interrogated for a texture.
This 'fixes' the crash reported in gallery.
An investigation of the root cause is underway.
Change-Id: I30f48e33148a2399f23e81d71749c0bad6335919
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Yoonsang Lee [Thu, 23 Jul 2015 05:38:18 +0000 (14:38 +0900)]
Doxygen grouping
- Grouping using @defgroup, @ingroup, @addtogroup
- Results are shown in the "Modules" tab of the generated doxygen html
- Grouping doxygen comments are in doc/xxx_doc.h
- Install doc/xxx_doc.h as well when conducting 'make install'
Change-Id: I46830ecf57a4ad842a6cd5cb63a98968f0a23dda
Adeel Kazmi [Tue, 1 Sep 2015 13:50:08 +0000 (06:50 -0700)]
Merge changes I02677edb,If59805d2 into devel/master
* changes:
Fix VD prevent issues
Fix prevent issues
taeyoon [Wed, 26 Aug 2015 07:19:49 +0000 (16:19 +0900)]
Fix VD prevent issues
- Add copy constructor & assignment operator (undefined, private member)
- Add KeyFrameBaseSpec<V>& operator=(...)
Change-Id: I02677edba93b122fe59ad3d0e9ee2a4155d5b8fb
taeyoon [Tue, 25 Aug 2015 09:45:28 +0000 (18:45 +0900)]
Fix prevent issues
- Handling NULL by if()
- 451521, 451524, 451534, 453410, 453417
Change-Id: If59805d26be51c63e0b65d19d9f639f3128fa672
Richard Underhill [Wed, 19 Aug 2015 15:38:18 +0000 (16:38 +0100)]
Fix for Valgrind reporting loss from QuramBitmapFactory in MCD.
There is a delete[]/free mismatch changed Dali to use malloc/free to
help with third party libraries.
Change-Id: Ib3fbe62f9b00cea5062b44cf1169de1f6dda3bf0
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Adeel Kazmi [Fri, 28 Aug 2015 16:58:47 +0000 (09:58 -0700)]
Merge "Fix VD prevent issues - DIVIDE_BY_ZERO" into devel/master
Adeel Kazmi [Fri, 28 Aug 2015 16:47:13 +0000 (09:47 -0700)]
Merge "Basic pan-gesture resampling for when prediction is off" into devel/master
Kimmo Hoikka [Fri, 28 Aug 2015 14:29:49 +0000 (07:29 -0700)]
Merge "Removed default in AnimatorBase::ApplyAlphaFunction switch statement to ensure that compiler will warn if any new built in alpha functions aren't handled." into devel/master
Tom Robinson [Tue, 25 Aug 2015 17:21:26 +0000 (18:21 +0100)]
Basic pan-gesture resampling for when prediction is off
Change-Id: Ib75998b9051ac495870dc6cf6333b1536fe42c03
Signed-off-by: Tom Robinson <tom.robinson@samsung.com>
UTC pan-gesture fix
Change-Id: I24728b70c44d1f11798ee9fd7230c0987b8b686f
Signed-off-by: Tom Robinson <tom.robinson@samsung.com>
Chu Hoang [Wed, 26 Aug 2015 16:17:39 +0000 (17:17 +0100)]
Removed default in AnimatorBase::ApplyAlphaFunction switch statement to ensure that compiler will warn if any new built in alpha functions aren't handled.
Change-Id: I43682ce8b37829b00c277b4d274a1eff9d63517e
Kimmo Hoikka [Wed, 26 Aug 2015 11:39:24 +0000 (04:39 -0700)]
Merge "Fixed a potential memory corruption due to update and render potentially using the same container simultaneously" into devel/master
Lee Morgan [Wed, 26 Aug 2015 10:14:24 +0000 (11:14 +0100)]
DALi Version 1.1.1
Change-Id: Ic0a5ee8724f8a8102f5a12038ba77021d57c809d
Heeyong Song [Wed, 26 Aug 2015 07:53:01 +0000 (16:53 +0900)]
Fix VD prevent issues - DIVIDE_BY_ZERO
Change-Id: Iceb219087a98082fa36e40a4f1701b17c7105c57
Kimmo Hoikka [Tue, 25 Aug 2015 14:31:46 +0000 (15:31 +0100)]
Fixed a potential memory corruption due to update and render potentially using the same container simultaneously
Fixed by not using double buffering with index but having two separate containers
==5511== ----------------------------------------------------------------
==5511== Possible data race during read of size 4 at 0x14ECD29C by thread #4
==5511== Locks held: none
==5511== at 0x55ADFB1: Dali::Internal::SceneGraph::UpdateManager::SaveBinary(Dali::IntrusivePtr<Dali::Internal::ShaderData>) (update-manager.cpp:632)
==5511== by 0x5599DF4: Dali::Internal::ProgramController::StoreBinary(Dali::IntrusivePtr<Dali::Internal::ShaderData>) (program-controller.cpp:151)
==5511== by 0x5598CFD: Dali::Internal::Program::Load() (program.cpp:559)
==5511== by 0x5598DB4: Dali::Internal::Program::Use() (program.cpp:135)
==5511== by 0x559799C: Dali::Internal::SceneGraph::Renderer::Render(Dali::Internal::Context&, Dali::Internal::SceneGraph::TextureCache&, unsigned int, Dali::Internal::SceneGraph::Shader&, Dali::Matrix const&, Dali::Matrix const&, Dali::Matrix const&, float, bool) (scene-graph-renderer.cpp:213)
==5511== by 0x55891B2: Dali::Internal::Render::ProcessRenderInstruction(Dali::Internal::SceneGraph::RenderInstruction const&, Dali::Internal::Context&, Dali::Internal::SceneGraph::TextureCache&, Dali::Internal::SceneGraph::Shader&, unsigned int, float) (render-algorithms.cpp:146)
==5511== by 0x558BDE5: Dali::Internal::SceneGraph::RenderManager::DoRender(Dali::Internal::SceneGraph::RenderInstruction&, Dali::Internal::SceneGraph::Shader&, float) (render-manager.cpp:558)
==5511== by 0x558C423: Dali::Internal::SceneGraph::RenderManager::Render(Dali::Integration::RenderStatus&) (render-manager.cpp:430)
==5511== by 0x551D25C: Dali::Internal::Core::Render(Dali::Integration::RenderStatus&) (core-impl.cpp:278)
==5511== by 0x4E72B04: Dali::Internal::Adaptor::RenderThread::Run() (render-thread.cpp:199)
==5511== by 0x4E72B58: Dali::Internal::Adaptor::RenderThread::InternalThreadEntryFunc(void*) (render-thread.h:197)
==5511== by 0x4C30E26: ??? (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==5511==
==5511== This conflicts with a previous write of size 4 by thread #3
==5511== Locks held: none
==5511== at 0x559F1EF: Dali::Internal::SceneGraph::SceneGraphBuffers::Swap() (scene-graph-buffers.cpp:45)
==5511== by 0x55ADADA: Dali::Internal::SceneGraph::UpdateManager::Update(float, unsigned int, unsigned int) (update-manager.cpp:1121)
==5511== by 0x551D229: Dali::Internal::Core::Update(float, unsigned int, unsigned int, Dali::Integration::UpdateStatus&) (core-impl.cpp:261)
==5511== by 0x4E74438: Dali::Internal::Adaptor::UpdateThread::Run() (update-thread.cpp:119)
==5511== by 0x4E744A8: Dali::Internal::Adaptor::UpdateThread::InternalThreadEntryFunc(void*) (update-thread.h:107)
==5511== by 0x4C30E26: ??? (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==5511== by 0x908A181: start_thread (pthread_create.c:312)
==5511== by 0x5E8EFBC: clone (clone.S:111)
==5511==
==5511== Address 0x14ECD29C is 12 bytes inside a block of size 24 alloc'd
==5511== at 0x4C2C460: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==5511== by 0x551D745: Dali::Internal::Core::Core(Dali::Integration::RenderController&, Dali::Integration::PlatformAbstraction&, Dali::Integration::GlAbstraction&, Dali::Integration::GlSyncAbstraction&, Dali::Integration::GestureManager&, Dali::ResourcePolicy::DataRetention) (core-impl.cpp:149)
==5511== by 0x55BB824: Dali::Integration::Core::New(Dali::Integration::RenderController&, Dali::Integration::PlatformAbstraction&, Dali::Integration::GlAbstraction&, Dali::Integration::GlSyncAbstraction&, Dali::Integration::GestureManager&, Dali::ResourcePolicy::DataRetention) (core.cpp:37)
==5511== by 0x4E9E9E8: Dali::Internal::Adaptor::Adaptor::Initialize(Dali::Configuration::ContextLoss) (adaptor-impl.cpp:139)
==5511== by 0x4E9FC3C: Dali::Internal::Adaptor::Adaptor::New(Dali::Any, Dali::RenderSurface*, Dali::Configuration::ContextLoss, Dali::Internal::Adaptor::EnvironmentOptions*) (adaptor-impl.cpp:79)
==5511== by 0x4E9FD05: Dali::Internal::Adaptor::Adaptor::New(Dali::Window, Dali::Configuration::ContextLoss, Dali::Internal::Adaptor::EnvironmentOptions*) (adaptor-impl.cpp:89)
==5511== by 0x4EA22BB: Dali::Internal::Adaptor::Application::CreateAdaptor() (application-impl.cpp:134)
==5511== by 0x4EA2407: Dali::Internal::Adaptor::Application::OnInit() (application-impl.cpp:175)
==5511== by 0x4EB8B88: Dali::Internal::Adaptor::Framework::AppStatusHandler(int, void*) (framework-tizen.cpp:380)
==5511== by 0x7D6BC9D: app_appcore_create (app_main.c:149)
==5511== by 0x7F6E819: appcore_efl_main (appcore-efl.c:16)
==5511== by 0x7D6BDEC: app_efl_main (app_main.c:116)
==5511== ----------------------------------------------------------------
Change-Id: I1bdcfd8c00d9f37b0dd1f3f580f1bd69d4e0a20b
Kimmo Hoikka [Tue, 25 Aug 2015 14:44:22 +0000 (07:44 -0700)]
Merge "Changed RendererAttachment to use blend flag from RenderDataProvider rather than base class's mUseBlend flag." into devel/master
Kimmo Hoikka [Tue, 25 Aug 2015 09:19:24 +0000 (10:19 +0100)]
Remove Helgrind warning when Node flags are illegally accessed from event and update thread at the same time
Change-Id: I45c483fe5db2d3cad32144f120b7d7311867658c
Adeel Kazmi [Thu, 20 Aug 2015 16:23:19 +0000 (17:23 +0100)]
(Logging) Ensure we do not output unrequired spaces & colons when trace is not enabled
Before: No Trace:
INFO: DALI: : MyDebug
Now: No Trace:
INFO: DALI: MyDebug
Before: Trace:
INFO: DALI: Entr: MyFunction()
INFO: DALI: : MyDebug
INFO: DALI: Exit: MyFunction()
Now: Trace:
INFO: DALI: Entr: MyFunction()
INFO: DALI: : MyDebug
INFO: DALI: Exit: MyFunction()
Change-Id: I3a04b50154a4f23ca90cad5a7ad2ef26ae6cb1cf
Chu Hoang [Thu, 20 Aug 2015 12:32:56 +0000 (13:32 +0100)]
DALi Version 1.1.0
Change-Id: I5a94629a418273369cd7cf3fa79d421676519175
Kimmo Hoikka [Fri, 14 Aug 2015 16:42:28 +0000 (09:42 -0700)]
Merge "Ensure synchronous buffer decode when using encoded buffer image." into devel/master
Kimmo Hoikka [Fri, 14 Aug 2015 16:26:01 +0000 (09:26 -0700)]
Merge "Changed drawing order for 2D and 3D layers" into devel/master
Adeel Kazmi [Fri, 14 Aug 2015 13:49:02 +0000 (14:49 +0100)]
Ensure synchronous buffer decode when using encoded buffer image.
Change-Id: Iaff725f9ee05c2c35d902849949389807689995f
Richard Huang [Thu, 13 Aug 2015 10:10:25 +0000 (11:10 +0100)]
Implemented WeakHandle in dali-core
WeakHandle stores a weak pointer to an internal Dali object. The handle to the object
can be accessed if the object exists, and such access is not reference counted. When
the object is deleted, the weak pointer will be set to NULL, and any further attmpt
to access to a deleted object will return an empty handle.
Change-Id: I56c8b0ea398f22c1d735270e6287124bdcea740b
Adeel Kazmi [Thu, 13 Aug 2015 19:08:54 +0000 (20:08 +0100)]
Remove Boost completely
Change-Id: Iedeecbfa65be7714db94bc15d94f545d5d5bb6aa
Adeel Kazmi [Fri, 31 Jul 2015 09:11:33 +0000 (10:11 +0100)]
Remove unnecessary timeDelta parameter from PostRender
Change-Id: Ie18c2d9e4b237d430673d7c5ed6f08f34ed23cc0
Ferran Sole [Thu, 13 Aug 2015 08:38:24 +0000 (09:38 +0100)]
Changed drawing order for 2D and 3D layers
-In 2D Layers, all renderers (opaque and transparent) are sorted based on its SortModifier/DepthIndex.
-In 3D Layers, opaque renderers are sorted by mesh and material to reduce GL state changes
and transparent renderers are sorted back to front. SortModifier/DepthIndex is used as an offset to
the Z position of the transparent renderers when sorting.
Change-Id: I5ca4cd4786bd106d62edf6428c58ad538a0dd2f3
Adeel Kazmi [Wed, 12 Aug 2015 09:50:16 +0000 (10:50 +0100)]
DALi Version 1.0.53
Change-Id: Ic6d5c2aa2da684eaf17b180157885db9fdf224ec
Chu Hoang [Mon, 20 Jul 2015 08:20:26 +0000 (09:20 +0100)]
Changed RendererAttachment to use blend flag from RenderDataProvider rather than base class's mUseBlend flag.
This fixes a issue where (when adding to the stage, removing and then re-adding) the Renderer blend flag can be become out of sync with the RenderableAttachment's mUseBlend flag.
Related: moved Renderer::mUseBlend flag and relevant methods to ImageRender since this way of controlling the blending is now specific to ImageRenderer.
Change-Id: Iebc0664946fe4c83b43291aa8004c66e004cbf22
Kimmo Hoikka [Mon, 10 Aug 2015 15:01:12 +0000 (16:01 +0100)]
Change Epsilon 0 and 1 to use the compiler provided values
Change-Id: I68cb4b0fe5c965c47560a46aa5575836b8f5743c
Xiangyin Ma [Thu, 6 Aug 2015 10:05:16 +0000 (11:05 +0100)]
DALi Version 1.0.52
Change-Id: Ie07d42a55baf409e7b5b5a859e3294eb209d08ad
Tom Robinson [Mon, 27 Jul 2015 16:18:31 +0000 (17:18 +0100)]
New Popup implementation
Change-Id: I8657560f0a83ef7beadf2a312096477ccb1fbb7a
Ferran Sole [Mon, 3 Aug 2015 13:30:39 +0000 (14:30 +0100)]
Re-enable sort modifier ( depth index ) in 3D layers
SortModifier, or DepthIndex in Renderers, is now being considered as an offset to
the Z value used when ordering transparent RenderItems back-to-front
Change-Id: Idc5f5cb825395ed0fb1ace211b11877109dc8ac5
Paul Wisbey [Fri, 31 Jul 2015 15:18:02 +0000 (16:18 +0100)]
Fixed memory corruption in RendererAttachment::DoPrepareRender()
(Fixes crash issue in blocks.example)
Change-Id: I18a3f3690ddc0204a1b69c0687aabae4fc627dad
Yoonsang Lee [Fri, 31 Jul 2015 05:53:43 +0000 (14:53 +0900)]
Update license information in the spec file
Change-Id: I78701683f7b42d44b732749a3c9e737b636889de
Tom Robinson [Thu, 30 Jul 2015 08:26:20 +0000 (09:26 +0100)]
DALi Version 1.0.51
Change-Id: I38cc4bae9ccede9450d48a4286655f3d8ecdb428
Kimmo Hoikka [Wed, 29 Jul 2015 12:02:38 +0000 (13:02 +0100)]
Cleanup platform abstraction API (to allow removal of dead code from Adaptor)
Change-Id: I70b633fa641676d8805f9e854806f54d1372fcbb
Nick Holland [Tue, 28 Jul 2015 15:36:36 +0000 (16:36 +0100)]
Temporarily disable v8 build and install from dali_env
when running dali_env script the v8 installation fails if the
machine is not using a http proxy.
Change-Id: I5caa75723c0a211b045c8ab30744c9777ae1d233
Adeel Kazmi [Tue, 28 Jul 2015 14:42:30 +0000 (07:42 -0700)]
Merge "Stop setting crazy Z value when SetSize(width,height) is used" into devel/master
Paul Wisbey [Thu, 16 Jul 2015 09:28:37 +0000 (10:28 +0100)]
Remove on/off stage behavior from Shader
Change-Id: I2ee41d546fee1c32c017a507ea9bfac9e471822e
Kimmo Hoikka [Thu, 23 Jul 2015 12:42:26 +0000 (13:42 +0100)]
Stop setting crazy Z value when SetSize(width,height) is used
Change-Id: Ic428a491ec271748eac7930a3126c4f9fb5132e3
Paul Wisbey [Thu, 23 Jul 2015 16:59:05 +0000 (17:59 +0100)]
Keep track of Bitmap data ownership
i.e. Disard refers to whether the data can be released after uploading.
ResourcePolicy::RETAIN does not mean that the data is externally owned.
Change-Id: I550f227e5463d677ba7e5ac5e889989360834089
Adeel Kazmi [Mon, 27 Jul 2015 10:40:29 +0000 (03:40 -0700)]
Merge "Changed UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the position of the mesh actor instead of relying on the ParentOrigin since the parent might not have any depth. Added more negative tests." into devel/master
Chu Hoang [Fri, 24 Jul 2015 15:22:40 +0000 (16:22 +0100)]
Changed UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the position of the mesh actor instead of relying on the ParentOrigin since the parent might not have any depth. Added more negative tests.
Refactored and cleaned up utc-Dali-Internal-FrustumCulling tests.
Change-Id: I5fa7fd85b6cc0866749733d3c13af1202b5cb4a3
Tom Robinson [Thu, 23 Jul 2015 13:58:38 +0000 (14:58 +0100)]
Removed unneeded index param and code from ConnectNode / Child
Change-Id: Ic6dd8519b44d861e3208b4d701d18e3f43776506
Lee Morgan [Thu, 23 Jul 2015 13:17:18 +0000 (14:17 +0100)]
Fix sampler property types
Change-Id: Ida87e40cd5a8c0ffa90fb6ca4e94ab69cccff5bc
Adeel Kazmi [Thu, 23 Jul 2015 11:08:43 +0000 (04:08 -0700)]
Merge "DALi Version 1.0.50" into devel/master
Richard Huang [Thu, 23 Jul 2015 10:55:38 +0000 (11:55 +0100)]
DALi Version 1.0.50
Change-Id: Ibbd0e36ba833d3b024934038b2eda74e59cfd0e3
Kimmo Hoikka [Thu, 23 Jul 2015 08:55:21 +0000 (01:55 -0700)]
Merge "Cleanup dead declaration from ShaderEffect" into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 14:14:56 +0000 (07:14 -0700)]
Merge "Changed view frustum culling to ignore mesh extents and instead use actor extents." into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 12:55:15 +0000 (13:55 +0100)]
Cleanup dead declaration from ShaderEffect
Change-Id: I96e27dd7692fcd828a15f4f1900fe9b6865c2788
Chu Hoang [Mon, 20 Jul 2015 15:55:39 +0000 (16:55 +0100)]
Changed view frustum culling to ignore mesh extents and instead use actor extents.
Removed Geometry::mHalfExtents and mRadius since they are no longer relevant.
Change-Id: I3d262e157bc30f7d999c0f73ba23469f7eac37a6
taeyoon [Mon, 20 Jul 2015 02:58:58 +0000 (11:58 +0900)]
Add UTCs for public-api
Change-Id: I50392f9caceebb5a39846058181f79ddada9a443
Kimmo Hoikka [Fri, 17 Jul 2015 15:05:15 +0000 (08:05 -0700)]
Merge "Fixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called after the actor is already on stage." into devel/master
Nick Holland [Fri, 17 Jul 2015 08:25:35 +0000 (09:25 +0100)]
DALi Version 1.0.49
Change-Id: I2f9f863ef1aef95cbf0493bf7c6a30305fd82773
Kimmo Hoikka [Thu, 16 Jul 2015 14:00:48 +0000 (07:00 -0700)]
Merge "Hit test algorithm bug fix" into devel/master
Kimmo Hoikka [Thu, 16 Jul 2015 13:17:20 +0000 (06:17 -0700)]
Merge "Set default behavior in Layer - to fix target UTC fail" into devel/master
Andrew Cox [Wed, 15 Jul 2015 12:56:39 +0000 (13:56 +0100)]
Move ShaderData from integration api to internal
Change-Id: Ibd3cae2fe9c4c08a78e3f99ce3b81f9dfbb2c8f1
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Ferran Sole [Wed, 15 Jul 2015 16:44:15 +0000 (17:44 +0100)]
Hit test algorithm bug fix
Change-Id: Ia601bcd0f9c30106eaab1ed3ebc32711ae9e70e3
Heeyong Song [Thu, 16 Jul 2015 04:55:05 +0000 (13:55 +0900)]
Set default behavior in Layer - to fix target UTC fail
Change-Id: I0340dd33102594f2e619205103e0af2c2bc9aced
Andrew Cox [Wed, 15 Jul 2015 15:42:41 +0000 (16:42 +0100)]
Passing modifiesGeometry flag from Shader and ShaderEffect
Change-Id: Id06feb3b06c9398f691794a23b178a7c44c4d996
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Chu Hoang [Tue, 14 Jul 2015 11:18:21 +0000 (12:18 +0100)]
Fixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called after the actor is already on stage.
Change-Id: Icda4d33e0abae3b91c790076f82493c4062242d6
Tom Robinson [Tue, 14 Jul 2015 15:09:07 +0000 (16:09 +0100)]
Removal of Actor::Insert API
Change-Id: I17c3851fb733d8c97aed024d1c4813e9d3a6fd30
Kimmo Hoikka [Tue, 14 Jul 2015 13:28:43 +0000 (06:28 -0700)]
Merge "Changed draw ordering to take into account the depth of the node in the hierarchy" into devel/master
Andrew Cox [Mon, 13 Jul 2015 17:02:52 +0000 (18:02 +0100)]
Deleted stray scene graph shader SetProgram() using resource id.
Change-Id: Idcfecd861b6f25b05739dbcfd42e7bddc2eb5786
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Ferran Sole [Thu, 9 Jul 2015 15:37:43 +0000 (16:37 +0100)]
Changed draw ordering to take into account the depth of the node in the hierarchy
Tree depth is multiplied by a known factor (10.000) to make it dominate the ordering.
Allows controls to still put renderers on top of their children as long as they know
the depth of the child tree
Change-Id: I3793b036150d39a930e9c55da1ea5b16febfd571
Kimmo Hoikka [Mon, 13 Jul 2015 17:50:35 +0000 (10:50 -0700)]
Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master
Adeel Kazmi [Mon, 13 Jul 2015 16:52:22 +0000 (17:52 +0100)]
Fix SceneGraph::Material header include
Change-Id: Ifae4110dbda898b5738b4806ce62288afbeabb2f
Andrew Cox [Mon, 13 Jul 2015 14:48:10 +0000 (15:48 +0100)]
Removed Resource Saving
Change-Id: I4fe2a6b00e364e39a321bc7c13f4a4980350f766
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Richard Huang [Mon, 13 Jul 2015 13:40:21 +0000 (14:40 +0100)]
Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D
Change-Id: If2392f95fa4d7ec2e3605d91e6aa9088b48b3104
Kimmo Hoikka [Mon, 13 Jul 2015 14:01:09 +0000 (07:01 -0700)]
Merge "Remove RenderableActor" into devel/master
Adeel Kazmi [Mon, 13 Jul 2015 11:17:31 +0000 (12:17 +0100)]
Remove RenderableActor
Change-Id: Ie92dea9a3301ba3e6226a097684689ab0e04d561
Andrew Cox [Fri, 12 Jun 2015 19:23:55 +0000 (20:23 +0100)]
Shader binary synchronous simplified IO
Loading shader binaries synchronously on event thread.
Saving shader binaries from ShaderFactory on event thread.
Deleted old resource sytem based shader binary loading.
Change-Id: I38a79a7b4e9eb33d9a5059f1c43d9e8c892b0867
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Ferran Sole [Wed, 8 Jul 2015 10:56:10 +0000 (11:56 +0100)]
Bug fix which makes applications crash when adding a renderer to an on stage actor
Change-Id: I8db74fac8cad03cc3a8fa5d2f86267882c1baa93
Kimmo Hoikka [Fri, 10 Jul 2015 14:47:14 +0000 (07:47 -0700)]
Merge "New parameter for FrameBufferImage creation" into devel/master
Ferran Sole [Fri, 3 Jul 2015 16:26:48 +0000 (17:26 +0100)]
Allow sharing RenderGeometries across multiple Renderers
Change-Id: I48d337a4d258e067fd5e01ad7075b24984092dcb
David Fumanal [Fri, 26 Jun 2015 14:07:50 +0000 (15:07 +0100)]
New parameter for FrameBufferImage creation
Change-Id: I2d5898848ec7c76dea78d60d3da64a24ccd496be
Kimmo Hoikka [Thu, 9 Jul 2015 17:34:05 +0000 (18:34 +0100)]
Remove de-funct dynamics support
Change-Id: I9633610eb33e9952dd3f10539e7272ed19287757
Adeel Kazmi [Thu, 9 Jul 2015 16:10:56 +0000 (09:10 -0700)]
Merge "DALi Version 1.0.48" into devel/master
Lee Morgan [Thu, 9 Jul 2015 14:03:17 +0000 (15:03 +0100)]
DALi Version 1.0.48
Change-Id: I501559f0819bc872c246578515f9866d9716388b
Kimmo Hoikka [Wed, 8 Jul 2015 14:24:06 +0000 (15:24 +0100)]
Remove UNSIGNED_INTEGER property type as it does not fully work and causes headache
Change-Id: I76a5607ed0a16d29029dd968e684f29189bf4ea5
Kimmo Hoikka [Tue, 7 Jul 2015 10:46:01 +0000 (11:46 +0100)]
Allow property conversions: float from int and int from float
Change-Id: Ic304cfb187cfba6fdd65d34764a6634e4fcd5d43