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 screen rotation""
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
x11
/
window-render-surface-x.cpp
diff --git
a/adaptors/x11/window-render-surface-x.cpp
b/adaptors/x11/window-render-surface-x.cpp
index
0580f54
..
9954f9a
100644
(file)
--- a/
adaptors/x11/window-render-surface-x.cpp
+++ b/
adaptors/x11/window-render-surface-x.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
@@
-59,6
+59,7
@@
WindowRenderSurface::WindowRenderSurface( Dali::PositionSize positionSize,
const std::string& className,
bool isTransparent)
: EcoreXRenderSurface( positionSize, surface, name, isTransparent ),
const std::string& className,
bool isTransparent)
: EcoreXRenderSurface( positionSize, surface, name, isTransparent ),
+ mX11Window( 0 ),
mNeedToApproveDeiconify(false),
mClassName(className)
{
mNeedToApproveDeiconify(false),
mClassName(className)
{
@@
-77,7
+78,7
@@
WindowRenderSurface::~WindowRenderSurface()
Ecore_X_Drawable WindowRenderSurface::GetDrawable()
{
// already an e-core type
Ecore_X_Drawable WindowRenderSurface::GetDrawable()
{
// already an e-core type
- return
(Ecore_X_Drawable)mX11Window
;
+ return
static_cast< Ecore_X_Drawable >( mX11Window )
;
}
Any WindowRenderSurface::GetSurface()
}
Any WindowRenderSurface::GetSurface()
@@
-112,9
+113,9
@@
void WindowRenderSurface::CreateEglSurface( EglInterface& eglIf )
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( eglIf );
// create the EGL surface
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( eglIf );
// create the EGL surface
- // need to c
ast to
X handle as in 64bit system ECore handle is 32 bit whereas EGLnative and XWindow are 64 bit
- XWindow window
= static_cast< XWindow>
( mX11Window );
- eglImpl.CreateSurfaceWindow(
(EGLNativeWindowType)window, mColorDepth ); // reinterpret_cast does not compile
+ // need to c
reate
X handle as in 64bit system ECore handle is 32 bit whereas EGLnative and XWindow are 64 bit
+ XWindow window( mX11Window );
+ eglImpl.CreateSurfaceWindow(
reinterpret_cast< EGLNativeWindowType >( window ), mColorDepth );
}
void WindowRenderSurface::DestroyEglSurface( EglInterface& eglIf )
}
void WindowRenderSurface::DestroyEglSurface( EglInterface& eglIf )
@@
-129,11
+130,11
@@
bool WindowRenderSurface::ReplaceEGLSurface( EglInterface& egl )
{
DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
{
DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
- // need to c
ast to
X handle as in 64bit system ECore handle is 32 bit whereas EGLnative and XWindow are 64 bit
- XWindow window
= static_cast< XWindow >
( mX11Window );
+ // need to c
reate
X handle as in 64bit system ECore handle is 32 bit whereas EGLnative and XWindow are 64 bit
+ XWindow window( mX11Window );
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
- return eglImpl.ReplaceSurfaceWindow(
(EGLNativeWindowType)window ); // reinterpret_cast does not compile
+ return eglImpl.ReplaceSurfaceWindow(
reinterpret_cast< EGLNativeWindowType >( window ) );
}
void WindowRenderSurface::MoveResize( Dali::PositionSize positionSize )
}
void WindowRenderSurface::MoveResize( Dali::PositionSize positionSize )
@@
-182,13
+183,13
@@
void WindowRenderSurface::StartRender()
{
}
{
}
-bool WindowRenderSurface::PreRender( EglInterface&, Integration::GlAbstraction& )
+bool WindowRenderSurface::PreRender( EglInterface&, Integration::GlAbstraction&
, bool
)
{
// nothing to do for windows
return true;
}
{
// nothing to do for windows
return true;
}
-void WindowRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface )
+void WindowRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface
, bool resizingSurface
)
{
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
eglImpl.SwapBuffers();
{
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
eglImpl.SwapBuffers();