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
[3.0] Support screen rotation
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
ecore
/
wayland
/
pixmap-render-surface-ecore-wl.cpp
diff --git
a/adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp
b/adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp
index
cc76c24
..
4acb518
100644
(file)
--- a/
adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp
+++ b/
adaptors/ecore/wayland/pixmap-render-surface-ecore-wl.cpp
@@
-23,7
+23,7
@@
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
-#include <
ecore-
wl-types.h>
+#include <wl-types.h>
#include <trigger-event.h>
#include <gl/egl-implementation.h>
#include <base/display-connection.h>
#include <trigger-event.h>
#include <gl/egl-implementation.h>
#include <base/display-connection.h>
@@
-52,8
+52,7
@@
PixmapRenderSurface::~PixmapRenderSurface()
// release the surface if we own one
if( mOwnSurface )
{
// release the surface if we own one
if( mOwnSurface )
{
- // if we did create the pixmap, delete the pixmap
- DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::General, "Own pixmap (%x) freed\n", mX11Pixmap );
+ //TODO: if we did create the pixmap, delete the pixmap
}
}
}
}
@@
-108,13
+107,13
@@
void PixmapRenderSurface::StartRender()
// FIXME
}
// FIXME
}
-bool PixmapRenderSurface::PreRender( EglInterface&, Integration::GlAbstraction& )
+bool PixmapRenderSurface::PreRender( EglInterface&, Integration::GlAbstraction&
, bool
)
{
// nothing to do for pixmaps
return true;
}
{
// nothing to do for pixmaps
return true;
}
-void PixmapRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface )
+void PixmapRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface
, bool resizingSurface
)
{
// flush gl instruction queue
glAbstraction.Flush();
{
// flush gl instruction queue
glAbstraction.Flush();
@@
-148,7
+147,7
@@
void PixmapRenderSurface::SetThreadSynchronization( ThreadSynchronizationInterfa
void PixmapRenderSurface::CreateWlRenderable()
{
// check we're creating one with a valid size
void PixmapRenderSurface::CreateWlRenderable()
{
// check we're creating one with a valid size
- DALI_ASSERT_ALWAYS( mPosition
.width > 0 && mPosition
.height > 0 && "Pixmap size is invalid" );
+ DALI_ASSERT_ALWAYS( mPosition
Size.width > 0 && mPositionSize
.height > 0 && "Pixmap size is invalid" );
// FIXME
}
// FIXME
}