From ca4f81211f6549cbae2e224ee6baf7453c9f490b Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Wed, 25 Oct 2023 16:42:10 +0900 Subject: [PATCH] [Tizen] Add lock for shader-precompiler This reverts commit d7445f87860698cebc1f9994ef5c2416d5b15cd8. Change-Id: I303b3a0e41c2f5add19b87e798d451e84ab7b8e8 --- .../common/combined-update-render-controller.cpp | 72 +++++++++++++++++----- .../common/combined-update-render-controller.h | 1 + 2 files changed, 58 insertions(+), 15 deletions(-) diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp index e2961d1..55a557a 100644 --- a/dali/internal/adaptor/common/combined-update-render-controller.cpp +++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp @@ -116,6 +116,7 @@ CombinedUpdateRenderController::CombinedUpdateRenderController(AdaptorInternalSe mUpdateRenderThreadCanSleep(FALSE), mPendingRequestUpdate(FALSE), mUseElapsedTimeAfterWait(FALSE), + mIsQuitedPreCompile(FALSE), mNewSurface(NULL), mDeletedSurface(nullptr), mPostRendering(FALSE), @@ -313,6 +314,11 @@ void CombinedUpdateRenderController::ReplaceSurface(Dali::RenderSurfaceInterface ConditionalWait::ScopedLock lock(mUpdateRenderThreadWaitCondition); mPostRendering = FALSE; // Clear the post-rendering flag as Update/Render thread will replace the surface now mNewSurface = newSurface; + if(mIsQuitedPreCompile == FALSE) + { + mIsQuitedPreCompile = TRUE; + Integration::ShaderPrecompiler::Get().StopPrecompile(); + } mUpdateRenderThreadWaitCondition.Notify(lock); } @@ -336,6 +342,11 @@ void CombinedUpdateRenderController::DeleteSurface(Dali::RenderSurfaceInterface* ConditionalWait::ScopedLock lock(mUpdateRenderThreadWaitCondition); mPostRendering = FALSE; // Clear the post-rendering flag as Update/Render thread will delete the surface now mDeletedSurface = surface; + if(mIsQuitedPreCompile == FALSE) + { + mIsQuitedPreCompile = TRUE; + Integration::ShaderPrecompiler::Get().StopPrecompile(); + } mUpdateRenderThreadWaitCondition.Notify(lock); } @@ -372,6 +383,11 @@ void CombinedUpdateRenderController::ResizeSurface() ConditionalWait::ScopedLock lock(mUpdateRenderThreadWaitCondition); // Surface is resized and the surface resized count is increased. mSurfaceResized++; + if(mIsQuitedPreCompile == FALSE) + { + mIsQuitedPreCompile = TRUE; + Integration::ShaderPrecompiler::Get().StopPrecompile(); + } mUpdateRenderThreadWaitCondition.Notify(lock); } } @@ -450,6 +466,11 @@ void CombinedUpdateRenderController::RunUpdateRenderThread(int numberOfCycles, A mUpdateRenderThreadCanSleep = FALSE; mUploadWithoutRendering = (updateMode == UpdateMode::SKIP_RENDER); LOG_COUNTER_EVENT("mUpdateRenderRunCount: %d, mUseElapsedTimeAfterWait: %d", mUpdateRenderRunCount, mUseElapsedTimeAfterWait); + if(mIsQuitedPreCompile == FALSE) + { + mIsQuitedPreCompile = TRUE; + Integration::ShaderPrecompiler::Get().StopPrecompile(); + } mUpdateRenderThreadWaitCondition.Notify(lock); } @@ -463,6 +484,11 @@ void CombinedUpdateRenderController::StopUpdateRenderThread() { ConditionalWait::ScopedLock lock(mUpdateRenderThreadWaitCondition); mDestroyUpdateRenderThread = TRUE; + if(mIsQuitedPreCompile == FALSE) + { + mIsQuitedPreCompile = TRUE; + Integration::ShaderPrecompiler::Get().StopPrecompile(); + } mUpdateRenderThreadWaitCondition.Notify(lock); } @@ -570,26 +596,37 @@ void CombinedUpdateRenderController::UpdateRenderThread() const bool renderToFboEnabled = 0u != renderToFboInterval; unsigned int frameCount = 0u; - if(Integration::ShaderPrecompiler::Get().IsEnable()) + if(!mDestroyUpdateRenderThread) { - std::vector precompiledShaderList; - Integration::ShaderPrecompiler::Get().GetPrecompileShaderList(precompiledShaderList); - DALI_LOG_RELEASE_INFO("ShaderPrecompiler[ENABLE], list size:%d \n",precompiledShaderList.size()); - for(auto precompiledShader = precompiledShaderList.begin(); precompiledShader != precompiledShaderList.end(); ++precompiledShader) + Integration::ShaderPrecompiler::Get().WaitPrecompileList(); + if(Integration::ShaderPrecompiler::Get().IsEnable()) { - auto numberOfPrecomipledShader = precompiledShader->shaderCount; - for(int i= 0; i precompiledShaderList; + Integration::ShaderPrecompiler::Get().GetPrecompileShaderList(precompiledShaderList); + DALI_LOG_RELEASE_INFO("ShaderPrecompiler[ENABLE], list size:%d \n", precompiledShaderList.size()); + for(auto precompiledShader = precompiledShaderList.begin(); precompiledShader != precompiledShaderList.end(); ++precompiledShader) { - auto vertexShader = std::string(graphics.GetController().GetGlAbstraction().GetVertexShaderPrefix() + precompiledShader->vertexPrefix[i].data() + precompiledShader->vertexShader.data()); - auto fragmentShader = std::string(graphics.GetController().GetGlAbstraction().GetFragmentShaderPrefix() + precompiledShader->fragmentPrefix[i].data() + precompiledShader->fragmentShader.data()); - mCore.PreCompileShader(vertexShader.data(), fragmentShader.data()); + if(mIsQuitedPreCompile == TRUE) + { + Integration::ShaderPrecompiler::Get().StopPrecompile(); + DALI_LOG_RELEASE_INFO("ShaderPrecompiler[ENABLE], but stop precompile"); + break; + } + + auto numberOfPrecomipledShader = precompiledShader->shaderCount; + for(int i = 0; i < numberOfPrecomipledShader; ++i) + { + auto vertexShader = std::string(graphics.GetController().GetGlAbstraction().GetVertexShaderPrefix() + precompiledShader->vertexPrefix[i].data() + precompiledShader->vertexShader.data()); + auto fragmentShader = std::string(graphics.GetController().GetGlAbstraction().GetFragmentShaderPrefix() + precompiledShader->fragmentPrefix[i].data() + precompiledShader->fragmentShader.data()); + mCore.PreCompileShader(vertexShader.data(), fragmentShader.data()); + } + DALI_LOG_RELEASE_INFO("ShaderPrecompiler[ENABLE], shader count :%d \n", numberOfPrecomipledShader); } - DALI_LOG_RELEASE_INFO("ShaderPrecompiler[ENABLE], shader count :%d \n",numberOfPrecomipledShader); } - } - else - { - DALI_LOG_RELEASE_INFO("ShaderPrecompiler[DISABLE] \n"); + else + { + DALI_LOG_RELEASE_INFO("ShaderPrecompiler[DISABLE] \n"); + } } while(UpdateRenderReady(useElapsedTime, updateRequired, timeToSleepUntil)) @@ -1036,6 +1073,11 @@ void CombinedUpdateRenderController::PostRenderComplete() { ConditionalWait::ScopedLock lock(mUpdateRenderThreadWaitCondition); mPostRendering = FALSE; + if(mIsQuitedPreCompile == FALSE) + { + mIsQuitedPreCompile = TRUE; + Integration::ShaderPrecompiler::Get().StopPrecompile(); + } mUpdateRenderThreadWaitCondition.Notify(lock); } diff --git a/dali/internal/adaptor/common/combined-update-render-controller.h b/dali/internal/adaptor/common/combined-update-render-controller.h index bec2f70..abb40d9 100644 --- a/dali/internal/adaptor/common/combined-update-render-controller.h +++ b/dali/internal/adaptor/common/combined-update-render-controller.h @@ -377,6 +377,7 @@ private: ///< Ensures we do not go to sleep if we have not processed the most recent update-request. volatile unsigned int mUseElapsedTimeAfterWait; ///< Whether we should use the elapsed time after waiting (set by the event-thread, read by the update-render-thread). + volatile unsigned int mIsQuitedPreCompile; ///< Whether we need to do precompile shader. Dali::RenderSurfaceInterface* volatile mNewSurface; ///< Will be set to the new-surface if requested (set by the event-thread, read & cleared by the update-render thread). Dali::RenderSurfaceInterface* volatile mDeletedSurface; ///< Will be set to the deleted surface if requested (set by the event-thread, read & cleared by the update-render thread). -- 2.7.4