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
Revert "[Tizen] Implement partial update"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
ubuntu-x11
/
pixmap-render-surface-ecore-x.h
diff --git
a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
index
873e7f4
..
05e850f
100644
(file)
--- a/
dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
+++ b/
dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.h
@@
-2,7
+2,7
@@
#define DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H
/*
#define DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H
/*
- * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-18,18
+18,17
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/devel-api/threading/conditional-wait.h>
+
// INTERNAL INCLUDES
// INTERNAL INCLUDES
-#include <dali/integration-api/egl-interface.h>
+#include <dali/public-api/dali-adaptor-common.h>
+#include <dali/integration-api/adaptor-framework/egl-interface.h>
+#include <dali/internal/graphics/common/graphics-interface.h>
#include <dali/internal/graphics/gles/egl-implementation.h>
#include <dali/internal/graphics/gles/egl-implementation.h>
+#include <dali/internal/system/linux/dali-ecore-x.h>
#include <dali/internal/window-system/common/pixmap-render-surface.h>
#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
#include <dali/internal/window-system/common/pixmap-render-surface.h>
#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
-#include <dali/public-api/dali-adaptor-common.h>
-#include <dali/internal/graphics/common/graphics-interface.h>
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/threading/conditional-wait.h>
-#include <Ecore_X.h>
-
namespace Dali
{
namespace Dali
{
@@
-70,77
+69,88
@@
public: // from WindowRenderSurface
*/
virtual void SetRenderNotification( TriggerEventInterface* renderNotification ) override;
*/
virtual void SetRenderNotification( TriggerEventInterface* renderNotification ) override;
-public: // from Dali::RenderSurface
+public: // from Dali::
Integration::
RenderSurface
/**
/**
- * @copydoc Dali::RenderSurface::GetPositionSize()
+ * @copydoc Dali::
Integration::
RenderSurface::GetPositionSize()
*/
virtual PositionSize GetPositionSize() const override;
/**
*/
virtual PositionSize GetPositionSize() const override;
/**
- * @copydoc Dali::RenderSurface::GetDpi()
+ * @copydoc Dali::
Integration::
RenderSurface::GetDpi()
*/
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
*/
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
/**
- * @copydoc Dali::RenderSurface::InitializeGraphics()
+ * @brief Return the orientation of the surface.
+ * @return The orientation
+ */
+ virtual int GetOrientation() const override;
+
+ /**
+ * @copydoc Dali::Integration::RenderSurface::InitializeGraphics()
*/
*/
- virtual void InitializeGraphics(
GraphicsInterface& graphics, Dali::DisplayConnection& displayConnection
) override;
+ virtual void InitializeGraphics() override;
/**
/**
- * @copydoc Dali::RenderSurface::CreateSurface()
+ * @copydoc Dali::
Integration::
RenderSurface::CreateSurface()
*/
virtual void CreateSurface() override;
/**
*/
virtual void CreateSurface() override;
/**
- * @copydoc Dali::RenderSurface::DestroySurface()
+ * @copydoc Dali::
Integration::
RenderSurface::DestroySurface()
*/
virtual void DestroySurface() override;
/**
*/
virtual void DestroySurface() override;
/**
- * @copydoc Dali::RenderSurface::ReplaceGraphicsSurface()
+ * @copydoc Dali::
Integration::
RenderSurface::ReplaceGraphicsSurface()
*/
virtual bool ReplaceGraphicsSurface() override;
/**
*/
virtual bool ReplaceGraphicsSurface() override;
/**
- * @copydoc Dali::RenderSurface::MoveResize()
+ * @copydoc Dali::
Integration::
RenderSurface::MoveResize()
*/
virtual void MoveResize( Dali::PositionSize positionSize) override {}
/**
*/
virtual void MoveResize( Dali::PositionSize positionSize) override {}
/**
- * @copydoc Dali::RenderSurface::StartRender()
+ * @copydoc Dali::
Integration::
RenderSurface::StartRender()
*/
virtual void StartRender() override;
/**
*/
virtual void StartRender() override;
/**
- * @copydoc Dali::RenderSurface::PreRender()
+ * @copydoc Dali::
Integration::
RenderSurface::PreRender()
*/
virtual bool PreRender( bool resizingSurface ) override;
/**
*/
virtual bool PreRender( bool resizingSurface ) override;
/**
- * @copydoc Dali::RenderSurface::PostRender()
+ * @copydoc Dali::
Integration::
RenderSurface::PostRender()
*/
virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) override;
/**
*/
virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) override;
/**
- * @copydoc Dali::RenderSurface::StopRender()
+ * @copydoc Dali::
Integration::
RenderSurface::StopRender()
*/
virtual void StopRender() override;
/**
*/
virtual void StopRender() override;
/**
- * @copydoc Dali::RenderSurface::SetThreadSynchronization
+ * @copydoc Dali::
Integration::
RenderSurface::SetThreadSynchronization
*/
virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override;
/**
*/
virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override;
/**
- * @copydoc Dali::RenderSurface::GetSurfaceType()
+ * @copydoc Dali::Integration::RenderSurface::GetSurfaceType()
+ */
+ virtual Integration::RenderSurface::Type GetSurfaceType() override;
+
+ /**
+ * @copydoc Dali::Integration::RenderSurface::MakeContextCurrent()
*/
*/
- virtual
RenderSurface::Type GetSurfaceType
() override;
+ virtual
void MakeContextCurrent
() override;
private: // from PixmapRenderSurface
/**
private: // from PixmapRenderSurface
/**
- * @copydoc Dali::RenderSurface::ReleaseLock()
+ * @copydoc Dali::
Integration::
RenderSurface::ReleaseLock()
*/
virtual void ReleaseLock() override;
*/
virtual void ReleaseLock() override;