X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fcommon%2Fwindow-render-surface.cpp;h=2ff7944ebb1ab1bfede7e3fe81207ba24cf4dc4a;hb=263ec21432f3d7c9f9be5b463748fdce8f6942e4;hp=e8d8367254c41544f0069a37413fd677a331e415;hpb=9a47e13e398225b2ca76a1958f7701e3b7662848;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp index e8d8367..2ff7944 100644 --- a/dali/internal/window-system/common/window-render-surface.cpp +++ b/dali/internal/window-system/common/window-render-surface.cpp @@ -25,11 +25,14 @@ // INTERNAL INCLUDES #include #include -#include +#include #include +#include #include #include #include +#include + namespace Dali { @@ -55,6 +58,9 @@ WindowRenderSurface::WindowRenderSurface( Dali::PositionSize positionSize, Any s mThreadSynchronization( NULL ), mRenderNotification( NULL ), mRotationTrigger( NULL ), + mGraphics( nullptr ), + mEGLSurface( nullptr ), + mEGLContext( nullptr ), mColorDepth( isTransparent ? COLOR_DEPTH_32 : COLOR_DEPTH_24 ), mOutputTransformedSignal(), mRotationAngle( 0 ), @@ -79,15 +85,15 @@ WindowRenderSurface::~WindowRenderSurface() void WindowRenderSurface::Initialize( Any surface ) { - // if width or height are zero, go full screen. - if ( (mPositionSize.width == 0) || (mPositionSize.height == 0) ) - { - // Default window size == screen size - mPositionSize.x = 0; - mPositionSize.y = 0; + // If width or height are zero, go full screen. + if ( (mPositionSize.width == 0) || (mPositionSize.height == 0) ) + { + // Default window size == screen size + mPositionSize.x = 0; + mPositionSize.y = 0; - WindowSystem::GetScreenSize( mPositionSize.width, mPositionSize.height ); - } + WindowSystem::GetScreenSize( mPositionSize.width, mPositionSize.height ); + } // Create a window base auto windowFactory = Dali::Internal::Adaptor::GetWindowFactory(); @@ -174,16 +180,27 @@ void WindowRenderSurface::GetDpi( unsigned int& dpiHorizontal, unsigned int& dpi mWindowBase->GetDpi( dpiHorizontal, dpiVertical ); } -void WindowRenderSurface::InitializeEgl( EglInterface& eglIf ) +void WindowRenderSurface::InitializeGraphics() { - DALI_LOG_TRACE_METHOD( gWindowRenderSurfaceLogFilter ); - Internal::Adaptor::EglImplementation& eglImpl = static_cast( eglIf ); + mGraphics = &mAdaptor->GetGraphicsInterface(); + + auto eglGraphics = static_cast(mGraphics); + mEGL = &eglGraphics->GetEglInterface(); - eglImpl.ChooseConfig(true, mColorDepth); + if ( mEGLContext == NULL ) + { + // Create the OpenGL context for this window + Internal::Adaptor::EglImplementation& eglImpl = static_cast(*mEGL); + eglImpl.ChooseConfig(true, mColorDepth); + eglImpl.CreateWindowContext( mEGLContext ); + + // Create the OpenGL surface + CreateSurface(); + } } -void WindowRenderSurface::CreateEglSurface( EglInterface& eglIf ) +void WindowRenderSurface::CreateSurface() { DALI_LOG_TRACE_METHOD( gWindowRenderSurfaceLogFilter ); @@ -199,29 +216,33 @@ void WindowRenderSurface::CreateEglSurface( EglInterface& eglIf ) height = mPositionSize.width; } - // create the EGL window + // Create the EGL window EGLNativeWindowType window = mWindowBase->CreateEglWindow( width, height ); - Internal::Adaptor::EglImplementation& eglImpl = static_cast( eglIf ); - eglImpl.CreateSurfaceWindow( window, mColorDepth ); + auto eglGraphics = static_cast(mGraphics); + + Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation(); + mEGLSurface = eglImpl.CreateSurfaceWindow( window, mColorDepth ); // Check rotation capability mRotationSupported = mWindowBase->IsEglWindowRotationSupported(); - DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::CreateEglSurface: w = %d h = %d angle = %d screen rotation = %d\n", mPositionSize.width, mPositionSize.height, mRotationAngle, mScreenRotationAngle ); + DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::CreateSurface: w = %d h = %d angle = %d screen rotation = %d\n", mPositionSize.width, mPositionSize.height, mRotationAngle, mScreenRotationAngle ); } -void WindowRenderSurface::DestroyEglSurface( EglInterface& eglIf ) +void WindowRenderSurface::DestroySurface() { DALI_LOG_TRACE_METHOD( gWindowRenderSurfaceLogFilter ); - Internal::Adaptor::EglImplementation& eglImpl = static_cast( eglIf ); - eglImpl.DestroySurface(); + auto eglGraphics = static_cast(mGraphics); + + Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation(); + eglImpl.DestroySurface( mEGLSurface ); mWindowBase->DestroyEglWindow(); } -bool WindowRenderSurface::ReplaceEGLSurface( EglInterface& egl ) +bool WindowRenderSurface::ReplaceGraphicsSurface() { DALI_LOG_TRACE_METHOD( gWindowRenderSurfaceLogFilter ); @@ -240,14 +261,16 @@ bool WindowRenderSurface::ReplaceEGLSurface( EglInterface& egl ) height = mPositionSize.width; } - // create the EGL window + // Create the EGL window EGLNativeWindowType window = mWindowBase->CreateEglWindow( width, height ); // Set screen rotation mScreenRotationFinished = false; - Internal::Adaptor::EglImplementation& eglImpl = static_cast( egl ); - return eglImpl.ReplaceSurfaceWindow( window ); + auto eglGraphics = static_cast(mGraphics); + + Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation(); + return eglImpl.ReplaceSurfaceWindow( window, mEGLSurface, mEGLContext ); } void WindowRenderSurface::MoveResize( Dali::PositionSize positionSize ) @@ -255,14 +278,14 @@ void WindowRenderSurface::MoveResize( Dali::PositionSize positionSize ) bool needToMove = false; bool needToResize = false; - // check moving + // Check moving if( (fabs(positionSize.x - mPositionSize.x) > MINIMUM_DIMENSION_CHANGE) || (fabs(positionSize.y - mPositionSize.y) > MINIMUM_DIMENSION_CHANGE) ) { needToMove = true; } - // check resizing + // Check resizing if( (fabs(positionSize.width - mPositionSize.width) > MINIMUM_DIMENSION_CHANGE) || (fabs(positionSize.height - mPositionSize.height) > MINIMUM_DIMENSION_CHANGE) ) { @@ -296,17 +319,14 @@ void WindowRenderSurface::MoveResize( Dali::PositionSize positionSize ) DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::MoveResize: %d, %d, %d, %d\n", mPositionSize.x, mPositionSize.y, mPositionSize.width, mPositionSize.height ); } -void WindowRenderSurface::SetViewMode( ViewMode viewMode ) -{ - mWindowBase->SetViewMode( viewMode ); -} - void WindowRenderSurface::StartRender() { } -bool WindowRenderSurface::PreRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, bool resizingSurface ) +bool WindowRenderSurface::PreRender( bool resizingSurface ) { + MakeContextCurrent(); + if( resizingSurface ) { #ifdef OVER_TIZEN_VERSION_4 @@ -341,33 +361,56 @@ bool WindowRenderSurface::PreRender( EglInterface& egl, Integration::GlAbstracti } } + auto eglGraphics = static_cast(mGraphics); + if ( eglGraphics ) + { + GlImplementation& mGLES = eglGraphics->GetGlesInterface(); + mGLES.PreRender(); + } + return true; } -void WindowRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstraction& glAbstraction, Dali::DisplayConnection* displayConnection, bool replacingSurface, bool resizingSurface ) +void WindowRenderSurface::PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface ) { - if( resizingSurface ) + // Inform the gl implementation that rendering has finished before informing the surface + auto eglGraphics = static_cast(mGraphics); + if ( eglGraphics ) { - if( !mRotationFinished ) - { - DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::PostRender: Trigger rotation event\n" ); + GlImplementation& mGLES = eglGraphics->GetGlesInterface(); + mGLES.PostRender(); - mRotationTrigger->Trigger(); - - if( mThreadSynchronization ) + if( renderToFbo ) + { + mGLES.Flush(); + mGLES.Finish(); + } + else + { + if( resizingSurface ) { - // Wait until the event-thread complete the rotation event processing - mThreadSynchronization->PostRenderWaitForCompletion(); + if( !mRotationFinished ) + { + DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::PostRender: Trigger rotation event\n" ); + + mRotationTrigger->Trigger(); + + if( mThreadSynchronization ) + { + // Wait until the event-thread complete the rotation event processing + mThreadSynchronization->PostRenderWaitForCompletion(); + } + } } } - } - Internal::Adaptor::EglImplementation& eglImpl = static_cast( egl ); - eglImpl.SwapBuffers(); + Internal::Adaptor::EglImplementation& eglImpl = eglGraphics->GetEglImplementation(); + eglImpl.SwapBuffers( mEGLSurface ); - if( mRenderNotification ) - { - mRenderNotification->Trigger(); + if( mRenderNotification ) + { + mRenderNotification->Trigger(); + } } } @@ -387,11 +430,29 @@ void WindowRenderSurface::ReleaseLock() // Nothing to do. } -RenderSurface::Type WindowRenderSurface::GetSurfaceType() +Integration::RenderSurface::Type WindowRenderSurface::GetSurfaceType() { return RenderSurface::WINDOW_RENDER_SURFACE; } +void WindowRenderSurface::MakeContextCurrent() +{ + if ( mEGL != nullptr ) + { + mEGL->MakeContextCurrent( mEGLSurface, mEGLContext ); + } +} + +Integration::DepthBufferAvailable WindowRenderSurface::GetDepthBufferRequired() +{ + return mGraphics ? mGraphics->GetDepthBufferRequired() : Integration::DepthBufferAvailable::FALSE; +} + +Integration::StencilBufferAvailable WindowRenderSurface::GetStencilBufferRequired() +{ + return mGraphics ? mGraphics->GetStencilBufferRequired() : Integration::StencilBufferAvailable::FALSE; +} + void WindowRenderSurface::OutputTransformed() { int screenRotationAngle = mWindowBase->GetScreenRotationAngle();