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
/
adaptor
/
common
/
adaptor.cpp
diff --git
a/dali/internal/adaptor/common/adaptor.cpp
b/dali/internal/adaptor/common/adaptor.cpp
index
6b40012
..
66b28ee
100755
(executable)
--- a/
dali/internal/adaptor/common/adaptor.cpp
+++ b/
dali/internal/adaptor/common/adaptor.cpp
@@
-41,14
+41,14
@@
Adaptor& Adaptor::New( Window window, Configuration::ContextLoss configuration )
return *adaptor;
}
return *adaptor;
}
-Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface& surface )
+Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface
Interface
& surface )
{
return New( nativeWindow, surface, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS );
}
{
return New( nativeWindow, surface, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS );
}
-Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface& surface, Configuration::ContextLoss configuration )
+Adaptor& Adaptor::New( Any nativeWindow, const Dali::RenderSurface
Interface
& surface, Configuration::ContextLoss configuration )
{
{
- Dali::RenderSurface
* pSurface = const_cast<Dali::RenderSu
rface *>(&surface);
+ Dali::RenderSurface
Interface* pSurface = const_cast<Dali::RenderSurfaceInte
rface *>(&surface);
Adaptor* adaptor = Internal::Adaptor::Adaptor::New( nativeWindow, pSurface, configuration, NULL );
return *adaptor;
}
Adaptor* adaptor = Internal::Adaptor::Adaptor::New( nativeWindow, pSurface, configuration, NULL );
return *adaptor;
}
@@
-88,7
+88,7
@@
void Adaptor::RemoveIdle( CallbackBase* callback )
mImpl->RemoveIdle( callback );
}
mImpl->RemoveIdle( callback );
}
-void Adaptor::ReplaceSurface( Any nativeWindow, Dali::RenderSurface& surface )
+void Adaptor::ReplaceSurface( Any nativeWindow, Dali::RenderSurface
Interface
& surface )
{
mImpl->ReplaceSurface(nativeWindow, surface);
}
{
mImpl->ReplaceSurface(nativeWindow, surface);
}
@@
-103,7
+103,7
@@
Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal()
return mImpl->LanguageChangedSignal();
}
return mImpl->LanguageChangedSignal();
}
-
RenderSu
rface& Adaptor::GetSurface()
+
Dali::RenderSurfaceInte
rface& Adaptor::GetSurface()
{
return mImpl->GetSurface();
}
{
return mImpl->GetSurface();
}
@@
-113,6
+113,11
@@
Any Adaptor::GetNativeWindowHandle()
return mImpl->GetNativeWindowHandle();
}
return mImpl->GetNativeWindowHandle();
}
+Any Adaptor::GetGraphicsDisplay()
+{
+ return mImpl->GetGraphicsDisplay();
+}
+
void Adaptor::ReleaseSurfaceLock()
{
mImpl->ReleaseSurfaceLock();
void Adaptor::ReleaseSurfaceLock()
{
mImpl->ReleaseSurfaceLock();
@@
-178,24
+183,24
@@
void Adaptor::SceneCreated()
mImpl->SceneCreated();
}
mImpl->SceneCreated();
}
-void Adaptor::
SetViewMode( ViewMode mode
)
+void Adaptor::
RenderOnce(
)
{
{
- mImpl->
SetViewMode( mode
);
+ mImpl->
RenderOnce(
);
}
}
-
void Adaptor::SetStereoBase( float stereoBase
)
+
const LogFactoryInterface& Adaptor::GetLogFactory(
)
{
{
-
mImpl->SetStereoBase( stereoBase
);
+
return mImpl->GetLogFactory(
);
}
}
-void Adaptor::Re
nderOnce(
)
+void Adaptor::Re
gisterProcessor( Integration::Processor& processor
)
{
{
- mImpl->Re
nderOnce(
);
+ mImpl->Re
gisterProcessor( processor
);
}
}
-
const LogFactoryInterface& Adaptor::GetLogFactory(
)
+
void Adaptor::UnregisterProcessor( Integration::Processor& processor
)
{
{
-
return mImpl->GetLogFactory(
);
+
mImpl->UnregisterProcessor( processor
);
}
Adaptor::Adaptor()
}
Adaptor::Adaptor()