From ce8a4b25b9b824fcd7550c04cf29371c1cdf936a Mon Sep 17 00:00:00 2001 From: Taehyub Kim Date: Mon, 30 Oct 2023 17:38:42 +0900 Subject: [PATCH] [Tizen] Add ShaderList for precompile This reverts commit 0c1e5360debaa35b72927526ae69b0e2205e273d. --- dali/integration-api/shader-precompiler.cpp | 14 +++++--------- dali/integration-api/shader-precompiler.h | 6 +++--- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dali/integration-api/shader-precompiler.cpp b/dali/integration-api/shader-precompiler.cpp index ad8efcf..f897a70 100644 --- a/dali/integration-api/shader-precompiler.cpp +++ b/dali/integration-api/shader-precompiler.cpp @@ -30,7 +30,7 @@ std::unique_ptr ShaderPrecompiler::mInstance = nullptr; std::once_flag ShaderPrecompiler::mOnceFlag; ShaderPrecompiler::ShaderPrecompiler() -: mRawShaderData(), +: mRawShaderList(), mPrecompiled(false), mEnabled(false) { @@ -44,7 +44,7 @@ ShaderPrecompiler& ShaderPrecompiler::Get() return *(mInstance.get()); } -void ShaderPrecompiler::GetPrecompileShaderList(RawShaderData& shaders) +void ShaderPrecompiler::GetPrecompileShaderList(std::vector& shaderList) { ConditionalWait::ScopedLock lock(mConditionalWait); if(!IsReady()) @@ -54,18 +54,14 @@ void ShaderPrecompiler::GetPrecompileShaderList(RawShaderData& shaders) } // move shader list - shaders = mRawShaderData; + shaderList = mRawShaderList; } -void ShaderPrecompiler::SavePrecomipleShaderList(RawShaderData& shaders) +void ShaderPrecompiler::SavePrecomipleShaderList(std::vector& shaderList) { ConditionalWait::ScopedLock lock(mConditionalWait); - mRawShaderData.vertexPrefix = shaders.vertexPrefix; - mRawShaderData.fragmentPrefix = shaders.fragmentPrefix; - mRawShaderData.vertexShader = shaders.vertexShader; - mRawShaderData.fragmentShader = shaders.fragmentShader; - mRawShaderData.shaderCount = shaders.shaderCount; + mRawShaderList = shaderList; mPrecompiled = true; mConditionalWait.Notify(lock); } diff --git a/dali/integration-api/shader-precompiler.h b/dali/integration-api/shader-precompiler.h index 1c2094b..1ad5ba7 100644 --- a/dali/integration-api/shader-precompiler.h +++ b/dali/integration-api/shader-precompiler.h @@ -69,7 +69,7 @@ public: * @SINCE_2_2.45 * @param[in] shaders shader data for precompile */ - void GetPrecompileShaderList(RawShaderData& shaders); + void GetPrecompileShaderList(std::vector& shaders); /** * @brief Save the precompile shader list. @@ -77,7 +77,7 @@ public: * @SINCE_2_2.45 * @param[in] shaders shader data for precompile */ - void SavePrecomipleShaderList(RawShaderData& shaders); + void SavePrecomipleShaderList(std::vector& shaders); /** * @brief Check precompile list is ready or not @@ -116,7 +116,7 @@ public: private: static std::unique_ptr mInstance; static std::once_flag mOnceFlag; - RawShaderData mRawShaderData; + std::vector mRawShaderList; ConditionalWait mConditionalWait; bool mPrecompiled; bool mEnabled; -- 2.7.4