From dbd3b86b1bb5cb452e3306c1dd27e2a059aad916 Mon Sep 17 00:00:00 2001 From: "Eunki, Hong" Date: Wed, 7 May 2025 09:01:20 +0900 Subject: [PATCH] Revert "Change non-shared uniform shader also ignore UBO" This reverts commit 4698b30e0998d2572ee8ecee6dd382cf516b802b. Change-Id: Ice9744aa5e7d52dd9481326533909c7ed7ec8b9d --- .../shaders/text-scroller-shader.vert | 2 +- .../graphics/shaders/text-visual-shader.vert | 2 +- .../internal/visuals/visual-factory-cache.cpp | 32 ++----------------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert b/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert index 240820744d..8a74212432 100644 --- a/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert +++ b/dali-toolkit/internal/graphics/shaders/text-scroller-shader.vert @@ -18,7 +18,7 @@ UNIFORM_BLOCK VertBlock UNIFORM highp mat4 uMvpMatrix; }; -UNIFORM_BLOCK NisualVertBlock +UNIFORM_BLOCK VisualVertBlock { //Visual size and offset UNIFORM highp vec2 offset; diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert index a31f4b0f15..d5a529bdbe 100644 --- a/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert +++ b/dali-toolkit/internal/graphics/shaders/text-visual-shader.vert @@ -13,7 +13,7 @@ UNIFORM_BLOCK VertBlock UNIFORM highp vec3 uSize; }; -UNIFORM_BLOCK NisualVertBlock +UNIFORM_BLOCK VisualVertBlock { //Visual size and offset UNIFORM highp vec2 offset; diff --git a/dali-toolkit/internal/visuals/visual-factory-cache.cpp b/dali-toolkit/internal/visuals/visual-factory-cache.cpp index a9651fb46e..751aa67212 100644 --- a/dali-toolkit/internal/visuals/visual-factory-cache.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-cache.cpp @@ -57,24 +57,6 @@ bool NeedToLoadYuvPlanes() return loadYuvPlanes; } -// Happy trick for Tizen platform! since 2025-04-22. eunkiki.hong@samsung.com -// Since uniform buffer reduce fps near 10% than before, let we ignore uniform block feature -// except several default SharedUniformBlocks, like "VisualVertBlock". -// If we resolve performance issue, please remove below code! -#define IGNORE_UNIFORM_BLOCKS_FOR_NORMAL_CASES 1 - -#if IGNORE_UNIFORM_BLOCKS_FOR_NORMAL_CASES -inline bool ApplyNonDefaultUniformBlockVertexShaderCode(std::string& vertexShader) -{ - auto it = vertexShader.find("VisualVertBlock"); - if(it != std::string::npos) - { - vertexShader.replace(it, 15, "NisualVertBlock"); - return true; - } - return false; -} -#endif } // namespace VisualFactoryCache::VisualFactoryCache(bool preMultiplyOnLoad) @@ -119,11 +101,11 @@ Shader VisualFactoryCache::GetShader(ShaderType type, bool useDefaultUniforms) Shader VisualFactoryCache::GenerateAndSaveShader(ShaderType type, std::string_view vertexShader, std::string_view fragmentShader, bool useDefaultUniforms) { - Shader shader; + Shader shader; std::string shaderName = Scripting::GetLinearEnumerationName(type, VISUAL_SHADER_TYPE_TABLE, VISUAL_SHADER_TYPE_TABLE_COUNT); // If the shader name is empty, it means that the shader is not generated internally. So, there is need to support file caching. Otherwise, it is defined externally. So, it needs not to support file caching. - Shader::Hint::Value shaderHints = shaderName.empty() ? Shader::Hint::NONE : Shader::Hint::FILE_CACHE_SUPPORT; + Shader::Hint::Value shaderHints = shaderName.empty()? Shader::Hint::NONE : Shader::Hint::FILE_CACHE_SUPPORT; if(useDefaultUniforms) { @@ -132,15 +114,7 @@ Shader VisualFactoryCache::GenerateAndSaveShader(ShaderType type, std::string_vi } else { -#if IGNORE_UNIFORM_BLOCKS_FOR_NORMAL_CASES - std::string convertedVertexShader = std::string(vertexShader); - if(ApplyNonDefaultUniformBlockVertexShaderCode(convertedVertexShader)) - { - vertexShader = convertedVertexShader; - shaderName += "_N"; - } -#endif - shader = Shader::New(vertexShader, fragmentShader, shaderHints, shaderName); + shader = Shader::New(vertexShader, fragmentShader, shaderHints, shaderName); mShader[type] = shader; } -- 2.34.1