From: dongsug-song <35130733+dongsug-song@users.noreply.github.com> Date: Wed, 2 Jan 2019 02:37:13 +0000 (+0900) Subject: [NUI] Revert "Workaround of Vulkan backend csfs crash issue (#630)" (#634) X-Git-Tag: submit/tizen_5.0/20190102.153745~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbd1902894bc0373d6eebc9400f5fb76e4b391b8;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Revert "Workaround of Vulkan backend csfs crash issue (#630)" (#634) This reverts commit 88dfb69c07810dc9ec5ae8cdb0340600f7aa323a. - this crash issue is solved by csfs' change --- diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs index d4b8be5d7..8e47d7de2 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -205,29 +205,6 @@ namespace Tizen.NUI argumentNullDelegate, argumentOutOfRangeDelegate); } - - //Workaround for Vulkan. should be removed. - internal void SetAgain() - { - SWIGRegisterExceptionCallbacks_NDalic( - applicationDelegate, - arithmeticDelegate, - divideByZeroDelegate, - indexOutOfRangeDelegate, - invalidCastDelegate, - invalidOperationDelegate, - ioDelegate, - nullReferenceDelegate, - outOfMemoryDelegate, - overflowDelegate, - systemDelegate); - - SWIGRegisterExceptionCallbacksArgument_NDalic( - argumentDelegate, - argumentNullDelegate, - argumentOutOfRangeDelegate); - } - } protected static SWIGExceptionHelper swigExceptionHelper = new SWIGExceptionHelper(); @@ -319,24 +296,10 @@ namespace Tizen.NUI { SWIGRegisterStringCallback_NDalic(stringDelegate); } - - //Workaround for Vulkan. should be removed. - internal void SetAgain() - { - SWIGRegisterStringCallback_NDalic(stringDelegate); - } } static protected SWIGStringHelper swigStringHelper = new SWIGStringHelper(); - //Workaround for Vulkan. should be removed. - internal static void SetAgainExceptionHelperAndStringHelper() - { - swigExceptionHelper.SetAgain(); - swigStringHelper.SetAgain(); - Tizen.Log.Error("NUI", $"[NOT ERROR] SetAgainExceptionHelperAndStringHelper()"); - } - static NDalicPINVOKE() { diff --git a/src/Tizen.NUI/src/internal/VersionCheck.cs b/src/Tizen.NUI/src/internal/VersionCheck.cs index 532693617..cc597b516 100755 --- a/src/Tizen.NUI/src/internal/VersionCheck.cs +++ b/src/Tizen.NUI/src/internal/VersionCheck.cs @@ -65,7 +65,7 @@ namespace Tizen.NUI } //[Conditional("DEBUG_ON")] - static internal void PrintDaliNativeVersion() + static private void PrintDaliNativeVersion() { int ver1 = -1; int ver2 = -1; diff --git a/src/Tizen.NUI/src/public/NUIApplication.cs b/src/Tizen.NUI/src/public/NUIApplication.cs index 02bc138ac..2575bf923 100755 --- a/src/Tizen.NUI/src/public/NUIApplication.cs +++ b/src/Tizen.NUI/src/public/NUIApplication.cs @@ -147,14 +147,6 @@ namespace Tizen.NUI if (windowSize != null) { _windowSize2D = windowSize; } if (windowPosition != null) { _windowPosition2D = windowPosition; } Registry.Instance.SavedApplicationThread = Thread.CurrentThread; - - //Workaround for Vulkan. should be removed. - if (Graphics.Backend == Graphics.BackendType.Vulkan) - { - Tizen.Log.Error("NUI", "[NOT ERROR] NUIApplication Constructor! Vulkan backend!"); - Version.PrintDaliNativeVersion(); - NDalicPINVOKE.SetAgainExceptionHelperAndStringHelper(); - } } ///