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
/
common
/
display-connection.h
diff --git
a/dali/internal/window-system/common/display-connection.h
b/dali/internal/window-system/common/display-connection.h
index
9a9243c
..
00c67c8
100644
(file)
--- a/
dali/internal/window-system/common/display-connection.h
+++ b/
dali/internal/window-system/common/display-connection.h
@@
-22,15
+22,12
@@
#include <dali/public-api/object/any.h>
// INTERNAL INCLUDES
#include <dali/public-api/object/any.h>
// INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/render-surface.h>
+#include <dali/integration-api/render-surface.h>
+#include <dali/internal/graphics/common/graphics-interface.h>
-#include <memory>
namespace Dali
{
namespace Dali
{
-
-class EglInterface;
-
namespace Internal
{
namespace Adaptor
namespace Internal
{
namespace Adaptor
@@
-46,18
+43,20
@@
public:
/**
* @brief Create an initialized DisplayConnection.
*
/**
* @brief Create an initialized DisplayConnection.
*
+ * @param[in] graphics The abstracted graphics interface
* @return A handle to a newly allocated DisplayConnection resource.
*/
* @return A handle to a newly allocated DisplayConnection resource.
*/
- static DisplayConnection* New();
+ static DisplayConnection* New(
Dali::Internal::Adaptor::GraphicsInterface& graphics
);
/**
* @brief Create an initialized DisplayConnection.
* Native surface will need this instead of DisplayConnection::New()
*
/**
* @brief Create an initialized DisplayConnection.
* Native surface will need this instead of DisplayConnection::New()
*
+ * @param[in] graphics The abstracted graphics interface
* @param[in] type Render surface type
* @return A handle to a newly allocated DisplayConnection resource.
*/
* @param[in] type Render surface type
* @return A handle to a newly allocated DisplayConnection resource.
*/
- static DisplayConnection* New( RenderSurface::Type type );
+ static DisplayConnection* New(
Dali::Internal::Adaptor::GraphicsInterface& graphics, Integration::
RenderSurface::Type type );
/**
* @brief Create a DisplayConnection handle; this can be initialised with DisplayConnection::New().
/**
* @brief Create a DisplayConnection handle; this can be initialised with DisplayConnection::New().
@@
-81,23
+80,14
@@
public:
Any GetDisplay();
/**
Any GetDisplay();
/**
- * @brief Get DPI
- * @param[out] dpiHorizontal set to the horizontal dpi
- * @param[out] dpiVertical set to the vertical dpi
- */
- static void GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical);
-
- /**
* @brief Consumes any possible events on the queue so that there is no leaking between frames
*/
void ConsumeEvents();
/**
* @brief Consumes any possible events on the queue so that there is no leaking between frames
*/
void ConsumeEvents();
/**
- * @brief Initialize EGL display
- *
- * @param egl implementation to use for the creation
+ * @brief Initialize the display
*/
*/
- bool Initialize
Egl(EglInterface& egl
);
+ bool Initialize
(
);
public:
public: