From b3075f1f090ce44b062f797ecd877518851297d4 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Mon, 27 Jul 2020 15:18:12 +0900 Subject: [PATCH] Revert "[Tizen] remove setenv() that can cause Seg fault" This reverts commit a13107d8f850037fc650081d39bf2687067371ef. Change-Id: I961c4fed06a2875340db25d50e304bb4a908f334 --- dali/internal/adaptor/common/adaptor-impl.cpp | 1 + .../window-system/tizen-wayland/native-render-surface-ecore-wl.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index b43c376..12008ab 100644 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -389,6 +389,7 @@ void Adaptor::Start() else { unsigned int maxTextureSize = mConfigurationManager->GetMaxTextureSize(); + setenv( DALI_ENV_MAX_TEXTURE_SIZE, std::to_string( maxTextureSize ).c_str(), 1 ); Dali::TizenPlatform::ImageLoader::SetMaxTextureSize( maxTextureSize ); } 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 5b955d3..9eda5e8 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 @@ -160,6 +160,7 @@ int NativeRenderSurfaceEcoreWl::GetOrientation() const void NativeRenderSurfaceEcoreWl::InitializeGraphics() { DALI_LOG_TRACE_METHOD( gNativeSurfaceLogFilter ); + unsetenv( "EGL_PLATFORM" ); mGraphics = &mAdaptor->GetGraphicsInterface(); auto eglGraphics = static_cast(mGraphics); -- 2.7.4