projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix SVACE issue" into devel/master
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
system
/
common
/
thread-controller.h
diff --git
a/dali/internal/system/common/thread-controller.h
b/dali/internal/system/common/thread-controller.h
index
9429525
..
c4f3961
100644
(file)
--- a/
dali/internal/system/common/thread-controller.h
+++ b/
dali/internal/system/common/thread-controller.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_INTERNAL_THREAD_CONTROLLER_H__
-#define
__DALI_INTERNAL_THREAD_CONTROLLER_H__
+#ifndef
DALI_INTERNAL_THREAD_CONTROLLER_H
+#define
DALI_INTERNAL_THREAD_CONTROLLER_H
/*
/*
- * Copyright (c) 20
18
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-19,10
+19,13
@@
*/
#include <dali/public-api/signals/callback.h>
*/
#include <dali/public-api/signals/callback.h>
+// INTERNAL INCLUDES
+#include <dali/internal/window-system/common/display-connection.h>
+
namespace Dali
{
namespace Dali
{
-class RenderSurface;
+class RenderSurface
Interface
;
namespace Internal
{
namespace Internal
{
@@
-30,6
+33,8
@@
namespace Internal
namespace Adaptor
{
namespace Adaptor
{
+enum class UpdateMode;
+
class AdaptorInternalServices;
class EnvironmentOptions;
class ThreadControllerInterface;
class AdaptorInternalServices;
class EnvironmentOptions;
class ThreadControllerInterface;
@@
-94,15
+99,23
@@
public:
* @brief Called by the adaptor when core requires one update
*
* @note If Adaptor is paused, we do one update/render only
* @brief Called by the adaptor when core requires one update
*
* @note If Adaptor is paused, we do one update/render only
+ *
+ * @param updateMode The update mode (i.e. either update and render, or update and upload without rendering)
*/
*/
- void RequestUpdateOnce();
+ void RequestUpdateOnce(
UpdateMode updateMode
);
/**
* @brief Replaces the surface.
*
* @param surface new surface
*/
/**
* @brief Replaces the surface.
*
* @param surface new surface
*/
- void ReplaceSurface( RenderSurface* surface );
+ void ReplaceSurface( Dali::RenderSurfaceInterface* surface );
+
+ /**
+ * Deletes the surface.
+ * @param surface The surface to be deleted
+ */
+ void DeleteSurface( Dali::RenderSurfaceInterface* surface );
/**
* Resize the surface.
/**
* Resize the surface.
@@
-110,6
+123,11
@@
public:
void ResizeSurface();
/**
void ResizeSurface();
/**
+ * Wait until the graphics is initialised.
+ */
+ void WaitForGraphicsInitialization();
+
+ /**
* @copydoc Dali::Adaptor::SetRenderRefreshRate()
*/
void SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender );
* @copydoc Dali::Adaptor::SetRenderRefreshRate()
*/
void SetRenderRefreshRate( unsigned int numberOfVSyncsPerRender );
@@
-119,13
+137,20
@@
public:
*/
void SetPreRenderCallback( CallbackBase* callback );
*/
void SetPreRenderCallback( CallbackBase* callback );
+ /**
+ * @brief Adds the new surface.
+ *
+ * @param surface new surface
+ */
+ void AddSurface( Dali::RenderSurfaceInterface* surface );
+
private:
// Undefined copy constructor.
private:
// Undefined copy constructor.
- ThreadController( const ThreadController& );
+ ThreadController( const ThreadController& )
= delete
;
// Undefined assignment operator.
// Undefined assignment operator.
- ThreadController& operator=( const ThreadController& );
+ ThreadController& operator=( const ThreadController& )
= delete
;
private:
private:
@@
-138,4
+163,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_INTERNAL_THREAD_CONTROLLER_H__
+#endif //
DALI_INTERNAL_THREAD_CONTROLLER_H