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] Add screen and client rotation itself function"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
ubuntu-x11
/
pixmap-render-surface-ecore-x.cpp
diff --git
a/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
b/dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
index
41a44da
..
2e93140
100644
(file)
--- a/
dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
+++ b/
dali/internal/window-system/ubuntu-x11/pixmap-render-surface-ecore-x.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-22,22
+22,19
@@
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-
#include <X11/extensions/Xfixes.h> // for damage notify
#include <X11/extensions/Xdamage.h> // for damage notify
#include <X11/extensions/Xfixes.h> // for damage notify
#include <X11/extensions/Xdamage.h> // for damage notify
-
#include <dali/integration-api/gl-abstraction.h>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/threading/mutex.h>
// INTERNAL INCLUDES
#include <dali/integration-api/gl-abstraction.h>
#include <dali/integration-api/debug.h>
#include <dali/devel-api/threading/mutex.h>
// INTERNAL INCLUDES
-#include <dali/integration-api/thread-synchronization-interface.h>
-#include <dali/internal/system/common/trigger-event.h>
-#include <dali/internal/window-system/common/display-connection.h>
-#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/integration-api/adaptor-framework/thread-synchronization-interface.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/adaptor/common/adaptor-internal-services.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/adaptor/common/adaptor-internal-services.h>
-
+#include <dali/internal/graphics/gles/egl-graphics.h>
+#include <dali/internal/system/common/trigger-event.h>
+#include <dali/internal/window-system/common/display-connection.h>
namespace Dali
{
namespace Dali
{
@@
-150,11
+147,6
@@
void PixmapRenderSurfaceEcoreX::GetDpi( unsigned int& dpiHorizontal, unsigned in
dpiVertical = int( yres + 0.5f );
}
dpiVertical = int( yres + 0.5f );
}
-int PixmapRenderSurfaceEcoreX::GetOrientation() const
-{
- return 0;
-}
-
void PixmapRenderSurfaceEcoreX::InitializeGraphics()
{
mGraphics = &mAdaptor->GetGraphicsInterface();
void PixmapRenderSurfaceEcoreX::InitializeGraphics()
{
mGraphics = &mAdaptor->GetGraphicsInterface();
@@
-317,9
+309,9
@@
void PixmapRenderSurfaceEcoreX::ReleaseLock()
}
}
}
}
-
Integration::RenderSu
rface::Type PixmapRenderSurfaceEcoreX::GetSurfaceType()
+
Dali::RenderSurfaceInte
rface::Type PixmapRenderSurfaceEcoreX::GetSurfaceType()
{
{
- return
Integration::RenderSu
rface::PIXMAP_RENDER_SURFACE;
+ return
Dali::RenderSurfaceInte
rface::PIXMAP_RENDER_SURFACE;
}
void PixmapRenderSurfaceEcoreX::MakeContextCurrent()
}
void PixmapRenderSurfaceEcoreX::MakeContextCurrent()