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
/
tizen-wayland
/
display-connection-impl-ecore-wl.cpp
diff --git
a/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
b/dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
index
42ffab6
..
f639ed5
100755
(executable)
--- a/
dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
+++ b/
dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-17,13
+17,16
@@
// CLASS HEADER
#include <dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.h>
// CLASS HEADER
#include <dali/internal/window-system/tizen-wayland/display-connection-impl-ecore-wl.h>
+#include <dali/internal/graphics/gles/egl-graphics.h>
// EXTERNAL_HEADERS
// EXTERNAL_HEADERS
-#include <Ecore_Wayland.h>
#include <dali/integration-api/debug.h>
#include <dali/integration-api/debug.h>
-// INTERNAL HEADERS
-#include <dali/integration-api/wayland/native-render-surface.h>
+#ifdef ECORE_WAYLAND2
+#include <Ecore_Wl2.h>
+#else
+#include <Ecore_Wayland.h>
+#endif
namespace Dali
{
namespace Dali
{
@@
-43,13
+46,14
@@
DisplayConnection* DisplayConnectionEcoreWl::New()
DisplayConnectionEcoreWl::DisplayConnectionEcoreWl()
: mDisplay( NULL ),
DisplayConnectionEcoreWl::DisplayConnectionEcoreWl()
: mDisplay( NULL ),
- mSurfaceType( RenderSurface::ECORE_RENDER_SURFACE )
+ mSurfaceType( Integration::RenderSurface::WINDOW_RENDER_SURFACE ),
+ mGraphics( nullptr )
{
}
DisplayConnectionEcoreWl::~DisplayConnectionEcoreWl()
{
{
}
DisplayConnectionEcoreWl::~DisplayConnectionEcoreWl()
{
- if( mSurfaceType == RenderSurface::NATIVE_RENDER_SURFACE )
+ if( mSurfaceType ==
Integration::
RenderSurface::NATIVE_RENDER_SURFACE )
{
ReleaseNativeDisplay();
}
{
ReleaseNativeDisplay();
}
@@
-64,9
+68,10
@@
void DisplayConnectionEcoreWl::ConsumeEvents()
{
}
{
}
-bool DisplayConnectionEcoreWl::Initialize
Egl(EglInterface& egl
)
+bool DisplayConnectionEcoreWl::Initialize
Graphics(
)
{
{
- EglImplementation& eglImpl = static_cast<EglImplementation&>(egl);
+ auto eglGraphics = static_cast<EglGraphics *>(mGraphics);
+ EglImplementation& eglImpl = eglGraphics->GetEglImplementation();
if( !eglImpl.InitializeGles( mDisplay ) )
{
if( !eglImpl.InitializeGles( mDisplay ) )
{
@@
-77,31
+82,28
@@
bool DisplayConnectionEcoreWl::InitializeEgl(EglInterface& egl)
return true;
}
return true;
}
-void DisplayConnectionEcoreWl::SetSurfaceType( RenderSurface::Type type )
+void DisplayConnectionEcoreWl::SetSurfaceType(
Integration::
RenderSurface::Type type )
{
mSurfaceType = type;
{
mSurfaceType = type;
- if( mSurfaceType == RenderSurface::NATIVE_RENDER_SURFACE )
+ if( mSurfaceType ==
Integration::
RenderSurface::NATIVE_RENDER_SURFACE )
{
mDisplay = GetNativeDisplay();
}
else
{
{
mDisplay = GetNativeDisplay();
}
else
{
+#ifdef ECORE_WAYLAND2
+ Ecore_Wl2_Display* display = ecore_wl2_connected_display_get( NULL );
+ mDisplay = reinterpret_cast< EGLNativeDisplayType >( ecore_wl2_display_get( display ) );
+#else
mDisplay = reinterpret_cast< EGLNativeDisplayType >( ecore_wl_display_get() );
mDisplay = reinterpret_cast< EGLNativeDisplayType >( ecore_wl_display_get() );
+#endif
}
}
}
}
-void DisplayConnectionEcoreWl::
GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical
)
+void DisplayConnectionEcoreWl::
SetGraphicsInterface( GraphicsInterface& graphics
)
{
{
- // calculate DPI
- float xres, yres;
-
- // 1 inch = 25.4 millimeters
- xres = ecore_wl_dpi_get();
- yres = ecore_wl_dpi_get();
-
- dpiHorizontal = int(xres + 0.5f); // rounding
- dpiVertical = int(yres + 0.5f);
+ mGraphics = &graphics;
}
EGLNativeDisplayType DisplayConnectionEcoreWl::GetNativeDisplay()
}
EGLNativeDisplayType DisplayConnectionEcoreWl::GetNativeDisplay()