From 3fe7030fe503879c909bf28c4a953fd19fee2a3b Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Mon, 8 Oct 2018 13:58:02 +0100 Subject: [PATCH] RenderSurface interface change in automated test utils Change-Id: Ia0b42a519d0e9df399cf3b274d410c083e6662e3 --- .../dali-toolkit-test-utils/toolkit-adaptor-impl.h | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h index e5d4a70..ee60af1 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h @@ -26,6 +26,18 @@ class EglInterface; class DisplayConnection; class ThreadSynchronizationInterface; +namespace Internal +{ + +namespace Adaptor +{ + +class GraphicsInterface; + +} // namespace Adaptor + +} // namespace Internal + namespace Integration { @@ -40,13 +52,13 @@ public: virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; } - virtual void InitializeEgl( EglInterface& egl ) {} + virtual void InitializeGraphics( Dali::Internal::Adaptor::GraphicsInterface& graphics, Dali::DisplayConnection& displayConnection ) {}; - virtual void CreateEglSurface( EglInterface& egl ) {} + virtual void CreateSurface() {} - virtual void DestroyEglSurface( EglInterface& egl ) {} + virtual void DestroySurface() {} - virtual bool ReplaceEGLSurface( EglInterface& egl ) { return false; } + virtual bool ReplaceGraphicsSurface() { return false; } virtual void MoveResize( Dali::PositionSize positionSize ) {} @@ -54,9 +66,9 @@ public: virtual void StartRender() {} - virtual bool PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, bool resizingSurface ) { return false; } + virtual bool PreRender( bool resizingSurface ) { return false; } - virtual void PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, DisplayConnection* displayConnection, bool replacingSurface, bool resizingSurface ) {} + virtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) {} virtual void StopRender() {} -- 2.7.4