Revert "[Tizen] Fix crash at terminate case when we use precompile option"

This reverts commit 394ce3a21fe5f90f09fe0bc21b8cde0b22cd7d4d.

diff --git a/dali/integration-api/adaptor-framework/shader-precompiler.cpp b/dali/integration-api/adaptor-framework/shader-precompiler.cpp
index f74fb3e636238519fdd244e9f6b90b95b5874920..1323ff48ae7acb1b99910095557a4ce7fa902ff5 100644 (file)
--- a/dali/integration-api/adaptor-framework/shader-precompiler.cpp
+++ b/dali/integration-api/adaptor-framework/shader-precompiler.cpp
@@ -102,10 +102,4 @@ void ShaderPreCompiler::Awake()
   mNeedsSleep = false;
   mConditionalWait.Notify(lock);
 }
-
-void ShaderPreCompiler::ClearPreCompiledPrograms()
-{
-  mProgram.clear();
-}
-
 } // namespace Dali

diff --git a/dali/integration-api/adaptor-framework/shader-precompiler.h b/dali/integration-api/adaptor-framework/shader-precompiler.h
index d2695427895c04f7ef52a56d20dbe6139d296867..4272b5f0ad60129a19a3e79a51c81e464974991e 100644 (file)
--- a/dali/integration-api/adaptor-framework/shader-precompiler.h
+++ b/dali/integration-api/adaptor-framework/shader-precompiler.h
@@ -42,7 +42,7 @@ struct RawShaderData
   std::vector<std::string_view> shaderName;
   std::string_view              vertexShader;
   std::string_view              fragmentShader;
-  bool                          custom;
+  bool custom;
 };
 
 /**
@@ -113,12 +113,6 @@ public:
    */
   void Awake();
 
-  /**
-   * @brief Remove all pre-compiled programs from cache.
-   * @note It must be called before graphics shutdown.
-   */
-  void ClearPreCompiledPrograms();
-
 private:
   /**
    * Construct a new ShaderPreCompiler.

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index 896fc066eebbf6fcb5d100982df7f8ff2d0c7bc4..c94bffb8d52f4bad61350478e1d46d3ed7410bc8 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -611,7 +611,7 @@ void CombinedUpdateRenderController::UpdateRenderThread()
           std::string fragmentShader;
           if(precompiledShader->custom)
           {
-            vertexShader   = precompiledShader->vertexPrefix[i].data();
+            vertexShader = precompiledShader->vertexPrefix[i].data();
             fragmentShader = precompiledShader->fragmentPrefix[i].data();
           }
           else
@@ -937,9 +937,6 @@ void CombinedUpdateRenderController::UpdateRenderThread()
   }
   TRACE_UPDATE_RENDER_BEGIN("DALI_RENDER_THREAD_FINISH");
 
-  // Remove pre-compiled program before context destroyed
-  ShaderPreCompiler::Get().ClearPreCompiledPrograms();
-
   // Inform core of context destruction
   mCore.ContextDestroyed();