From c233992c9b529d75cfdabd05025871fee2c599b1 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Tue, 14 Jul 2020 18:52:20 +0900 Subject: [PATCH] Revert "[Tizen] remove setenv() that can cause Seg fault" This reverts commit 83f74c1be37401972d2ce39690c5066c977b06a6. --- 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 1d845aa..58f9c85 100755 --- 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 066fac6..6c5b8da 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 @@ -150,6 +150,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