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] Revert "Support multiple window rendering""
[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
91ee161
..
1f4a305
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
@@
-1,5
+1,5
@@
-#ifndef
__DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H__
-#define
__DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H__
+#ifndef
DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H
+#define
DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H
/*
* Copyright (c) 2018 Samsung Electronics Co., Ltd.
/*
* Copyright (c) 2018 Samsung Electronics Co., Ltd.
@@
-20,15
+20,17
@@
// INTERNAL INCLUDES
#include <dali/integration-api/egl-interface.h>
// INTERNAL INCLUDES
#include <dali/integration-api/egl-interface.h>
-#include <dali/internal/graphics/gles
20
/egl-implementation.h>
+#include <dali/internal/graphics/gles/egl-implementation.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
// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
#include <dali/devel-api/threading/conditional-wait.h>
#include <Ecore_X.h>
#include <dali/devel-api/threading/conditional-wait.h>
#include <Ecore_X.h>
+
namespace Dali
{
namespace Internal
namespace Dali
{
namespace Internal
@@
-47,13
+49,9
@@
public:
* Uses an X11 surface to render to.
* @param [in] positionSize the position and size of the surface
* @param [in] surface can be a X-window or X-pixmap (type must be unsigned int).
* Uses an X11 surface to render to.
* @param [in] positionSize the position and size of the surface
* @param [in] surface can be a X-window or X-pixmap (type must be unsigned int).
- * @param [in] name optional name of surface passed in
* @param [in] isTransparent if it is true, surface has 32 bit color depth, otherwise, 24 bit
*/
* @param [in] isTransparent if it is true, surface has 32 bit color depth, otherwise, 24 bit
*/
- PixmapRenderSurfaceEcoreX( Dali::PositionSize positionSize,
- Any surface,
- const std::string& name,
- bool isTransparent = false);
+ PixmapRenderSurfaceEcoreX( Dali::PositionSize positionSize, Any surface, bool isTransparent = false );
/**
* @brief Destructor
/**
* @brief Destructor
@@
-72,79
+70,84
@@
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;
+ virtual PositionSize GetPositionSize() const
override
;
/**
/**
- * @copydoc Dali::
RenderSurface::InitializeEgl
()
+ * @copydoc Dali::
Integration::RenderSurface::GetDpi
()
*/
*/
- virtual void
InitializeEgl( EglInterface& egl )
;
+ virtual void
GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override
;
/**
/**
- * @copydoc Dali::
RenderSurface::CreateEglSurface
()
+ * @copydoc Dali::
Integration::RenderSurface::InitializeGraphics
()
*/
*/
- virtual void
CreateEglSurface( EglInterface& egl )
;
+ virtual void
InitializeGraphics() override
;
/**
/**
- * @copydoc Dali::
RenderSurface::DestroyEgl
Surface()
+ * @copydoc Dali::
Integration::RenderSurface::Create
Surface()
*/
*/
- virtual void
DestroyEglSurface( EglInterface& egl )
;
+ virtual void
CreateSurface() override
;
/**
/**
- * @copydoc Dali::
RenderSurface::ReplaceEGL
Surface()
+ * @copydoc Dali::
Integration::RenderSurface::Destroy
Surface()
*/
*/
- virtual
bool ReplaceEGLSurface( EglInterface& egl )
;
+ virtual
void DestroySurface() override
;
/**
/**
- * @copydoc Dali::
RenderSurface::MoveResiz
e()
+ * @copydoc Dali::
Integration::RenderSurface::ReplaceGraphicsSurfac
e()
*/
*/
- virtual
void MoveResize( Dali::PositionSize positionSize) {}
+ virtual
bool ReplaceGraphicsSurface() override;
/**
/**
- * @copydoc Dali::
RenderSurface::SetViewMod
e()
+ * @copydoc Dali::
Integration::RenderSurface::MoveResiz
e()
*/
*/
- v
oid SetViewMode( ViewMode viewMode )
{}
+ v
irtual void MoveResize( Dali::PositionSize positionSize) override
{}
/**
/**
- * @copydoc Dali::RenderSurface::StartRender()
+ * @copydoc Dali::
Integration::
RenderSurface::StartRender()
*/
*/
- virtual void StartRender();
+ virtual void StartRender()
override
;
/**
/**
- * @copydoc Dali::RenderSurface::PreRender()
+ * @copydoc Dali::
Integration::
RenderSurface::PreRender()
*/
*/
- virtual bool PreRender(
EglInterface& egl, Integration::GlAbstraction& glAbstraction, bool resizingSurface )
;
+ virtual bool PreRender(
bool resizingSurface ) override
;
/**
/**
- * @copydoc Dali::RenderSurface::PostRender()
+ * @copydoc Dali::
Integration::
RenderSurface::PostRender()
*/
*/
- virtual void PostRender(
EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface, bool resizingSurface )
;
+ virtual void PostRender(
bool renderToFbo, bool replacingSurface, bool resizingSurface ) override
;
/**
/**
- * @copydoc Dali::RenderSurface::StopRender()
+ * @copydoc Dali::
Integration::
RenderSurface::StopRender()
*/
*/
- virtual void StopRender();
+ virtual void StopRender()
override
;
/**
/**
- * @copydoc Dali::RenderSurface::SetThreadSynchronization
+ * @copydoc Dali::
Integration::
RenderSurface::SetThreadSynchronization
*/
*/
- virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization );
+ virtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization )
override
;
/**
/**
- * @copydoc Dali::RenderSurface::GetSurfaceType()
+ * @copydoc Dali::
Integration::
RenderSurface::GetSurfaceType()
*/
*/
- virtual RenderSurface::Type GetSurfaceType();
+ virtual Integration::RenderSurface::Type GetSurfaceType() override;
+
+ /**
+ * @copydoc Dali::Integration::RenderSurface::MakeContextCurrent()
+ */
+ virtual void MakeContextCurrent() override;
private: // from PixmapRenderSurface
/**
private: // from PixmapRenderSurface
/**
- * @copydoc Dali::RenderSurface::ReleaseLock()
+ * @copydoc Dali::
Integration::
RenderSurface::ReleaseLock()
*/
*/
- virtual void ReleaseLock();
+ virtual void ReleaseLock()
override
;
/**
* @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize()
/**
* @copydoc Dali::Internal::Adaptor::PixmapRenderSurface::Initialize()
@@
-173,9
+176,9
@@
private:
private: // Data
static const int BUFFER_COUNT = 2;
private: // Data
static const int BUFFER_COUNT = 2;
-
+ GraphicsInterface* mGraphics; ///< Graphics interface
+ Dali::DisplayConnection* mDisplayConnection; ///< Display connection
PositionSize mPosition; ///< Position
PositionSize mPosition; ///< Position
- std::string mTitle; ///< Title of window which shows from "xinfo -topvwins" command
TriggerEventInterface* mRenderNotification; ///< Render notification trigger
ColorDepth mColorDepth; ///< Color depth of surface (32 bit or 24 bit)
bool mOwnSurface; ///< Whether we own the surface (responsible for deleting it)
TriggerEventInterface* mRenderNotification; ///< Render notification trigger
ColorDepth mColorDepth; ///< Color depth of surface (32 bit or 24 bit)
bool mOwnSurface; ///< Whether we own the surface (responsible for deleting it)
@@
-194,4
+197,4
@@
private: // Data
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H__
+#endif //
DALI_ECORE_X_PIXMAP_RENDER_SURFACE_H