X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fcommon%2Fcore-impl.h;h=02b6223028947aff050ac8ff753163e861550c81;hb=85a80d48b8627b6029033b9e70776edf7678393f;hp=17bc172a16b374b217017befe70ddfab72b4c930;hpb=1533c2d9e8ec616c376ea3345b84ad55a6fbc53a;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/common/core-impl.h b/dali/internal/common/core-impl.h old mode 100644 new mode 100755 index 17bc172..02b6223 --- a/dali/internal/common/core-impl.h +++ b/dali/internal/common/core-impl.h @@ -2,7 +2,7 @@ #define DALI_INTERNAL_CORE_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ // INTERNAL INCLUDES #include #include +#include #include #include #include @@ -79,7 +80,10 @@ public: Integration::GlAbstraction& glAbstraction, Integration::GlSyncAbstraction& glSyncAbstraction, Integration::GestureManager& gestureManager, - ResourcePolicy::DataRetention dataRetentionPolicy ); + ResourcePolicy::DataRetention dataRetentionPolicy, + Integration::RenderToFrameBuffer renderToFboEnabled, + Integration::DepthBufferAvailable depthBufferAvailable, + Integration::StencilBufferAvailable stencilBufferAvailable ); /** * Destructor @@ -112,6 +116,11 @@ public: void SurfaceResized(unsigned int width, unsigned int height); /** + * @copydoc Dali::Integration::Core::SurfaceResized(unsigned int, unsigned int, int orientation) + */ + void SurfaceResized( unsigned int width, unsigned int height, int orientation ); + + /** * @copydoc Dali::Integration::Core::SetTopMargin( unsigned int margin ) */ void SetTopMargin( unsigned int margin ); @@ -129,7 +138,7 @@ public: /** * @copydoc Dali::Integration::Core::Update() */ - void Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds, unsigned int nextVSyncTimeMilliseconds, Integration::UpdateStatus& status ); + void Update( float elapsedSeconds, unsigned int lastVSyncTimeMilliseconds, unsigned int nextVSyncTimeMilliseconds, Integration::UpdateStatus& status, bool renderToFboEnabled, bool isRenderingToFbo ); /** * @copydoc Dali::Integration::Core::Render() @@ -137,16 +146,6 @@ public: void Render( Integration::RenderStatus& status ); /** - * @copydoc Dali::Integration::Core::Suspend() - */ - void Suspend(); - - /** - * @copydoc Dali::Integration::Core::Resume() - */ - void Resume(); - - /** * @copydoc Dali::Integration::Core::SceneCreated() */ void SceneCreated(); @@ -265,7 +264,6 @@ private: AnimationPlaylistOwner mAnimationPlaylist; ///< For 'Fire and forget' animation support OwnerPointer mPropertyNotificationManager; ///< For safe signal emmision of property changed notifications IntrusivePtr< RelayoutController > mRelayoutController; ///< Size negotiation relayout controller - bool mIsActive : 1; ///< Whether Core is active or suspended bool mProcessingEvent : 1; ///< True during ProcessEvents() OwnerPointer mRenderTaskProcessor; ///< Handles the processing of render tasks