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
/
display-connection-impl-x.h
diff --git
a/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.h
b/dali/internal/window-system/ubuntu-x11/display-connection-impl-x.h
index
4c781be
..
4f6890f
100644
(file)
--- a/
dali/internal/window-system/ubuntu-x11/display-connection-impl-x.h
+++ b/
dali/internal/window-system/ubuntu-x11/display-connection-impl-x.h
@@
-18,18
+18,13
@@
*
*/
*
*/
-// EXTERNAL INCLUDES
-#include <dali/integration-api/x11/ecore-x-types.h>
-
// INTERNAL INCLUDES
#include <dali/internal/window-system/common/display-connection-impl.h>
// INTERNAL INCLUDES
#include <dali/internal/window-system/common/display-connection-impl.h>
-#include <dali/public-api/object/base-object.h>
-#include <dali/internal/graphics/gles20/egl-implementation.h>
+#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
namespace Dali
{
namespace Dali
{
-class RenderSurface;
class DisplayConnection;
namespace Internal
class DisplayConnection;
namespace Internal
@@
-74,21
+69,24
@@
public:
Any GetDisplay();
/**
Any GetDisplay();
/**
- * @copydoc Dali::DisplayConnection::
GetDpi
+ * @copydoc Dali::DisplayConnection::
ConsumeEvents
*/
*/
-
static void GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical
);
+
void ConsumeEvents(
);
/**
/**
- * @copydoc Dali::DisplayConnection::
ConsumeEvent
s
+ * @copydoc Dali::DisplayConnection::
InitializeGraphic
s
*/
*/
-
void ConsumeEvent
s();
+
bool InitializeGraphic
s();
/**
/**
- * @copydoc Dali::
DisplayConnection::InitializeEgl
+ * @copydoc Dali::
Internal::Adaptor::DisplayConnection::SetSurfaceType
*/
*/
-
bool InitializeEgl(EglInterface& egl
);
+
void SetSurfaceType( Integration::RenderSurface::Type type
);
- void SetSurfaceType( RenderSurface::Type type );
+ /**
+ * @copydoc Dali::Internal::Adaptor::DisplayConnection::SetGraphicsInterface
+ */
+ void SetGraphicsInterface( GraphicsInterface& graphics );
public:
public:
@@
-107,6
+105,8
@@
protected:
private:
private:
+ GraphicsInterface* mGraphics; ///< The graphics interface
+
public:
XDisplay* mDisplay; ///< X-display for rendering
public:
XDisplay* mDisplay; ///< X-display for rendering