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 branch 'devel/master' into sandbox/dkdk/tizen
[platform/core/uifw/dali-adaptor.git]
/
dali
/
integration-api
/
adaptor-framework
/
native-render-surface.h
diff --git
a/dali/integration-api/adaptor-framework/native-render-surface.h
b/dali/integration-api/adaptor-framework/native-render-surface.h
index
1efcfb3
..
a42d8fc
100644
(file)
--- a/
dali/integration-api/adaptor-framework/native-render-surface.h
+++ b/
dali/integration-api/adaptor-framework/native-render-surface.h
@@
-2,7
+2,7
@@
#define DALI_NATIVE_RENDER_SURFACE_H
/*
#define DALI_NATIVE_RENDER_SURFACE_H
/*
- * Copyright (c) 20
19
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,12
+19,11
@@
*/
// INTERNAL INCLUDES
*/
// INTERNAL INCLUDES
-#include <dali/public-api/dali-adaptor-common.h>
#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
+#include <dali/public-api/dali-adaptor-common.h>
namespace Dali
{
namespace Dali
{
-
class TriggerEventInterface;
/**
class TriggerEventInterface;
/**
@@
-33,7
+32,6
@@
class TriggerEventInterface;
class DALI_ADAPTOR_API NativeRenderSurface : public Dali::RenderSurfaceInterface
{
public:
class DALI_ADAPTOR_API NativeRenderSurface : public Dali::RenderSurfaceInterface
{
public:
-
/**
* @brief Default constructor
*/
/**
* @brief Default constructor
*/
@@
-45,7
+43,6
@@
public:
virtual ~NativeRenderSurface() = default;
public: // API
virtual ~NativeRenderSurface() = default;
public: // API
-
/**
* @brief Get the render surface the adaptor is using to render to.
* @return reference to current render surface
/**
* @brief Get the render surface the adaptor is using to render to.
* @return reference to current render surface
@@
-56,7
+53,7
@@
public: // API
* @brief Sets the render notification trigger to call when render thread is completed a frame
* @param renderNotification to use
*/
* @brief Sets the render notification trigger to call when render thread is completed a frame
* @param renderNotification to use
*/
- virtual void SetRenderNotification(
TriggerEventInterface* renderNotification
) = 0;
+ virtual void SetRenderNotification(
TriggerEventInterface* renderNotification
) = 0;
/**
* @brief Waits until surface is replaced
/**
* @brief Waits until surface is replaced
@@
-64,14
+61,7
@@
public: // API
*/
virtual void WaitUntilSurfaceReplaced() = 0;
*/
virtual void WaitUntilSurfaceReplaced() = 0;
- /**
- * @brief Get the native surface handle
- * @return The native surface handle
- */
- virtual Any GetNativeHandle() = 0;
-
private: // from NativeRenderSurface
private: // from NativeRenderSurface
-
/**
* @brief Create a renderable
*/
/**
* @brief Create a renderable
*/
@@
-83,13
+73,11
@@
private: // from NativeRenderSurface
virtual void ReleaseDrawable() = 0;
protected:
virtual void ReleaseDrawable() = 0;
protected:
-
// Undefined
NativeRenderSurface(const NativeRenderSurface&) = delete;
// Undefined
NativeRenderSurface& operator=(const NativeRenderSurface& rhs) = delete;
// Undefined
NativeRenderSurface(const NativeRenderSurface&) = delete;
// Undefined
NativeRenderSurface& operator=(const NativeRenderSurface& rhs) = delete;
-
};
} // namespace Dali
};
} // namespace Dali