X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Ftizen-wayland%2Fnative-render-surface-ecore-wl.cpp;h=e69e8f151d23668c246895450ce7455bb8283c27;hb=9d1664abe78262c8a9bcf25d703581e347a8dc29;hp=56fc04a1a1d4ff8898abc0a5fdc1e8e5c71999f8;hpb=0f9ac19f22e942610bb1fb5f6fd06f743278d2ab;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp index 56fc04a..e69e8f1 100644 --- a/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp +++ b/dali/internal/window-system/tizen-wayland/native-render-surface-ecore-wl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -51,40 +51,6 @@ namespace Debug::Filter* gNativeSurfaceLogFilter = Debug::Filter::New(Debug::Verbose, false, "LOG_NATIVE_RENDER_SURFACE"); #endif -inline void PrintTBMSurfaceQueueError( int errorCode ) -{ - switch( errorCode ) - { - case TBM_SURFACE_QUEUE_ERROR_EMPTY: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_EMPTY" ); - break; - case TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_INVALID_QUEUE" ); - break; - case TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_INVALID_SURFACE" ); - break; - case TBM_SURFACE_QUEUE_ERROR_SURFACE_ALLOC_FAILED: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_SURFACE_ALLOC_FAILED" ); - break; - case TBM_SURFACE_QUEUE_ERROR_ALREADY_EXIST: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_ALREADY_EXIST" ); - break; - case TBM_SURFACE_QUEUE_ERROR_UNKNOWN_SURFACE: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_UNKNOWN_SURFACE" ); - break; - case TBM_SURFACE_QUEUE_ERROR_INVALID_SEQUENCE: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_INVALID_SEQUENCE" ); - break; - case TBM_SURFACE_QUEUE_ERROR_TIMEOUT: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_TIMEOUT" ); - break; - default: - DALI_LOG_ERROR( "TBM_SURFACE_QUEUE_ERROR_UNKNOWN" ); - break; - } -} - } // unnamed namespace NativeRenderSurfaceEcoreWl::NativeRenderSurfaceEcoreWl( Dali::PositionSize positionSize, bool isTransparent ) @@ -110,6 +76,11 @@ NativeRenderSurfaceEcoreWl::NativeRenderSurfaceEcoreWl( Dali::PositionSize posit NativeRenderSurfaceEcoreWl::~NativeRenderSurfaceEcoreWl() { + if ( mEGLSurface ) + { + DestroySurface(); + } + // release the surface if we own one if( mOwnSurface ) { @@ -171,6 +142,11 @@ void NativeRenderSurfaceEcoreWl::GetDpi( unsigned int& dpiHorizontal, unsigned i dpiVertical = int( yres + 0.5f ); } +int NativeRenderSurfaceEcoreWl::GetOrientation() const +{ + return 0; +} + void NativeRenderSurfaceEcoreWl::InitializeGraphics() { DALI_LOG_TRACE_METHOD( gNativeSurfaceLogFilter ); @@ -236,8 +212,6 @@ void NativeRenderSurfaceEcoreWl::MoveResize( Dali::PositionSize positionSize ) if( error != TBM_SURFACE_QUEUE_ERROR_NONE ) { DALI_LOG_ERROR( "Failed to resize tbm_surface_queue" ); - - PrintTBMSurfaceQueueError( error ); } mPosition = positionSize;